@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.
Files changed (13) hide show
  1. package/bundles/datorama-core.umd.js +24 -9
  2. package/bundles/datorama-core.umd.js.map +1 -1
  3. package/bundles/datorama-core.umd.min.js +2 -2
  4. package/bundles/datorama-core.umd.min.js.map +1 -1
  5. package/esm2015/lib/grid-v2/grid-store/grid.service.js +24 -9
  6. package/esm2015/lib/version.js +2 -2
  7. package/esm5/lib/grid-v2/grid-store/grid.service.js +24 -9
  8. package/esm5/lib/version.js +2 -2
  9. package/fesm2015/datorama-core.js +24 -9
  10. package/fesm2015/datorama-core.js.map +1 -1
  11. package/fesm5/datorama-core.js +24 -9
  12. package/fesm5/datorama-core.js.map +1 -1
  13. package/package.json +1 -1
package/bundles/datorama-core.umd.js CHANGED
@@ -14466,15 +14466,30 @@
14466
14466
  };
14467
14467
  GridService.prototype.setGridSort = function (gridSort) {
14468
14468
  if (this.api && gridSort) {
14469
- var sort = gridSort.sort, sortIndex = gridSort.sortIndex;
14469
+ var sort = gridSort.sort, sortIndex = gridSort.sortIndex, colId_1 = gridSort.colId;
14470
14470
  if (!isNil(sortIndex)) {
14471
- var columns = this.api.columns.getAllGridColumns();
14472
- if (columns) {
14473
- var column = columns[sortIndex];
14474
- if (column) {
14475
- var sortToApply = { colId: column.getColId(), sort: sort };
14476
- this.updateSettings({ sort: sortToApply });
14477
- this.api.grid.setSortModel([sortToApply]);
14471
+ var gridColumns = this.api.columns.getAllGridColumns();
14472
+ if (gridColumns) {
14473
+ var primaryColumns = this.api.columns.getPrimaryColumns();
14474
+ var primaryColumn = primaryColumns.find(function (col) { return col.getColId() === colId_1; });
14475
+ if (primaryColumn) {
14476
+ /** Column is no pivot value column */
14477
+ var columnById = gridColumns.find(function (col) {
14478
+ return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
14479
+ });
14480
+ if (columnById) {
14481
+ var sortToApply = { colId: columnById.getColId(), sort: sort };
14482
+ this.updateSettings({ sort: sortToApply });
14483
+ this.api.grid.setSortModel([sortToApply]);
14484
+ }
14485
+ }
14486
+ else {
14487
+ var columnByIndex = gridColumns[sortIndex];
14488
+ if (columnByIndex) {
14489
+ var sortToApply = { colId: columnByIndex.getColId(), sort: sort };
14490
+ this.updateSettings({ sort: sortToApply });
14491
+ this.api.grid.setSortModel([sortToApply]);
14492
+ }
14478
14493
  }
14479
14494
  }
14480
14495
  }
@@ -25424,7 +25439,7 @@
25424
25439
  };
25425
25440
  }
25426
25441
 
25427
- window.coreVersion = '22.6.0';
25442
+ window.coreVersion = '22.6.3';
25428
25443
 
25429
25444
  exports.APP_TRANSLATE = APP_TRANSLATE;
25430
25445
  exports.AceService = AceService;