primereact 10.3.0 → 10.3.2

package/treetable/treetable.cjs.js

@@ -266,7 +266,7 @@ var ColumnBase = componentbase.ComponentBase.extend({
   }
 });
 
-var styles = "\n@layer primereact {\n    .p-treetable {\n        position: relative;\n    }\n    \n    .p-treetable > .p-treetable-wrapper {\n        overflow: auto;\n    }\n    \n    .p-treetable table {\n        border-collapse: collapse;\n        width: 100%;\n        table-layout: fixed;\n    }\n    \n    .p-treetable .p-sortable-column {\n        cursor: pointer;\n        user-select: none;\n    }\n    \n    .p-treetable-selectable .p-treetable-tbody > tr {\n        cursor: pointer;\n    }\n    \n    .p-treetable-toggler {\n        cursor: pointer;\n        user-select: none;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        flex-shrink: 0;\n        vertical-align: middle;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    .p-treetable-toggler + .p-checkbox {\n        vertical-align: middle;\n    }\n    \n    .p-treetable-toggler + .p-checkbox + span {\n        vertical-align: middle;\n    }\n    \n    /* Resizable */\n    .p-treetable-resizable > .p-treetable-wrapper {\n        overflow-x: auto;\n    }\n    \n    .p-treetable-resizable .p-treetable-thead > tr > th,\n    .p-treetable-resizable .p-treetable-tfoot > tr > td,\n    .p-treetable-resizable .p-treetable-tbody > tr > td {\n        overflow: hidden;\n    }\n    \n    .p-treetable-resizable .p-resizable-column {\n        background-clip: padding-box;\n        position: relative;\n    }\n    \n    .p-treetable-resizable-fit .p-resizable-column:last-child .p-column-resizer {\n        display: none;\n    }\n    \n    .p-treetable .p-column-resizer {\n        display: block;\n        position: absolute;\n        top: 0;\n        right: 0;\n        margin: 0;\n        width: 0.5rem;\n        height: 100%;\n        padding: 0px;\n        cursor: col-resize;\n        border: 1px solid transparent;\n    }\n    \n    .p-treetable .p-column-resizer-helper {\n        width: 1px;\n        position: absolute;\n        z-index: 10;\n        display: none;\n    }\n    \n    /* Scrollable */\n    .p-treetable-scrollable-wrapper {\n        position: relative;\n    }\n    .p-treetable-scrollable-header,\n    .p-treetable-scrollable-footer {\n        overflow: hidden;\n        border: 0 none;\n    }\n    \n    .p-treetable-scrollable-body {\n        overflow: auto;\n        position: relative;\n    }\n    \n    .p-treetable-virtual-table {\n        position: absolute;\n    }\n    \n    /* Frozen Columns */\n    .p-treetable-frozen-view .p-treetable-scrollable-body {\n        overflow: hidden;\n    }\n    \n    .p-treetable-unfrozen-view {\n        position: absolute;\n        top: 0px;\n        left: 0px;\n    }\n    \n    /* Reorder */\n    .p-treetable-reorder-indicator-up,\n    .p-treetable-reorder-indicator-down {\n        position: absolute;\n        display: none;\n    }\n    \n    /* Loader */\n    .p-treetable .p-treetable-loading-overlay {\n        position: absolute;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        z-index: 2;\n    }\n}\n";
+var styles = "\n@layer primereact {\n    .p-treetable {\n        position: relative;\n    }\n    \n    .p-treetable > .p-treetable-wrapper {\n        overflow: auto;\n    }\n    \n    .p-treetable table {\n        border-collapse: collapse;\n        width: 100%;\n        table-layout: fixed;\n    }\n    \n    .p-treetable .p-sortable-column {\n        cursor: pointer;\n        user-select: none;\n    }\n    \n    .p-treetable-selectable .p-treetable-tbody > tr {\n        cursor: pointer;\n    }\n    \n    .p-treetable-toggler {\n        cursor: pointer;\n        user-select: none;\n        display: inline-flex;\n        align-items: center;\n        justify-content: center;\n        flex-shrink: 0;\n        vertical-align: middle;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    .p-treetable-toggler + .p-checkbox {\n        vertical-align: middle;\n    }\n    \n    .p-treetable-toggler + .p-checkbox + span {\n        vertical-align: middle;\n    }\n    \n    /* Resizable */\n    .p-treetable-resizable > .p-treetable-wrapper {\n        overflow-x: auto;\n    }\n    \n    .p-treetable-resizable .p-treetable-thead > tr > th,\n    .p-treetable-resizable .p-treetable-tfoot > tr > td,\n    .p-treetable-resizable .p-treetable-tbody > tr > td {\n        overflow: hidden;\n    }\n    \n    .p-treetable-resizable .p-resizable-column {\n        background-clip: padding-box;\n        position: relative;\n    }\n    \n    .p-treetable-resizable-fit .p-resizable-column:last-child .p-column-resizer {\n        display: none;\n    }\n    \n    .p-treetable .p-column-resizer {\n        display: block;\n        position: absolute;\n        top: 0;\n        right: 0;\n        margin: 0;\n        width: 0.5rem;\n        height: 100%;\n        padding: 0px;\n        cursor: col-resize;\n        border: 1px solid transparent;\n    }\n    \n    .p-treetable .p-column-resizer-helper {\n        width: 1px;\n        position: absolute;\n        z-index: 10;\n        display: none;\n    }\n    \n    /* Scrollable */\n    .p-treetable-scrollable-wrapper {\n        position: relative;\n    }\n    .p-treetable-scrollable-header,\n    .p-treetable-scrollable-footer {\n        overflow: hidden;\n        border: 0 none;\n    }\n    \n    .p-treetable-scrollable-body {\n        overflow: auto;\n        position: relative;\n    }\n    \n    .p-treetable-virtual-table {\n        position: absolute;\n    }\n    \n    /* Frozen Columns */\n    .p-treetable-frozen-view .p-treetable-scrollable-body {\n        overflow: hidden;\n    }\n    \n    .p-treetable-unfrozen-view {\n        position: absolute;\n        top: 0px;\n        left: 0px;\n    }\n    \n    /* Reorder */\n    .p-treetable-reorder-indicator-up,\n    .p-treetable-reorder-indicator-down {\n        position: absolute;\n        display: none;\n    }\n    \n    /* Loader */\n    .p-treetable .p-treetable-loading-overlay {\n        position: absolute;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        z-index: 2;\n    }\n\n    /* Alignment */\n    .p-treetable .p-treetable-thead > tr > th.p-align-left > .p-column-header-content,\n    .p-treetable .p-treetable-tbody > tr > td.p-align-left,\n    .p-treetable .p-treetable-tfoot > tr > td.p-align-left {\n        text-align: left;\n        justify-content: flex-start;\n    }\n    .p-treetable .p-treetable-thead > tr > th.p-align-right > .p-column-header-content,\n    .p-treetable .p-treetable-tbody > tr > td.p-align-right,\n    .p-treetable .p-treetable-tfoot > tr > td.p-align-right {\n        text-align: right;\n        justify-content: flex-end;\n    }\n    .p-treetable .p-treetable-thead > tr > th.p-align-center > .p-column-header-content,\n    .p-treetable .p-treetable-tbody > tr > td.p-align-center,\n    .p-treetable .p-treetable-tfoot > tr > td.p-align-center {\n        text-align: center;\n        justify-content: center;\n    }\n}\n";
 var classes = {
   root: function root(_ref) {
     var props = _ref.props,
@@ -286,8 +286,8 @@ var classes = {
   header: 'p-treetable-header',
   footer: 'p-treetable-footer',
   resizeHelper: 'p-column-resizer-helper',
-  reorderIndicatorUp: 'p-datatable-reorder-indicator-up',
-  reorderIndicatorDown: 'p-datatable-reorder-indicator-down',
+  reorderIndicatorUp: 'p-treetable-reorder-indicator-up',
+  reorderIndicatorDown: 'p-treetable-reorder-indicator-down',
   wrapper: 'p-treetable-wrapper',
   table: function table(_ref2) {
     var props = _ref2.props;
@@ -304,30 +304,33 @@ var classes = {
   emptyMessage: 'p-treetable-emptymessage',
   bodyCell: function bodyCell(_ref3) {
     var props = _ref3.bodyProps,
-      editingState = _ref3.editingState;
-    return utils.classNames({
+      editingState = _ref3.editingState,
+      align = _ref3.align;
+    return utils.classNames(_defineProperty({
       'p-editable-column': props.editor,
       'p-cell-editing': props.editor ? editingState : false
-    });
+    }, "p-align-".concat(align), !!align));
   },
   sortBadge: 'p-sortable-column-badge',
   headerTitle: 'p-column-title',
+  headerContent: 'p-column-header-content',
   headerCell: function headerCell(_ref4) {
     var props = _ref4.headerProps,
       frozen = _ref4.frozen,
       column = _ref4.column,
       options = _ref4.options,
       getColumnProp = _ref4.getColumnProp,
-      sorted = _ref4.sorted;
+      sorted = _ref4.sorted,
+      align = _ref4.align;
     return options.filterOnly ? utils.classNames('p-filter-column', {
       'p-frozen-column': frozen
-    }) : utils.classNames({
+    }) : utils.classNames(_defineProperty({
       'p-sortable-column': getColumnProp(column, 'sortable'),
       'p-highlight': sorted,
       'p-frozen-column': frozen,
       'p-resizable-column': props.resizableColumns && getColumnProp(column, 'resizeable'),
       'p-reorderable-column': props.reorderableColumns && getColumnProp(column, 'reorderable') && !frozen
-    });
+    }, "p-align-".concat(align), !!align));
   },
   columnResizer: 'p-column-resizer p-clickable',
   sortIcon: 'p-sortable-column-icon',
@@ -429,9 +432,9 @@ var TreeTableBase = componentbase.ComponentBase.extend({
     propagateSelectionDown: true,
     propagateSelectionUp: true,
     removableSort: false,
-    reorderableColumns: false,
     reorderIndicatorDownIcon: null,
     reorderIndicatorUpIcon: null,
+    reorderableColumns: false,
     resizableColumns: false,
     rowClassName: null,
     rowHover: false,
@@ -444,8 +447,8 @@ var TreeTableBase = componentbase.ComponentBase.extend({
     selectionMode: null,
     showGridlines: false,
     sortField: null,
-    sortMode: 'single',
     sortIcon: null,
+    sortMode: 'single',
     sortOrder: null,
     stripedRows: false,
     style: null,
@@ -474,6 +477,7 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
   var selfClick = React__namespace.useRef(false);
   var overlayEventListener = React__namespace.useRef(null);
   var tabIndexTimeout = React__namespace.useRef(null);
+  var mergeProps = hooks.useMergeProps();
   var getColumnProp = function getColumnProp(name) {
     return ColumnBase.getCProp(props.column, name);
   };
@@ -504,7 +508,7 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
         showGridlines: props.metaData.props.showGridlines
       }
     };
-    return utils.mergeProps(ptm("column.".concat(key), {
+    return mergeProps(ptm("column.".concat(key), {
       column: columnMetadata
     }), ptm("column.".concat(key), columnMetadata), ptmo(cProps, key, columnMetadata));
   };
@@ -663,7 +667,7 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
       props: props
     });else content = utils.ObjectUtils.resolveFieldData(props.node.data, props.field);
   }
-  var editorKeyHelperProps = utils.mergeProps({
+  var editorKeyHelperProps = mergeProps({
     tabIndex: 0,
     ref: keyHelperRef,
     className: 'p-cell-editor-key-helper p-hidden-accessible',
@@ -671,14 +675,16 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
       return onEditorFocus(e);
     }
   }, getColumnPTOptions('editorKeyHelperLabel'));
-  var editorKeyHelperLabelProps = utils.mergeProps(getColumnPTOptions('editorKeyHelper'));
+  var editorKeyHelperLabelProps = mergeProps(getColumnPTOptions('editorKeyHelper'));
   /* eslint-disable */
   var editorKeyHelper = props.editor && /*#__PURE__*/React__namespace.createElement("a", editorKeyHelperProps, /*#__PURE__*/React__namespace.createElement("span", editorKeyHelperLabelProps));
+  var align = getColumnProp('align');
   /* eslint-enable */
-  var bodyCellProps = utils.mergeProps({
+  var bodyCellProps = mergeProps({
     className: utils.classNames(bodyClassName || props.className, cx('bodyCell', {
       bodyProps: props,
-      editingState: editingState
+      editingState: editingState,
+      align: align
     })),
     style: style,
     onClick: function onClick(e) {
@@ -704,6 +710,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
   var checkboxRef = React__namespace.useRef(null);
   var checkboxBoxRef = React__namespace.useRef(null);
   var nodeTouched = React__namespace.useRef(false);
+  var mergeProps = hooks.useMergeProps();
   var expanded = props.expandedKeys ? props.expandedKeys[props.node.key] !== undefined : false;
   var getColumnProp = function getColumnProp(column, name) {
     return ColumnBase.getCProp(column, name);
@@ -730,7 +737,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
         scrollable: props.metaData.props.scrollable
       }
     };
-    return utils.mergeProps(ptm("column.".concat(key), {
+    return mergeProps(ptm("column.".concat(key), {
       column: columnMetadata
     }), ptm("column.".concat(key), columnMetadata), ptmo(cProps, key, columnMetadata));
   };
@@ -745,7 +752,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
         partialChecked: isPartialChecked()
       }
     };
-    return utils.mergeProps(ptm("column.".concat(key), {
+    return mergeProps(ptm("column.".concat(key), {
       column: columnMetadata
     }), ptm("column.".concat(key), columnMetadata), ptmo(cProps, key, columnMetadata));
   };
@@ -1001,7 +1008,10 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
     }
   };
   var isSelected = function isSelected() {
-    if ((props.selectionMode === 'single' || props.selectionMode === 'multiple') && props.selectionKeys) return props.selectionMode === 'single' ? props.selectionKeys === props.node.key : props.selectionKeys[props.node.key] !== undefined;else return false;
+    if (props.selectionMode === 'single' || (props.selectionMode === 'multiple' || props.selectionMode === 'checkbox') && props.selectionKeys) {
+      return props.selectionMode === 'single' ? props.selectionKeys === props.node.key : props.selectionKeys[props.node.key] !== undefined;
+    }
+    return false;
   };
   var isChecked = function isChecked() {
     return props.selectionKeys ? props.selectionKeys[props.node.key] && props.selectionKeys[props.node.key].checked : false;
@@ -1011,7 +1021,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var createToggler = function createToggler(column) {
     var label = expanded ? PrimeReact.ariaLabel('collapseLabel') : PrimeReact.ariaLabel('expandLabel');
-    var rowTogglerIconProps = utils.mergeProps({
+    var rowTogglerIconProps = mergeProps({
       className: cx('rowTogglerIcon'),
       'aria-hidden': true
     }, getColumnPTOptions(column, 'rowTogglerIcon'));
@@ -1019,7 +1029,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
     var togglerIcon = utils.IconUtils.getJSXIcon(props.togglerIcon || icon, _objectSpread$4({}, rowTogglerIconProps), {
       props: props
     });
-    var rowTogglerProps = utils.mergeProps({
+    var rowTogglerProps = mergeProps({
       type: 'button',
       className: cx('rowToggler'),
       onClick: function onClick(e) {
@@ -1054,7 +1064,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
     if (props.selectionMode === 'checkbox' && props.node.selectable !== false) {
       var checked = isChecked();
       var partialChecked = isPartialChecked();
-      var checboxIconProps = utils.mergeProps({
+      var checboxIconProps = mergeProps({
         className: cx('checkboxIcon')
       }, getColumnCheckboxPTOptions(column, 'checkboxIcon'));
       var icon = checked ? props.checkboxIcon || /*#__PURE__*/React__namespace.createElement(check.CheckIcon, checboxIconProps) : partialChecked ? props.checkboxIcon || /*#__PURE__*/React__namespace.createElement(minus.MinusIcon, checboxIconProps) : null;
@@ -1063,7 +1073,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
         checked: checked,
         partialChecked: partialChecked
       });
-      var hiddenInputProps = utils.mergeProps({
+      var hiddenInputProps = mergeProps({
         type: 'checkbox',
         onFocus: function onFocus(e) {
           return onCheckboxFocus();
@@ -1072,7 +1082,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
           return onCheckboxBlur();
         }
       }, getColumnCheckboxPTOptions(column, 'hiddenInput'));
-      var checkboxWrapperProps = utils.mergeProps({
+      var checkboxWrapperProps = mergeProps({
         className: cx('checkboxWrapper'),
         onClick: function onClick(e) {
           return onCheckboxChange(e);
@@ -1080,10 +1090,10 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
         role: 'checkbox',
         'aria-checked': checked
       }, getColumnCheckboxPTOptions(column, 'checkboxWrapper'));
-      var hiddenInputWrapperProps = utils.mergeProps({
+      var hiddenInputWrapperProps = mergeProps({
         className: 'p-hidden-accessible'
       }, getColumnCheckboxPTOptions(column, 'hiddenInputWrapper'));
-      var checkboxProps = utils.mergeProps({
+      var checkboxProps = mergeProps({
         className: cx('checkbox', {
           checked: checked,
           partialChecked: partialChecked
@@ -1100,6 +1110,9 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var createCell = function createCell(column, index) {
     var toggler, checkbox;
+    if (getColumnProp(column, 'hidden')) {
+      return null;
+    }
     if (getColumnProp(column, 'expander')) {
       toggler = createToggler(column);
       checkbox = createCheckbox(column);
@@ -1172,7 +1185,7 @@ var TreeTableRow = /*#__PURE__*/React__namespace.memo(function (props) {
     className = _objectSpread$4(_objectSpread$4({}, className), rowClassName);
   }
   className = utils.classNames(className, props.node.className);
-  var rowProps = utils.mergeProps({
+  var rowProps = mergeProps({
     tabIndex: 0,
     className: className,
     style: props.node.style,
@@ -1208,6 +1221,7 @@ function _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) le
 function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TreeTableBody = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = hooks.useMergeProps();
   var isSingleSelectionMode = props.selectionMode === 'single';
   var isMultipleSelectionMode = props.selectionMode === 'multiple';
   var _props$ptCallbacks = props.ptCallbacks,
@@ -1414,18 +1428,20 @@ var TreeTableBody = /*#__PURE__*/React__namespace.memo(function (props) {
       return null;
     } else {
       var colSpan = props.columns ? props.columns.length : null;
-      var _content = props.emptyMessage || PrimeReact.localeOption('emptyMessage');
-      var emptyMessageProps = utils.mergeProps({
+      var _content = utils.ObjectUtils.getJSXElement(props.emptyMessage, {
+        props: props.tableProps
+      }) || PrimeReact.localeOption('emptyMessage');
+      var emptyMessageProps = mergeProps({
         className: cx('emptyMessage')
       }, getPTOptions('emptyMessage'));
-      var emptyMessageCellProps = utils.mergeProps({
+      var emptyMessageCellProps = mergeProps({
         colSpan: colSpan
       }, getPTOptions('emptyMessageCell'));
       return /*#__PURE__*/React__namespace.createElement("tr", emptyMessageProps, /*#__PURE__*/React__namespace.createElement("td", emptyMessageCellProps, _content));
     }
   };
   var content = props.value && props.value.length ? createRows() : createEmptyMessage();
-  var tbodyProps = utils.mergeProps({
+  var tbodyProps = mergeProps({
     className: cx('tbody')
   }, getPTOptions('tbody'));
   return /*#__PURE__*/React__namespace.createElement("tbody", tbodyProps, content);
@@ -1458,6 +1474,7 @@ var RowBase = componentbase.ComponentBase.extend({
 });
 
 var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = hooks.useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -1475,12 +1492,12 @@ var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
       parent: props.metaData,
       hostName: props.hostName
     };
-    return utils.mergeProps(ptm("column.".concat(key), {
+    return mergeProps(ptm("column.".concat(key), {
       column: columnMetadata
     }), ptm("column.".concat(key), columnMetadata), ptmo(cProps, key, columnMetadata));
   };
   var createFooterCell = function createFooterCell(column, index) {
-    var footerCellProps = utils.mergeProps({
+    var footerCellProps = mergeProps({
       key: column.field || index,
       className: getColumnProp(column, 'footerClassName') || getColumnProp(column, 'className'),
       style: getColumnProp(column, 'footerStyle') || getColumnProp(column, 'style'),
@@ -1495,7 +1512,7 @@ var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
   var createFooterRow = function createFooterRow(row, index) {
     var rowColumns = React__namespace.Children.toArray(RowBase.getCProp(row, 'children'));
     var rowFooterCells = rowColumns.map(createFooterCell);
-    var footerRowProps = utils.mergeProps(ptm('footerRow', {
+    var footerRowProps = mergeProps(ptm('footerRow', {
       hostName: props.hostName
     }));
     return /*#__PURE__*/React__namespace.createElement("tr", _extends({}, footerRowProps, {
@@ -1509,7 +1526,7 @@ var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
   var createColumns = function createColumns(columns) {
     if (columns) {
       var headerCells = columns.map(createFooterCell);
-      var footerRowProps = utils.mergeProps(ptm('footerRow', {
+      var footerRowProps = mergeProps(ptm('footerRow', {
         hostName: props.hostName
       }));
       return /*#__PURE__*/React__namespace.createElement("tr", footerRowProps, headerCells);
@@ -1524,7 +1541,7 @@ var TreeTableFooter = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var content = props.columnGroup ? createColumnGroup() : createColumns(props.columns);
   if (hasFooter()) {
-    var tfootProps = utils.mergeProps({
+    var tfootProps = mergeProps({
       className: cx('tfoot')
     }, ptm('tfoot', {
       hostName: props.hostName
@@ -1542,6 +1559,7 @@ function _arrayLikeToArray$1(arr, len) { if (len == null || len > arr.length) le
 function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
+  var mergeProps = hooks.useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -1560,14 +1578,14 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
       parent: props.metaData,
       hostName: props.hostName
     }, params);
-    return utils.mergeProps(ptm("column.".concat(key), {
+    return mergeProps(ptm("column.".concat(key), {
       column: columnMetadata
     }), ptm("column.".concat(key), columnMetadata), ptmo(cProps, key, columnMetadata));
   };
   var onHeaderClick = function onHeaderClick(event, column) {
     if (getColumnProp(column, 'sortable')) {
       var targetNode = event.target;
-      if (utils.DomHandler.getAttribute(targetNode, 'data-p-sortable-column') === true || utils.DomHandler.getAttribute(targetNode, 'data-pc-section') === 'headertitle' || utils.DomHandler.getAttribute(targetNode, 'data-pc-section') === 'sorticon' || utils.DomHandler.getAttribute(targetNode.parentElement, 'data-pc-section') === 'sorticon') {
+      if (utils.DomHandler.getAttribute(targetNode, 'data-p-sortable-column') === true || utils.DomHandler.getAttribute(targetNode, 'data-pc-section') === 'headertitle' || utils.DomHandler.getAttribute(targetNode, 'data-pc-section') === 'sorticon' || utils.DomHandler.getAttribute(targetNode.parentElement, 'data-pc-section') === 'sorticon' || targetNode.closest('[data-p-sortable-column="true"]') && !targetNode.closest('[data-pc-section="filtermenubutton"]')) {
         props.onSort({
           originalEvent: event,
           sortField: getColumnProp(column, 'sortField') || getColumnProp(column, 'field'),
@@ -1684,7 +1702,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var createSortIcon = function createSortIcon(column, sorted, sortOrder) {
     if (getColumnProp(column, 'sortable')) {
-      var sortIconProps = utils.mergeProps({
+      var sortIconProps = mergeProps({
         className: cx('sortIcon')
       }, getColumnPTOptions(column, 'sortIcon', {
         context: {
@@ -1704,7 +1722,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var createResizer = function createResizer(column) {
     if (props.resizableColumns) {
-      var columnResizerProps = utils.mergeProps({
+      var columnResizerProps = mergeProps({
         className: cx('columnResizer'),
         onMouseDown: function onMouseDown(e) {
           return onResizerMouseDown(e, column);
@@ -1717,7 +1735,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var createSortBadge = function createSortBadge(column, sortMetaDataIndex) {
     if (sortMetaDataIndex !== -1 && props.multiSortMeta && props.multiSortMeta.length > 1) {
-      var sortBadgeProps = utils.mergeProps({
+      var sortBadgeProps = mergeProps({
         className: cx('sortBadge')
       }, getColumnPTOptions(column, 'sortBadge'));
       return /*#__PURE__*/React__namespace.createElement("span", sortBadgeProps, sortMetaDataIndex + 1);
@@ -1728,13 +1746,16 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
     var title = utils.ObjectUtils.getJSXElement(getColumnProp(column, 'header'), {
       props: options
     });
-    var headerTitleProps = utils.mergeProps({
+    var headerTitleProps = mergeProps({
       className: cx('headerTitle')
     }, getColumnPTOptions(column, 'headerTitle'));
     return /*#__PURE__*/React__namespace.createElement("span", headerTitleProps, title);
   };
   var createHeaderCell = function createHeaderCell(column, options) {
     var filterElement;
+    if (getColumnProp(column, 'hidden')) {
+      return null;
+    }
     if (getColumnProp(column, 'filter') && options.renderFilter) {
       filterElement = getColumnProp(column, 'filterElement') || /*#__PURE__*/React__namespace.createElement(inputtext.InputText, {
         onInput: function onInput(e) {
@@ -1754,7 +1775,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
     }
     if (options.filterOnly) {
       var frozen = getColumnProp(column, 'frozen');
-      var headerCellProps = utils.mergeProps({
+      var headerCellProps = mergeProps({
         key: getColumnProp(column, 'columnKey') || getColumnProp(column, 'field') || options.index,
         className: utils.classNames(cx('headerCell', {
           options: options,
@@ -1780,6 +1801,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
       var multipleSorted = multiSortMetaData !== null;
       var sorted = getColumnProp(column, 'sortable') && (singleSorted || multipleSorted);
       var _frozen = getColumnProp(column, 'frozen');
+      var align = getColumnProp(column, 'alignHeader');
       var sortOrder = 0;
       if (singleSorted) sortOrder = props.sortOrder;else if (multipleSorted) sortOrder = multiSortMetaData.order;
       var sortIconElement = createSortIcon(column, sorted, sortOrder);
@@ -1789,14 +1811,15 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
       var hasTooltip = utils.ObjectUtils.isNotEmpty(headerTooltip);
       var title = createTitle(column, options);
       var resizer = createResizer(column);
-      var _headerCellProps = utils.mergeProps({
+      var _headerCellProps = mergeProps({
         className: utils.classNames(getColumnProp(column, 'headerClassName') || getColumnProp(column, 'className'), cx('headerCell', {
           headerProps: props,
           frozen: _frozen,
           column: column,
           options: options,
           getColumnProp: getColumnProp,
-          sorted: sorted
+          sorted: sorted,
+          align: align
         })),
         style: getColumnProp(column, 'headerStyle') || getColumnProp(column, 'style'),
         tabIndex: getColumnProp(column, 'sortable') ? props.tabIndex : null,
@@ -1835,11 +1858,15 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
           resizable: props.resizableColumns
         }
       }));
+      var headerContentProps = mergeProps({
+        className: cx('headerContent')
+      }, getColumnPTOptions(column, 'headerContent'));
+      var header = /*#__PURE__*/React__namespace.createElement("div", headerContentProps, title, sortIconElement, sortBadge, filterElement);
       return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, {
         key: column.columnKey || column.field || options.index
       }, /*#__PURE__*/React__namespace.createElement("th", _extends({
         ref: headerCellRef
-      }, _headerCellProps), resizer, title, sortIconElement, sortBadge, filterElement), hasTooltip && /*#__PURE__*/React__namespace.createElement(tooltip.Tooltip, _extends({
+      }, _headerCellProps), resizer, header), hasTooltip && /*#__PURE__*/React__namespace.createElement(tooltip.Tooltip, _extends({
         target: headerCellRef,
         content: headerTooltip
       }, getColumnProp(column, 'headerTooltipOptions'), {
@@ -1856,7 +1883,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
         renderFilter: true
       });
     });
-    var headerRowProps = utils.mergeProps(ptm('headerRow', {
+    var headerRowProps = mergeProps(ptm('headerRow', {
       hostName: props.hostName
     }));
     return /*#__PURE__*/React__namespace.createElement("tr", _extends({}, headerRowProps, {
@@ -1869,7 +1896,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
   };
   var createColumns = function createColumns(columns) {
     if (columns) {
-      var headerRowProps = utils.mergeProps(ptm('headerRow', {
+      var headerRowProps = mergeProps(ptm('headerRow', {
         hostName: props.hostName
       }));
       if (hasColumnFilter(columns)) {
@@ -1900,7 +1927,7 @@ var TreeTableHeader = /*#__PURE__*/React__namespace.memo(function (props) {
     }
   };
   var content = props.columnGroup ? createColumnGroup() : createColumns(props.columns);
-  var theadProps = utils.mergeProps({
+  var theadProps = mergeProps({
     className: cx('thead')
   }, ptm('thead', {
     hostName: props.hostName
@@ -1919,6 +1946,7 @@ var TreeTableScrollableView = /*#__PURE__*/React__namespace.memo(function (props
   var scrollTableRef = React__namespace.useRef(null);
   var scrollFooterRef = React__namespace.useRef(null);
   var scrollFooterBoxRef = React__namespace.useRef(null);
+  var mergeProps = hooks.useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     cx = _props$ptCallbacks.cx,
@@ -1964,25 +1992,28 @@ var TreeTableScrollableView = /*#__PURE__*/React__namespace.memo(function (props
     var frozenView = elementRef.current.previousElementSibling;
     var frozenScrollBody;
     if (frozenView) {
-      frozenScrollBody = utils.DomHandler.findSingle(frozenView, '.p-treetable-scrollable-body');
+      frozenScrollBody = utils.DomHandler.findSingle(frozenView, '[data-pc-section="scrollablebody"]');
     }
-    scrollHeaderBoxRef.current.style.marginLeft = -1 * scrollBodyRef.current.scrollLeft + 'px';
+    scrollHeaderBoxRef.current.style.transform = "translateX(-".concat(scrollBodyRef.current.scrollLeft, "px)");
     if (scrollFooterBoxRef.current) {
-      scrollFooterBoxRef.current.style.marginLeft = -1 * scrollBodyRef.current.scrollLeft + 'px';
+      scrollFooterBoxRef.current.style.transform = "translateX(-".concat(scrollBodyRef.current.scrollLeft, "px)");
     }
     if (frozenScrollBody) {
       frozenScrollBody.scrollTop = scrollBodyRef.current.scrollTop;
     }
   };
   hooks.useMountEffect(function () {
+    var el = utils.DomHandler.find(findDataTableContainer(elementRef.current), '[data-pc-section="scrollablebody"]');
+    el = el.length > 1 ? el[1] : el[0];
+    var scrollBarWidth = utils.DomHandler.calculateScrollbarWidth(el);
     if (!props.frozen) {
-      var scrollBarWidth = utils.DomHandler.calculateScrollbarWidth();
-      scrollHeaderBoxRef.current.style.marginRight = scrollBarWidth + 'px';
+      var _scrollBarWidth = utils.DomHandler.calculateScrollbarWidth();
+      scrollHeaderBoxRef.current.style.marginRight = _scrollBarWidth + 'px';
       if (scrollFooterBoxRef.current) {
-        scrollFooterBoxRef.current.style.marginRight = scrollBarWidth + 'px';
+        scrollFooterBoxRef.current.style.marginRight = _scrollBarWidth + 'px';
       }
     } else {
-      scrollBodyRef.current.style.paddingBottom = utils.DomHandler.calculateScrollbarWidth() + 'px';
+      scrollBodyRef.current.style.paddingBottom = scrollBarWidth + 'px';
     }
   });
   React__namespace.useEffect(function () {
@@ -1995,7 +2026,7 @@ var TreeTableScrollableView = /*#__PURE__*/React__namespace.memo(function (props
           key: col.field + '_' + i
         });
       });
-      var scrollableColgroupProps = utils.mergeProps({
+      var scrollableColgroupProps = mergeProps({
         className: cx('scrollableColgroup')
       }, getPTOptions('scrollableColgroup'));
       return /*#__PURE__*/React__namespace.createElement("colgroup", scrollableColgroupProps, cols);
@@ -2006,7 +2037,7 @@ var TreeTableScrollableView = /*#__PURE__*/React__namespace.memo(function (props
   var width = props.frozen ? props.frozenWidth : 'calc(100% - ' + props.frozenWidth + ')';
   var left = props.frozen ? null : props.frozenWidth;
   var colGroup = createColGroup();
-  var scrollableProps = utils.mergeProps({
+  var scrollableProps = mergeProps({
     className: cx('scrollable', {
       scrolaableProps: props
     }),
@@ -2015,19 +2046,19 @@ var TreeTableScrollableView = /*#__PURE__*/React__namespace.memo(function (props
       left: left
     }
   }, getPTOptions('scrollable'));
-  var scrollableHeaderProps = utils.mergeProps({
+  var scrollableHeaderProps = mergeProps({
     className: cx('scrollableHeader'),
     onScroll: function onScroll(e) {
       return onHeaderScroll();
     }
   }, getPTOptions('scrollableHeader'));
-  var scrollableHeaderBoxProps = utils.mergeProps({
+  var scrollableHeaderBoxProps = mergeProps({
     className: cx('scrollableHeaderBox')
   }, getPTOptions('scrollableHeaderBox'));
-  var scrollableHeaderTableProps = utils.mergeProps({
+  var scrollableHeaderTableProps = mergeProps({
     className: cx('scrollableHeaderTable')
   }, getPTOptions('scrollableHeaderTable'));
-  var scrollableBodyProps = utils.mergeProps({
+  var scrollableBodyProps = mergeProps({
     className: cx('scrollableBody'),
     style: !props.frozen && props.scrollHeight ? {
       overflowY: 'scroll'
@@ -2036,19 +2067,19 @@ var TreeTableScrollableView = /*#__PURE__*/React__namespace.memo(function (props
       return onBodyScroll();
     }
   }, getPTOptions('scrollableBody'));
-  var scrollableBodyTableProps = utils.mergeProps({
+  var scrollableBodyTableProps = mergeProps({
     style: {
       top: '0'
     },
     className: cx('scrollableBodyTable')
   }, getPTOptions('scrollableBodyTable'));
-  var scrollableFooterProps = utils.mergeProps({
+  var scrollableFooterProps = mergeProps({
     className: cx('scrollableFooter')
   }, getPTOptions('scrollableFooter'));
-  var scrollableFooterBoxProps = utils.mergeProps({
+  var scrollableFooterBoxProps = mergeProps({
     className: sx('scrollableFooterBox')
   }, getPTOptions('scrollableFooterBox'));
-  var scrollableFooterTableProps = utils.mergeProps({
+  var scrollableFooterTableProps = mergeProps({
     className: cx('scrollableFooterTable')
   }, getPTOptions('scrollableFooterTable'));
   return /*#__PURE__*/React__namespace.createElement("div", _extends({
@@ -2075,6 +2106,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
+  var mergeProps = hooks.useMergeProps();
   var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
   var props = TreeTableBase.getProps(inProps, context);
   var _React$useState = React__namespace.useState(props.expandedKeys),
@@ -2276,7 +2308,7 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   };
   var sortNodes = function sortNodes(data) {
     var value = _toConsumableArray(data);
-    if (columnSortable.current && columnSortable.current === 'custom' && columnSortFunction.current) {
+    if (columnSortable.current && columnSortFunction.current) {
       value = columnSortFunction.current({
         data: data,
         field: getSortField(),
@@ -2407,9 +2439,9 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
         if (newColumnWidth > 15 && nextColumnWidth > 15) {
           if (props.scrollable) {
             var scrollableView = findParentScrollableView(resizeColumn.current);
-            var scrollableBodyTable = utils.DomHandler.findSingle(scrollableView, 'table.p-treetable-scrollable-body-table');
-            var scrollableHeaderTable = utils.DomHandler.findSingle(scrollableView, 'table.p-treetable-scrollable-header-table');
-            var scrollableFooterTable = utils.DomHandler.findSingle(scrollableView, 'table.p-treetable-scrollable-footer-table');
+            var scrollableBodyTable = utils.DomHandler.findSingle(scrollableView, 'table[data-pc-section="scrollablebodytable"]');
+            var scrollableHeaderTable = utils.DomHandler.findSingle(scrollableView, 'table[data-pc-section="scrollableheadertable"]');
+            var scrollableFooterTable = utils.DomHandler.findSingle(scrollableView, 'table[data-pc-section="scrollablefootertable"]');
             var resizeColumnIndex = utils.DomHandler.index(resizeColumn.current);
             resizeColGroup(scrollableHeaderTable, resizeColumnIndex, newColumnWidth, nextColumnWidth);
             resizeColGroup(scrollableBodyTable, resizeColumnIndex, newColumnWidth, nextColumnWidth);
@@ -2424,9 +2456,9 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
       } else if (props.columnResizeMode === 'expand') {
         if (props.scrollable) {
           var _scrollableView = findParentScrollableView(resizeColumn.current);
-          var _scrollableBodyTable = utils.DomHandler.findSingle(_scrollableView, 'table.p-treetable-scrollable-body-table');
-          var _scrollableHeaderTable = utils.DomHandler.findSingle(_scrollableView, 'table.p-treetable-scrollable-header-table');
-          var _scrollableFooterTable = utils.DomHandler.findSingle(_scrollableView, 'table.p-treetable-scrollable-footer-table');
+          var _scrollableBodyTable = utils.DomHandler.findSingle(_scrollableView, 'table[data-pc-section="scrollablebodytable"]');
+          var _scrollableHeaderTable = utils.DomHandler.findSingle(_scrollableView, 'table[data-pc-section="scrollableheadertable"]');
+          var _scrollableFooterTable = utils.DomHandler.findSingle(_scrollableView, 'table[data-pc-section="scrollablefootertable"]');
           _scrollableBodyTable.style.width = _scrollableBodyTable.offsetWidth + delta + 'px';
           _scrollableHeaderTable.style.width = _scrollableHeaderTable.offsetWidth + delta + 'px';
           if (_scrollableFooterTable) {
@@ -2927,39 +2959,39 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   var createTableBody = function createTableBody(value, columns) {
     return /*#__PURE__*/React__namespace.createElement(TreeTableBody, {
       hostName: "TreeTable",
-      value: value,
-      originalOptions: props.value,
       checkboxIcon: props.checkboxIcon,
       columns: columns,
+      contextMenuSelectionKey: props.contextMenuSelectionKey,
+      emptyMessage: props.emptyMessage,
       expandedKeys: getExpandedKeys(),
-      selectOnEdit: props.selectOnEdit,
-      onToggle: onToggle,
-      togglerTemplate: props.togglerTemplate,
-      onExpand: props.onExpand,
-      onCollapse: props.onCollapse,
-      paginator: props.paginator,
       first: getFirst(),
-      rows: getRows(),
-      selectionMode: props.selectionMode,
-      selectionKeys: props.selectionKeys,
-      onSelectionChange: props.onSelectionChange,
+      lazy: props.lazy,
+      loading: props.loading,
+      metaData: metaData,
       metaKeySelection: props.metaKeySelection,
+      onCollapse: props.onCollapse,
+      onContextMenu: props.onContextMenu,
+      onContextMenuSelectionChange: props.onContextMenuSelectionChange,
+      onExpand: props.onExpand,
       onRowClick: props.onRowClick,
       onRowMouseEnter: props.onRowMouseEnter,
       onRowMouseLeave: props.onRowMouseLeave,
       onSelect: props.onSelect,
+      onSelectionChange: props.onSelectionChange,
+      onToggle: onToggle,
       onUnselect: props.onUnselect,
-      propagateSelectionUp: props.propagateSelectionUp,
+      originalOptions: props.value,
+      paginator: props.paginator,
       propagateSelectionDown: props.propagateSelectionDown,
-      lazy: props.lazy,
-      rowClassName: props.rowClassName,
-      emptyMessage: props.emptyMessage,
-      loading: props.loading,
-      contextMenuSelectionKey: props.contextMenuSelectionKey,
-      onContextMenuSelectionChange: props.onContextMenuSelectionChange,
-      onContextMenu: props.onContextMenu,
+      propagateSelectionUp: props.propagateSelectionUp,
       ptCallbacks: ptCallbacks,
-      metaData: metaData
+      rowClassName: props.rowClassName,
+      rows: getRows(),
+      selectOnEdit: props.selectOnEdit,
+      selectionKeys: props.selectionKeys,
+      selectionMode: props.selectionMode,
+      togglerTemplate: props.togglerTemplate,
+      value: value
     });
   };
   var createPaginator = function createPaginator(position, totalRecords) {
@@ -3011,7 +3043,7 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
       frozenView = createScrollableView(value, frozenColumns, true, props.frozenHeaderColumnGroup, props.frozenFooterColumnGroup);
     }
     scrollableView = createScrollableView(value, scrollableColumns, false, props.headerColumnGroup, props.footerColumnGroup);
-    var scrollableWrapperProps = utils.mergeProps({
+    var scrollableWrapperProps = mergeProps({
       className: ptCallbacks.cx('scrollableWrapper')
     }, ptCallbacks.ptm('scrollableWrapper'));
     return /*#__PURE__*/React__namespace.createElement("div", scrollableWrapperProps, frozenView, scrollableView);
@@ -3021,10 +3053,10 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
     var header = createTableHeader(columns, props.headerColumnGroup);
     var footer = createTableFooter(columns, props.footerColumnGroup);
     var body = createTableBody(value, columns);
-    var wrapperProps = utils.mergeProps({
+    var wrapperProps = mergeProps({
       className: ptCallbacks.cx('wrapper')
     }, ptCallbacks.ptm('wrapper'));
-    var tableProps = utils.mergeProps({
+    var tableProps = mergeProps({
       style: props.tableStyle,
       className: utils.classNames(props.tableClassName, ptCallbacks.cx('table'))
     }, ptCallbacks.ptm('table'));
@@ -3037,7 +3069,7 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   };
   var createLoader = function createLoader() {
     if (props.loading) {
-      var loadingIconProps = utils.mergeProps({
+      var loadingIconProps = mergeProps({
         className: ptCallbacks.cx('loadingIcon')
       }, ptCallbacks.ptm('loadingIcon'));
       var icon = props.loadingIcon || /*#__PURE__*/React__namespace.createElement(spinner.SpinnerIcon, _extends({}, loadingIconProps, {
@@ -3046,10 +3078,10 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
       var loadingIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, loadingIconProps), {
         props: props
       });
-      var loadingWrapperProps = utils.mergeProps({
+      var loadingWrapperProps = mergeProps({
         className: ptCallbacks.cx('loadingWrapper')
       }, ptCallbacks.ptm('loadingWrapper'));
-      var loadingOverlayProps = utils.mergeProps({
+      var loadingOverlayProps = mergeProps({
         className: ptCallbacks.cx('loadingOverlay')
       }, ptCallbacks.ptm('loadingOverlay'));
       return /*#__PURE__*/React__namespace.createElement("div", loadingWrapperProps, /*#__PURE__*/React__namespace.createElement("div", loadingOverlayProps, loadingIcon));
@@ -3059,13 +3091,13 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   var data = processedData();
   var table = createTable(data);
   var totalRecords = getTotalRecords(data);
-  var headerProps = utils.mergeProps({
+  var headerProps = mergeProps({
     className: ptCallbacks.cx('header')
   }, ptCallbacks.ptm('header'));
-  var footerProps = utils.mergeProps({
+  var footerProps = mergeProps({
     className: ptCallbacks.cx('footer')
   }, ptCallbacks.ptm('footer'));
-  var resizeHelperProps = utils.mergeProps({
+  var resizeHelperProps = mergeProps({
     className: ptCallbacks.cx('resizeHelper'),
     style: {
       display: 'none'
@@ -3079,14 +3111,14 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
   var resizeHelper = props.resizableColumns && /*#__PURE__*/React__namespace.createElement("div", _extends({
     ref: resizerHelperRef
   }, resizeHelperProps));
-  var reorderIndicatorUpProps = utils.mergeProps({
+  var reorderIndicatorUpProps = mergeProps({
     className: ptCallbacks.cx('reorderIndicatorUp'),
     style: {
       position: 'absolute',
       display: 'none'
     }
   }, ptCallbacks.ptm('reorderIndicatorUp'));
-  var reorderIndicatorUpIconProps = utils.mergeProps(ptCallbacks.ptm('reorderIndicatorUpIcon'));
+  var reorderIndicatorUpIconProps = mergeProps(ptCallbacks.ptm('reorderIndicatorUpIcon'));
   var reorderIndicatorUpIcon = props.reorderableColumns && utils.IconUtils.getJSXIcon(props.reorderIndicatorUpIcon || /*#__PURE__*/React__namespace.createElement(arrowdown.ArrowDownIcon, reorderIndicatorUpIconProps), _objectSpread({}, reorderIndicatorUpIconProps), {
     props: props
   });
@@ -3100,14 +3132,14 @@ var TreeTable = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref)
       display: 'none'
     }
   };
-  var reorderIndicatorDownIconProps = utils.mergeProps(ptCallbacks.ptm('reorderIndicatorDownIcon'));
+  var reorderIndicatorDownIconProps = mergeProps(ptCallbacks.ptm('reorderIndicatorDownIcon'));
   var reorderIndicatorDownIcon = utils.IconUtils.getJSXIcon(props.reorderIndicatorDownIcon || /*#__PURE__*/React__namespace.createElement(arrowup.ArrowUpIcon, reorderIndicatorDownIconProps), _objectSpread({}, reorderIndicatorDownIconProps), {
     props: props
   });
   var reorderIndicatorDown = props.reorderableColumns && /*#__PURE__*/React__namespace.createElement("span", _extends({
     ref: reorderIndicatorDownRef
   }, reorderIndicatorDownProps), reorderIndicatorDownIcon);
-  var rootProps = utils.mergeProps({
+  var rootProps = mergeProps({
     id: props.id,
     className: utils.classNames(props.className, ptCallbacks.cx('root', {
       isRowSelectionMode: isRowSelectionMode