@datorama/core 22.6.0 → 22.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14267,15 +14267,30 @@ var GridService = /** @class */ (function () {
14267
14267
  };
14268
14268
  GridService.prototype.setGridSort = function (gridSort) {
14269
14269
  if (this.api && gridSort) {
14270
- var sort = gridSort.sort, sortIndex = gridSort.sortIndex;
14270
+ var sort = gridSort.sort, sortIndex = gridSort.sortIndex, colId_1 = gridSort.colId;
14271
14271
  if (!isNil(sortIndex)) {
14272
- var columns = this.api.columns.getAllGridColumns();
14273
- if (columns) {
14274
- var column = columns[sortIndex];
14275
- if (column) {
14276
- var sortToApply = { colId: column.getColId(), sort: sort };
14277
- this.updateSettings({ sort: sortToApply });
14278
- this.api.grid.setSortModel([sortToApply]);
14272
+ var gridColumns = this.api.columns.getAllGridColumns();
14273
+ if (gridColumns) {
14274
+ var primaryColumns = this.api.columns.getPrimaryColumns();
14275
+ var primaryColumn = primaryColumns.find(function (col) { return col.getColId() === colId_1; });
14276
+ if (primaryColumn) {
14277
+ /** Column is no pivot value column */
14278
+ var columnById = gridColumns.find(function (col) {
14279
+ return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
14280
+ });
14281
+ if (columnById) {
14282
+ var sortToApply = { colId: columnById.getColId(), sort: sort };
14283
+ this.updateSettings({ sort: sortToApply });
14284
+ this.api.grid.setSortModel([sortToApply]);
14285
+ }
14286
+ }
14287
+ else {
14288
+ var columnByIndex = gridColumns[sortIndex];
14289
+ if (columnByIndex) {
14290
+ var sortToApply = { colId: columnByIndex.getColId(), sort: sort };
14291
+ this.updateSettings({ sort: sortToApply });
14292
+ this.api.grid.setSortModel([sortToApply]);
14293
+ }
14279
14294
  }
14280
14295
  }
14281
14296
  }
@@ -25225,7 +25240,7 @@ function fixNgLeaks() {
25225
25240
  };
25226
25241
  }
25227
25242
 
25228
- window.coreVersion = '22.6.0';
25243
+ window.coreVersion = '22.6.3';
25229
25244
 
25230
25245
  /**
25231
25246
  * @license