@adaptabletools/adaptable 20.0.0-canary.15 → 20.0.0-canary.16

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/Select/Select.js +2 -2
  3. package/src/env.js +2 -2
  4. package/src/migration/VersionUpgrade20.js +32 -10
  5. package/tsconfig.esm.tsbuildinfo +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptabletools/adaptable",
3
- "version": "20.0.0-canary.15",
3
+ "version": "20.0.0-canary.16",
4
4
  "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
5
5
  "keywords": [
6
6
  "web-components",
package/src/components/Select/Select.js CHANGED
@@ -95,7 +95,7 @@ export const Select = function (props) {
95
95
  };
96
96
  const renderMultipleValues = props.renderMultipleValues;
97
97
  const isMulti = props.isMulti ?? Array.isArray(props.value);
98
- const showHeaderSelectionCheckbox = props.showHeaderSelectionCheckbox ?? false;
98
+ const showHeaderSelectionCheckbox = isMulti && (props.showHeaderSelectionCheckbox ?? false);
99
99
  let selectedOption = null;
100
100
  if (isMulti) {
101
101
  selectedOption =
@@ -335,7 +335,7 @@ export const Select = function (props) {
335
335
  zIndex: 999999,
336
336
  boxShadow: 'var(--ab-cmp-select-menu__box-shadow)',
337
337
  minWidth: `var(--ab-cmp-select-menu__min-width)`,
338
- '--ab-cmp-select-menu__min-height': `min(${(props.options || []).length * ROW_HEIGHT}px, 20rem)`,
338
+ '--ab-cmp-select-menu__min-height': `min(${((props.options || []).length + (showHeaderSelectionCheckbox ? 1 : 0)) * ROW_HEIGHT}px, 20rem)`,
339
339
  ...commonStyles(state),
340
340
  ...props.menuStyle,
341
341
  };
package/src/env.js CHANGED
@@ -1,5 +1,5 @@
1
1
  export default {
2
2
  NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
3
- PUBLISH_TIMESTAMP: 1741795376820 || Date.now(),
4
- VERSION: "20.0.0-canary.15" || '--current-version--',
3
+ PUBLISH_TIMESTAMP: 1741870286789 || Date.now(),
4
+ VERSION: "20.0.0-canary.16" || '--current-version--',
5
5
  };
package/src/migration/VersionUpgrade20.js CHANGED
@@ -2,21 +2,13 @@ import { VersionUpgrade } from './VersionUpgrade';
2
2
  import { ALL_ADAPTABLE_DATA_TYPES } from '../agGrid/agGridDataTypeDefinitions';
3
3
  function transition_pre_20(layout) {
4
4
  const l = layout;
5
- if (l.AggregationColumns && !Array.isArray(l.AggregationColumns)) {
6
- const oldAggs = l.AggregationColumns || {};
7
- const newAggs = Object.entries(oldAggs).map(([colId, aggFunc]) => ({
8
- ColumnId: colId,
9
- AggFunc: aggFunc,
10
- }));
11
- layout.TableAggregationColumns = newAggs;
12
- }
13
5
  if (l.Columns) {
14
6
  layout.TableColumns = l.Columns;
15
7
  delete l.Columns;
16
8
  delete layout.PivotColumns;
17
9
  }
18
10
  if (l.PinnedColumnsMap) {
19
- layout.ColumnPinning = l.PinnedColumnsMap;
11
+ layout.ColumnPinning = { ...l.PinnedColumnsMap };
20
12
  delete l.PinnedColumnsMap;
21
13
  }
22
14
  if (l.ColumnHeadersMap) {
@@ -30,10 +22,40 @@ function transition_pre_20(layout) {
30
22
  if (l.EnablePivot) {
31
23
  layout.PivotColumns = l.PivotColumns || [];
32
24
  delete layout.TableColumns;
25
+ delete l.EnablePivot;
33
26
  if (l.AggregationColumns) {
34
- layout.PivotAggregationColumns = layout.TableAggregationColumns;
27
+ layout.PivotAggregationColumns = (Object.entries(l.AggregationColumns) || []).map(([ColumnId, AggFunc]) => {
28
+ return {
29
+ ColumnId,
30
+ AggFunc,
31
+ };
32
+ });
33
+ delete layout.TableAggregationColumns;
34
+ delete l.AggregationColumns;
35
+ }
36
+ if (l.RowGroupedColumns) {
37
+ layout.PivotGroupedColumns = l.RowGroupedColumns;
38
+ delete l.RowGroupedColumns;
35
39
  }
36
40
  }
41
+ else {
42
+ if (l.AggregationColumns && !Array.isArray(l.AggregationColumns)) {
43
+ const oldAggs = l.AggregationColumns || {};
44
+ const newAggs = Object.entries(oldAggs).map(([ColumnId, AggFunc]) => ({
45
+ ColumnId,
46
+ AggFunc,
47
+ }));
48
+ layout.TableAggregationColumns = newAggs;
49
+ delete l.AggregationColumns;
50
+ }
51
+ }
52
+ if (l.ExpandedRowGroupValues) {
53
+ layout.RowGroupValues = {
54
+ RowGroupDefaultBehavior: 'collapsed',
55
+ ExceptionGroupKeys: l.ExpandedRowGroupValues,
56
+ };
57
+ delete l.ExpandedRowGroupValues;
58
+ }
37
59
  if (Array.isArray(l.ColumnFilters)) {
38
60
  layout.ColumnFilters = l.ColumnFilters.map((columnFilter) => {
39
61
  const filter = {