primereact 10.3.0 → 10.3.2

package/treetable/treetable.esm.js

@@ -2,8 +2,8 @@
 import * as React from 'react';
 import PrimeReact, { FilterMatchMode, ariaLabel, localeOption, PrimeReactContext, FilterService } from 'primereact/api';
 import { ComponentBase, useHandleStyle } from 'primereact/componentbase';
-import { ObjectUtils, classNames, DomHandler, mergeProps, IconUtils } from 'primereact/utils';
-import { useEventListener, useUnmountEffect, useMountEffect } from 'primereact/hooks';
+import { ObjectUtils, classNames, DomHandler, IconUtils } from 'primereact/utils';
+import { useMergeProps, useEventListener, useUnmountEffect, useMountEffect } from 'primereact/hooks';
 import { ArrowDownIcon } from 'primereact/icons/arrowdown';
 import { ArrowUpIcon } from 'primereact/icons/arrowup';
 import { SpinnerIcon } from 'primereact/icons/spinner';
@@ -239,7 +239,7 @@ var ColumnBase = 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,
@@ -259,8 +259,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;
@@ -277,30 +277,33 @@ var classes = {
   emptyMessage: 'p-treetable-emptymessage',
   bodyCell: function bodyCell(_ref3) {
     var props = _ref3.bodyProps,
-      editingState = _ref3.editingState;
-    return classNames({
+      editingState = _ref3.editingState,
+      align = _ref3.align;
+    return 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 ? classNames('p-filter-column', {
       'p-frozen-column': frozen
-    }) : classNames({
+    }) : 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',
@@ -402,9 +405,9 @@ var TreeTableBase = ComponentBase.extend({
     propagateSelectionDown: true,
     propagateSelectionUp: true,
     removableSort: false,
-    reorderableColumns: false,
     reorderIndicatorDownIcon: null,
     reorderIndicatorUpIcon: null,
+    reorderableColumns: false,
     resizableColumns: false,
     rowClassName: null,
     rowHover: false,
@@ -417,8 +420,8 @@ var TreeTableBase = ComponentBase.extend({
     selectionMode: null,
     showGridlines: false,
     sortField: null,
-    sortMode: 'single',
     sortIcon: null,
+    sortMode: 'single',
     sortOrder: null,
     stripedRows: false,
     style: null,
@@ -447,6 +450,7 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
   var selfClick = React.useRef(false);
   var overlayEventListener = React.useRef(null);
   var tabIndexTimeout = React.useRef(null);
+  var mergeProps = useMergeProps();
   var getColumnProp = function getColumnProp(name) {
     return ColumnBase.getCProp(props.column, name);
   };
@@ -647,11 +651,13 @@ var TreeTableBodyCell = function TreeTableBodyCell(props) {
   var editorKeyHelperLabelProps = mergeProps(getColumnPTOptions('editorKeyHelper'));
   /* eslint-disable */
   var editorKeyHelper = props.editor && /*#__PURE__*/React.createElement("a", editorKeyHelperProps, /*#__PURE__*/React.createElement("span", editorKeyHelperLabelProps));
+  var align = getColumnProp('align');
   /* eslint-enable */
   var bodyCellProps = mergeProps({
     className: classNames(bodyClassName || props.className, cx('bodyCell', {
       bodyProps: props,
-      editingState: editingState
+      editingState: editingState,
+      align: align
     })),
     style: style,
     onClick: function onClick(e) {
@@ -677,6 +683,7 @@ var TreeTableRow = /*#__PURE__*/React.memo(function (props) {
   var checkboxRef = React.useRef(null);
   var checkboxBoxRef = React.useRef(null);
   var nodeTouched = React.useRef(false);
+  var mergeProps = useMergeProps();
   var expanded = props.expandedKeys ? props.expandedKeys[props.node.key] !== undefined : false;
   var getColumnProp = function getColumnProp(column, name) {
     return ColumnBase.getCProp(column, name);
@@ -974,7 +981,10 @@ var TreeTableRow = /*#__PURE__*/React.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;
@@ -1073,6 +1083,9 @@ var TreeTableRow = /*#__PURE__*/React.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);
@@ -1181,6 +1194,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var isSingleSelectionMode = props.selectionMode === 'single';
   var isMultipleSelectionMode = props.selectionMode === 'multiple';
   var _props$ptCallbacks = props.ptCallbacks,
@@ -1387,7 +1401,9 @@ var TreeTableBody = /*#__PURE__*/React.memo(function (props) {
       return null;
     } else {
       var colSpan = props.columns ? props.columns.length : null;
-      var _content = props.emptyMessage || localeOption('emptyMessage');
+      var _content = ObjectUtils.getJSXElement(props.emptyMessage, {
+        props: props.tableProps
+      }) || localeOption('emptyMessage');
       var emptyMessageProps = mergeProps({
         className: cx('emptyMessage')
       }, getPTOptions('emptyMessage'));
@@ -1431,6 +1447,7 @@ var RowBase = ComponentBase.extend({
 });
 
 var TreeTableFooter = /*#__PURE__*/React.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -1515,6 +1532,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.memo(function (props) {
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     ptmo = _props$ptCallbacks.ptmo,
@@ -1540,7 +1558,7 @@ var TreeTableHeader = /*#__PURE__*/React.memo(function (props) {
   var onHeaderClick = function onHeaderClick(event, column) {
     if (getColumnProp(column, 'sortable')) {
       var targetNode = event.target;
-      if (DomHandler.getAttribute(targetNode, 'data-p-sortable-column') === true || DomHandler.getAttribute(targetNode, 'data-pc-section') === 'headertitle' || DomHandler.getAttribute(targetNode, 'data-pc-section') === 'sorticon' || DomHandler.getAttribute(targetNode.parentElement, 'data-pc-section') === 'sorticon') {
+      if (DomHandler.getAttribute(targetNode, 'data-p-sortable-column') === true || DomHandler.getAttribute(targetNode, 'data-pc-section') === 'headertitle' || DomHandler.getAttribute(targetNode, 'data-pc-section') === 'sorticon' || 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'),
@@ -1708,6 +1726,9 @@ var TreeTableHeader = /*#__PURE__*/React.memo(function (props) {
   };
   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.createElement(InputText, {
         onInput: function onInput(e) {
@@ -1753,6 +1774,7 @@ var TreeTableHeader = /*#__PURE__*/React.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);
@@ -1769,7 +1791,8 @@ var TreeTableHeader = /*#__PURE__*/React.memo(function (props) {
           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,
@@ -1808,11 +1831,15 @@ var TreeTableHeader = /*#__PURE__*/React.memo(function (props) {
           resizable: props.resizableColumns
         }
       }));
+      var headerContentProps = mergeProps({
+        className: cx('headerContent')
+      }, getColumnPTOptions(column, 'headerContent'));
+      var header = /*#__PURE__*/React.createElement("div", headerContentProps, title, sortIconElement, sortBadge, filterElement);
       return /*#__PURE__*/React.createElement(React.Fragment, {
         key: column.columnKey || column.field || options.index
       }, /*#__PURE__*/React.createElement("th", _extends({
         ref: headerCellRef
-      }, _headerCellProps), resizer, title, sortIconElement, sortBadge, filterElement), hasTooltip && /*#__PURE__*/React.createElement(Tooltip, _extends({
+      }, _headerCellProps), resizer, header), hasTooltip && /*#__PURE__*/React.createElement(Tooltip, _extends({
         target: headerCellRef,
         content: headerTooltip
       }, getColumnProp(column, 'headerTooltipOptions'), {
@@ -1892,6 +1919,7 @@ var TreeTableScrollableView = /*#__PURE__*/React.memo(function (props) {
   var scrollTableRef = React.useRef(null);
   var scrollFooterRef = React.useRef(null);
   var scrollFooterBoxRef = React.useRef(null);
+  var mergeProps = useMergeProps();
   var _props$ptCallbacks = props.ptCallbacks,
     ptm = _props$ptCallbacks.ptm,
     cx = _props$ptCallbacks.cx,
@@ -1937,25 +1965,28 @@ var TreeTableScrollableView = /*#__PURE__*/React.memo(function (props) {
     var frozenView = elementRef.current.previousElementSibling;
     var frozenScrollBody;
     if (frozenView) {
-      frozenScrollBody = DomHandler.findSingle(frozenView, '.p-treetable-scrollable-body');
+      frozenScrollBody = 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;
     }
   };
   useMountEffect(function () {
+    var el = DomHandler.find(findDataTableContainer(elementRef.current), '[data-pc-section="scrollablebody"]');
+    el = el.length > 1 ? el[1] : el[0];
+    var scrollBarWidth = DomHandler.calculateScrollbarWidth(el);
     if (!props.frozen) {
-      var scrollBarWidth = DomHandler.calculateScrollbarWidth();
-      scrollHeaderBoxRef.current.style.marginRight = scrollBarWidth + 'px';
+      var _scrollBarWidth = 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 = DomHandler.calculateScrollbarWidth() + 'px';
+      scrollBodyRef.current.style.paddingBottom = scrollBarWidth + 'px';
     }
   });
   React.useEffect(function () {
@@ -2048,6 +2079,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.forwardRef(function (inProps, ref) {
+  var mergeProps = useMergeProps();
   var context = React.useContext(PrimeReactContext);
   var props = TreeTableBase.getProps(inProps, context);
   var _React$useState = React.useState(props.expandedKeys),
@@ -2249,7 +2281,7 @@ var TreeTable = /*#__PURE__*/React.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(),
@@ -2380,9 +2412,9 @@ var TreeTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
         if (newColumnWidth > 15 && nextColumnWidth > 15) {
           if (props.scrollable) {
             var scrollableView = findParentScrollableView(resizeColumn.current);
-            var scrollableBodyTable = DomHandler.findSingle(scrollableView, 'table.p-treetable-scrollable-body-table');
-            var scrollableHeaderTable = DomHandler.findSingle(scrollableView, 'table.p-treetable-scrollable-header-table');
-            var scrollableFooterTable = DomHandler.findSingle(scrollableView, 'table.p-treetable-scrollable-footer-table');
+            var scrollableBodyTable = DomHandler.findSingle(scrollableView, 'table[data-pc-section="scrollablebodytable"]');
+            var scrollableHeaderTable = DomHandler.findSingle(scrollableView, 'table[data-pc-section="scrollableheadertable"]');
+            var scrollableFooterTable = DomHandler.findSingle(scrollableView, 'table[data-pc-section="scrollablefootertable"]');
             var resizeColumnIndex = DomHandler.index(resizeColumn.current);
             resizeColGroup(scrollableHeaderTable, resizeColumnIndex, newColumnWidth, nextColumnWidth);
             resizeColGroup(scrollableBodyTable, resizeColumnIndex, newColumnWidth, nextColumnWidth);
@@ -2397,9 +2429,9 @@ var TreeTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
       } else if (props.columnResizeMode === 'expand') {
         if (props.scrollable) {
           var _scrollableView = findParentScrollableView(resizeColumn.current);
-          var _scrollableBodyTable = DomHandler.findSingle(_scrollableView, 'table.p-treetable-scrollable-body-table');
-          var _scrollableHeaderTable = DomHandler.findSingle(_scrollableView, 'table.p-treetable-scrollable-header-table');
-          var _scrollableFooterTable = DomHandler.findSingle(_scrollableView, 'table.p-treetable-scrollable-footer-table');
+          var _scrollableBodyTable = DomHandler.findSingle(_scrollableView, 'table[data-pc-section="scrollablebodytable"]');
+          var _scrollableHeaderTable = DomHandler.findSingle(_scrollableView, 'table[data-pc-section="scrollableheadertable"]');
+          var _scrollableFooterTable = DomHandler.findSingle(_scrollableView, 'table[data-pc-section="scrollablefootertable"]');
           _scrollableBodyTable.style.width = _scrollableBodyTable.offsetWidth + delta + 'px';
           _scrollableHeaderTable.style.width = _scrollableHeaderTable.offsetWidth + delta + 'px';
           if (_scrollableFooterTable) {
@@ -2900,39 +2932,39 @@ var TreeTable = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
   var createTableBody = function createTableBody(value, columns) {
     return /*#__PURE__*/React.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) {