@datorama/core 22.6.3 → 22.7.2

package/fesm5/datorama-core.js

@@ -11402,26 +11402,26 @@ var GridQuery = /** @class */ (function (_super) {
         return settings;
     };
     GridQuery.prototype.getSort = function () {
-        if (this.gridRef.gridOptions.pivotMode) {
-            var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId = _a.colId;
-            var column = this.api.columns.getColumn(colId);
-            var allColumns = this.api.columns.getAllGridColumns();
-            if (column) {
-                return { colId: colId, sort: sort, field: getColField(column.getColDef()), sortIndex: allColumns.indexOf(column) };
-            }
-            else {
-                var secondaryColumn = this.getSecondaryColumn(colId);
-                if (secondaryColumn) {
-                    return {
-                        colId: colId,
-                        sort: sort,
-                        field: getColField(secondaryColumn.getColDef()),
-                        sortIndex: allColumns.indexOf(secondaryColumn)
-                    };
-                }
+        return this.api.grid.getSortModel().pop();
+    };
+    GridQuery.prototype.getExternalSort = function () {
+        var _a = this.getSort() || {}, sort = _a.sort, colId = _a.colId;
+        var column = this.api.columns.getColumn(colId);
+        var allColumns = this.api.columns.getAllGridColumns();
+        if (column) {
+            return { colId: colId, sort: sort, field: getColField(column.getColDef()), sortIndex: allColumns.indexOf(column) };
+        }
+        else {
+            var secondaryColumn = this.getSecondaryColumn(colId);
+            if (secondaryColumn) {
+                return {
+                    colId: colId,
+                    sort: sort,
+                    field: getColField(secondaryColumn.getColDef()),
+                    sortIndex: allColumns.indexOf(secondaryColumn)
+                };
             }
         }
-        return this.api.grid.getSortModel().pop();
     };
     GridQuery.prototype.selectSort = function () {
         return this.select(function (state) { return state.settings.sort; });
@@ -14266,38 +14266,37 @@ var GridService = /** @class */ (function () {
         }
     };
     GridService.prototype.setGridSort = function (gridSort) {
-        if (this.api && gridSort) {
-            var sort = gridSort.sort, sortIndex = gridSort.sortIndex, colId_1 = gridSort.colId;
+        if (gridSort && this.api && this.api.grid.getDisplayedRowCount() > 0) {
+            var colId_1 = gridSort.colId, sort = gridSort.sort, sortIndex = gridSort.sortIndex;
+            var sortToApply = gridSort;
             if (!isNil(sortIndex)) {
                 var gridColumns = this.api.columns.getAllGridColumns();
                 if (gridColumns) {
-                    var primaryColumns = this.api.columns.getPrimaryColumns();
-                    var primaryColumn = primaryColumns.find(function (col) { return col.getColId() === colId_1; });
-                    if (primaryColumn) {
-                        /** Column is no pivot value column */
+                    var valueColumns = this.api.columns.getValueColumns();
+                    var valueColumn = valueColumns.find(function (col) { return col.getColId() === colId_1; });
+                    var isPivotColId = colId_1.startsWith('pivot');
+                    if (isPivotColId || valueColumn) {
+                        /** Column is pivot value column, sort by index */
+                        var columnByIndex = gridColumns[sortIndex];
+                        var pivotValueColumn = columnByIndex && columnByIndex.getColDef().pivotValueColumn;
+                        var pivotValueColumnId = pivotValueColumn && pivotValueColumn.getColId();
+                        if (pivotValueColumnId === colId_1) {
+                            sortToApply = { colId: columnByIndex.getColId(), sort: sort };
+                        }
+                    }
+                    else {
+                        /** Sort by column id */
                         var columnById = gridColumns.find(function (col) {
                             return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
                         });
                         if (columnById) {
-                            var sortToApply = { colId: columnById.getColId(), sort: sort };
-                            this.updateSettings({ sort: sortToApply });
-                            this.api.grid.setSortModel([sortToApply]);
-                        }
-                    }
-                    else {
-                        var columnByIndex = gridColumns[sortIndex];
-                        if (columnByIndex) {
-                            var sortToApply = { colId: columnByIndex.getColId(), sort: sort };
-                            this.updateSettings({ sort: sortToApply });
-                            this.api.grid.setSortModel([sortToApply]);
+                            sortToApply = { colId: columnById.getColId(), sort: sort };
                         }
                     }
                 }
             }
-            else {
-                this.updateSettings({ sort: gridSort });
-                this.api.grid.setSortModel([gridSort]);
-            }
+            this.updateSettings({ sort: sortToApply });
+            this.api.grid.setSortModel([sortToApply]);
         }
     };
     GridService.prototype.updateFilter = function (column, filter) {
@@ -15474,7 +15473,7 @@ var DatoGridControllerComponent = /** @class */ (function () {
             var data = _this.getGridData();
             _this.onGridChange.emit({
                 filter: _this.gridQuery.getExternalFilter(),
-                sort: _this.gridQuery.getSort(),
+                sort: _this.gridQuery.getExternalSort(),
                 type: type,
                 data: data
             });
@@ -25240,7 +25239,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.6.3';
+window.coreVersion = '22.7.2';
 
 /**
  * @license