@datorama/core 21.4.0-rc.11 → 21.4.0-rc.12

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.
@@ -11620,7 +11620,7 @@
11620
11620
  return Object.keys(filter).reduce(function (filters, field) {
11621
11621
  var datoFilter = filter[field];
11622
11622
  if (datoFilter) {
11623
- filters.push({ colId: datoFilter.colId, field: field, filter: datoFilter });
11623
+ filters.push({ field: field, filter: datoFilter });
11624
11624
  }
11625
11625
  return filters;
11626
11626
  }, []);
@@ -12866,7 +12866,7 @@
12866
12866
  var columnValues = this.getColumnValues();
12867
12867
  this.columnValues = columnValues.map(function (_a) {
12868
12868
  var value = _a.value;
12869
- return value;
12869
+ return _this.pivotColumn ? value[_this.colField] : value;
12870
12870
  });
12871
12871
  this.listOptions = columnValues.map(mapToListItemWithFormatted);
12872
12872
  }
@@ -12963,7 +12963,9 @@
12963
12963
  filter.pivotKeys = this.pivotKeys;
12964
12964
  if (this.pivotColumn) {
12965
12965
  filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce(function (fieldMap, field, index) {
12966
- fieldMap[field] = _this.pivotKeys[index];
12966
+ if (_this.pivotKeys[index]) {
12967
+ fieldMap[field] = _this.pivotKeys[index];
12968
+ }
12967
12969
  return fieldMap;
12968
12970
  }, {});
12969
12971
  }
@@ -14370,13 +14372,13 @@
14370
14372
  var e_2, _a;
14371
14373
  try {
14372
14374
  for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
14373
- var _b = filters_1_1.value, colId = _b.colId, filter = _b.filter;
14374
- var column = this.api.columns.getColumn(colId);
14375
+ var filter = filters_1_1.value.filter;
14376
+ var column = this.api.columns.getColumn(filter.colId);
14375
14377
  if (column) {
14376
14378
  this.setColumnFilter(column, filter);
14377
14379
  }
14378
14380
  else {
14379
- var pivotColumn = this.gridQuery.getSecondaryColumn(colId);
14381
+ var pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
14380
14382
  this.setColumnFilter(pivotColumn, filter);
14381
14383
  }
14382
14384
  }