@wcardinal/wcardinal-ui 0.293.0 → 0.295.0

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 (30) hide show
  1. package/dist/types/wcardinal/ui/d-chart-axis-base-options-parser.d.ts +6 -12
  2. package/dist/types/wcardinal/ui/d-chart-axis-base.d.ts +5 -1
  3. package/dist/types/wcardinal/ui/d-chart-axis.d.ts +3 -1
  4. package/dist/types/wcardinal/ui/d-table-data-tree-item-accessor.d.ts +9 -4
  5. package/dist/types/wcardinal/ui/d-table-data-tree-selection-impl.d.ts +2 -1
  6. package/dist/types/wcardinal/ui/d-table-data-tree.d.ts +2 -2
  7. package/dist/wcardinal/ui/d-chart-axis-base-options-parser.js +10 -52
  8. package/dist/wcardinal/ui/d-chart-axis-base-options-parser.js.map +1 -1
  9. package/dist/wcardinal/ui/d-chart-axis-base-tick-container.js +4 -4
  10. package/dist/wcardinal/ui/d-chart-axis-base-tick-container.js.map +1 -1
  11. package/dist/wcardinal/ui/d-chart-axis-base.js +23 -7
  12. package/dist/wcardinal/ui/d-chart-axis-base.js.map +1 -1
  13. package/dist/wcardinal/ui/d-chart-axis.js.map +1 -1
  14. package/dist/wcardinal/ui/d-table-data-tree-filter.js +12 -8
  15. package/dist/wcardinal/ui/d-table-data-tree-filter.js.map +1 -1
  16. package/dist/wcardinal/ui/d-table-data-tree-item-accessor.js +13 -3
  17. package/dist/wcardinal/ui/d-table-data-tree-item-accessor.js.map +1 -1
  18. package/dist/wcardinal/ui/d-table-data-tree-selection-impl.js +7 -5
  19. package/dist/wcardinal/ui/d-table-data-tree-selection-impl.js.map +1 -1
  20. package/dist/wcardinal/ui/d-table-data-tree.js +5 -4
  21. package/dist/wcardinal/ui/d-table-data-tree.js.map +1 -1
  22. package/dist/wcardinal-ui-theme-dark.js +1 -1
  23. package/dist/wcardinal-ui-theme-dark.min.js +1 -1
  24. package/dist/wcardinal-ui-theme-white.js +1 -1
  25. package/dist/wcardinal-ui-theme-white.min.js +1 -1
  26. package/dist/wcardinal-ui.cjs.js +75 -84
  27. package/dist/wcardinal-ui.js +75 -84
  28. package/dist/wcardinal-ui.min.js +2 -2
  29. package/dist/wcardinal-ui.min.js.map +1 -1
  30. package/package.json +1 -1
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.293.0
2
+ Winter Cardinal UI v0.295.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -72588,55 +72588,13 @@ var DChartAxisBaseBar = /** @class */ (function () {
72588
72588
  var DChartAxisBaseOptionParser = /** @class */ (function () {
72589
72589
  function DChartAxisBaseOptionParser(theme, options) {
72590
72590
  var _a, _b;
72591
- this._coordinateIndex = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
72592
- this._position = this.toPosition(theme, options);
72593
- this._tick = this.toTick(theme, options);
72594
- this._label = this.toLabel(theme, options);
72595
- this._padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
72596
- this._bar = this.toBar(theme, options);
72591
+ this.coordinate = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
72592
+ this.position = this.toPosition(theme, options);
72593
+ this.tick = this.toTick(theme, options);
72594
+ this.label = this.toLabel(theme, options);
72595
+ this.padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
72596
+ this.bar = this.toBar(theme, options);
72597
72597
  }
72598
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "coordinateIndex", {
72599
- get: function () {
72600
- return this._coordinateIndex;
72601
- },
72602
- enumerable: false,
72603
- configurable: true
72604
- });
72605
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "padding", {
72606
- get: function () {
72607
- return this._padding;
72608
- },
72609
- enumerable: false,
72610
- configurable: true
72611
- });
72612
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "position", {
72613
- get: function () {
72614
- return this._position;
72615
- },
72616
- enumerable: false,
72617
- configurable: true
72618
- });
72619
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "bar", {
72620
- get: function () {
72621
- return this._bar;
72622
- },
72623
- enumerable: false,
72624
- configurable: true
72625
- });
72626
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "tick", {
72627
- get: function () {
72628
- return this._tick;
72629
- },
72630
- enumerable: false,
72631
- configurable: true
72632
- });
72633
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "label", {
72634
- get: function () {
72635
- return this._label;
72636
- },
72637
- enumerable: false,
72638
- configurable: true
72639
- });
72640
72598
  DChartAxisBaseOptionParser.prototype.toPosition = function (theme, options) {
72641
72599
  var position = options === null || options === void 0 ? void 0 : options.position;
72642
72600
  if (isString(position)) {
@@ -72696,7 +72654,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
72696
72654
  };
72697
72655
  };
72698
72656
  DChartAxisBaseOptionParser.prototype.toTickPosition = function (tickPosition) {
72699
- var position = this._position;
72657
+ var position = this.position;
72700
72658
  if (tickPosition === DChartAxisTickPosition.OUTSIDE || tickPosition === "OUTSIDE") {
72701
72659
  switch (position) {
72702
72660
  case DChartAxisPosition.TOP:
@@ -72872,7 +72830,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
72872
72830
  };
72873
72831
  DChartAxisBaseOptionParser.prototype.toTickMajorTextAlign = function (theme, options) {
72874
72832
  var _a, _b;
72875
- var position = this._position;
72833
+ var position = this.position;
72876
72834
  return {
72877
72835
  horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getMajorTickTextAlignHorizontal(position),
72878
72836
  vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getMajorTickTextAlignVertical(position)
@@ -72963,7 +72921,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
72963
72921
  };
72964
72922
  DChartAxisBaseOptionParser.prototype.toTickMinorTextAlign = function (theme, options) {
72965
72923
  var _a, _b;
72966
- var position = this._position;
72924
+ var position = this.position;
72967
72925
  return {
72968
72926
  horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getMinorTickTextAlignHorizontal(position),
72969
72927
  vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getMinorTickTextAlignVertical(position)
@@ -73031,7 +72989,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
73031
72989
  };
73032
72990
  DChartAxisBaseOptionParser.prototype.toLabelAlign = function (theme, options) {
73033
72991
  var _a, _b;
73034
- var position = this._position;
72992
+ var position = this.position;
73035
72993
  return {
73036
72994
  horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getLabelAlignHorizontal(position),
73037
72995
  vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getLabelAlignVertical(position)
@@ -73360,7 +73318,7 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
73360
73318
  var coordinate = void 0;
73361
73319
  switch (parser.position) {
73362
73320
  case DChartAxisPosition.TOP:
73363
- coordinate = plotArea.coordinate.x.get(parser.coordinateIndex);
73321
+ coordinate = plotArea.coordinate.x.get(parser.coordinate);
73364
73322
  if (coordinate) {
73365
73323
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
73366
73324
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
@@ -73369,7 +73327,7 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
73369
73327
  }
73370
73328
  break;
73371
73329
  case DChartAxisPosition.BOTTOM:
73372
- coordinate = plotArea.coordinate.x.get(parser.coordinateIndex);
73330
+ coordinate = plotArea.coordinate.x.get(parser.coordinate);
73373
73331
  if (coordinate) {
73374
73332
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
73375
73333
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
@@ -73378,7 +73336,7 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
73378
73336
  }
73379
73337
  break;
73380
73338
  case DChartAxisPosition.LEFT:
73381
- coordinate = plotArea.coordinate.y.get(parser.coordinateIndex);
73339
+ coordinate = plotArea.coordinate.y.get(parser.coordinate);
73382
73340
  if (coordinate) {
73383
73341
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
73384
73342
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
@@ -73387,7 +73345,7 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
73387
73345
  }
73388
73346
  break;
73389
73347
  case DChartAxisPosition.RIGHT:
73390
- coordinate = plotArea.coordinate.y.get(parser.coordinateIndex);
73348
+ coordinate = plotArea.coordinate.y.get(parser.coordinate);
73391
73349
  if (coordinate) {
73392
73350
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
73393
73351
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
@@ -73561,13 +73519,6 @@ var DChartAxisBase = /** @class */ (function () {
73561
73519
  this._bar = this.newBar(parser, theme, options);
73562
73520
  this._tick = this.newTick(parser, theme, options);
73563
73521
  }
73564
- Object.defineProperty(DChartAxisBase.prototype, "parser", {
73565
- get: function () {
73566
- return this._parser;
73567
- },
73568
- enumerable: false,
73569
- configurable: true
73570
- });
73571
73522
  DChartAxisBase.prototype.newParser = function (theme, options) {
73572
73523
  return new DChartAxisBaseOptionParser(theme, options);
73573
73524
  };
@@ -73575,6 +73526,29 @@ var DChartAxisBase = /** @class */ (function () {
73575
73526
  get: function () {
73576
73527
  return this._parser.position;
73577
73528
  },
73529
+ set: function (position) {
73530
+ this._parser.position = position;
73531
+ },
73532
+ enumerable: false,
73533
+ configurable: true
73534
+ });
73535
+ Object.defineProperty(DChartAxisBase.prototype, "coordinate", {
73536
+ get: function () {
73537
+ return this._parser.coordinate;
73538
+ },
73539
+ set: function (coordinate) {
73540
+ this._parser.coordinate = coordinate;
73541
+ },
73542
+ enumerable: false,
73543
+ configurable: true
73544
+ });
73545
+ Object.defineProperty(DChartAxisBase.prototype, "padding", {
73546
+ get: function () {
73547
+ return this._parser.padding;
73548
+ },
73549
+ set: function (padding) {
73550
+ this._parser.padding = padding;
73551
+ },
73578
73552
  enumerable: false,
73579
73553
  configurable: true
73580
73554
  });
@@ -87908,43 +87882,47 @@ var DTableDataTreeFilter = /** @class */ (function (_super) {
87908
87882
  }
87909
87883
  };
87910
87884
  DTableDataTreeFilter.prototype.hasFiltered = function (parent, nodes, filter) {
87911
- var toChildren = this._parent.accessor.toChildren;
87885
+ var accessor = this._parent.accessor;
87886
+ var toChildren = accessor.toChildren;
87887
+ var hasChildren = accessor.hasChildren;
87912
87888
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
87913
87889
  var node = nodes[i];
87914
87890
  if (this.isFiltered(node, -1, filter)) {
87915
87891
  return true;
87916
87892
  }
87917
87893
  var children = toChildren(node);
87918
- if (children != null &&
87919
- 0 < children.length &&
87920
- this.hasFiltered(parent, children, filter)) {
87894
+ if (hasChildren(node, children) && this.hasFiltered(parent, children, filter)) {
87921
87895
  return true;
87922
87896
  }
87923
87897
  }
87924
87898
  return false;
87925
87899
  };
87926
87900
  DTableDataTreeFilter.prototype.addAllToFiltered = function (parent, nodes, filtered, cursor) {
87927
- var toChildren = this._parent.accessor.toChildren;
87901
+ var accessor = this._parent.accessor;
87902
+ var toChildren = accessor.toChildren;
87903
+ var hasChildren = accessor.hasChildren;
87928
87904
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
87929
87905
  var node = nodes[i];
87930
87906
  filtered.push(cursor[0]);
87931
87907
  cursor[0] += 1;
87932
87908
  var children = toChildren(node);
87933
- if (children != null && 0 < children.length && parent.isOpened(node)) {
87909
+ if (hasChildren(node, children) && parent.isOpened(node)) {
87934
87910
  this.addAllToFiltered(parent, children, filtered, cursor);
87935
87911
  }
87936
87912
  }
87937
87913
  };
87938
87914
  DTableDataTreeFilter.prototype.newFilteredSub = function (parent, nodes, filter, filtered, cursor) {
87939
87915
  var result = false;
87940
- var toChildren = this._parent.accessor.toChildren;
87916
+ var accessor = this._parent.accessor;
87917
+ var toChildren = accessor.toChildren;
87918
+ var hasChildren = accessor.hasChildren;
87941
87919
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
87942
87920
  var node = nodes[i];
87943
87921
  var index = cursor[0];
87944
87922
  cursor[0] += 1;
87945
87923
  var isFiltered = this.isFiltered(node, index, filter);
87946
87924
  var children = toChildren(node);
87947
- if (children != null && 0 < children.length) {
87925
+ if (hasChildren(node, children)) {
87948
87926
  if (parent.isOpened(node)) {
87949
87927
  if (isFiltered) {
87950
87928
  filtered.push(index);
@@ -88052,11 +88030,21 @@ var toParent = function (node) {
88052
88030
  var toChildren$1 = function (node) {
88053
88031
  return node.children;
88054
88032
  };
88033
+ var hasChildren = function (node, children) {
88034
+ return children != null && 0 < children.length;
88035
+ };
88055
88036
  var DTableDataTreeItemAccessor = /** @class */ (function () {
88056
88037
  function DTableDataTreeItemAccessor(options) {
88057
- var _a, _b;
88058
- this.toParent = (_a = options === null || options === void 0 ? void 0 : options.toParent) !== null && _a !== void 0 ? _a : toParent;
88059
- this.toChildren = (_b = options === null || options === void 0 ? void 0 : options.toChildren) !== null && _b !== void 0 ? _b : toChildren$1;
88038
+ if (options != null) {
88039
+ this.toParent = options.toParent || toParent;
88040
+ this.toChildren = options.toChildren || toChildren$1;
88041
+ this.hasChildren = options.hasChildren || hasChildren;
88042
+ }
88043
+ else {
88044
+ this.toParent = toParent;
88045
+ this.toChildren = toChildren$1;
88046
+ this.hasChildren = hasChildren;
88047
+ }
88060
88048
  }
88061
88049
  return DTableDataTreeItemAccessor;
88062
88050
  }());
@@ -88098,9 +88086,11 @@ var DTableDataTreeSelectionImpl = /** @class */ (function (_super) {
88098
88086
  });
88099
88087
  DTableDataTreeSelectionImpl.prototype.onNodeChange = function (nodes) {
88100
88088
  if (nodes != null) {
88101
- var toChildren = this._parent.accessor.toChildren;
88089
+ var accessor = this._parent.accessor;
88090
+ var toChildren = accessor.toChildren;
88091
+ var hasChildren = accessor.hasChildren;
88102
88092
  var oldRows = this._rows;
88103
- var newRows = this.newRows(nodes, toChildren, oldRows, new Set());
88093
+ var newRows = this.newRows(nodes, toChildren, hasChildren, oldRows, new Set());
88104
88094
  if (oldRows.size !== newRows.size) {
88105
88095
  this._rows = newRows;
88106
88096
  this.onChange();
@@ -88114,15 +88104,15 @@ var DTableDataTreeSelectionImpl = /** @class */ (function (_super) {
88114
88104
  }
88115
88105
  }
88116
88106
  };
88117
- DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, rows, result) {
88107
+ DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, hasChildren, rows, result) {
88118
88108
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
88119
88109
  var node = nodes[i];
88120
88110
  if (rows.has(node)) {
88121
88111
  result.add(node);
88122
88112
  }
88123
88113
  var children = toChildren(node);
88124
- if (children != null) {
88125
- this.newRows(children, toChildren, rows, result);
88114
+ if (hasChildren(node, children)) {
88115
+ this.newRows(children, toChildren, hasChildren, rows, result);
88126
88116
  }
88127
88117
  }
88128
88118
  return result;
@@ -88561,7 +88551,8 @@ var DTableDataTree = /** @class */ (function (_super) {
88561
88551
  var supplimentals = this._supplimentals;
88562
88552
  var flags = this._flags;
88563
88553
  if (nodes != null) {
88564
- var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, this._accessor.toChildren);
88554
+ var accessor = this._accessor;
88555
+ var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, accessor.toChildren, accessor.hasChildren);
88565
88556
  if (irows !== rows.length) {
88566
88557
  rows.length = irows;
88567
88558
  supplimentals.length = irows;
@@ -88575,7 +88566,7 @@ var DTableDataTree = /** @class */ (function (_super) {
88575
88566
  DTableDataTree.prototype.toSupplimental = function (ilevel, hasChildren, isOpened) {
88576
88567
  return (ilevel << 2) | (hasChildren ? 2 : 0) | (isOpened ? 1 : 0);
88577
88568
  };
88578
- DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren) {
88569
+ DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren, hasChildren) {
88579
88570
  var nodesLength = nodes.length;
88580
88571
  var istart = reverse ? nodesLength - 1 : 0;
88581
88572
  var idelta = reverse ? -1 : +1;
@@ -88583,7 +88574,7 @@ var DTableDataTree = /** @class */ (function (_super) {
88583
88574
  var node = nodes[i];
88584
88575
  var children = toChildren(node);
88585
88576
  var isOpened = flags.has(node);
88586
- var supplimental = this.toSupplimental(ilevel, !!(children && 0 < children.length), isOpened);
88577
+ var supplimental = this.toSupplimental(ilevel, hasChildren(node, children), isOpened);
88587
88578
  if (irows < rows.length) {
88588
88579
  rows[irows] = node;
88589
88580
  supplimentals[irows] = supplimental;
@@ -88594,7 +88585,7 @@ var DTableDataTree = /** @class */ (function (_super) {
88594
88585
  }
88595
88586
  irows += 1;
88596
88587
  if (isOpened && children) {
88597
- irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren);
88588
+ irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren, hasChildren);
88598
88589
  }
88599
88590
  }
88600
88591
  return irows;
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.293.0
2
+ Winter Cardinal UI v0.295.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -54272,55 +54272,13 @@
54272
54272
  var DChartAxisBaseOptionParser = /** @class */ (function () {
54273
54273
  function DChartAxisBaseOptionParser(theme, options) {
54274
54274
  var _a, _b;
54275
- this._coordinateIndex = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
54276
- this._position = this.toPosition(theme, options);
54277
- this._tick = this.toTick(theme, options);
54278
- this._label = this.toLabel(theme, options);
54279
- this._padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
54280
- this._bar = this.toBar(theme, options);
54275
+ this.coordinate = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
54276
+ this.position = this.toPosition(theme, options);
54277
+ this.tick = this.toTick(theme, options);
54278
+ this.label = this.toLabel(theme, options);
54279
+ this.padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
54280
+ this.bar = this.toBar(theme, options);
54281
54281
  }
54282
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "coordinateIndex", {
54283
- get: function () {
54284
- return this._coordinateIndex;
54285
- },
54286
- enumerable: false,
54287
- configurable: true
54288
- });
54289
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "padding", {
54290
- get: function () {
54291
- return this._padding;
54292
- },
54293
- enumerable: false,
54294
- configurable: true
54295
- });
54296
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "position", {
54297
- get: function () {
54298
- return this._position;
54299
- },
54300
- enumerable: false,
54301
- configurable: true
54302
- });
54303
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "bar", {
54304
- get: function () {
54305
- return this._bar;
54306
- },
54307
- enumerable: false,
54308
- configurable: true
54309
- });
54310
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "tick", {
54311
- get: function () {
54312
- return this._tick;
54313
- },
54314
- enumerable: false,
54315
- configurable: true
54316
- });
54317
- Object.defineProperty(DChartAxisBaseOptionParser.prototype, "label", {
54318
- get: function () {
54319
- return this._label;
54320
- },
54321
- enumerable: false,
54322
- configurable: true
54323
- });
54324
54282
  DChartAxisBaseOptionParser.prototype.toPosition = function (theme, options) {
54325
54283
  var position = options === null || options === void 0 ? void 0 : options.position;
54326
54284
  if (isString(position)) {
@@ -54380,7 +54338,7 @@
54380
54338
  };
54381
54339
  };
54382
54340
  DChartAxisBaseOptionParser.prototype.toTickPosition = function (tickPosition) {
54383
- var position = this._position;
54341
+ var position = this.position;
54384
54342
  if (tickPosition === DChartAxisTickPosition.OUTSIDE || tickPosition === "OUTSIDE") {
54385
54343
  switch (position) {
54386
54344
  case DChartAxisPosition.TOP:
@@ -54556,7 +54514,7 @@
54556
54514
  };
54557
54515
  DChartAxisBaseOptionParser.prototype.toTickMajorTextAlign = function (theme, options) {
54558
54516
  var _a, _b;
54559
- var position = this._position;
54517
+ var position = this.position;
54560
54518
  return {
54561
54519
  horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getMajorTickTextAlignHorizontal(position),
54562
54520
  vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getMajorTickTextAlignVertical(position)
@@ -54647,7 +54605,7 @@
54647
54605
  };
54648
54606
  DChartAxisBaseOptionParser.prototype.toTickMinorTextAlign = function (theme, options) {
54649
54607
  var _a, _b;
54650
- var position = this._position;
54608
+ var position = this.position;
54651
54609
  return {
54652
54610
  horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getMinorTickTextAlignHorizontal(position),
54653
54611
  vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getMinorTickTextAlignVertical(position)
@@ -54715,7 +54673,7 @@
54715
54673
  };
54716
54674
  DChartAxisBaseOptionParser.prototype.toLabelAlign = function (theme, options) {
54717
54675
  var _a, _b;
54718
- var position = this._position;
54676
+ var position = this.position;
54719
54677
  return {
54720
54678
  horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getLabelAlignHorizontal(position),
54721
54679
  vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getLabelAlignVertical(position)
@@ -55044,7 +55002,7 @@
55044
55002
  var coordinate = void 0;
55045
55003
  switch (parser.position) {
55046
55004
  case DChartAxisPosition.TOP:
55047
- coordinate = plotArea.coordinate.x.get(parser.coordinateIndex);
55005
+ coordinate = plotArea.coordinate.x.get(parser.coordinate);
55048
55006
  if (coordinate) {
55049
55007
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
55050
55008
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
@@ -55053,7 +55011,7 @@
55053
55011
  }
55054
55012
  break;
55055
55013
  case DChartAxisPosition.BOTTOM:
55056
- coordinate = plotArea.coordinate.x.get(parser.coordinateIndex);
55014
+ coordinate = plotArea.coordinate.x.get(parser.coordinate);
55057
55015
  if (coordinate) {
55058
55016
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
55059
55017
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
@@ -55062,7 +55020,7 @@
55062
55020
  }
55063
55021
  break;
55064
55022
  case DChartAxisPosition.LEFT:
55065
- coordinate = plotArea.coordinate.y.get(parser.coordinateIndex);
55023
+ coordinate = plotArea.coordinate.y.get(parser.coordinate);
55066
55024
  if (coordinate) {
55067
55025
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
55068
55026
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
@@ -55071,7 +55029,7 @@
55071
55029
  }
55072
55030
  break;
55073
55031
  case DChartAxisPosition.RIGHT:
55074
- coordinate = plotArea.coordinate.y.get(parser.coordinateIndex);
55032
+ coordinate = plotArea.coordinate.y.get(parser.coordinate);
55075
55033
  if (coordinate) {
55076
55034
  var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
55077
55035
  var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
@@ -55245,13 +55203,6 @@
55245
55203
  this._bar = this.newBar(parser, theme, options);
55246
55204
  this._tick = this.newTick(parser, theme, options);
55247
55205
  }
55248
- Object.defineProperty(DChartAxisBase.prototype, "parser", {
55249
- get: function () {
55250
- return this._parser;
55251
- },
55252
- enumerable: false,
55253
- configurable: true
55254
- });
55255
55206
  DChartAxisBase.prototype.newParser = function (theme, options) {
55256
55207
  return new DChartAxisBaseOptionParser(theme, options);
55257
55208
  };
@@ -55259,6 +55210,29 @@
55259
55210
  get: function () {
55260
55211
  return this._parser.position;
55261
55212
  },
55213
+ set: function (position) {
55214
+ this._parser.position = position;
55215
+ },
55216
+ enumerable: false,
55217
+ configurable: true
55218
+ });
55219
+ Object.defineProperty(DChartAxisBase.prototype, "coordinate", {
55220
+ get: function () {
55221
+ return this._parser.coordinate;
55222
+ },
55223
+ set: function (coordinate) {
55224
+ this._parser.coordinate = coordinate;
55225
+ },
55226
+ enumerable: false,
55227
+ configurable: true
55228
+ });
55229
+ Object.defineProperty(DChartAxisBase.prototype, "padding", {
55230
+ get: function () {
55231
+ return this._parser.padding;
55232
+ },
55233
+ set: function (padding) {
55234
+ this._parser.padding = padding;
55235
+ },
55262
55236
  enumerable: false,
55263
55237
  configurable: true
55264
55238
  });
@@ -69687,43 +69661,47 @@
69687
69661
  }
69688
69662
  };
69689
69663
  DTableDataTreeFilter.prototype.hasFiltered = function (parent, nodes, filter) {
69690
- var toChildren = this._parent.accessor.toChildren;
69664
+ var accessor = this._parent.accessor;
69665
+ var toChildren = accessor.toChildren;
69666
+ var hasChildren = accessor.hasChildren;
69691
69667
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
69692
69668
  var node = nodes[i];
69693
69669
  if (this.isFiltered(node, -1, filter)) {
69694
69670
  return true;
69695
69671
  }
69696
69672
  var children = toChildren(node);
69697
- if (children != null &&
69698
- 0 < children.length &&
69699
- this.hasFiltered(parent, children, filter)) {
69673
+ if (hasChildren(node, children) && this.hasFiltered(parent, children, filter)) {
69700
69674
  return true;
69701
69675
  }
69702
69676
  }
69703
69677
  return false;
69704
69678
  };
69705
69679
  DTableDataTreeFilter.prototype.addAllToFiltered = function (parent, nodes, filtered, cursor) {
69706
- var toChildren = this._parent.accessor.toChildren;
69680
+ var accessor = this._parent.accessor;
69681
+ var toChildren = accessor.toChildren;
69682
+ var hasChildren = accessor.hasChildren;
69707
69683
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
69708
69684
  var node = nodes[i];
69709
69685
  filtered.push(cursor[0]);
69710
69686
  cursor[0] += 1;
69711
69687
  var children = toChildren(node);
69712
- if (children != null && 0 < children.length && parent.isOpened(node)) {
69688
+ if (hasChildren(node, children) && parent.isOpened(node)) {
69713
69689
  this.addAllToFiltered(parent, children, filtered, cursor);
69714
69690
  }
69715
69691
  }
69716
69692
  };
69717
69693
  DTableDataTreeFilter.prototype.newFilteredSub = function (parent, nodes, filter, filtered, cursor) {
69718
69694
  var result = false;
69719
- var toChildren = this._parent.accessor.toChildren;
69695
+ var accessor = this._parent.accessor;
69696
+ var toChildren = accessor.toChildren;
69697
+ var hasChildren = accessor.hasChildren;
69720
69698
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
69721
69699
  var node = nodes[i];
69722
69700
  var index = cursor[0];
69723
69701
  cursor[0] += 1;
69724
69702
  var isFiltered = this.isFiltered(node, index, filter);
69725
69703
  var children = toChildren(node);
69726
- if (children != null && 0 < children.length) {
69704
+ if (hasChildren(node, children)) {
69727
69705
  if (parent.isOpened(node)) {
69728
69706
  if (isFiltered) {
69729
69707
  filtered.push(index);
@@ -69831,11 +69809,21 @@
69831
69809
  var toChildren$1 = function (node) {
69832
69810
  return node.children;
69833
69811
  };
69812
+ var hasChildren = function (node, children) {
69813
+ return children != null && 0 < children.length;
69814
+ };
69834
69815
  var DTableDataTreeItemAccessor = /** @class */ (function () {
69835
69816
  function DTableDataTreeItemAccessor(options) {
69836
- var _a, _b;
69837
- this.toParent = (_a = options === null || options === void 0 ? void 0 : options.toParent) !== null && _a !== void 0 ? _a : toParent;
69838
- this.toChildren = (_b = options === null || options === void 0 ? void 0 : options.toChildren) !== null && _b !== void 0 ? _b : toChildren$1;
69817
+ if (options != null) {
69818
+ this.toParent = options.toParent || toParent;
69819
+ this.toChildren = options.toChildren || toChildren$1;
69820
+ this.hasChildren = options.hasChildren || hasChildren;
69821
+ }
69822
+ else {
69823
+ this.toParent = toParent;
69824
+ this.toChildren = toChildren$1;
69825
+ this.hasChildren = hasChildren;
69826
+ }
69839
69827
  }
69840
69828
  return DTableDataTreeItemAccessor;
69841
69829
  }());
@@ -69877,9 +69865,11 @@
69877
69865
  });
69878
69866
  DTableDataTreeSelectionImpl.prototype.onNodeChange = function (nodes) {
69879
69867
  if (nodes != null) {
69880
- var toChildren = this._parent.accessor.toChildren;
69868
+ var accessor = this._parent.accessor;
69869
+ var toChildren = accessor.toChildren;
69870
+ var hasChildren = accessor.hasChildren;
69881
69871
  var oldRows = this._rows;
69882
- var newRows = this.newRows(nodes, toChildren, oldRows, new Set());
69872
+ var newRows = this.newRows(nodes, toChildren, hasChildren, oldRows, new Set());
69883
69873
  if (oldRows.size !== newRows.size) {
69884
69874
  this._rows = newRows;
69885
69875
  this.onChange();
@@ -69893,15 +69883,15 @@
69893
69883
  }
69894
69884
  }
69895
69885
  };
69896
- DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, rows, result) {
69886
+ DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, hasChildren, rows, result) {
69897
69887
  for (var i = 0, imax = nodes.length; i < imax; ++i) {
69898
69888
  var node = nodes[i];
69899
69889
  if (rows.has(node)) {
69900
69890
  result.add(node);
69901
69891
  }
69902
69892
  var children = toChildren(node);
69903
- if (children != null) {
69904
- this.newRows(children, toChildren, rows, result);
69893
+ if (hasChildren(node, children)) {
69894
+ this.newRows(children, toChildren, hasChildren, rows, result);
69905
69895
  }
69906
69896
  }
69907
69897
  return result;
@@ -70340,7 +70330,8 @@
70340
70330
  var supplimentals = this._supplimentals;
70341
70331
  var flags = this._flags;
70342
70332
  if (nodes != null) {
70343
- var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, this._accessor.toChildren);
70333
+ var accessor = this._accessor;
70334
+ var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, accessor.toChildren, accessor.hasChildren);
70344
70335
  if (irows !== rows.length) {
70345
70336
  rows.length = irows;
70346
70337
  supplimentals.length = irows;
@@ -70354,7 +70345,7 @@
70354
70345
  DTableDataTree.prototype.toSupplimental = function (ilevel, hasChildren, isOpened) {
70355
70346
  return (ilevel << 2) | (hasChildren ? 2 : 0) | (isOpened ? 1 : 0);
70356
70347
  };
70357
- DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren) {
70348
+ DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren, hasChildren) {
70358
70349
  var nodesLength = nodes.length;
70359
70350
  var istart = reverse ? nodesLength - 1 : 0;
70360
70351
  var idelta = reverse ? -1 : +1;
@@ -70362,7 +70353,7 @@
70362
70353
  var node = nodes[i];
70363
70354
  var children = toChildren(node);
70364
70355
  var isOpened = flags.has(node);
70365
- var supplimental = this.toSupplimental(ilevel, !!(children && 0 < children.length), isOpened);
70356
+ var supplimental = this.toSupplimental(ilevel, hasChildren(node, children), isOpened);
70366
70357
  if (irows < rows.length) {
70367
70358
  rows[irows] = node;
70368
70359
  supplimentals[irows] = supplimental;
@@ -70373,7 +70364,7 @@
70373
70364
  }
70374
70365
  irows += 1;
70375
70366
  if (isOpened && children) {
70376
- irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren);
70367
+ irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren, hasChildren);
70377
70368
  }
70378
70369
  }
70379
70370
  return irows;