@datorama/core 21.4.0-rc.2 → 21.4.0-rc.3

package/fesm5/datorama-core.js

@@ -11366,14 +11366,24 @@ var GridQuery = /** @class */ (function (_super) {
         return settings;
     };
     GridQuery.prototype.getSort = function () {
-        var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId = _a.colId;
-        var column = this.api.columns.getColumn(colId);
-        var secondaryColumns = this.api.columns.getSecondaryColumns();
-        var pivotedColumn = secondaryColumns && secondaryColumns.find(function (col) { return col.getColId() === colId; });
-        var sortColumn = column || pivotedColumn;
-        var sortField = sortColumn && getColField(sortColumn.getColDef());
-        var pivotColIndex = secondaryColumns && pivotedColumn && secondaryColumns.indexOf(pivotedColumn);
-        return { colId: sortField, sort: sort, pivotColIndex: pivotColIndex };
+        if (this.gridRef.gridOptions.pivotMode) {
+            var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId_1 = _a.colId;
+            var column = this.api.columns.getColumn(colId_1);
+            var secondaryColumns = this.api.columns.getSecondaryColumns();
+            var pivotedColumn_1 = secondaryColumns && secondaryColumns.find(function (col) { return col.getColId() === colId_1; });
+            if (pivotedColumn_1) {
+                var uniquePivotParents = uniq(secondaryColumns.map(function (column) { return column.getParent(); }));
+                var secondaryColumn = secondaryColumns.find(function (col) { return col.getColId() === pivotedColumn_1.getColId(); });
+                var pivotColIndex = uniquePivotParents.indexOf(secondaryColumn.getParent());
+                return { colId: getColField(pivotedColumn_1.getColDef()), sort: sort, pivotColIndex: pivotColIndex };
+            }
+            else if (column) {
+                return { colId: getColField(column.getColDef()), sort: sort };
+            }
+        }
+        else {
+            return this.api.grid.getSortModel().pop();
+        }
     };
     GridQuery.prototype.selectSort = function () {
         return this.select(function (state) { return state.settings.sort; });