primevue 3.32.1 → 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);
         }),
@@ -4307,10 +4309,10 @@ this.primevue.datatable = (function (api, ArrowDownIcon, ArrowUpIcon, SpinnerIco
           } finally {
             _iterator.f();
           }
+          var comparer = new Intl.Collator(undefined, {
+            numeric: true
+          }).compare;
           data.sort(function (data1, data2) {
-            var comparer = new Intl.Collator(undefined, {
-              numeric: true
-            }).compare;
             var value1 = resolvedFieldDatas.get(data1);
             var value2 = resolvedFieldDatas.get(data2);
             var result = null;