@datorama/core 22.8.1-rc.1 → 22.8.2-rc.1

package/fesm2015/datorama-core.js

@@ -10092,7 +10092,7 @@ let GridQuery = class GridQuery extends Query {
         const storeSettings = this.getValue().settings;
         const settings = {
             gridAlignment: storeSettings.gridAlignment,
-            sort: this.getSort(),
+            sort: this.getGridOptions().sortByStore ? this.getSort() : this.getSortModel(),
             hiddenColumns,
             groupedColumns: groupedColumns.map(toColId),
             filter: this.getFilter(),
@@ -10106,31 +10106,29 @@ let GridQuery = class GridQuery extends Query {
         }
         return settings;
     }
-    getSort() {
+    getSortModel() {
         return this.api.grid.getSortModel().pop();
     }
+    getSort() {
+        return this.getValue().settings.sort || this.getSortModel();
+    }
     getExternalSort() {
-        const { sort, colId } = this.getSort() || {};
+        const { sort, colId, sortIndex: savedSortIndex } = 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) };
+            const field = getColField(column.getColDef());
+            return { colId, sort, field };
         }
         else {
             const secondaryColumn = this.getSecondaryColumn(colId);
             if (secondaryColumn) {
-                return {
-                    colId,
-                    sort,
-                    field: getColField(secondaryColumn.getColDef()),
-                    sortIndex: allColumns.indexOf(secondaryColumn)
-                };
+                const sortIndex = savedSortIndex || allColumns.indexOf(secondaryColumn);
+                const field = getColField(secondaryColumn.getColDef());
+                return { colId, sort, field, sortIndex };
             }
         }
     }
-    selectSort() {
-        return this.select(state => state.settings.sort);
-    }
     /* @internal */
     _setApi(api, gridRef) {
         this.api = api;
@@ -12716,7 +12714,7 @@ let GridService = class GridService {
         }
     }
     setGridSort(gridSort) {
-        if (this.api && gridSort) {
+        if (gridSort && this.api && this.api.grid.getDisplayedRowCount() > 0) {
             const { colId, sort, sortIndex } = gridSort;
             let sortToApply = gridSort;
             if (!isNil(sortIndex)) {
@@ -12728,10 +12726,11 @@ let GridService = class GridService {
                     if (isPivotColId || valueColumn) {
                         /** Column is pivot value column, sort by index */
                         const columnByIndex = gridColumns[sortIndex];
-                        const valueColumnId = columnByIndex && columnByIndex.getColDef().pivotValueColumn.getColId();
-                        if (valueColumnId === colId) {
-                            sortToApply = { colId: columnByIndex.getColId(), sort };
-                        }
+                        // const pivotValueColumn = columnByIndex && columnByIndex.getColDef().pivotValueColumn;
+                        // const pivotValueColumnId = pivotValueColumn && pivotValueColumn.getColId();
+                        // if (pivotValueColumnId === colId) {
+                        sortToApply = { colId: columnByIndex.getColId(), sort, sortIndex };
+                        // }
                     }
                     else {
                         /** Sort by column id */
@@ -13822,6 +13821,7 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
                 type,
                 data
             });
+            triggerWindowResize();
         });
     }
     listenToStoreSettingsChanges() {
@@ -22714,7 +22714,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.8.1-rc.';
+window.coreVersion = '22.8.2-rc.';
 
 /**
  * @license