@datorama/core 22.6.3 → 22.7.2

package/fesm2015/datorama-core.js

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