@datorama/core 22.0.6 → 22.2.0

package/fesm2015/datorama-core.js

@@ -10099,20 +10099,17 @@ let GridQuery = class GridQuery extends Query {
         if (this.gridRef.gridOptions.pivotMode) {
             const { sort, colId } = this.api.grid.getSortModel().pop() || {};
             const column = this.api.columns.getColumn(colId);
-            const pivotedColumn = this.getSecondaryColumn(colId);
-            if (pivotedColumn) {
-                const uniquePivotParents = uniq(this.api.columns.getSecondaryColumns().map(column => column.getParent()));
-                const secondaryColumn = this.getSecondaryColumn(pivotedColumn.getColId());
-                const pivotColIndex = uniquePivotParents.indexOf(secondaryColumn.getParent());
-                return { colId, sort, pivotColIndex, colField: getColField(pivotedColumn.getColDef()) };
-            }
-            else if (column) {
+            if (column) {
                 return { colId, sort, colField: getColField(column.getColDef()) };
             }
+            else {
+                const secondaryColumn = this.getSecondaryColumn(colId);
+                if (secondaryColumn) {
+                    return { colId, sort, colField: getColField(secondaryColumn.getColDef()) };
+                }
+            }
         }
-        else {
-            return this.api.grid.getSortModel().pop();
-        }
+        return this.api.grid.getSortModel().pop();
     }
     selectSort() {
         return this.select(state => state.settings.sort);
@@ -10209,7 +10206,10 @@ let GridQuery = class GridQuery extends Query {
     }
     getSecondaryColumn(colId) {
         const secondaryColumns = this.api.columns.getSecondaryColumns();
-        return secondaryColumns && secondaryColumns.find(col => col.getColId() === colId);
+        if (secondaryColumns) {
+            return secondaryColumns.find(col => col.getColId() === colId);
+        }
+        return null;
     }
     filterCheckboxSelectionColumn(columns) {
         return columns.filter((column) => !column.getUserProvidedColDef() || !column.getUserProvidedColDef().checkboxSelection);
@@ -12678,14 +12678,31 @@ let GridService = class GridService {
             for (const { filter } of filters) {
                 const column = this.api.columns.getColumn(filter.colId);
                 if (column) {
-                    this.setColumnFilter(column, filter);
+                    this.setColumnFilter(column, filter, false);
                 }
                 else {
-                    const pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
-                    this.setColumnFilter(pivotColumn, filter);
+                    const secondaryColumn = this.gridQuery.getSecondaryColumn(filter.colId);
+                    if (secondaryColumn) {
+                        this.setColumnFilter(secondaryColumn, filter, false);
+                    }
                 }
             }
-            this.notifyFilterUpdate();
+            this.api.grid.onFilterChanged();
+        }
+    }
+    setGridSort({ colId, sort }) {
+        if (this.api) {
+            const column = this.api.columns.getColumn(colId);
+            if (column) {
+                column.setSort(sort);
+            }
+            else {
+                const secondaryColumn = this.gridQuery.getSecondaryColumn(colId);
+                if (secondaryColumn) {
+                    secondaryColumn.setSort(sort);
+                }
+            }
+            this.api.grid.onSortChanged();
         }
     }
     updateFilter(column, filter) {
@@ -13702,6 +13719,9 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
     setGridFilters(filters) {
         this.gridService.setGridFilters(filters);
     }
+    setGridSort(sort) {
+        this.gridService.setGridSort(sort);
+    }
     onFilterChanged() {
         return this.gridQuery.filterChanged();
     }
@@ -22625,7 +22645,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.0.6';
+window.coreVersion = '22.2.0';
 
 /**
  * @license