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

package/bundles/datorama-core.umd.js

@@ -11581,7 +11581,7 @@
             var storeSettings = this.getValue().settings;
             var settings = {
                 gridAlignment: storeSettings.gridAlignment,
-                sort: this.getSort(),
+                sort: this.getGridOptions().sortByStore ? this.getSort() : this.getSortModel(),
                 hiddenColumns: hiddenColumns,
                 groupedColumns: groupedColumns.map(toColId),
                 filter: this.getFilter(),
@@ -11595,31 +11595,29 @@
             }
             return settings;
         };
-        GridQuery.prototype.getSort = function () {
+        GridQuery.prototype.getSortModel = function () {
             return this.api.grid.getSortModel().pop();
         };
+        GridQuery.prototype.getSort = function () {
+            return this.getValue().settings.sort || this.getSortModel();
+        };
         GridQuery.prototype.getExternalSort = function () {
-            var _a = this.getSort() || {}, sort = _a.sort, colId = _a.colId;
+            var _a = this.getSort() || {}, sort = _a.sort, colId = _a.colId, savedSortIndex = _a.sortIndex;
             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) };
+                var field = getColField(column.getColDef());
+                return { colId: colId, sort: sort, field: field };
             }
             else {
                 var secondaryColumn = this.getSecondaryColumn(colId);
                 if (secondaryColumn) {
-                    return {
-                        colId: colId,
-                        sort: sort,
-                        field: getColField(secondaryColumn.getColDef()),
-                        sortIndex: allColumns.indexOf(secondaryColumn)
-                    };
+                    var sortIndex = savedSortIndex || allColumns.indexOf(secondaryColumn);
+                    var field = getColField(secondaryColumn.getColDef());
+                    return { colId: colId, sort: sort, field: field, sortIndex: sortIndex };
                 }
             }
         };
-        GridQuery.prototype.selectSort = function () {
-            return this.select(function (state) { return state.settings.sort; });
-        };
         /* @internal */
         GridQuery.prototype._setApi = function (api, gridRef) {
             this.api = api;
@@ -14460,7 +14458,7 @@
             }
         };
         GridService.prototype.setGridSort = function (gridSort) {
-            if (this.api && gridSort) {
+            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)) {
@@ -14472,10 +14470,11 @@
                         if (isPivotColId || valueColumn) {
                             /** Column is pivot value column, sort by index */
                             var columnByIndex = gridColumns[sortIndex];
-                            var valueColumnId = columnByIndex && columnByIndex.getColDef().pivotValueColumn.getColId();
-                            if (valueColumnId === colId_1) {
-                                sortToApply = { colId: columnByIndex.getColId(), sort: sort };
-                            }
+                            // const pivotValueColumn = columnByIndex && columnByIndex.getColDef().pivotValueColumn;
+                            // const pivotValueColumnId = pivotValueColumn && pivotValueColumn.getColId();
+                            // if (pivotValueColumnId === colId) {
+                            sortToApply = { colId: columnByIndex.getColId(), sort: sort, sortIndex: sortIndex };
+                            // }
                         }
                         else {
                             /** Sort by column id */
@@ -15674,6 +15673,7 @@
                     type: type,
                     data: data
                 });
+                triggerWindowResize();
             });
         };
         DatoGridControllerComponent.prototype.listenToStoreSettingsChanges = function () {
@@ -25466,7 +25466,7 @@
         };
     }
 
-    window.coreVersion = '22.8.1-rc.';
+    window.coreVersion = '22.8.2-rc.';
 
     exports.APP_TRANSLATE = APP_TRANSLATE;
     exports.AceService = AceService;