primevue 3.32.0 → 3.32.2

package/datatable/datatable.js

@@ -1246,7 +1246,7 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
     function _defineProperty$9(obj, key, value) { key = _toPropertyKey$9(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
     function _toPropertyKey$9(arg) { var key = _toPrimitive$9(arg, "string"); return _typeof$9(key) === "symbol" ? key : String(key); }
     function _toPrimitive$9(input, hint) { if (_typeof$9(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof$9(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-    var _hoisted_1$5 = ["data-p-selection-column", "data-p-editable-column", "data-p-cell-editing", "data-p-frozen-column"];
+    var _hoisted_1$5 = ["colspan", "rowspan", "data-p-selection-column", "data-p-editable-column", "data-p-cell-editing", "data-p-frozen-column"];
     var _hoisted_2$2 = ["aria-expanded", "aria-controls", "aria-label"];
     var _hoisted_3$2 = ["aria-label"];
     var _hoisted_4$1 = ["aria-label"];
@@ -1274,6 +1274,8 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         key: 1,
         style: $options.containerStyle,
         "class": $options.containerClass,
+        colspan: $options.columnProp('colspan'),
+        rowspan: $options.columnProp('rowspan'),
         onClick: _cache[6] || (_cache[6] = function () {
           return $options.onClick && $options.onClick.apply($options, arguments);
         }),
@@ -1616,7 +1618,7 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         },
         getRowIndex: function getRowIndex(index) {
           var getItemOptions = this.getVirtualScrollerProp('getItemOptions');
-          return getItemOptions ? getItemOptions(index).index : this.first + index;
+          return getItemOptions ? getItemOptions(index).index : index;
         },
         getRowStyle: function getRowStyle(rowData) {
           if (this.rowStyle) {
@@ -4102,15 +4104,15 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
     script$1.render = render$1;
 
     function _typeof$1(obj) { "@babel/helpers - typeof"; return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof$1(obj); }
-    function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-    function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-    function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-    function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
     function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
     function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
     function _defineProperty$1(obj, key, value) { key = _toPropertyKey$1(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
     function _toPropertyKey$1(arg) { var key = _toPrimitive$1(arg, "string"); return _typeof$1(key) === "symbol" ? key : String(key); }
     function _toPrimitive$1(input, hint) { if (_typeof$1(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof$1(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+    function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+    function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+    function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+    function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
     function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
     function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
     function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -4248,7 +4250,7 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
           if (this.columnProp(column, 'sortable')) {
             var targetNode = event.target;
             var columnField = this.columnProp(column, 'sortField') || this.columnProp(column, 'field');
-            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') === 'headercontent' || utils.DomHandler.getAttribute(targetNode, 'data-pc-section') === 'sorticon' || utils.DomHandler.getAttribute(targetNode.parentElement, 'data-pc-section') === 'sorticon' || utils.DomHandler.getAttribute(targetNode.parentElement.parentElement, 'data-pc-section') === 'sorticon' || targetNode.closest('[data-p-sortable-column="true"]')) {
+            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') === 'headercontent' || utils.DomHandler.getAttribute(targetNode, 'data-pc-section') === 'sorticon' || utils.DomHandler.getAttribute(targetNode.parentElement, 'data-pc-section') === 'sorticon' || utils.DomHandler.getAttribute(targetNode.parentElement.parentElement, 'data-pc-section') === 'sorticon' || targetNode.closest('[data-p-sortable-column="true"]') && !targetNode.closest('[data-pc-section="filtermenubutton"]')) {
               utils.DomHandler.clearSelection();
               if (this.sortMode === 'single') {
                 if (this.d_sortField === columnField) {
@@ -4294,13 +4296,27 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
             return this.sortMultiple(value);
           }
           var data = _toConsumableArray(value);
+          var resolvedFieldDatas = new Map();
+          var _iterator = _createForOfIteratorHelper(data),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var item = _step.value;
+              resolvedFieldDatas.set(item, utils.ObjectUtils.resolveFieldData(item, this.d_sortField));
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          var comparer = new Intl.Collator(undefined, {
+            numeric: true
+          }).compare;
           data.sort(function (data1, data2) {
-            var value1 = utils.ObjectUtils.resolveFieldData(data1, _this.d_sortField);
-            var value2 = utils.ObjectUtils.resolveFieldData(data2, _this.d_sortField);
+            var value1 = resolvedFieldDatas.get(data1);
+            var value2 = resolvedFieldDatas.get(data2);
             var result = null;
-            if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = value1.localeCompare(value2, undefined, {
-              numeric: true
-            });else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
+            if (value1 == null && value2 != null) result = -1;else if (value1 != null && value2 == null) result = 1;else if (value1 == null && value2 == null) result = 0;else if (typeof value1 === 'string' && typeof value2 === 'string') result = comparer(value1, value2);else result = value1 < value2 ? -1 : value1 > value2 ? 1 : 0;
             return _this.d_sortOrder * result;
           });
           return data;
@@ -4327,9 +4343,10 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
           var result = null;
           if (typeof value1 === 'string' || value1 instanceof String) {
             if (value1.localeCompare && value1 !== value2) {
-              return this.d_multiSortMeta[index].order * value1.localeCompare(value2, undefined, {
+              var comparer = new Intl.Collator(undefined, {
                 numeric: true
-              });
+              }).compare;
+              return this.d_multiSortMeta[index].order * comparer(value1, value2);
             }
           } else {
             result = value1 < value2 ? -1 : 1;
@@ -4356,14 +4373,40 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
           }
           this.d_multiSortMeta = _toConsumableArray(this.d_multiSortMeta);
         },
+        getActiveFilters: function getActiveFilters(filters) {
+          var removeEmptyFilters = function removeEmptyFilters(_ref) {
+            var _ref2 = _slicedToArray(_ref, 2),
+              key = _ref2[0],
+              value = _ref2[1];
+            if (value.constraints) {
+              var filteredConstraints = value.constraints.filter(function (constraint) {
+                return constraint.value !== null;
+              });
+              if (filteredConstraints.length > 0) {
+                return [key, _objectSpread$1(_objectSpread$1({}, value), {}, {
+                  constraints: filteredConstraints
+                })];
+              }
+            } else if (value.value !== null) {
+              return [key, value];
+            }
+            return undefined;
+          };
+          var filterValidEntries = function filterValidEntries(entry) {
+            return entry !== undefined;
+          };
+          var entries = Object.entries(filters).map(removeEmptyFilters).filter(filterValidEntries);
+          return Object.fromEntries(entries);
+        },
         filter: function filter(data) {
           var _this3 = this;
           if (!data) {
             return;
           }
           this.clearEditingMetaData();
+          var activeFilters = this.getActiveFilters(this.filters);
           var globalFilterFieldsArray;
-          if (this.filters['global']) {
+          if (activeFilters['global']) {
             globalFilterFieldsArray = this.globalFilterFields || this.columns.map(function (col) {
               return _this3.columnProp(col, 'filterField') || _this3.columnProp(col, 'field');
             });
@@ -4373,26 +4416,26 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
             var localMatch = true;
             var globalMatch = false;
             var localFiltered = false;
-            for (var prop in this.filters) {
-              if (Object.prototype.hasOwnProperty.call(this.filters, prop) && prop !== 'global') {
+            for (var prop in activeFilters) {
+              if (Object.prototype.hasOwnProperty.call(activeFilters, prop) && prop !== 'global') {
                 localFiltered = true;
                 var filterField = prop;
-                var filterMeta = this.filters[filterField];
+                var filterMeta = activeFilters[filterField];
                 if (filterMeta.operator) {
-                  var _iterator = _createForOfIteratorHelper(filterMeta.constraints),
-                    _step;
+                  var _iterator2 = _createForOfIteratorHelper(filterMeta.constraints),
+                    _step2;
                   try {
-                    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                      var filterConstraint = _step.value;
+                    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                      var filterConstraint = _step2.value;
                       localMatch = this.executeLocalFilter(filterField, data[i], filterConstraint);
                       if (filterMeta.operator === api.FilterOperator.OR && localMatch || filterMeta.operator === api.FilterOperator.AND && !localMatch) {
                         break;
                       }
                     }
                   } catch (err) {
-                    _iterator.e(err);
+                    _iterator2.e(err);
                   } finally {
-                    _iterator.f();
+                    _iterator2.f();
                   }
                 } else {
                   localMatch = this.executeLocalFilter(filterField, data[i], filterMeta);
@@ -4402,17 +4445,17 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
                 }
               }
             }
-            if (this.filters['global'] && !globalMatch && globalFilterFieldsArray) {
+            if (localMatch && activeFilters['global'] && !globalMatch && globalFilterFieldsArray) {
               for (var j = 0; j < globalFilterFieldsArray.length; j++) {
                 var globalFilterField = globalFilterFieldsArray[j];
-                globalMatch = api.FilterService.filters[this.filters['global'].matchMode || api.FilterMatchMode.CONTAINS](utils.ObjectUtils.resolveFieldData(data[i], globalFilterField), this.filters['global'].value, this.filterLocale);
+                globalMatch = api.FilterService.filters[activeFilters['global'].matchMode || api.FilterMatchMode.CONTAINS](utils.ObjectUtils.resolveFieldData(data[i], globalFilterField), activeFilters['global'].value, this.filterLocale);
                 if (globalMatch) {
                   break;
                 }
               }
             }
             var matches = void 0;
-            if (this.filters['global']) {
+            if (activeFilters['global']) {
               matches = localFiltered ? localFiltered && localMatch && globalMatch : globalMatch;
             } else {
               matches = localFiltered && localMatch;
@@ -4421,7 +4464,7 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
               filteredValue.push(data[i]);
             }
           }
-          if (filteredValue.length === this.value.length) {
+          if (filteredValue.length === this.value.length || Object.keys(activeFilters).length == 0) {
             filteredValue = data;
           }
           var filterEvent = this.createLazyLoadEvent();
@@ -4815,17 +4858,17 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         updateSelectionKeys: function updateSelectionKeys(selection) {
           this.d_selectionKeys = {};
           if (Array.isArray(selection)) {
-            var _iterator2 = _createForOfIteratorHelper(selection),
-              _step2;
+            var _iterator3 = _createForOfIteratorHelper(selection),
+              _step3;
             try {
-              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                var data = _step2.value;
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var data = _step3.value;
                 this.d_selectionKeys[String(utils.ObjectUtils.resolveFieldData(data, this.dataKey))] = 1;
               }
             } catch (err) {
-              _iterator2.e(err);
+              _iterator3.e(err);
             } finally {
-              _iterator2.f();
+              _iterator3.f();
             }
           } else {
             this.d_selectionKeys[String(utils.ObjectUtils.resolveFieldData(selection, this.dataKey))] = 1;
@@ -4834,17 +4877,17 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         updateExpandedRowKeys: function updateExpandedRowKeys(expandedRows) {
           if (expandedRows && expandedRows.length) {
             this.d_expandedRowKeys = {};
-            var _iterator3 = _createForOfIteratorHelper(expandedRows),
-              _step3;
+            var _iterator4 = _createForOfIteratorHelper(expandedRows),
+              _step4;
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                var data = _step3.value;
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                var data = _step4.value;
                 this.d_expandedRowKeys[String(utils.ObjectUtils.resolveFieldData(data, this.dataKey))] = 1;
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator4.e(err);
             } finally {
-              _iterator3.f();
+              _iterator4.f();
             }
           } else {
             this.d_expandedRowKeys = null;
@@ -4853,17 +4896,17 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         updateEditingRowKeys: function updateEditingRowKeys(editingRows) {
           if (editingRows && editingRows.length) {
             this.d_editingRowKeys = {};
-            var _iterator4 = _createForOfIteratorHelper(editingRows),
-              _step4;
+            var _iterator5 = _createForOfIteratorHelper(editingRows),
+              _step5;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                var data = _step4.value;
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var data = _step5.value;
                 this.d_editingRowKeys[String(utils.ObjectUtils.resolveFieldData(data, this.dataKey))] = 1;
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator4.f();
+              _iterator5.f();
             }
           } else {
             this.d_editingRowKeys = null;
@@ -4924,8 +4967,8 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
             data.forEach(function (record) {
               csv += '\n';
               var rowInitiated = false;
-              for (var _i = 0; _i < _this4.columns.length; _i++) {
-                var _column = _this4.columns[_i];
+              for (var _i2 = 0; _i2 < _this4.columns.length; _i2++) {
+                var _column = _this4.columns[_i2];
                 if (_this4.columnProp(_column, 'exportable') !== false && _this4.columnProp(_column, 'field')) {
                   if (rowInitiated) csv += _this4.csvSeparator;else rowInitiated = true;
                   var cellData = utils.ObjectUtils.resolveFieldData(record, _this4.columnProp(_column, 'field'));
@@ -4945,9 +4988,9 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
 
           //footers
           var footerInitiated = false;
-          for (var _i2 = 0; _i2 < this.columns.length; _i2++) {
-            var _column2 = this.columns[_i2];
-            if (_i2 === 0) csv += '\n';
+          for (var _i3 = 0; _i3 < this.columns.length; _i3++) {
+            var _column2 = this.columns[_i3];
+            if (_i3 === 0) csv += '\n';
             if (this.columnProp(_column2, 'exportable') !== false && this.columnProp(_column2, 'exportFooter')) {
               if (footerInitiated) csv += this.csvSeparator;else footerInitiated = true;
               csv += '"' + (this.columnProp(_column2, 'exportFooter') || this.columnProp(_column2, 'footer') || this.columnProp(_column2, 'field')) + '"';
@@ -4992,6 +5035,9 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
               var updateTableWidth = function updateTableWidth(el) {
                 !!el && (el.style.width = el.style.minWidth = tableWidth);
               };
+
+              // Reasoning: resize table cells before updating the table width so that it can use existing computed cell widths and adjust only the one column.
+              this.resizeTableCells(newColumnWidth);
               updateTableWidth(this.$refs.table);
               if (!this.virtualScrollerDisabled) {
                 var body = this.$refs.bodyRef && this.$refs.bodyRef.$el;
@@ -4999,7 +5045,6 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
                 updateTableWidth(body);
                 updateTableWidth(frozenBody);
               }
-              this.resizeTableCells(newColumnWidth);
             }
             this.$emit('column-resize-end', {
               element: this.resizeColumnElement,
@@ -5507,10 +5552,10 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         cloneFilters: function cloneFilters() {
           var cloned = {};
           if (this.filters) {
-            Object.entries(this.filters).forEach(function (_ref) {
-              var _ref2 = _slicedToArray(_ref, 2),
-                prop = _ref2[0],
-                value = _ref2[1];
+            Object.entries(this.filters).forEach(function (_ref3) {
+              var _ref4 = _slicedToArray(_ref3, 2),
+                prop = _ref4[0],
+                value = _ref4[1];
               cloned[prop] = value.operator ? {
                 operator: value.operator,
                 constraints: value.constraints.map(function (constraint) {
@@ -5602,20 +5647,20 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
           var cols = this.recursiveGetChildren(children, []);
           if (this.reorderableColumns && this.d_columnOrder) {
             var orderedColumns = [];
-            var _iterator5 = _createForOfIteratorHelper(this.d_columnOrder),
-              _step5;
+            var _iterator6 = _createForOfIteratorHelper(this.d_columnOrder),
+              _step6;
             try {
-              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                var columnKey = _step5.value;
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                var columnKey = _step6.value;
                 var column = this.findColumnByKey(cols, columnKey);
                 if (column && !this.columnProp(column, 'hidden')) {
                   orderedColumns.push(column);
                 }
               }
             } catch (err) {
-              _iterator5.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator5.f();
+              _iterator6.f();
             }
             return [].concat(orderedColumns, _toConsumableArray(cols.filter(function (item) {
               return orderedColumns.indexOf(item) < 0;
@@ -5626,19 +5671,19 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         headerColumnGroup: function headerColumnGroup() {
           var children = this.getChildren();
           if (children) {
-            var _iterator6 = _createForOfIteratorHelper(children),
-              _step6;
+            var _iterator7 = _createForOfIteratorHelper(children),
+              _step7;
             try {
-              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                var child = _step6.value;
+              for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                var child = _step7.value;
                 if (child.type.name === 'ColumnGroup' && this.columnProp(child, 'type') === 'header') {
                   return child;
                 }
               }
             } catch (err) {
-              _iterator6.e(err);
+              _iterator7.e(err);
             } finally {
-              _iterator6.f();
+              _iterator7.f();
             }
           }
           return null;
@@ -5646,19 +5691,19 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
         footerColumnGroup: function footerColumnGroup() {
           var children = this.getChildren();
           if (children) {
-            var _iterator7 = _createForOfIteratorHelper(children),
-              _step7;
+            var _iterator8 = _createForOfIteratorHelper(children),
+              _step8;
             try {
-              for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                var child = _step7.value;
+              for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+                var child = _step8.value;
                 if (child.type.name === 'ColumnGroup' && this.columnProp(child, 'type') === 'footer') {
                   return child;
                 }
               }
             } catch (err) {
-              _iterator7.e(err);
+              _iterator8.e(err);
             } finally {
-              _iterator7.f();
+              _iterator8.f();
             }
           }
           return null;