diff --git a/components/lib/datatable/BodyCell.js b/components/lib/datatable/BodyCell.js index 9dd17bb34c..aa22b7c2ea 100644 --- a/components/lib/datatable/BodyCell.js +++ b/components/lib/datatable/BodyCell.js @@ -628,13 +628,16 @@ export const BodyCell = React.memo((props) => { ); } else if (rowReorder) { const showReorder = props.showRowReorderElement ? props.showRowReorderElement(props.rowData, { rowIndex: props.rowIndex, props: props.tableProps }) : true; + + const customIcon = getColumnProp('rowReorderIcon') const rowReorderIconProps = mergeProps( { className: cx('rowReorderIcon') }, - getColumnPTOptions('rowReorderIcon') + customIcon ? null : getColumnPTOptions('rowReorderIcon') ); - const rowReorderIcon = getColumnProp('rowReorderIcon') || ; + + const rowReorderIcon = customIcon || ; content = showReorder ? IconUtils.getJSXIcon(rowReorderIcon, { ...rowReorderIconProps }, { props }) : null; } else if (expander) { diff --git a/components/lib/datatable/TableBody.js b/components/lib/datatable/TableBody.js index 1225d46ebe..6174d3c089 100644 --- a/components/lib/datatable/TableBody.js +++ b/components/lib/datatable/TableBody.js @@ -607,9 +607,10 @@ export const TableBody = React.memo( const { originalEvent: event } = e; if (!isUnsyled && DomHandler.hasClass(event.target, 'p-datatable-reorderablerow-handle')) { - event.currentTarget.draggable = true; + event.currentTarget?.draggable = true; + event.target?.draggable = false; } else { - event.currentTarget.draggable = false; + event.currentTarget?.draggable = false; } if (allowRowDrag(e)) {