cx 26.2.1 → 26.2.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.
- package/build/charts/Chart.d.ts.map +1 -1
- package/build/charts/Chart.js +5 -4
- package/build/charts/ColumnBarBase.d.ts +3 -3
- package/build/charts/ColumnBarBase.d.ts.map +1 -1
- package/build/charts/ColumnBarBase.js +1 -1
- package/build/charts/Legend.d.ts.map +1 -1
- package/build/charts/Legend.js +11 -4
- package/build/charts/Marker.d.ts +3 -3
- package/build/charts/Marker.d.ts.map +1 -1
- package/build/charts/MarkerLine.d.ts +7 -7
- package/build/charts/MarkerLine.d.ts.map +1 -1
- package/build/charts/MarkerLine.js +14 -10
- package/build/charts/PieChart.d.ts +4 -4
- package/build/charts/PieChart.d.ts.map +1 -1
- package/build/charts/PieChart.js +36 -14
- package/build/charts/PieLabel.d.ts.map +1 -1
- package/build/charts/PieLabel.js +2 -1
- package/build/charts/RangeMarker.d.ts +3 -3
- package/build/charts/RangeMarker.d.ts.map +1 -1
- package/build/charts/RangeMarker.js +1 -1
- package/build/charts/axis/TimeAxis.d.ts +3 -3
- package/build/charts/axis/TimeAxis.d.ts.map +1 -1
- package/build/charts/axis/TimeAxis.js +70 -21
- package/build/charts/helpers/ValueAtFinder.d.ts +1 -1
- package/build/charts/helpers/ValueAtFinder.d.ts.map +1 -1
- package/build/charts/helpers/ValueAtFinder.js +5 -2
- package/build/data/StructuredSelector.js +3 -4
- package/build/data/createAccessorModelProxy.d.ts +6 -11
- package/build/data/createAccessorModelProxy.d.ts.map +1 -1
- package/build/data/createAccessorModelProxy.js +1 -3
- package/build/svg/Ellipse.d.ts +5 -4
- package/build/svg/Ellipse.d.ts.map +1 -1
- package/build/svg/Ellipse.js +9 -6
- package/build/svg/Line.d.ts +1 -0
- package/build/svg/Line.d.ts.map +1 -1
- package/build/svg/Line.js +4 -1
- package/build/svg/Text.d.ts +12 -6
- package/build/svg/Text.d.ts.map +1 -1
- package/build/svg/Text.js +12 -4
- package/build/ui/Controller.d.ts +2 -0
- package/build/ui/Controller.d.ts.map +1 -1
- package/build/ui/Controller.js +3 -0
- package/build/ui/HoverSync.d.ts.map +1 -1
- package/build/ui/HoverSync.js +7 -2
- package/build/ui/Prop.d.ts +1 -1
- package/build/ui/Prop.d.ts.map +1 -1
- package/build/ui/Text.d.ts +3 -3
- package/build/ui/Text.d.ts.map +1 -1
- package/build/ui/Text.js +5 -5
- package/build/ui/adapter/GroupAdapter.d.ts.map +1 -1
- package/build/ui/adapter/GroupAdapter.js +20 -10
- package/build/ui/app/History.js +1 -1
- package/build/widgets/List.d.ts.map +1 -1
- package/build/widgets/List.js +6 -7
- package/build/widgets/drag-drop/DropZone.d.ts +3 -3
- package/build/widgets/drag-drop/DropZone.d.ts.map +1 -1
- package/build/widgets/form/Calendar.d.ts.map +1 -1
- package/build/widgets/form/Calendar.js +30 -11
- package/build/widgets/form/ColorField.d.ts.map +1 -1
- package/build/widgets/form/ColorField.js +16 -7
- package/build/widgets/form/DateTimeField.d.ts.map +1 -1
- package/build/widgets/form/DateTimeField.js +23 -10
- package/build/widgets/form/Field.d.ts +2 -0
- package/build/widgets/form/Field.d.ts.map +1 -1
- package/build/widgets/form/Field.js +11 -5
- package/build/widgets/form/LookupField.d.ts +1 -1
- package/build/widgets/form/LookupField.d.ts.map +1 -1
- package/build/widgets/form/LookupField.js +6 -6
- package/build/widgets/form/MonthField.d.ts.map +1 -1
- package/build/widgets/form/MonthField.js +15 -7
- package/build/widgets/form/MonthPicker.d.ts +1 -2
- package/build/widgets/form/MonthPicker.d.ts.map +1 -1
- package/build/widgets/form/MonthPicker.js +84 -41
- package/build/widgets/form/NumberField.d.ts +2 -0
- package/build/widgets/form/NumberField.d.ts.map +1 -1
- package/build/widgets/form/NumberField.js +45 -15
- package/build/widgets/form/TextField.d.ts +1 -9
- package/build/widgets/form/TextField.d.ts.map +1 -1
- package/build/widgets/form/TextField.js +1 -1
- package/build/widgets/grid/Grid.d.ts +2 -2
- package/build/widgets/grid/Grid.d.ts.map +1 -1
- package/build/widgets/grid/Grid.js +9 -4
- package/build/widgets/grid/Pagination.d.ts.map +1 -1
- package/build/widgets/grid/Pagination.js +4 -4
- package/build/widgets/grid/TreeNode.d.ts.map +1 -1
- package/build/widgets/grid/TreeNode.js +10 -2
- package/build/widgets/icons/folder.d.ts.map +1 -1
- package/build/widgets/icons/folder.js +1 -0
- package/build/widgets/icons/forward.d.ts.map +1 -1
- package/build/widgets/icons/forward.js +4 -3
- package/build/widgets/icons/loading.d.ts.map +1 -1
- package/build/widgets/icons/loading.js +6 -5
- package/build/widgets/icons/square.d.ts.map +1 -1
- package/build/widgets/icons/square.js +3 -3
- package/build/widgets/index.d.ts +3 -1
- package/build/widgets/index.d.ts.map +1 -1
- package/build/widgets/index.js +3 -1
- package/build/widgets/overlay/ContextMenu.d.ts.map +1 -1
- package/build/widgets/overlay/ContextMenu.js +2 -0
- package/build/widgets/overlay/Dropdown.d.ts +2 -1
- package/build/widgets/overlay/Dropdown.d.ts.map +1 -1
- package/build/widgets/overlay/Dropdown.js +75 -20
- package/build/widgets/overlay/MsgBox.d.ts +1 -0
- package/build/widgets/overlay/MsgBox.d.ts.map +1 -1
- package/build/widgets/overlay/MsgBox.js +2 -2
- package/build/widgets/overlay/Overlay.d.ts +32 -2
- package/build/widgets/overlay/Overlay.d.ts.map +1 -1
- package/build/widgets/overlay/Overlay.js +47 -16
- package/build/widgets/overlay/Toast.d.ts +1 -1
- package/build/widgets/overlay/Toast.d.ts.map +1 -1
- package/build/widgets/overlay/Toast.js +4 -1
- package/build/widgets/overlay/Tooltip.d.ts +6 -0
- package/build/widgets/overlay/Tooltip.d.ts.map +1 -1
- package/build/widgets/overlay/Tooltip.js +24 -9
- package/build/widgets/overlay/Window.d.ts.map +1 -1
- package/build/widgets/overlay/Window.js +24 -9
- package/dist/charts.css +325 -272
- package/dist/charts.js +11 -5
- package/dist/data.js +2 -2
- package/dist/manifest.js +892 -880
- package/dist/svg.css +14 -8
- package/dist/svg.js +9 -1
- package/dist/ui.js +29 -16
- package/dist/widgets.css +997 -294
- package/dist/widgets.js +317 -121
- package/package.json +1 -1
- package/src/charts/Bar.scss +13 -10
- package/src/charts/BarGraph.scss +31 -29
- package/src/charts/BubbleGraph.scss +11 -8
- package/src/charts/Chart.ts +5 -3
- package/src/charts/Column.scss +13 -10
- package/src/charts/ColumnBarBase.tsx +255 -230
- package/src/charts/ColumnGraph.scss +13 -11
- package/src/charts/Gridlines.scss +10 -8
- package/src/charts/Legend.scss +57 -50
- package/src/charts/Legend.tsx +257 -213
- package/src/charts/LegendEntry.scss +35 -29
- package/src/charts/LineGraph.scss +28 -25
- package/src/charts/Marker.scss +12 -10
- package/src/charts/Marker.tsx +3 -2
- package/src/charts/MarkerLine.scss +11 -8
- package/src/charts/MarkerLine.tsx +196 -177
- package/src/charts/PieChart.scss +12 -9
- package/src/charts/PieChart.tsx +717 -591
- package/src/charts/PieLabel.tsx +99 -81
- package/src/charts/Range.scss +11 -8
- package/src/charts/RangeMarker.tsx +204 -187
- package/src/charts/ScatterGraph.scss +12 -9
- package/src/charts/axis/Axis.scss +6 -5
- package/src/charts/axis/CategoryAxis.scss +10 -8
- package/src/charts/axis/NumericAxis.scss +9 -6
- package/src/charts/axis/TimeAxis.scss +9 -6
- package/src/charts/axis/TimeAxis.tsx +753 -637
- package/src/charts/axis/index.scss +4 -5
- package/src/charts/axis/variables.scss +4 -2
- package/src/charts/helpers/ValueAtFinder.ts +19 -5
- package/src/charts/index.scss +16 -19
- package/src/charts/maps.scss +0 -0
- package/src/charts/palette.scss +11 -31
- package/src/charts/palette.variables.scss +23 -0
- package/src/charts/variables.scss +35 -3
- package/src/data/StructuredSelector.ts +2 -2
- package/src/data/createAccessorModelProxy.ts +66 -74
- package/src/index.scss +5 -6
- package/src/maps.scss +5 -0
- package/src/svg/Ellipse.tsx +62 -55
- package/src/svg/Line.tsx +57 -42
- package/src/svg/Svg.scss +6 -6
- package/src/svg/Text.scss +19 -0
- package/src/svg/Text.tsx +172 -116
- package/src/svg/index.scss +3 -2
- package/src/svg/maps.scss +0 -0
- package/src/svg/variables.scss +0 -0
- package/src/ui/Container.spec.ts +59 -0
- package/src/ui/Controller.spec.tsx +30 -0
- package/src/ui/Controller.ts +5 -0
- package/src/ui/HoverSync.tsx +179 -147
- package/src/ui/Prop.ts +1 -1
- package/src/ui/Text.ts +12 -9
- package/src/ui/adapter/GroupAdapter.spec.ts +42 -0
- package/src/ui/adapter/GroupAdapter.ts +25 -14
- package/src/ui/app/History.ts +1 -1
- package/src/ui/index.scss +1 -1
- package/src/ui/layout/LabelsLeftLayout.scss +5 -7
- package/src/ui/layout/LabelsTopLayout.scss +4 -6
- package/src/ui/layout/index.scss +2 -3
- package/src/ui/maps.scss +0 -0
- package/src/ui/variables.scss +1 -2
- package/src/util/index.scss +4 -2
- package/src/util/maps.scss +1 -0
- package/src/util/scss/besm.scss +15 -0
- package/src/util/scss/calc.scss +103 -11
- package/src/util/scss/defaults.scss +24 -0
- package/src/util/scss/elements.scss +78 -0
- package/src/util/scss/global.scss +15 -0
- package/src/util/scss/include.scss +17 -9
- package/src/util/scss/index.scss +1 -9
- package/src/util/scss/maps.scss +2 -0
- package/src/util/scss/pad-size.scss +9 -0
- package/src/util/scss/padding.scss +6 -0
- package/src/util/scss/screen-size.scss +5 -0
- package/src/util/scss/variables.scss +6 -0
- package/src/util/variables.scss +1 -0
- package/src/variables.scss +5 -217
- package/src/widgets/Button.maps.scss +103 -0
- package/src/widgets/Button.scss +33 -9
- package/src/widgets/Button.variables.scss +8 -104
- package/src/widgets/CxCredit.scss +2 -0
- package/src/widgets/FlexBox.scss +16 -11
- package/src/widgets/Heading.scss +6 -0
- package/src/widgets/HighlightedSearchText.scss +8 -1
- package/src/widgets/Icon.scss +6 -0
- package/src/widgets/List.scss +7 -0
- package/src/widgets/List.tsx +6 -7
- package/src/widgets/ProgressBar.scss +9 -0
- package/src/widgets/Resizer.scss +9 -7
- package/src/widgets/Section.scss +53 -56
- package/src/widgets/animations.scss +4 -2
- package/src/widgets/box.scss +47 -0
- package/src/widgets/drag-drop/DragClone.scss +12 -4
- package/src/widgets/drag-drop/DragHandle.scss +12 -6
- package/src/widgets/drag-drop/DragSource.scss +12 -6
- package/src/widgets/drag-drop/DropZone.scss +9 -0
- package/src/widgets/drag-drop/DropZone.tsx +3 -3
- package/src/widgets/drag-drop/index.scss +4 -4
- package/src/widgets/drag-drop/maps.scss +7 -0
- package/src/widgets/drag-drop/variables.scss +8 -5
- package/src/widgets/form/Calendar.maps.scss +54 -0
- package/src/widgets/form/Calendar.scss +49 -11
- package/src/widgets/form/Calendar.tsx +755 -653
- package/src/widgets/form/Calendar.variables.scss +3 -46
- package/src/widgets/form/Checkbox.maps.scss +34 -0
- package/src/widgets/form/Checkbox.scss +14 -3
- package/src/widgets/form/Checkbox.variables.scss +4 -36
- package/src/widgets/form/ColorField.scss +21 -2
- package/src/widgets/form/ColorField.tsx +485 -431
- package/src/widgets/form/ColorPicker.maps.scss +21 -0
- package/src/widgets/form/ColorPicker.scss +26 -9
- package/src/widgets/form/ColorPicker.variables.scss +3 -16
- package/src/widgets/form/DateTimeField.scss +54 -21
- package/src/widgets/form/DateTimeField.tsx +697 -615
- package/src/widgets/form/DateTimePicker.scss +14 -4
- package/src/widgets/form/Field.maps.scss +122 -0
- package/src/widgets/form/Field.scss +54 -18
- package/src/widgets/form/Field.tsx +611 -504
- package/src/widgets/form/Field.variables.scss +46 -0
- package/src/widgets/form/HelpText.scss +8 -5
- package/src/widgets/form/Label.scss +10 -3
- package/src/widgets/form/LookupField.maps.scss +26 -0
- package/src/widgets/form/LookupField.scss +54 -24
- package/src/widgets/form/LookupField.tsx +25 -21
- package/src/widgets/form/MonthField.scss +48 -26
- package/src/widgets/form/MonthField.tsx +645 -567
- package/src/widgets/form/MonthPicker.maps.scss +50 -0
- package/src/widgets/form/MonthPicker.scss +44 -35
- package/src/widgets/form/MonthPicker.tsx +954 -724
- package/src/widgets/form/MonthPicker.variables.scss +24 -0
- package/src/widgets/form/NumberField.scss +19 -2
- package/src/widgets/form/NumberField.tsx +576 -466
- package/src/widgets/form/Radio.maps.scss +36 -0
- package/src/widgets/form/Radio.scss +12 -2
- package/src/widgets/form/Radio.variables.scss +3 -42
- package/src/widgets/form/Select.scss +25 -9
- package/src/widgets/form/Slider.scss +23 -14
- package/src/widgets/form/Switch.scss +18 -8
- package/src/widgets/form/TextArea.scss +14 -1
- package/src/widgets/form/TextField.scss +24 -3
- package/src/widgets/form/TextField.tsx +9 -21
- package/src/widgets/form/UploadButton.scss +14 -6
- package/src/widgets/form/ValidationError.scss +10 -6
- package/src/widgets/form/Wheel.scss +14 -4
- package/src/widgets/form/index.scss +22 -24
- package/src/widgets/form/maps.scss +81 -0
- package/src/widgets/form/variables.scss +111 -355
- package/src/widgets/grid/Grid.scss +19 -2
- package/src/widgets/grid/Grid.spec.ts +42 -0
- package/src/widgets/grid/Grid.tsx +15 -7
- package/src/widgets/grid/Pagination.scss +11 -2
- package/src/widgets/grid/Pagination.tsx +110 -102
- package/src/widgets/grid/TreeNode.scss +25 -8
- package/src/widgets/grid/TreeNode.tsx +127 -116
- package/src/widgets/grid/index.scss +3 -4
- package/src/widgets/grid/maps.scss +110 -0
- package/src/widgets/grid/variables.scss +48 -137
- package/src/widgets/icons/folder.tsx +1 -2
- package/src/widgets/icons/forward.tsx +23 -20
- package/src/widgets/icons/loading.tsx +22 -19
- package/src/widgets/icons/square.tsx +20 -17
- package/src/widgets/index.scss +16 -16
- package/src/widgets/index.ts +63 -58
- package/src/widgets/lists.scss +42 -0
- package/src/widgets/maps.scss +139 -0
- package/src/widgets/nav/Link.scss +14 -1
- package/src/widgets/nav/Menu.scss +13 -7
- package/src/widgets/nav/Menu.variables.scss +1 -12
- package/src/widgets/nav/MenuItem.scss +21 -6
- package/src/widgets/nav/Scroller.scss +11 -2
- package/src/widgets/nav/Tab.maps.scss +78 -0
- package/src/widgets/nav/Tab.scss +12 -6
- package/src/widgets/nav/Tab.variables.scss +7 -76
- package/src/widgets/nav/cover.scss +6 -4
- package/src/widgets/nav/index.scss +6 -6
- package/src/widgets/nav/maps.scss +32 -0
- package/src/widgets/nav/variables.scss +4 -11
- package/src/widgets/overlay/ContextMenu.ts +3 -0
- package/src/widgets/overlay/Dropdown.scss +47 -16
- package/src/widgets/overlay/Dropdown.tsx +851 -676
- package/src/widgets/overlay/MsgBox.tsx +125 -111
- package/src/widgets/overlay/Overlay.scss +60 -40
- package/src/widgets/overlay/Overlay.tsx +948 -800
- package/src/widgets/overlay/Toast.scss +42 -34
- package/src/widgets/overlay/Toast.ts +11 -1
- package/src/widgets/overlay/Tooltip.scss +27 -96
- package/src/widgets/overlay/Tooltip.tsx +376 -309
- package/src/widgets/overlay/Window.maps.scss +51 -0
- package/src/widgets/overlay/Window.scss +17 -17
- package/src/widgets/overlay/Window.tsx +291 -236
- package/src/widgets/overlay/Window.variables.scss +2 -43
- package/src/widgets/overlay/index.d.ts +11 -11
- package/src/widgets/overlay/index.scss +6 -15
- package/src/widgets/overlay/maps.scss +44 -0
- package/src/widgets/overlay/variables.scss +11 -42
- package/src/widgets/variables.scss +33 -117
- package/src/global.scss +0 -14
package/dist/svg.css
CHANGED
|
@@ -1,19 +1,25 @@
|
|
|
1
|
-
.cxs-text-anchor-middle {
|
|
2
|
-
text-anchor: middle;
|
|
3
|
-
}
|
|
4
|
-
|
|
5
|
-
.cxs-text-anchor-right {
|
|
6
|
-
text-anchor: end;
|
|
7
|
-
}
|
|
8
|
-
|
|
9
1
|
.cxb-svg {
|
|
10
2
|
box-sizing: border-box;
|
|
11
3
|
overflow: hidden;
|
|
12
4
|
position: relative;
|
|
13
5
|
height: 150px;
|
|
14
6
|
}
|
|
7
|
+
|
|
15
8
|
.cxb-svg > svg {
|
|
16
9
|
width: 100%;
|
|
17
10
|
height: 100%;
|
|
18
11
|
position: absolute;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
.cxb-text {
|
|
15
|
+
fill: currentColor;
|
|
16
|
+
stroke: none;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.cxs-text-anchor-middle {
|
|
20
|
+
text-anchor: middle;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
.cxs-text-anchor-right {
|
|
24
|
+
text-anchor: end;
|
|
19
25
|
}
|
package/dist/svg.js
CHANGED
|
@@ -153,12 +153,14 @@ class Text extends BoundedObject {
|
|
|
153
153
|
dx: undefined,
|
|
154
154
|
dy: undefined,
|
|
155
155
|
textAnchor: undefined,
|
|
156
|
+
dominantBaseline: undefined,
|
|
156
157
|
fill: undefined,
|
|
157
158
|
stroke: undefined,
|
|
158
159
|
});
|
|
159
160
|
}
|
|
160
161
|
init() {
|
|
161
162
|
if (this.ta) this.textAnchor = this.ta;
|
|
163
|
+
if (this.db) this.dominantBaseline = this.db;
|
|
162
164
|
if (this.bind) {
|
|
163
165
|
this.value = {
|
|
164
166
|
bind: this.bind,
|
|
@@ -196,6 +198,7 @@ class Text extends BoundedObject {
|
|
|
196
198
|
dx: data.dx,
|
|
197
199
|
dy: data.dy,
|
|
198
200
|
textAnchor: textAnchor,
|
|
201
|
+
dominantBaseline: data.dominantBaseline,
|
|
199
202
|
style: data.style,
|
|
200
203
|
fill: data.fill,
|
|
201
204
|
stroke: data.stroke,
|
|
@@ -208,7 +211,6 @@ class Text extends BoundedObject {
|
|
|
208
211
|
Text.prototype.anchors = "0.5 0.5 0.5 0.5";
|
|
209
212
|
Text.prototype.baseClass = "text";
|
|
210
213
|
Text.prototype.autoTextAnchor = false;
|
|
211
|
-
Text.prototype.autoAnchor = false;
|
|
212
214
|
Widget.alias("svg.text", Text);
|
|
213
215
|
|
|
214
216
|
class TextualBoundedObject extends BoundedObject {
|
|
@@ -471,6 +473,9 @@ class ClipRect extends BoundedObject {
|
|
|
471
473
|
ClipRect.prototype.anchors = "0 1 1 0";
|
|
472
474
|
|
|
473
475
|
class Ellipse extends TextualBoundedObject {
|
|
476
|
+
constructor(config) {
|
|
477
|
+
super(config);
|
|
478
|
+
}
|
|
474
479
|
declareData(...args) {
|
|
475
480
|
super.declareData(...args, {
|
|
476
481
|
colorIndex: undefined,
|
|
@@ -509,6 +514,9 @@ Ellipse.prototype.anchors = "0 1 1 0";
|
|
|
509
514
|
Widget.alias("ellipse", Ellipse);
|
|
510
515
|
|
|
511
516
|
class Line extends TextualBoundedObject {
|
|
517
|
+
constructor(config) {
|
|
518
|
+
super(config);
|
|
519
|
+
}
|
|
512
520
|
declareData(...args) {
|
|
513
521
|
super.declareData(...args, {
|
|
514
522
|
colorIndex: undefined,
|
package/dist/ui.js
CHANGED
|
@@ -152,6 +152,9 @@ class Controller extends Component {
|
|
|
152
152
|
invokeMethod(methodName, ...args) {
|
|
153
153
|
return this.instance.invokeControllerMethod(methodName, ...args);
|
|
154
154
|
}
|
|
155
|
+
getParentControllerByType(type) {
|
|
156
|
+
return this.instance.getControllerByType(type);
|
|
157
|
+
}
|
|
155
158
|
}
|
|
156
159
|
Controller.namespace = "ui.controller.";
|
|
157
160
|
Controller.factory = function (alias, config, more) {
|
|
@@ -2751,7 +2754,7 @@ class HoverSync extends PureContainerBase {
|
|
|
2751
2754
|
report: (channel, hoverId, active) => {
|
|
2752
2755
|
let ch = channels[channel];
|
|
2753
2756
|
if (!ch) return;
|
|
2754
|
-
let state = active && hoverId != null;
|
|
2757
|
+
let state = active && hoverId != null ? hoverId : false;
|
|
2755
2758
|
if (ch.state !== state && (ch.state === hoverId || active)) {
|
|
2756
2759
|
ch.state = state;
|
|
2757
2760
|
ch.subscribers.notify(state);
|
|
@@ -3721,7 +3724,7 @@ class History {
|
|
|
3721
3724
|
}
|
|
3722
3725
|
static navigate(state, title, url, replace = false) {
|
|
3723
3726
|
url = Url.resolve(url);
|
|
3724
|
-
if (!window.history.pushState || reload) {
|
|
3727
|
+
if (!window.history.pushState || reload || !this.store) {
|
|
3725
3728
|
window.location[replace ? "replace" : "assign"](url);
|
|
3726
3729
|
return true;
|
|
3727
3730
|
}
|
|
@@ -3884,26 +3887,28 @@ class GroupAdapter extends ArrayAdapter {
|
|
|
3884
3887
|
if (!groupings) {
|
|
3885
3888
|
this.groupings = null;
|
|
3886
3889
|
} else if (isArray(groupings)) {
|
|
3887
|
-
|
|
3888
|
-
this.groupings.
|
|
3890
|
+
// Clone groupings to avoid mutating the original config
|
|
3891
|
+
this.groupings = groupings.map((g) => {
|
|
3889
3892
|
const groupSorters = [];
|
|
3890
3893
|
const key = {};
|
|
3894
|
+
const resolvedKey = {};
|
|
3891
3895
|
for (const name in g.key) {
|
|
3892
3896
|
const keyConfig = g.key[name];
|
|
3893
3897
|
if (!keyConfig || typeof keyConfig !== "object" || !("value" in keyConfig)) {
|
|
3894
|
-
|
|
3898
|
+
resolvedKey[name] = {
|
|
3895
3899
|
value: keyConfig,
|
|
3896
3900
|
direction: "ASC",
|
|
3897
3901
|
};
|
|
3902
|
+
} else {
|
|
3903
|
+
resolvedKey[name] = keyConfig;
|
|
3898
3904
|
}
|
|
3899
|
-
|
|
3900
|
-
key[name] = resolvedKey.value;
|
|
3905
|
+
key[name] = resolvedKey[name].value;
|
|
3901
3906
|
groupSorters.push({
|
|
3902
3907
|
field: name,
|
|
3903
|
-
direction: resolvedKey.direction,
|
|
3908
|
+
direction: resolvedKey[name].direction,
|
|
3904
3909
|
});
|
|
3905
3910
|
}
|
|
3906
|
-
|
|
3911
|
+
const grouper = new Grouper(
|
|
3907
3912
|
key,
|
|
3908
3913
|
{
|
|
3909
3914
|
...this.aggregates,
|
|
@@ -3912,13 +3917,21 @@ class GroupAdapter extends ArrayAdapter {
|
|
|
3912
3917
|
(r) => r.store.getData(),
|
|
3913
3918
|
g.text,
|
|
3914
3919
|
);
|
|
3915
|
-
|
|
3916
|
-
g.comparer
|
|
3917
|
-
|
|
3918
|
-
(
|
|
3919
|
-
|
|
3920
|
-
|
|
3921
|
-
|
|
3920
|
+
const comparer =
|
|
3921
|
+
g.comparer ??
|
|
3922
|
+
(groupSorters.length > 0
|
|
3923
|
+
? getComparer(
|
|
3924
|
+
groupSorters,
|
|
3925
|
+
(x) => x.key,
|
|
3926
|
+
this.sortOptions ? Culture.getComparer(this.sortOptions) : undefined,
|
|
3927
|
+
)
|
|
3928
|
+
: null);
|
|
3929
|
+
return {
|
|
3930
|
+
...g,
|
|
3931
|
+
key: resolvedKey,
|
|
3932
|
+
grouper,
|
|
3933
|
+
comparer,
|
|
3934
|
+
};
|
|
3922
3935
|
});
|
|
3923
3936
|
} else {
|
|
3924
3937
|
throw new Error("Invalid grouping provided.");
|