@wcardinal/wcardinal-ui 0.418.0 → 0.420.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 (121) hide show
  1. package/dist/types/wcardinal/ui/d-chart-axis-base-tick-container.d.ts +7 -7
  2. package/dist/types/wcardinal/ui/d-chart-axis-container-impl.d.ts +4 -4
  3. package/dist/types/wcardinal/ui/d-chart-axis-container.d.ts +2 -2
  4. package/dist/types/wcardinal/ui/d-chart-coordinate-base.d.ts +5 -5
  5. package/dist/types/wcardinal/ui/d-chart-coordinate-container-impl.d.ts +4 -4
  6. package/dist/types/wcardinal/ui/d-chart-coordinate-container.d.ts +2 -2
  7. package/dist/types/wcardinal/ui/{d-chart-plot-area-impl.d.ts → d-chart-plot-area-base.d.ts} +23 -20
  8. package/dist/types/wcardinal/ui/d-chart-plot-area-onefold.d.ts +41 -0
  9. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-axis-container.d.ts +24 -0
  10. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container-sub.d.ts +22 -0
  11. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container.d.ts +18 -0
  12. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-overflow-mask-primary.d.ts +5 -0
  13. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-overflow-mask-secondary.d.ts +5 -0
  14. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-series-container.d.ts +43 -0
  15. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-sub-base.d.ts +46 -0
  16. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-sub-primary.d.ts +11 -0
  17. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-sub-secondary.d.ts +11 -0
  18. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-sub.d.ts +22 -0
  19. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold-view-target.d.ts +30 -0
  20. package/dist/types/wcardinal/ui/d-chart-plot-area-twofold.d.ts +46 -0
  21. package/dist/types/wcardinal/ui/d-chart-plot-area.d.ts +31 -7
  22. package/dist/types/wcardinal/ui/d-chart-selection-gridline-x.d.ts +0 -1
  23. package/dist/types/wcardinal/ui/d-chart-selection-gridline-y.d.ts +0 -1
  24. package/dist/types/wcardinal/ui/d-chart-series-container-impl.d.ts +5 -4
  25. package/dist/types/wcardinal/ui/d-chart-series-container.d.ts +2 -3
  26. package/dist/types/wcardinal/ui/d-chart.d.ts +5 -3
  27. package/dist/types/wcardinal/ui/index.d.ts +14 -1
  28. package/dist/types/wcardinal/ui/theme/dark/d-theme-dark-chart-plot-area.d.ts +1 -0
  29. package/dist/types/wcardinal/ui/theme/white/d-theme-white-chart-plot-area.d.ts +1 -0
  30. package/dist/wcardinal/ui/d-chart-axis-base-bar.js +13 -8
  31. package/dist/wcardinal/ui/d-chart-axis-base-bar.js.map +1 -1
  32. package/dist/wcardinal/ui/d-chart-axis-base-guide-container.js +1 -0
  33. package/dist/wcardinal/ui/d-chart-axis-base-guide-container.js.map +1 -1
  34. package/dist/wcardinal/ui/d-chart-axis-base-tick-container.js +15 -14
  35. package/dist/wcardinal/ui/d-chart-axis-base-tick-container.js.map +1 -1
  36. package/dist/wcardinal/ui/d-chart-axis-base-tick-major-gridline.js +4 -6
  37. package/dist/wcardinal/ui/d-chart-axis-base-tick-major-gridline.js.map +1 -1
  38. package/dist/wcardinal/ui/d-chart-axis-base-tick-major.js +4 -6
  39. package/dist/wcardinal/ui/d-chart-axis-base-tick-major.js.map +1 -1
  40. package/dist/wcardinal/ui/d-chart-axis-base-tick-minor.js +4 -6
  41. package/dist/wcardinal/ui/d-chart-axis-base-tick-minor.js.map +1 -1
  42. package/dist/wcardinal/ui/d-chart-axis-container-impl.js +2 -3
  43. package/dist/wcardinal/ui/d-chart-axis-container-impl.js.map +1 -1
  44. package/dist/wcardinal/ui/d-chart-axis-container.js.map +1 -1
  45. package/dist/wcardinal/ui/d-chart-axis-guide-simple.js +9 -6
  46. package/dist/wcardinal/ui/d-chart-axis-guide-simple.js.map +1 -1
  47. package/dist/wcardinal/ui/d-chart-coordinate-base.js +2 -4
  48. package/dist/wcardinal/ui/d-chart-coordinate-base.js.map +1 -1
  49. package/dist/wcardinal/ui/d-chart-coordinate-container-impl.js.map +1 -1
  50. package/dist/wcardinal/ui/d-chart-coordinate-container.js.map +1 -1
  51. package/dist/wcardinal/ui/d-chart-plot-area-base.js +117 -0
  52. package/dist/wcardinal/ui/d-chart-plot-area-base.js.map +1 -0
  53. package/dist/wcardinal/ui/d-chart-plot-area-onefold.js +166 -0
  54. package/dist/wcardinal/ui/d-chart-plot-area-onefold.js.map +1 -0
  55. package/dist/wcardinal/ui/d-chart-plot-area-twofold-axis-container.js +129 -0
  56. package/dist/wcardinal/ui/d-chart-plot-area-twofold-axis-container.js.map +1 -0
  57. package/dist/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container-sub.js +118 -0
  58. package/dist/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container-sub.js.map +1 -0
  59. package/dist/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container.js +53 -0
  60. package/dist/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container.js.map +1 -0
  61. package/dist/wcardinal/ui/d-chart-plot-area-twofold-overflow-mask-primary.js +28 -0
  62. package/dist/wcardinal/ui/d-chart-plot-area-twofold-overflow-mask-primary.js.map +1 -0
  63. package/dist/wcardinal/ui/d-chart-plot-area-twofold-overflow-mask-secondary.js +28 -0
  64. package/dist/wcardinal/ui/d-chart-plot-area-twofold-overflow-mask-secondary.js.map +1 -0
  65. package/dist/wcardinal/ui/d-chart-plot-area-twofold-series-container.js +186 -0
  66. package/dist/wcardinal/ui/d-chart-plot-area-twofold-series-container.js.map +1 -0
  67. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub-base.js +109 -0
  68. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub-base.js.map +1 -0
  69. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub-primary.js +49 -0
  70. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub-primary.js.map +1 -0
  71. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub-secondary.js +50 -0
  72. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub-secondary.js.map +1 -0
  73. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub.js +6 -0
  74. package/dist/wcardinal/ui/d-chart-plot-area-twofold-sub.js.map +1 -0
  75. package/dist/wcardinal/ui/d-chart-plot-area-twofold-view-target.js +81 -0
  76. package/dist/wcardinal/ui/d-chart-plot-area-twofold-view-target.js.map +1 -0
  77. package/dist/wcardinal/ui/d-chart-plot-area-twofold.js +204 -0
  78. package/dist/wcardinal/ui/d-chart-plot-area-twofold.js.map +1 -0
  79. package/dist/wcardinal/ui/d-chart-plot-area.js.map +1 -1
  80. package/dist/wcardinal/ui/d-chart-selection-gridline-x.js +4 -8
  81. package/dist/wcardinal/ui/d-chart-selection-gridline-x.js.map +1 -1
  82. package/dist/wcardinal/ui/d-chart-selection-gridline-y.js +4 -8
  83. package/dist/wcardinal/ui/d-chart-selection-gridline-y.js.map +1 -1
  84. package/dist/wcardinal/ui/d-chart-selection-marker.js +5 -2
  85. package/dist/wcardinal/ui/d-chart-selection-marker.js.map +1 -1
  86. package/dist/wcardinal/ui/d-chart-series-container-impl.js +4 -2
  87. package/dist/wcardinal/ui/d-chart-series-container-impl.js.map +1 -1
  88. package/dist/wcardinal/ui/d-chart-series-container.js.map +1 -1
  89. package/dist/wcardinal/ui/d-chart-series-linear.js +1 -1
  90. package/dist/wcardinal/ui/d-chart-series-linear.js.map +1 -1
  91. package/dist/wcardinal/ui/d-chart.js +19 -14
  92. package/dist/wcardinal/ui/d-chart.js.map +1 -1
  93. package/dist/wcardinal/ui/index.js +14 -1
  94. package/dist/wcardinal/ui/index.js.map +1 -1
  95. package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-plot-area.js +3 -0
  96. package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-plot-area.js.map +1 -1
  97. package/dist/wcardinal/ui/theme/white/d-theme-white-chart-plot-area.js +3 -0
  98. package/dist/wcardinal/ui/theme/white/d-theme-white-chart-plot-area.js.map +1 -1
  99. package/dist/wcardinal-ui-theme-dark-en-us.js +4 -1
  100. package/dist/wcardinal-ui-theme-dark-en-us.min.js +2 -2
  101. package/dist/wcardinal-ui-theme-dark-en-us.min.js.map +1 -1
  102. package/dist/wcardinal-ui-theme-dark-ja-jp.js +4 -1
  103. package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +2 -2
  104. package/dist/wcardinal-ui-theme-dark-ja-jp.min.js.map +1 -1
  105. package/dist/wcardinal-ui-theme-dark.js +4 -1
  106. package/dist/wcardinal-ui-theme-dark.min.js +2 -2
  107. package/dist/wcardinal-ui-theme-white-en-us.js +4 -1
  108. package/dist/wcardinal-ui-theme-white-en-us.min.js +2 -2
  109. package/dist/wcardinal-ui-theme-white-en-us.min.js.map +1 -1
  110. package/dist/wcardinal-ui-theme-white-ja-jp.js +4 -1
  111. package/dist/wcardinal-ui-theme-white-ja-jp.min.js +2 -2
  112. package/dist/wcardinal-ui-theme-white-ja-jp.min.js.map +1 -1
  113. package/dist/wcardinal-ui-theme-white.js +4 -1
  114. package/dist/wcardinal-ui-theme-white.min.js +2 -2
  115. package/dist/wcardinal-ui.cjs.js +1276 -222
  116. package/dist/wcardinal-ui.js +1270 -222
  117. package/dist/wcardinal-ui.min.js +2 -2
  118. package/dist/wcardinal-ui.min.js.map +1 -1
  119. package/package.json +1 -1
  120. package/dist/wcardinal/ui/d-chart-plot-area-impl.js +0 -237
  121. package/dist/wcardinal/ui/d-chart-plot-area-impl.js.map +0 -1
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.418.0
2
+ Winter Cardinal UI v0.420.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -57662,28 +57662,32 @@
57662
57662
  var index = this._index;
57663
57663
  var shape = this._shape;
57664
57664
  if (shape != null && container != null) {
57665
+ var parser = this._parser;
57665
57666
  var plotArea = container.plotArea;
57666
- var plotAreaWidth = plotArea.width;
57667
- var plotAreaHeight = plotArea.height;
57668
- var offset = this._parser.padding * index;
57667
+ var plotAreaBounds = plotArea.getAxisBounds(parser.position);
57668
+ var plotAreaX = plotAreaBounds.x;
57669
+ var plotAreaY = plotAreaBounds.y;
57670
+ var plotAreaWidth = plotAreaBounds.width;
57671
+ var plotAreaHeight = plotAreaBounds.height;
57672
+ var offset = parser.padding * index;
57669
57673
  shape.lock(EShapeLockPart.UPLOADED);
57670
57674
  var position = shape.transform.position;
57671
57675
  var size = shape.size;
57672
- switch (this._parser.position) {
57676
+ switch (parser.position) {
57673
57677
  case DChartAxisPosition.TOP:
57674
- position.set(plotAreaWidth * 0.5, 0 - offset);
57678
+ position.set(plotAreaX + plotAreaWidth * 0.5, plotAreaY - offset);
57675
57679
  size.set(plotAreaWidth, 0);
57676
57680
  break;
57677
57681
  case DChartAxisPosition.BOTTOM:
57678
- position.set(plotAreaWidth * 0.5, plotAreaHeight + offset);
57682
+ position.set(plotAreaX + plotAreaWidth * 0.5, plotAreaY + plotAreaHeight + offset);
57679
57683
  size.set(plotAreaWidth, 0);
57680
57684
  break;
57681
57685
  case DChartAxisPosition.LEFT:
57682
- position.set(0 - offset, plotAreaHeight * 0.5);
57686
+ position.set(plotAreaX - offset, plotAreaY + plotAreaHeight * 0.5);
57683
57687
  size.set(0, plotAreaHeight);
57684
57688
  break;
57685
57689
  case DChartAxisPosition.RIGHT:
57686
- position.set(plotAreaWidth + offset, plotAreaHeight * 0.5);
57690
+ position.set(plotAreaX + plotAreaWidth + offset, plotAreaY + plotAreaHeight * 0.5);
57687
57691
  size.set(0, plotAreaHeight);
57688
57692
  break;
57689
57693
  }
@@ -57695,6 +57699,7 @@
57695
57699
  DChartAxisBaseBar.prototype.destroy = function () {
57696
57700
  var shape = this._shape;
57697
57701
  if (shape != null) {
57702
+ this._shape = undefined;
57698
57703
  shape.destroy();
57699
57704
  }
57700
57705
  this._index = 0;
@@ -57771,6 +57776,7 @@
57771
57776
  for (var i = 0, imax = list.length; i < imax; ++i) {
57772
57777
  list[i].destroy();
57773
57778
  }
57779
+ list.length = 0;
57774
57780
  this._index = 0;
57775
57781
  this._container = undefined;
57776
57782
  };
@@ -58246,12 +58252,8 @@
58246
58252
  }
58247
58253
  Object.defineProperty(DChartAxisBaseTickMajorGridline.prototype, "shapes", {
58248
58254
  get: function () {
58249
- var result = this._shapes;
58250
- if (result == null) {
58251
- result = this.newShapes();
58252
- this._shapes = result;
58253
- }
58254
- return result;
58255
+ var _a;
58256
+ return ((_a = this._shapes) !== null && _a !== void 0 ? _a : (this._shapes = this.newShapes()));
58255
58257
  },
58256
58258
  enumerable: false,
58257
58259
  configurable: true
@@ -58310,6 +58312,8 @@
58310
58312
  for (var i = 0, imax = shapes.length; i < imax; ++i) {
58311
58313
  shapes[i].destroy();
58312
58314
  }
58315
+ shapes.length = 0;
58316
+ this._shapes = undefined;
58313
58317
  }
58314
58318
  this._index = 0;
58315
58319
  this._container = undefined;
@@ -58325,12 +58329,8 @@
58325
58329
  }
58326
58330
  Object.defineProperty(DChartAxisBaseTickMajor.prototype, "shapes", {
58327
58331
  get: function () {
58328
- var result = this._shapes;
58329
- if (result == null) {
58330
- result = this.newShapes();
58331
- this._shapes = result;
58332
- }
58333
- return result;
58332
+ var _a;
58333
+ return ((_a = this._shapes) !== null && _a !== void 0 ? _a : (this._shapes = this.newShapes()));
58334
58334
  },
58335
58335
  enumerable: false,
58336
58336
  configurable: true
@@ -58394,6 +58394,8 @@
58394
58394
  for (var i = 0, imax = shapes.length; i < imax; ++i) {
58395
58395
  shapes[i].destroy();
58396
58396
  }
58397
+ shapes.length = 0;
58398
+ this._shapes = undefined;
58397
58399
  }
58398
58400
  this._gridline.destroy();
58399
58401
  this._index = 0;
@@ -58409,12 +58411,8 @@
58409
58411
  }
58410
58412
  Object.defineProperty(DChartAxisBaseTickMinor.prototype, "shapes", {
58411
58413
  get: function () {
58412
- var result = this._shapes;
58413
- if (result == null) {
58414
- result = this.newShapes();
58415
- this._shapes = result;
58416
- }
58417
- return result;
58414
+ var _a;
58415
+ return ((_a = this._shapes) !== null && _a !== void 0 ? _a : (this._shapes = this.newShapes()));
58418
58416
  },
58419
58417
  enumerable: false,
58420
58418
  configurable: true
@@ -58468,6 +58466,8 @@
58468
58466
  for (var i = 0, imax = shapes.length; i < imax; ++i) {
58469
58467
  shapes[i].destroy();
58470
58468
  }
58469
+ shapes.length = 0;
58470
+ this._shapes = undefined;
58471
58471
  }
58472
58472
  this._index = 0;
58473
58473
  this._container = undefined;
@@ -58559,6 +58559,11 @@
58559
58559
  var minorShapes = this._minor.shapes;
58560
58560
  if (parser.tick.enable && container != null && majorShapes && minorShapes) {
58561
58561
  var plotArea = container.plotArea;
58562
+ var plotAreaBounds = plotArea.getAxisBounds(parser.position);
58563
+ var plotAreaX = plotAreaBounds.x;
58564
+ var plotAreaY = plotAreaBounds.y;
58565
+ var plotAreaWidth = plotAreaBounds.width;
58566
+ var plotAreaHeight = plotAreaBounds.height;
58562
58567
  var transform = plotArea.container.transform.localTransform;
58563
58568
  var gridlineShapes = this._major.gridline.shapes;
58564
58569
  var offset = parser.padding * this._index;
@@ -58574,8 +58579,7 @@
58574
58579
  var domainVisible = this.getDomainVisible(plotArea, coordinate, work);
58575
58580
  var domainVisibleFrom = domainVisible.from;
58576
58581
  var domainVisibleTo = domainVisible.to;
58577
- var plotAreaHeight = plotArea.height;
58578
- return this.updateX(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaHeight);
58582
+ return this.updateX(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaY - offset, transform, plotAreaY, plotAreaHeight);
58579
58583
  }
58580
58584
  break;
58581
58585
  case DChartAxisPosition.BOTTOM:
@@ -58587,8 +58591,7 @@
58587
58591
  var domainVisible = this.getDomainVisible(plotArea, coordinate, work);
58588
58592
  var domainVisibleFrom = domainVisible.from;
58589
58593
  var domainVisibleTo = domainVisible.to;
58590
- var plotAreaHeight = plotArea.height;
58591
- return this.updateX(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaHeight + offset, transform, plotAreaHeight);
58594
+ return this.updateX(domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaY + plotAreaHeight + offset, transform, plotAreaY, plotAreaHeight);
58592
58595
  }
58593
58596
  break;
58594
58597
  case DChartAxisPosition.LEFT:
@@ -58600,8 +58603,7 @@
58600
58603
  var rangeVisible = this.getRangeVisible(plotArea, coordinate, work);
58601
58604
  var rangeVisibleFrom = rangeVisible.from;
58602
58605
  var rangeVisibleTo = rangeVisible.to;
58603
- var plotAreaWidth = plotArea.width;
58604
- return this.updateY(rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - offset, transform, plotAreaWidth);
58606
+ return this.updateY(rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaX - offset, transform, plotAreaX, plotAreaWidth);
58605
58607
  }
58606
58608
  break;
58607
58609
  case DChartAxisPosition.RIGHT:
@@ -58613,8 +58615,7 @@
58613
58615
  var rangeVisible = this.getRangeVisible(plotArea, coordinate, work);
58614
58616
  var rangeVisibleFrom = rangeVisible.from;
58615
58617
  var rangeVisibleTo = rangeVisible.to;
58616
- var plotAreaWidth = plotArea.width;
58617
- return this.updateY(rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaWidth + offset, transform, plotAreaWidth);
58618
+ return this.updateY(rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaX + plotAreaWidth + offset, transform, plotAreaX, plotAreaWidth);
58618
58619
  }
58619
58620
  break;
58620
58621
  }
@@ -58622,7 +58623,7 @@
58622
58623
  return false;
58623
58624
  };
58624
58625
  DChartAxisBaseTickContainer.prototype.getDomain = function (plotArea, coordinate, result) {
58625
- var bounds = plotArea.getBoundsInContainer();
58626
+ var bounds = plotArea.getContainerBounds();
58626
58627
  var transform = coordinate.transform;
58627
58628
  return result.set(coordinate.unmap(transform.unmap(bounds.x)), coordinate.unmap(transform.unmap(bounds.x + bounds.width)));
58628
58629
  };
@@ -58630,14 +58631,14 @@
58630
58631
  return result;
58631
58632
  };
58632
58633
  DChartAxisBaseTickContainer.prototype.getRange = function (plotArea, coordinate, result) {
58633
- var bounds = plotArea.getBoundsInContainer();
58634
+ var bounds = plotArea.getContainerBounds();
58634
58635
  var transform = coordinate.transform;
58635
58636
  return result.set(coordinate.unmap(transform.unmap(bounds.y)), coordinate.unmap(transform.unmap(bounds.y + bounds.height)));
58636
58637
  };
58637
58638
  DChartAxisBaseTickContainer.prototype.getRangeVisible = function (plotArea, coordinate, result) {
58638
58639
  return result;
58639
58640
  };
58640
- DChartAxisBaseTickContainer.prototype.updateX = function (domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionY, transform, plotAreaHeight) {
58641
+ DChartAxisBaseTickContainer.prototype.updateX = function (domainFrom, domainTo, domainVisibleFrom, domainVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionY, transform, plotAreaY, plotAreaHeight) {
58641
58642
  var tick = this._parser.tick;
58642
58643
  var majorTick = tick.major;
58643
58644
  var majorCount = majorTick.count;
@@ -58664,7 +58665,7 @@
58664
58665
  var majorTickStep = majorTicks[imajorTick + 2];
58665
58666
  this.showMajor(majorShape, majotTickPositionX, shapePositionY, majorFormatter === null || majorFormatter === void 0 ? void 0 : majorFormatter.format(majorTickPosition, majorTickStep));
58666
58667
  if (i < gridlineShapes.length) {
58667
- this.showMajorGridline(gridlineShapes[i], majorTickPosition, majotTickPositionX, plotAreaHeight * 0.5, 0, plotAreaHeight);
58668
+ this.showMajorGridline(gridlineShapes[i], majorTickPosition, majotTickPositionX, plotAreaY + plotAreaHeight * 0.5, 0, plotAreaHeight);
58668
58669
  }
58669
58670
  }
58670
58671
  else {
@@ -58690,7 +58691,7 @@
58690
58691
  }
58691
58692
  return true;
58692
58693
  };
58693
- DChartAxisBaseTickContainer.prototype.updateY = function (rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionX, transform, plotAreaWidth) {
58694
+ DChartAxisBaseTickContainer.prototype.updateY = function (rangeFrom, rangeTo, rangeVisibleFrom, rangeVisibleTo, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionX, transform, plotAreaX, plotAreaWidth) {
58694
58695
  var tick = this._parser.tick;
58695
58696
  var majorTick = tick.major;
58696
58697
  var majorCount = majorTick.count;
@@ -58717,7 +58718,7 @@
58717
58718
  var majorTickStep = majorTicks[imajorTick + 2];
58718
58719
  this.showMajor(majorShape, shapePositionX, majotTickPositionY, majorFormatter === null || majorFormatter === void 0 ? void 0 : majorFormatter.format(majorTickPosition, majorTickStep));
58719
58720
  if (i < gridlineShapes.length) {
58720
- this.showMajorGridline(gridlineShapes[i], majorTickPosition, plotAreaWidth * 0.5, majotTickPositionY, plotAreaWidth, 0);
58721
+ this.showMajorGridline(gridlineShapes[i], majorTickPosition, plotAreaX + plotAreaWidth * 0.5, majotTickPositionY, plotAreaWidth, 0);
58721
58722
  }
58722
58723
  }
58723
58724
  else {
@@ -58922,9 +58923,9 @@
58922
58923
  * SPDX-License-Identifier: Apache-2.0
58923
58924
  */
58924
58925
  var DChartAxisContainerImpl = /** @class */ (function () {
58925
- function DChartAxisContainerImpl(plotArea, options) {
58926
+ function DChartAxisContainerImpl(plotArea, container, options) {
58926
58927
  this._plotArea = plotArea;
58927
- this._container = new EShapeContainer();
58928
+ this._container = container;
58928
58929
  this._list = new Map();
58929
58930
  }
58930
58931
  Object.defineProperty(DChartAxisContainerImpl.prototype, "container", {
@@ -59399,9 +59400,12 @@
59399
59400
  var axis = this._axis;
59400
59401
  if (shape != null && container != null && axis != null) {
59401
59402
  var plotArea = container.plotArea;
59403
+ var plotAreaBounds = plotArea.getAxisBounds(axis.position);
59404
+ var plotAreaX = plotAreaBounds.x;
59405
+ var plotAreaY = plotAreaBounds.y;
59406
+ var plotAreaWidth = plotAreaBounds.width;
59407
+ var plotAreaHeight = plotAreaBounds.height;
59402
59408
  var transform = plotArea.container.transform.localTransform;
59403
- var plotAreaWidth = plotArea.width;
59404
- var plotAreaHeight = plotArea.height;
59405
59409
  var offset = axis.padding * index;
59406
59410
  switch (axis.position) {
59407
59411
  case DChartAxisPosition.TOP:
@@ -59412,10 +59416,10 @@
59412
59416
  work.set(coordinateX.transform.map(coordinateX.map(this._position)), 0);
59413
59417
  transform.apply(work, work);
59414
59418
  var x = work.x;
59415
- shape.update(axis.position, x, plotAreaHeight * 0.5, this._isShown && 0 <= x && x <= plotAreaWidth, plotAreaWidth, plotAreaHeight, offset);
59419
+ shape.update(axis.position, x, plotAreaY + plotAreaHeight * 0.5, this._isShown && plotAreaX <= x && x <= plotAreaX + plotAreaWidth, plotAreaWidth, plotAreaHeight, offset);
59416
59420
  }
59417
59421
  else {
59418
- shape.update(axis.position, 0, plotAreaHeight * 0.5, false, plotAreaWidth, plotAreaHeight, offset);
59422
+ shape.update(axis.position, plotAreaX, plotAreaY + plotAreaHeight * 0.5, false, plotAreaWidth, plotAreaHeight, offset);
59419
59423
  }
59420
59424
  break;
59421
59425
  case DChartAxisPosition.LEFT:
@@ -59426,10 +59430,10 @@
59426
59430
  work.set(0, coordinateY.transform.map(coordinateY.map(this._position)));
59427
59431
  transform.apply(work, work);
59428
59432
  var y = work.y;
59429
- shape.update(axis.position, plotAreaWidth * 0.5, y, this._isShown && 0 <= y && y <= plotAreaHeight, plotAreaWidth, plotAreaHeight, offset);
59433
+ shape.update(axis.position, plotAreaX + plotAreaWidth * 0.5, y, this._isShown && plotAreaY <= y && y <= plotAreaY + plotAreaHeight, plotAreaWidth, plotAreaHeight, offset);
59430
59434
  }
59431
59435
  else {
59432
- shape.update(axis.position, plotAreaWidth * 0.5, 0, false, plotAreaWidth, plotAreaHeight, offset);
59436
+ shape.update(axis.position, plotAreaX + plotAreaWidth * 0.5, plotAreaY, false, plotAreaWidth, plotAreaHeight, offset);
59433
59437
  }
59434
59438
  break;
59435
59439
  }
@@ -59740,12 +59744,10 @@
59740
59744
  }
59741
59745
  };
59742
59746
  DChartCoordinateBase.prototype.getPixelDomain = function (plotArea, result) {
59743
- var padding = plotArea.padding;
59744
- return result.set(padding.getLeft(), plotArea.width - padding.getRight());
59747
+ return plotArea.getPixelDomain(result);
59745
59748
  };
59746
59749
  DChartCoordinateBase.prototype.getPixelRange = function (plotArea, result) {
59747
- var padding = plotArea.padding;
59748
- return result.set(plotArea.height - padding.getBottom(), padding.getTop());
59750
+ return plotArea.getPixelRange(result);
59749
59751
  };
59750
59752
  DChartCoordinateBase.prototype.toFitDomain = function (from, to, plotArea, result) {
59751
59753
  if (from == null) {
@@ -60379,6 +60381,119 @@
60379
60381
  return DChartOverview;
60380
60382
  }(DBase));
60381
60383
 
60384
+ /*
60385
+ * Copyright (C) 2019 Toshiba Corporation
60386
+ * SPDX-License-Identifier: Apache-2.0
60387
+ */
60388
+ var DChartPlotAreaBase = /** @class */ (function (_super) {
60389
+ __extends(DChartPlotAreaBase, _super);
60390
+ function DChartPlotAreaBase(chart, options) {
60391
+ var _this = _super.call(this, options) || this;
60392
+ _this._isContainerBoundsDirty = true;
60393
+ _this._containerBounds = new pixi_js.Rectangle();
60394
+ _this._workPoint = new pixi_js.Point();
60395
+ _this._pixelBounds = new pixi_js.Rectangle();
60396
+ _this._chart = chart;
60397
+ _this._blendStartTime = 0;
60398
+ _this._blendDuration = 1000;
60399
+ _this._blendTimeout = null;
60400
+ _this._onBlendBound = function () {
60401
+ _this.onBlend();
60402
+ };
60403
+ _this._isViewDirty = true;
60404
+ _this._view = _this.newView(options);
60405
+ return _this;
60406
+ }
60407
+ DChartPlotAreaBase.prototype.onResize = function (newWidth, newHeight, oldWidth, oldHeight) {
60408
+ this._isViewDirty = true;
60409
+ this._isContainerBoundsDirty = true;
60410
+ _super.prototype.onResize.call(this, newWidth, newHeight, oldWidth, oldHeight);
60411
+ };
60412
+ Object.defineProperty(DChartPlotAreaBase.prototype, "chart", {
60413
+ get: function () {
60414
+ return this._chart;
60415
+ },
60416
+ enumerable: false,
60417
+ configurable: true
60418
+ });
60419
+ Object.defineProperty(DChartPlotAreaBase.prototype, "view", {
60420
+ get: function () {
60421
+ return this._view;
60422
+ },
60423
+ enumerable: false,
60424
+ configurable: true
60425
+ });
60426
+ DChartPlotAreaBase.prototype.onWheel = function (e, deltas, global) {
60427
+ var vresult = this._view.onWheel(e, deltas, global);
60428
+ var sresult = _super.prototype.onWheel.call(this, e, deltas, global);
60429
+ return vresult || sresult;
60430
+ };
60431
+ DChartPlotAreaBase.prototype.onDblClick = function (e, interactionManager) {
60432
+ var vresult = this._view.onDblClick(e, interactionManager);
60433
+ var sresult = _super.prototype.onDblClick.call(this, e, interactionManager);
60434
+ return vresult || sresult;
60435
+ };
60436
+ DChartPlotAreaBase.prototype.onDown = function (e) {
60437
+ this._view.onDown(e);
60438
+ _super.prototype.onDown.call(this, e);
60439
+ };
60440
+ DChartPlotAreaBase.prototype.render = function (renderer) {
60441
+ if (this._isViewDirty) {
60442
+ this._isViewDirty = false;
60443
+ this.onViewDirty();
60444
+ }
60445
+ _super.prototype.render.call(this, renderer);
60446
+ };
60447
+ DChartPlotAreaBase.prototype.getPixelDomain = function (result) {
60448
+ var padding = this.padding;
60449
+ return result.set(padding.getLeft(), this.width - padding.getRight());
60450
+ };
60451
+ DChartPlotAreaBase.prototype.getPixelRange = function (result) {
60452
+ var padding = this.padding;
60453
+ return result.set(this.height - padding.getBottom(), padding.getTop());
60454
+ };
60455
+ DChartPlotAreaBase.prototype.getPixelBounds = function () {
60456
+ var result = this._pixelBounds;
60457
+ result.x = 0;
60458
+ result.y = 0;
60459
+ result.width = this.width;
60460
+ result.height = this.height;
60461
+ return result;
60462
+ };
60463
+ DChartPlotAreaBase.prototype.getAxisBounds = function (position) {
60464
+ return this.getPixelBounds();
60465
+ };
60466
+ DChartPlotAreaBase.prototype.getSelectionBoundsX = function () {
60467
+ return this.getPixelBounds();
60468
+ };
60469
+ DChartPlotAreaBase.prototype.getSelectionBoundsY = function () {
60470
+ return this.getPixelBounds();
60471
+ };
60472
+ DChartPlotAreaBase.prototype.getContainerBounds = function () {
60473
+ var result = this._containerBounds;
60474
+ if (this._isContainerBoundsDirty) {
60475
+ this._isContainerBoundsDirty = false;
60476
+ var container = this.container;
60477
+ container.updateTransform();
60478
+ var transform = container.transform.localTransform;
60479
+ var work = this._workPoint;
60480
+ work.set(0, 0);
60481
+ transform.applyInverse(work, work);
60482
+ result.x = work.x;
60483
+ result.y = work.y;
60484
+ work.set(this.width, this.height);
60485
+ transform.applyInverse(work, work);
60486
+ result.width = work.x - result.x;
60487
+ result.height = work.y - result.y;
60488
+ }
60489
+ return result;
60490
+ };
60491
+ DChartPlotAreaBase.prototype.getType = function () {
60492
+ return "DChartPlotArea";
60493
+ };
60494
+ return DChartPlotAreaBase;
60495
+ }(DBase));
60496
+
60382
60497
  /*
60383
60498
  * Copyright (C) 2019 Toshiba Corporation
60384
60499
  * SPDX-License-Identifier: Apache-2.0
@@ -60655,11 +60770,10 @@
60655
60770
  */
60656
60771
  var DChartSeriesContainerImpl = /** @class */ (function () {
60657
60772
  function DChartSeriesContainerImpl(plotArea, options) {
60658
- var _a;
60659
60773
  this._plotArea = plotArea;
60660
60774
  this._domain = new DChartRegionImpl(NaN, NaN);
60661
60775
  this._range = new DChartRegionImpl(NaN, NaN);
60662
- this._selection = (_a = options === null || options === void 0 ? void 0 : options.selection) !== null && _a !== void 0 ? _a : null;
60776
+ this._selection = null;
60663
60777
  this._fill = new DChartSeriesFillImpl(options === null || options === void 0 ? void 0 : options.fill);
60664
60778
  this._stroke = new DChartSeriesStrokeImpl(options === null || options === void 0 ? void 0 : options.stroke);
60665
60779
  this._size = new DChartSeriesPointImpl(options === null || options === void 0 ? void 0 : options.size);
@@ -60693,6 +60807,9 @@
60693
60807
  get: function () {
60694
60808
  return this._selection;
60695
60809
  },
60810
+ set: function (selection) {
60811
+ this._selection = selection;
60812
+ },
60696
60813
  enumerable: false,
60697
60814
  configurable: true
60698
60815
  });
@@ -60841,202 +60958,1109 @@
60841
60958
  * Copyright (C) 2019 Toshiba Corporation
60842
60959
  * SPDX-License-Identifier: Apache-2.0
60843
60960
  */
60844
- var DChartPlotAreaImpl = /** @class */ (function (_super) {
60845
- __extends(DChartPlotAreaImpl, _super);
60846
- function DChartPlotAreaImpl(chart, options) {
60847
- var _this = _super.call(this, options) || this;
60848
- _this._chart = chart;
60849
- _this._blendStartTime = 0;
60850
- _this._blendDuration = 1000;
60851
- _this._blendTimeout = null;
60852
- _this._onBlendBound = function () {
60853
- _this.onBlend();
60854
- };
60855
- return _this;
60856
- }
60857
- DChartPlotAreaImpl.prototype.init = function (options) {
60858
- var _this = this;
60961
+ var DChartPlotAreaOnefold = /** @class */ (function (_super) {
60962
+ __extends(DChartPlotAreaOnefold, _super);
60963
+ function DChartPlotAreaOnefold(chart, options) {
60859
60964
  var _a;
60860
- _super.prototype.init.call(this, options);
60861
- this._isBoundsInContainerDirty = true;
60862
- this._boundsInContainer = new pixi_js.Rectangle();
60863
- this._workPoint = new pixi_js.Point();
60965
+ var _this = _super.call(this, chart, options) || this;
60864
60966
  // Container
60865
60967
  var container = new DChartPlotAreaContainer(function () {
60866
60968
  _this._isViewDirty = true;
60867
- _this._isBoundsInContainerDirty = true;
60969
+ _this._isContainerBoundsDirty = true;
60868
60970
  DApplications.update(_this);
60869
60971
  });
60870
- this._container = container;
60871
- this.addChild(container);
60972
+ _this._container = container;
60973
+ _this.addChild(container);
60974
+ // Overflow mask
60975
+ var mask = (_a = options === null || options === void 0 ? void 0 : options.mask) !== null && _a !== void 0 ? _a : _this.theme.isOverflowMaskEnabled();
60976
+ if (mask) {
60977
+ container.mask = _this.getOverflowMask();
60978
+ }
60872
60979
  // View
60873
- this._isViewDirty = true;
60874
- this._view = new DViewImpl(this, function () { return container; }, options === null || options === void 0 ? void 0 : options.view);
60875
- // Coordinate container
60876
- this._coordinate = new DChartCoordinateContainerImpl(this, options === null || options === void 0 ? void 0 : options.coordinate);
60877
- // Series container
60878
- var series = new DChartSeriesContainerImpl(this, options === null || options === void 0 ? void 0 : options.series);
60879
- this._series = series;
60880
- // Axis container
60881
- var axis = new DChartAxisContainerImpl(this, options === null || options === void 0 ? void 0 : options.axis);
60882
- this._axis = axis;
60883
- this.addChild(axis.container);
60980
+ _this._isViewDirty = true;
60981
+ _this._view = new DViewImpl(_this, function () { return container; }, options === null || options === void 0 ? void 0 : options.view);
60982
+ // Coordinate
60983
+ _this._coordinate = new DChartCoordinateContainerImpl(_this, options === null || options === void 0 ? void 0 : options.coordinate);
60984
+ // Series
60985
+ var seriesOptions = options === null || options === void 0 ? void 0 : options.series;
60986
+ var series = new DChartSeriesContainerImpl(_this, seriesOptions);
60987
+ _this._series = series;
60988
+ // Axis
60989
+ var axisOptions = options === null || options === void 0 ? void 0 : options.axis;
60990
+ var axis = new DChartAxisContainerImpl(_this, new EShapeContainer(), axisOptions);
60991
+ _this._axis = axis;
60992
+ _this.addChild(axis.container);
60993
+ // Add series
60994
+ _this.addSeries(series, seriesOptions === null || seriesOptions === void 0 ? void 0 : seriesOptions.list);
60995
+ // Add axes
60996
+ _this.addAxes(axis, axisOptions === null || axisOptions === void 0 ? void 0 : axisOptions.list);
60884
60997
  // Selection
60885
- var selection = series.selection;
60886
- if (selection) {
60998
+ var selection = seriesOptions === null || seriesOptions === void 0 ? void 0 : seriesOptions.selection;
60999
+ if (selection != null) {
61000
+ series.selection = selection;
60887
61001
  selection.bind(series);
60888
61002
  }
60889
- // Overflow mask
60890
- var mask = (_a = options === null || options === void 0 ? void 0 : options.mask) !== null && _a !== void 0 ? _a : this.theme.isOverflowMaskEnabled();
60891
- if (mask) {
60892
- container.mask = this.getOverflowMask();
61003
+ return _this;
61004
+ }
61005
+ DChartPlotAreaOnefold.prototype.getOverflowMask = function () {
61006
+ if (this._overflowMask == null) {
61007
+ this._overflowMask = new DBaseOverflowMask(this);
61008
+ this.reflowable.add(this._overflowMask);
61009
+ this.toDirty();
60893
61010
  }
60894
- // Add series and axes
60895
- if (options != null) {
60896
- // Series
60897
- var s = options.series;
60898
- if (s != null) {
60899
- var list = s.list;
60900
- if (list) {
60901
- var listLength = list.length;
60902
- if (0 < listLength) {
60903
- for (var i = 0; i < listLength; ++i) {
60904
- series.add(list[i]);
60905
- }
60906
- series.update();
60907
- }
61011
+ return this._overflowMask;
61012
+ };
61013
+ DChartPlotAreaOnefold.prototype.addSeries = function (series, list) {
61014
+ if (list != null) {
61015
+ var listLength = list.length;
61016
+ if (0 < listLength) {
61017
+ for (var i = 0; i < listLength; ++i) {
61018
+ series.add(list[i]);
60908
61019
  }
61020
+ series.update();
60909
61021
  }
60910
- // Axes
60911
- var a = options.axis;
60912
- if (a != null) {
60913
- var list = a.list;
60914
- if (list) {
60915
- for (var i = 0, imax = list.length; i < imax; ++i) {
60916
- axis.add(list[i]);
60917
- }
61022
+ }
61023
+ };
61024
+ DChartPlotAreaOnefold.prototype.addAxes = function (axis, list) {
61025
+ if (list != null) {
61026
+ for (var i = 0, imax = list.length; i < imax; ++i) {
61027
+ axis.add(list[i]);
61028
+ }
61029
+ }
61030
+ };
61031
+ Object.defineProperty(DChartPlotAreaOnefold.prototype, "coordinate", {
61032
+ get: function () {
61033
+ return this._coordinate;
61034
+ },
61035
+ enumerable: false,
61036
+ configurable: true
61037
+ });
61038
+ Object.defineProperty(DChartPlotAreaOnefold.prototype, "series", {
61039
+ get: function () {
61040
+ return this._series;
61041
+ },
61042
+ enumerable: false,
61043
+ configurable: true
61044
+ });
61045
+ Object.defineProperty(DChartPlotAreaOnefold.prototype, "container", {
61046
+ get: function () {
61047
+ return this._container;
61048
+ },
61049
+ enumerable: false,
61050
+ configurable: true
61051
+ });
61052
+ Object.defineProperty(DChartPlotAreaOnefold.prototype, "axis", {
61053
+ get: function () {
61054
+ return this._axis;
61055
+ },
61056
+ enumerable: false,
61057
+ configurable: true
61058
+ });
61059
+ DChartPlotAreaOnefold.prototype.newView = function (options) {
61060
+ var _this = this;
61061
+ return new DViewImpl(this, function () { return _this._container; }, options === null || options === void 0 ? void 0 : options.view);
61062
+ };
61063
+ DChartPlotAreaOnefold.prototype.onViewDirty = function () {
61064
+ this._coordinate.fit();
61065
+ this._axis.onRender();
61066
+ this._series.onRender();
61067
+ };
61068
+ DChartPlotAreaOnefold.prototype.fit = function (duration, domainFrom, domainTo, rangeFrom, rangeTo) {
61069
+ var coordinate = this._coordinate;
61070
+ var axis = this._axis;
61071
+ var series = this._series;
61072
+ if (duration != null && duration <= 0) {
61073
+ coordinate.fit(domainFrom, domainTo, rangeFrom, rangeTo);
61074
+ axis.update();
61075
+ series.update();
61076
+ }
61077
+ else {
61078
+ this._blendDuration = duration != null ? duration : 200;
61079
+ this._blendStartTime = Date.now();
61080
+ coordinate.mark(domainFrom, domainTo, rangeFrom, rangeTo);
61081
+ var blendTimeout = this._blendTimeout;
61082
+ if (blendTimeout != null) {
61083
+ window.clearTimeout(blendTimeout);
61084
+ }
61085
+ this._blendTimeout = window.setTimeout(this._onBlendBound, 0);
61086
+ }
61087
+ return this;
61088
+ };
61089
+ DChartPlotAreaOnefold.prototype.onBlend = function () {
61090
+ var now = Date.now();
61091
+ var ratio = (now - this._blendStartTime) / this._blendDuration;
61092
+ if (ratio < 1) {
61093
+ this._blendTimeout = window.setTimeout(this._onBlendBound, 0);
61094
+ }
61095
+ else {
61096
+ this._blendTimeout = null;
61097
+ ratio = 1;
61098
+ }
61099
+ this._coordinate.blend(DAnimationTimings.ELASTIC(ratio));
61100
+ this._axis.update();
61101
+ this._series.update();
61102
+ };
61103
+ DChartPlotAreaOnefold.prototype.destroy = function () {
61104
+ this._container.destroy();
61105
+ this._series.destroy();
61106
+ this._axis.destroy();
61107
+ };
61108
+ return DChartPlotAreaOnefold;
61109
+ }(DChartPlotAreaBase));
61110
+
61111
+ /*
61112
+ * Copyright (C) 2019 Toshiba Corporation
61113
+ * SPDX-License-Identifier: Apache-2.0
61114
+ */
61115
+ var DChartPlotAreaTwofoldAxisContainer = /** @class */ (function () {
61116
+ function DChartPlotAreaTwofoldAxisContainer(plotArea, container, primary, secondary) {
61117
+ this._plotArea = plotArea;
61118
+ this._container = container;
61119
+ this._list = new Map();
61120
+ this._primary = primary;
61121
+ this._secondary = secondary;
61122
+ }
61123
+ Object.defineProperty(DChartPlotAreaTwofoldAxisContainer.prototype, "container", {
61124
+ get: function () {
61125
+ return this._container;
61126
+ },
61127
+ enumerable: false,
61128
+ configurable: true
61129
+ });
61130
+ Object.defineProperty(DChartPlotAreaTwofoldAxisContainer.prototype, "plotArea", {
61131
+ get: function () {
61132
+ return this._plotArea;
61133
+ },
61134
+ enumerable: false,
61135
+ configurable: true
61136
+ });
61137
+ DChartPlotAreaTwofoldAxisContainer.prototype.add = function (axis) {
61138
+ var list = this._list;
61139
+ var axes = list.get(axis.position);
61140
+ if (axes == null) {
61141
+ axes = [];
61142
+ list.set(axis.position, axes);
61143
+ }
61144
+ axes.push(axis);
61145
+ axis.bind(this, axes.length - 1);
61146
+ };
61147
+ DChartPlotAreaTwofoldAxisContainer.prototype.get = function (position, index) {
61148
+ var primary = this._primary;
61149
+ var primarySize = primary.size(position);
61150
+ if (0 <= index && index < primarySize) {
61151
+ return primary.get(position, index);
61152
+ }
61153
+ var secondary = this._secondary;
61154
+ var secondarySize = secondary.size(position);
61155
+ if (primarySize <= index && index < primarySize + secondarySize) {
61156
+ return secondary.get(position, index - primarySize);
61157
+ }
61158
+ var list = this._list;
61159
+ var axes = list.get(toEnum(position, DChartAxisPosition));
61160
+ if (axes) {
61161
+ if (primarySize + secondarySize <= index &&
61162
+ index < primarySize + secondarySize + axes.length) {
61163
+ return axes[index - primarySize - secondarySize];
61164
+ }
61165
+ }
61166
+ return null;
61167
+ };
61168
+ DChartPlotAreaTwofoldAxisContainer.prototype.indexOf = function (axis) {
61169
+ var primary = this._primary;
61170
+ var result = primary.indexOf(axis);
61171
+ if (0 <= result) {
61172
+ return result;
61173
+ }
61174
+ var secondary = this._secondary;
61175
+ result = secondary.indexOf(axis);
61176
+ if (0 <= result) {
61177
+ return primary.size(axis.position) + result;
61178
+ }
61179
+ var list = this._list;
61180
+ var axes = list.get(axis.position);
61181
+ if (axes) {
61182
+ return primary.size(axis.position) + secondary.size(axis.position) + axes.indexOf(axis);
61183
+ }
61184
+ return -1;
61185
+ };
61186
+ DChartPlotAreaTwofoldAxisContainer.prototype.clear = function (position) {
61187
+ this._primary.clear(position);
61188
+ this._secondary.clear(position);
61189
+ var list = this._list;
61190
+ var axes = list.get(toEnum(position, DChartAxisPosition));
61191
+ if (axes) {
61192
+ for (var i = 0, imax = axes.length; i < imax; ++i) {
61193
+ axes[i].destroy();
61194
+ }
61195
+ axes.length = 0;
61196
+ }
61197
+ return this;
61198
+ };
61199
+ DChartPlotAreaTwofoldAxisContainer.prototype.size = function (position) {
61200
+ var list = this._list;
61201
+ var axes = list.get(toEnum(position, DChartAxisPosition));
61202
+ return (this._primary.size(position) +
61203
+ this._secondary.size(position) +
61204
+ (axes != null ? axes.length : 0));
61205
+ };
61206
+ DChartPlotAreaTwofoldAxisContainer.prototype.update = function () {
61207
+ this._primary.update();
61208
+ this._secondary.update();
61209
+ this._list.forEach(function (axes) {
61210
+ for (var i = 0, imax = axes.length; i < imax; ++i) {
61211
+ axes[i].update();
61212
+ }
61213
+ });
61214
+ };
61215
+ DChartPlotAreaTwofoldAxisContainer.prototype.onRender = function () {
61216
+ this._primary.onRender();
61217
+ this._secondary.onRender();
61218
+ this._list.forEach(function (axes) {
61219
+ for (var i = 0, imax = axes.length; i < imax; ++i) {
61220
+ axes[i].onRender();
61221
+ }
61222
+ });
61223
+ };
61224
+ DChartPlotAreaTwofoldAxisContainer.prototype.destroy = function () {
61225
+ this._primary.destroy();
61226
+ this._secondary.destroy();
61227
+ this._list.forEach(function (axes) {
61228
+ for (var i = 0, imax = axes.length; i < imax; ++i) {
61229
+ axes[i].destroy();
61230
+ }
61231
+ axes.length = 0;
61232
+ });
61233
+ };
61234
+ return DChartPlotAreaTwofoldAxisContainer;
61235
+ }());
61236
+
61237
+ /*
61238
+ * Copyright (C) 2019 Toshiba Corporation
61239
+ * SPDX-License-Identifier: Apache-2.0
61240
+ */
61241
+ var DChartPlotAreaTwofoldCoorinateContainerSub = /** @class */ (function () {
61242
+ function DChartPlotAreaTwofoldCoorinateContainerSub(container, primary, secondary) {
61243
+ this._container = container;
61244
+ this._primary = primary;
61245
+ this._secondary = secondary;
61246
+ }
61247
+ Object.defineProperty(DChartPlotAreaTwofoldCoorinateContainerSub.prototype, "container", {
61248
+ get: function () {
61249
+ return this._container;
61250
+ },
61251
+ enumerable: false,
61252
+ configurable: true
61253
+ });
61254
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.add = function (coordinate, index) {
61255
+ if (index != null) {
61256
+ var primary = this._primary;
61257
+ var primarySize = primary.size();
61258
+ if (index < primarySize) {
61259
+ if (0 <= index) {
61260
+ primary.add(coordinate, index);
60918
61261
  }
60919
61262
  }
61263
+ else {
61264
+ this._secondary.add(coordinate, index - primarySize);
61265
+ }
61266
+ return this;
61267
+ }
61268
+ else {
61269
+ this._secondary.add(coordinate);
60920
61270
  }
61271
+ return this;
60921
61272
  };
60922
- DChartPlotAreaImpl.prototype.onResize = function (newWidth, newHeight, oldWidth, oldHeight) {
60923
- this._isViewDirty = true;
60924
- this._isBoundsInContainerDirty = true;
60925
- _super.prototype.onResize.call(this, newWidth, newHeight, oldWidth, oldHeight);
61273
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.get = function (index) {
61274
+ var primary = this._primary;
61275
+ var primarySize = primary.size();
61276
+ if (0 <= index && index < primarySize) {
61277
+ return primary.get(index);
61278
+ }
61279
+ var secondary = this._secondary;
61280
+ var secondarySize = secondary.size();
61281
+ if (primarySize <= index && index < primarySize + secondarySize) {
61282
+ secondary.get(index - primarySize);
61283
+ }
61284
+ return null;
60926
61285
  };
60927
- DChartPlotAreaImpl.prototype.getOverflowMask = function () {
60928
- if (this._overflowMask == null) {
60929
- this._overflowMask = new DBaseOverflowMask(this);
60930
- this.reflowable.add(this._overflowMask);
60931
- this.toDirty();
61286
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.indexOf = function (coordinate) {
61287
+ var result = this._primary.indexOf(coordinate);
61288
+ if (0 <= result) {
61289
+ return result;
60932
61290
  }
60933
- return this._overflowMask;
61291
+ result = this._secondary.indexOf(coordinate);
61292
+ if (0 <= result) {
61293
+ return this._primary.size() + result;
61294
+ }
61295
+ return -1;
61296
+ };
61297
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.remove = function (coordinateOrIndex) {
61298
+ if (isNumber(coordinateOrIndex)) {
61299
+ var index = coordinateOrIndex;
61300
+ var primary = this._primary;
61301
+ var primarySize = primary.size();
61302
+ if (0 <= index && index < primarySize) {
61303
+ return primary.remove(index);
61304
+ }
61305
+ var secondary = this._secondary;
61306
+ var secondarySize = secondary.size();
61307
+ if (primarySize <= index && index < primarySize + secondarySize) {
61308
+ secondary.remove(index - primarySize);
61309
+ }
61310
+ }
61311
+ else {
61312
+ var coordinate = coordinateOrIndex;
61313
+ var result = this._primary.remove(coordinate);
61314
+ if (result != null) {
61315
+ return result;
61316
+ }
61317
+ result = this._secondary.remove(coordinate);
61318
+ if (result != null) {
61319
+ return result;
61320
+ }
61321
+ }
61322
+ return null;
61323
+ };
61324
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.clear = function () {
61325
+ this._primary.clear();
61326
+ this._secondary.clear();
61327
+ return this;
61328
+ };
61329
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.destroy = function () {
61330
+ return this.clear();
61331
+ };
61332
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.size = function () {
61333
+ return this._primary.size() + this._secondary.size();
61334
+ };
61335
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.fit = function (from, to) {
61336
+ this._primary.fit(from, to);
61337
+ this._secondary.fit(from, to);
61338
+ return this;
61339
+ };
61340
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.mark = function (from, to) {
61341
+ this._primary.mark(from, to);
61342
+ this._secondary.mark(from, to);
61343
+ return this;
61344
+ };
61345
+ DChartPlotAreaTwofoldCoorinateContainerSub.prototype.blend = function (ratio) {
61346
+ this._primary.blend(ratio);
61347
+ this._secondary.blend(ratio);
61348
+ return this;
60934
61349
  };
60935
- Object.defineProperty(DChartPlotAreaImpl.prototype, "chart", {
61350
+ return DChartPlotAreaTwofoldCoorinateContainerSub;
61351
+ }());
61352
+
61353
+ /*
61354
+ * Copyright (C) 2019 Toshiba Corporation
61355
+ * SPDX-License-Identifier: Apache-2.0
61356
+ */
61357
+ var DChartPlotAreaTwofoldCoorinateContainer = /** @class */ (function () {
61358
+ function DChartPlotAreaTwofoldCoorinateContainer(plotArea, primary, secondary) {
61359
+ this._plotArea = plotArea;
61360
+ this._primary = primary;
61361
+ this._secondary = secondary;
61362
+ this._x = new DChartPlotAreaTwofoldCoorinateContainerSub(this, primary.x, secondary.x);
61363
+ this._y = new DChartPlotAreaTwofoldCoorinateContainerSub(this, primary.y, secondary.y);
61364
+ }
61365
+ Object.defineProperty(DChartPlotAreaTwofoldCoorinateContainer.prototype, "x", {
60936
61366
  get: function () {
60937
- return this._chart;
61367
+ return this._x;
60938
61368
  },
60939
61369
  enumerable: false,
60940
61370
  configurable: true
60941
61371
  });
60942
- Object.defineProperty(DChartPlotAreaImpl.prototype, "coordinate", {
61372
+ Object.defineProperty(DChartPlotAreaTwofoldCoorinateContainer.prototype, "y", {
60943
61373
  get: function () {
60944
- return this._coordinate;
61374
+ return this._y;
60945
61375
  },
60946
61376
  enumerable: false,
60947
61377
  configurable: true
60948
61378
  });
60949
- Object.defineProperty(DChartPlotAreaImpl.prototype, "series", {
61379
+ Object.defineProperty(DChartPlotAreaTwofoldCoorinateContainer.prototype, "plotArea", {
60950
61380
  get: function () {
60951
- return this._series;
61381
+ return this._plotArea;
61382
+ },
61383
+ enumerable: false,
61384
+ configurable: true
61385
+ });
61386
+ DChartPlotAreaTwofoldCoorinateContainer.prototype.fit = function (domainFrom, domainTo, rangeFrom, rangeTo) {
61387
+ this._x.fit(domainFrom, domainTo);
61388
+ this._y.fit(rangeFrom, rangeTo);
61389
+ return this;
61390
+ };
61391
+ DChartPlotAreaTwofoldCoorinateContainer.prototype.mark = function (domainFrom, domainTo, rangeFrom, rangeTo) {
61392
+ this._x.mark(domainFrom, domainTo);
61393
+ this._y.mark(rangeFrom, rangeTo);
61394
+ return this;
61395
+ };
61396
+ DChartPlotAreaTwofoldCoorinateContainer.prototype.blend = function (ratio) {
61397
+ this._x.blend(ratio);
61398
+ this._y.blend(ratio);
61399
+ return this;
61400
+ };
61401
+ return DChartPlotAreaTwofoldCoorinateContainer;
61402
+ }());
61403
+
61404
+ /*
61405
+ * Copyright (C) 2019 Toshiba Corporation
61406
+ * SPDX-License-Identifier: Apache-2.0
61407
+ */
61408
+ var DChartPlotAreaTwofoldOverflowMaskPrimary = /** @class */ (function (_super) {
61409
+ __extends(DChartPlotAreaTwofoldOverflowMaskPrimary, _super);
61410
+ function DChartPlotAreaTwofoldOverflowMaskPrimary() {
61411
+ return _super !== null && _super.apply(this, arguments) || this;
61412
+ }
61413
+ DChartPlotAreaTwofoldOverflowMaskPrimary.prototype.onReflow = function (base, width, height) {
61414
+ if (this._isInitialized && this._width === width && this._height === height) {
61415
+ return;
61416
+ }
61417
+ this._isInitialized = true;
61418
+ this._width = width;
61419
+ this._height = height;
61420
+ var hh = height * 0.5;
61421
+ this.clear();
61422
+ this.beginFill(0xffffff, 1);
61423
+ this.drawRect(0, 0, width, hh);
61424
+ this.endFill();
61425
+ };
61426
+ return DChartPlotAreaTwofoldOverflowMaskPrimary;
61427
+ }(DBaseOverflowMaskSimple));
61428
+
61429
+ /*
61430
+ * Copyright (C) 2019 Toshiba Corporation
61431
+ * SPDX-License-Identifier: Apache-2.0
61432
+ */
61433
+ var DChartPlotAreaTwofoldOverflowMaskSecondary = /** @class */ (function (_super) {
61434
+ __extends(DChartPlotAreaTwofoldOverflowMaskSecondary, _super);
61435
+ function DChartPlotAreaTwofoldOverflowMaskSecondary() {
61436
+ return _super !== null && _super.apply(this, arguments) || this;
61437
+ }
61438
+ DChartPlotAreaTwofoldOverflowMaskSecondary.prototype.onReflow = function (base, width, height) {
61439
+ if (this._isInitialized && this._width === width && this._height === height) {
61440
+ return;
61441
+ }
61442
+ this._isInitialized = true;
61443
+ this._width = width;
61444
+ this._height = height;
61445
+ var hh = height * 0.5;
61446
+ this.clear();
61447
+ this.beginFill(0xffffff, 1);
61448
+ this.drawRect(0, hh, width, hh);
61449
+ this.endFill();
61450
+ };
61451
+ return DChartPlotAreaTwofoldOverflowMaskSecondary;
61452
+ }(DBaseOverflowMaskSimple));
61453
+
61454
+ /*
61455
+ * Copyright (C) 2019 Toshiba Corporation
61456
+ * SPDX-License-Identifier: Apache-2.0
61457
+ */
61458
+ var DChartPlotAreaTwofoldSeriesContainer = /** @class */ (function () {
61459
+ function DChartPlotAreaTwofoldSeriesContainer(plotArea, primary, secondary) {
61460
+ this._plotArea = plotArea;
61461
+ this._primary = primary;
61462
+ this._secondary = secondary;
61463
+ this._domain = new DChartRegionImpl(NaN, NaN);
61464
+ this._range = new DChartRegionImpl(NaN, NaN);
61465
+ }
61466
+ DChartPlotAreaTwofoldSeriesContainer.prototype.newFill = function (index, options) {
61467
+ return this._secondary.newFill(index, options);
61468
+ };
61469
+ DChartPlotAreaTwofoldSeriesContainer.prototype.newStroke = function (index, options) {
61470
+ return this._secondary.newStroke(index, options);
61471
+ };
61472
+ DChartPlotAreaTwofoldSeriesContainer.prototype.newSize = function (index, options, x, y) {
61473
+ return this._secondary.newSize(index, options, x, y);
61474
+ };
61475
+ DChartPlotAreaTwofoldSeriesContainer.prototype.newOffset = function (index, options, x, y) {
61476
+ return this._secondary.newOffset(index, options, x, y);
61477
+ };
61478
+ DChartPlotAreaTwofoldSeriesContainer.prototype.newPadding = function (index, options) {
61479
+ return this._secondary.newPadding(index, options);
61480
+ };
61481
+ Object.defineProperty(DChartPlotAreaTwofoldSeriesContainer.prototype, "plotArea", {
61482
+ get: function () {
61483
+ return this._plotArea;
60952
61484
  },
60953
61485
  enumerable: false,
60954
61486
  configurable: true
60955
61487
  });
60956
- Object.defineProperty(DChartPlotAreaImpl.prototype, "container", {
61488
+ Object.defineProperty(DChartPlotAreaTwofoldSeriesContainer.prototype, "selection", {
61489
+ get: function () {
61490
+ return this._secondary.selection;
61491
+ },
61492
+ enumerable: false,
61493
+ configurable: true
61494
+ });
61495
+ DChartPlotAreaTwofoldSeriesContainer.prototype.update = function () {
61496
+ this._primary.update();
61497
+ this._secondary.update();
61498
+ var selection = this._secondary.selection;
61499
+ if (selection) {
61500
+ selection.update();
61501
+ }
61502
+ };
61503
+ DChartPlotAreaTwofoldSeriesContainer.prototype.onRender = function () {
61504
+ this._primary.onRender();
61505
+ this._secondary.onRender();
61506
+ var selection = this._secondary.selection;
61507
+ if (selection) {
61508
+ selection.onRender();
61509
+ }
61510
+ };
61511
+ DChartPlotAreaTwofoldSeriesContainer.prototype.add = function (series) {
61512
+ this._secondary.add(series);
61513
+ };
61514
+ DChartPlotAreaTwofoldSeriesContainer.prototype.get = function (index) {
61515
+ var primary = this._primary;
61516
+ var primarySize = primary.size();
61517
+ if (0 <= index && index < primarySize) {
61518
+ return primary.get(index);
61519
+ }
61520
+ var secondary = this._secondary;
61521
+ var secondarySize = secondary.size();
61522
+ if (primarySize <= index && index < primarySize + secondarySize) {
61523
+ return secondary.get(index - primarySize);
61524
+ }
61525
+ return null;
61526
+ };
61527
+ DChartPlotAreaTwofoldSeriesContainer.prototype.indexOf = function (series) {
61528
+ var primary = this._primary;
61529
+ var result = primary.indexOf(series);
61530
+ if (0 <= result) {
61531
+ return result;
61532
+ }
61533
+ result = this._secondary.indexOf(series);
61534
+ if (0 <= result) {
61535
+ return primary.size() + result;
61536
+ }
61537
+ return -1;
61538
+ };
61539
+ DChartPlotAreaTwofoldSeriesContainer.prototype.clear = function () {
61540
+ this._primary.clear();
61541
+ this._secondary.clear();
61542
+ return this;
61543
+ };
61544
+ DChartPlotAreaTwofoldSeriesContainer.prototype.size = function () {
61545
+ return this._primary.size() + this._secondary.size();
61546
+ };
61547
+ DChartPlotAreaTwofoldSeriesContainer.prototype.destroy = function () {
61548
+ this.clear();
61549
+ var selection = this._secondary.selection;
61550
+ if (selection) {
61551
+ selection.unbind();
61552
+ }
61553
+ };
61554
+ DChartPlotAreaTwofoldSeriesContainer.prototype.getDomain = function (coordinate, result) {
61555
+ this._primary.getDomain(coordinate, result);
61556
+ var from = result.from;
61557
+ var to = result.to;
61558
+ this._secondary.getDomain(coordinate, result);
61559
+ result.add(from, to);
61560
+ return result;
61561
+ };
61562
+ DChartPlotAreaTwofoldSeriesContainer.prototype.getRange = function (coordinate, result) {
61563
+ result.clear();
61564
+ this._primary.getRange(coordinate, result);
61565
+ var from = result.from;
61566
+ var to = result.to;
61567
+ this._secondary.getRange(coordinate, result);
61568
+ result.add(from, to);
61569
+ return result;
61570
+ };
61571
+ Object.defineProperty(DChartPlotAreaTwofoldSeriesContainer.prototype, "domain", {
61572
+ get: function () {
61573
+ var result = this._domain;
61574
+ result.clear();
61575
+ var pdomain = this._primary.domain;
61576
+ result.add(pdomain.from, pdomain.to);
61577
+ var sdomain = this._secondary.domain;
61578
+ result.add(sdomain.from, sdomain.to);
61579
+ return result;
61580
+ },
61581
+ enumerable: false,
61582
+ configurable: true
61583
+ });
61584
+ Object.defineProperty(DChartPlotAreaTwofoldSeriesContainer.prototype, "range", {
61585
+ get: function () {
61586
+ var result = this._domain;
61587
+ result.clear();
61588
+ var prange = this._primary.range;
61589
+ result.add(prange.from, prange.to);
61590
+ var srange = this._secondary.range;
61591
+ result.add(srange.from, srange.to);
61592
+ return result;
61593
+ },
61594
+ enumerable: false,
61595
+ configurable: true
61596
+ });
61597
+ DChartPlotAreaTwofoldSeriesContainer.prototype.hitTest = function (x, y) {
61598
+ var result = this._secondary.hitTest(x, y);
61599
+ if (result != null) {
61600
+ return result;
61601
+ }
61602
+ return this._primary.hitTest(x, y);
61603
+ };
61604
+ DChartPlotAreaTwofoldSeriesContainer.prototype.calcHitPoint = function (x, y, result) {
61605
+ var _a;
61606
+ var result1 = result;
61607
+ var result2 = ((_a = DChartPlotAreaTwofoldSeriesContainer.WORK_CALCHITPOINT) !== null && _a !== void 0 ? _a : (DChartPlotAreaTwofoldSeriesContainer.WORK_CALCHITPOINT = new DChartSeriesHitResult()));
61608
+ var series2 = this._secondary.calcHitPoint(x, y, result2);
61609
+ var series1 = this._primary.calcHitPoint(x, y, result1);
61610
+ if (series1 != null) {
61611
+ if (series2 != null) {
61612
+ if (result1.distance <= result2.distance) {
61613
+ return series1;
61614
+ }
61615
+ else {
61616
+ result1.copyFrom(result2);
61617
+ return series2;
61618
+ }
61619
+ }
61620
+ else {
61621
+ return series1;
61622
+ }
61623
+ }
61624
+ else {
61625
+ if (series2 != null) {
61626
+ result1.copyFrom(result2);
61627
+ return series2;
61628
+ }
61629
+ else {
61630
+ return null;
61631
+ }
61632
+ }
61633
+ };
61634
+ return DChartPlotAreaTwofoldSeriesContainer;
61635
+ }());
61636
+
61637
+ /*
61638
+ * Copyright (C) 2019 Toshiba Corporation
61639
+ * SPDX-License-Identifier: Apache-2.0
61640
+ */
61641
+ var DChartPlotAreaTwofoldSubBase = /** @class */ (function () {
61642
+ function DChartPlotAreaTwofoldSubBase(plotArea, onContainerChange, mask, margin, axisShapeContainer, options) {
61643
+ this._isContainerBoundsDirty = true;
61644
+ this._containerBounds = new pixi_js.Rectangle();
61645
+ this._workPoint = new pixi_js.Point();
61646
+ this._margin = margin;
61647
+ this._plotArea = plotArea;
61648
+ // Container
61649
+ var container = new DChartPlotAreaContainer(onContainerChange);
61650
+ this._container = container;
61651
+ // Coordinate
61652
+ this._coordinate = new DChartCoordinateContainerImpl(this, options === null || options === void 0 ? void 0 : options.coordinate);
61653
+ // Overflow mask
61654
+ if (mask) {
61655
+ container.mask = this.getOverflowMask();
61656
+ }
61657
+ // Series
61658
+ this._series = new DChartSeriesContainerImpl(this, options === null || options === void 0 ? void 0 : options.series);
61659
+ // Axis
61660
+ this._axis = new DChartAxisContainerImpl(this, axisShapeContainer, options === null || options === void 0 ? void 0 : options.axis);
61661
+ }
61662
+ Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "plotArea", {
61663
+ get: function () {
61664
+ return this._plotArea;
61665
+ },
61666
+ enumerable: false,
61667
+ configurable: true
61668
+ });
61669
+ Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "chart", {
61670
+ get: function () {
61671
+ return this._plotArea.chart;
61672
+ },
61673
+ enumerable: false,
61674
+ configurable: true
61675
+ });
61676
+ Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "container", {
60957
61677
  get: function () {
60958
61678
  return this._container;
60959
61679
  },
60960
61680
  enumerable: false,
60961
61681
  configurable: true
60962
61682
  });
60963
- Object.defineProperty(DChartPlotAreaImpl.prototype, "axis", {
61683
+ Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "series", {
60964
61684
  get: function () {
60965
- return this._axis;
61685
+ return this._series;
60966
61686
  },
60967
61687
  enumerable: false,
60968
61688
  configurable: true
60969
61689
  });
60970
- Object.defineProperty(DChartPlotAreaImpl.prototype, "view", {
61690
+ Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "coordinate", {
60971
61691
  get: function () {
60972
- return this._view;
61692
+ return this._coordinate;
60973
61693
  },
60974
61694
  enumerable: false,
60975
61695
  configurable: true
60976
61696
  });
60977
- DChartPlotAreaImpl.prototype.onWheel = function (e, deltas, global) {
60978
- var vresult = this._view.onWheel(e, deltas, global);
60979
- var sresult = _super.prototype.onWheel.call(this, e, deltas, global);
60980
- return vresult || sresult;
61697
+ Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "axis", {
61698
+ get: function () {
61699
+ return this._axis;
61700
+ },
61701
+ enumerable: false,
61702
+ configurable: true
61703
+ });
61704
+ // eslint-disable-next-line @typescript-eslint/ban-types
61705
+ DChartPlotAreaTwofoldSubBase.prototype.on = function (name, callback, context) {
61706
+ this._plotArea.on(name, callback, context);
61707
+ return this;
60981
61708
  };
60982
- DChartPlotAreaImpl.prototype.onDblClick = function (e, interactionManager) {
60983
- var vresult = this._view.onDblClick(e, interactionManager);
60984
- var sresult = _super.prototype.onDblClick.call(this, e, interactionManager);
60985
- return vresult || sresult;
61709
+ // eslint-disable-next-line @typescript-eslint/ban-types
61710
+ DChartPlotAreaTwofoldSubBase.prototype.off = function (name, callback, context) {
61711
+ this._plotArea.off(name, callback, context);
61712
+ return this;
60986
61713
  };
60987
- DChartPlotAreaImpl.prototype.onDown = function (e) {
60988
- this._view.onDown(e);
60989
- _super.prototype.onDown.call(this, e);
61714
+ DChartPlotAreaTwofoldSubBase.prototype.getPixelDomain = function (result) {
61715
+ var plotArea = this._plotArea;
61716
+ var padding = plotArea.padding;
61717
+ var width = plotArea.width;
61718
+ return result.set(padding.getLeft(), width - padding.getRight());
60990
61719
  };
60991
- DChartPlotAreaImpl.prototype.render = function (renderer) {
60992
- if (this._isViewDirty) {
60993
- this._isViewDirty = false;
60994
- this._coordinate.fit();
60995
- this._axis.onRender();
60996
- this._series.onRender();
60997
- }
60998
- _super.prototype.render.call(this, renderer);
61720
+ DChartPlotAreaTwofoldSubBase.prototype.getAxisBounds = function (position) {
61721
+ return this.getPixelBounds();
61722
+ };
61723
+ DChartPlotAreaTwofoldSubBase.prototype.getSelectionBoundsX = function () {
61724
+ return this.getPixelBounds();
61725
+ };
61726
+ DChartPlotAreaTwofoldSubBase.prototype.getSelectionBoundsY = function () {
61727
+ return this.getPixelBounds();
60999
61728
  };
61000
- DChartPlotAreaImpl.prototype.destroy = function () {
61729
+ DChartPlotAreaTwofoldSubBase.prototype.toBoundsDirty = function () {
61730
+ this._isContainerBoundsDirty = true;
61731
+ };
61732
+ DChartPlotAreaTwofoldSubBase.prototype.destroy = function () {
61001
61733
  this._container.destroy();
61002
61734
  this._series.destroy();
61003
61735
  this._axis.destroy();
61004
61736
  };
61005
- DChartPlotAreaImpl.prototype.getType = function () {
61006
- return "DChartPlotArea";
61737
+ return DChartPlotAreaTwofoldSubBase;
61738
+ }());
61739
+
61740
+ /*
61741
+ * Copyright (C) 2019 Toshiba Corporation
61742
+ * SPDX-License-Identifier: Apache-2.0
61743
+ */
61744
+ var DChartPlotAreaTwofoldSubPrimary = /** @class */ (function (_super) {
61745
+ __extends(DChartPlotAreaTwofoldSubPrimary, _super);
61746
+ function DChartPlotAreaTwofoldSubPrimary() {
61747
+ return _super !== null && _super.apply(this, arguments) || this;
61748
+ }
61749
+ DChartPlotAreaTwofoldSubPrimary.prototype.getOverflowMask = function () {
61750
+ if (this._overflowMask == null) {
61751
+ var plotArea = this._plotArea;
61752
+ this._overflowMask = new DChartPlotAreaTwofoldOverflowMaskPrimary(plotArea);
61753
+ plotArea.reflowable.add(this._overflowMask);
61754
+ plotArea.toDirty();
61755
+ }
61756
+ return this._overflowMask;
61007
61757
  };
61008
- DChartPlotAreaImpl.prototype.getBoundsInContainer = function () {
61009
- var result = this._boundsInContainer;
61010
- if (this._isBoundsInContainerDirty) {
61011
- this._isBoundsInContainerDirty = false;
61012
- var container = this.container;
61013
- container.updateTransform();
61014
- var transform = container.transform.localTransform;
61015
- var work = this._workPoint;
61016
- work.set(0, 0);
61017
- transform.applyInverse(work, work);
61018
- result.x = work.x;
61019
- result.y = work.y;
61020
- work.set(this.width, this.height);
61021
- transform.applyInverse(work, work);
61022
- result.width = work.x - result.x;
61023
- result.height = work.y - result.y;
61758
+ DChartPlotAreaTwofoldSubPrimary.prototype.getPixelRange = function (result) {
61759
+ var plotArea = this._plotArea;
61760
+ var padding = plotArea.padding;
61761
+ var paddingTop = padding.getTop();
61762
+ var height = plotArea.height;
61763
+ return result.set((height - this._margin) * 0.5, paddingTop);
61764
+ };
61765
+ DChartPlotAreaTwofoldSubPrimary.prototype.getPixelBounds = function () {
61766
+ var result = this._plotArea.getPixelBounds();
61767
+ result.height *= 0.5;
61768
+ return result;
61769
+ };
61770
+ DChartPlotAreaTwofoldSubPrimary.prototype.getContainerBounds = function () {
61771
+ var result = this._containerBounds;
61772
+ if (this._isContainerBoundsDirty) {
61773
+ this._isContainerBoundsDirty = false;
61774
+ var bounds = this._plotArea.getContainerBounds();
61775
+ result.width = bounds.width;
61776
+ result.height = bounds.height * 0.5;
61777
+ result.x = bounds.x;
61778
+ result.y = bounds.y;
61024
61779
  }
61025
61780
  return result;
61026
61781
  };
61027
- DChartPlotAreaImpl.prototype.fit = function (duration, domainFrom, domainTo, rangeFrom, rangeTo) {
61028
- var coordinate = this._coordinate;
61029
- var axis = this._axis;
61030
- var series = this._series;
61782
+ return DChartPlotAreaTwofoldSubPrimary;
61783
+ }(DChartPlotAreaTwofoldSubBase));
61784
+
61785
+ /*
61786
+ * Copyright (C) 2019 Toshiba Corporation
61787
+ * SPDX-License-Identifier: Apache-2.0
61788
+ */
61789
+ var DChartPlotAreaTwofoldSubSecondary = /** @class */ (function (_super) {
61790
+ __extends(DChartPlotAreaTwofoldSubSecondary, _super);
61791
+ function DChartPlotAreaTwofoldSubSecondary() {
61792
+ return _super !== null && _super.apply(this, arguments) || this;
61793
+ }
61794
+ DChartPlotAreaTwofoldSubSecondary.prototype.getOverflowMask = function () {
61795
+ if (this._overflowMask == null) {
61796
+ var plotArea = this._plotArea;
61797
+ this._overflowMask = new DChartPlotAreaTwofoldOverflowMaskSecondary(plotArea);
61798
+ plotArea.reflowable.add(this._overflowMask);
61799
+ plotArea.toDirty();
61800
+ }
61801
+ return this._overflowMask;
61802
+ };
61803
+ DChartPlotAreaTwofoldSubSecondary.prototype.getPixelRange = function (result) {
61804
+ var plotArea = this._plotArea;
61805
+ var padding = plotArea.padding;
61806
+ var paddingBottom = padding.getBottom();
61807
+ var height = plotArea.height;
61808
+ return result.set(height - paddingBottom, (height + this._margin) * 0.5);
61809
+ };
61810
+ DChartPlotAreaTwofoldSubSecondary.prototype.getPixelBounds = function () {
61811
+ var result = this._plotArea.getPixelBounds();
61812
+ result.height *= 0.5;
61813
+ result.y = result.height;
61814
+ return result;
61815
+ };
61816
+ DChartPlotAreaTwofoldSubSecondary.prototype.getContainerBounds = function () {
61817
+ var result = this._containerBounds;
61818
+ if (this._isContainerBoundsDirty) {
61819
+ this._isContainerBoundsDirty = false;
61820
+ var bounds = this._plotArea.getContainerBounds();
61821
+ result.width = bounds.width;
61822
+ result.height = bounds.height * 0.5;
61823
+ result.x = bounds.x;
61824
+ result.y = bounds.y + result.height;
61825
+ }
61826
+ return result;
61827
+ };
61828
+ return DChartPlotAreaTwofoldSubSecondary;
61829
+ }(DChartPlotAreaTwofoldSubBase));
61830
+
61831
+ var DChartPlotAreaTwofoldViewTargetPoint = /** @class */ (function () {
61832
+ function DChartPlotAreaTwofoldViewTargetPoint(primary, secondary) {
61833
+ this._primary = primary;
61834
+ this._secondary = secondary;
61835
+ }
61836
+ Object.defineProperty(DChartPlotAreaTwofoldViewTargetPoint.prototype, "x", {
61837
+ get: function () {
61838
+ return this._secondary.x;
61839
+ },
61840
+ set: function (x) {
61841
+ this._primary.x = x;
61842
+ this._secondary.x = x;
61843
+ },
61844
+ enumerable: false,
61845
+ configurable: true
61846
+ });
61847
+ Object.defineProperty(DChartPlotAreaTwofoldViewTargetPoint.prototype, "y", {
61848
+ get: function () {
61849
+ return this._secondary.y;
61850
+ },
61851
+ set: function (y) {
61852
+ this._primary.y = y;
61853
+ this._secondary.y = y;
61854
+ },
61855
+ enumerable: false,
61856
+ configurable: true
61857
+ });
61858
+ DChartPlotAreaTwofoldViewTargetPoint.prototype.set = function (x, y) {
61859
+ this._primary.set(x, y);
61860
+ this._secondary.set(x, y);
61861
+ return this;
61862
+ };
61863
+ return DChartPlotAreaTwofoldViewTargetPoint;
61864
+ }());
61865
+ var DChartPlotAreaTwofoldViewTarget = /** @class */ (function () {
61866
+ function DChartPlotAreaTwofoldViewTarget(primary, secondary) {
61867
+ this._primary = primary;
61868
+ this._secondary = secondary;
61869
+ this._scale = new DChartPlotAreaTwofoldViewTargetPoint(primary.scale, secondary.scale);
61870
+ this._position = new DChartPlotAreaTwofoldViewTargetPoint(primary.position, secondary.position);
61871
+ }
61872
+ Object.defineProperty(DChartPlotAreaTwofoldViewTarget.prototype, "scale", {
61873
+ get: function () {
61874
+ return this._scale;
61875
+ },
61876
+ enumerable: false,
61877
+ configurable: true
61878
+ });
61879
+ Object.defineProperty(DChartPlotAreaTwofoldViewTarget.prototype, "position", {
61880
+ get: function () {
61881
+ return this._position;
61882
+ },
61883
+ enumerable: false,
61884
+ configurable: true
61885
+ });
61886
+ DChartPlotAreaTwofoldViewTarget.prototype.getLocalBounds = function (rect) {
61887
+ this._primary.getLocalBounds(rect);
61888
+ var x1 = rect.x;
61889
+ var y1 = rect.y;
61890
+ var w1 = rect.width;
61891
+ var h1 = rect.height;
61892
+ this._secondary.getLocalBounds(rect);
61893
+ var x2 = rect.x;
61894
+ var y2 = rect.y;
61895
+ var w2 = rect.width;
61896
+ var h2 = rect.height;
61897
+ var x3 = Math.min(x1, x2);
61898
+ var y3 = Math.min(y1, y2);
61899
+ var x4 = Math.max(x1 + w1, x2 + w2);
61900
+ var y4 = Math.max(y1 + h1, y2 + h2);
61901
+ rect.x = x3;
61902
+ rect.y = y3;
61903
+ rect.width = x4 - x3;
61904
+ rect.height = y4 - y3;
61905
+ return rect;
61906
+ };
61907
+ return DChartPlotAreaTwofoldViewTarget;
61908
+ }());
61909
+
61910
+ /*
61911
+ * Copyright (C) 2019 Toshiba Corporation
61912
+ * SPDX-License-Identifier: Apache-2.0
61913
+ */
61914
+ var DChartPlotAreaTwofold = /** @class */ (function (_super) {
61915
+ __extends(DChartPlotAreaTwofold, _super);
61916
+ function DChartPlotAreaTwofold(chart, options) {
61917
+ var _a, _b, _c, _d, _e, _f, _g;
61918
+ var _this = _super.call(this, chart, options) || this;
61919
+ // Margin
61920
+ var theme = _this.theme;
61921
+ var margin = (_a = options === null || options === void 0 ? void 0 : options.margin) !== null && _a !== void 0 ? _a : theme.getMargin();
61922
+ _this._margin = margin;
61923
+ // Primary
61924
+ var axisShapeContainer = new EShapeContainer();
61925
+ var onContainerChangeBound = function () {
61926
+ _this.onContainerChange();
61927
+ };
61928
+ var mask = (_b = options === null || options === void 0 ? void 0 : options.mask) !== null && _b !== void 0 ? _b : theme.isOverflowMaskEnabled();
61929
+ var primaryOptions = options === null || options === void 0 ? void 0 : options.primary;
61930
+ var primary = new DChartPlotAreaTwofoldSubPrimary(_this, onContainerChangeBound, mask, margin, axisShapeContainer, primaryOptions);
61931
+ _this._primary = primary;
61932
+ // Secondary
61933
+ var secondaryOptions = options === null || options === void 0 ? void 0 : options.secondary;
61934
+ var secondary = new DChartPlotAreaTwofoldSubSecondary(_this, onContainerChangeBound, mask, margin, axisShapeContainer, secondaryOptions);
61935
+ _this._secondary = secondary;
61936
+ // Container
61937
+ _this.addChild(primary.container);
61938
+ _this.addChild(secondary.container);
61939
+ // Coordinate
61940
+ _this._coordinate = new DChartPlotAreaTwofoldCoorinateContainer(_this, primary.coordinate, secondary.coordinate);
61941
+ // Series
61942
+ var primarySeries = primary.series;
61943
+ var secondarySeries = secondary.series;
61944
+ var series = new DChartPlotAreaTwofoldSeriesContainer(_this, primarySeries, secondarySeries);
61945
+ _this._series = series;
61946
+ // Axis
61947
+ var primaryAxis = primary.axis;
61948
+ var secondaryAxis = secondary.axis;
61949
+ _this.addChild(axisShapeContainer);
61950
+ var axis = new DChartPlotAreaTwofoldAxisContainer(_this, axisShapeContainer, primaryAxis, secondaryAxis);
61951
+ _this._axis = axis;
61952
+ // Add Series
61953
+ _this.addSeries(primarySeries, (_c = primaryOptions === null || primaryOptions === void 0 ? void 0 : primaryOptions.series) === null || _c === void 0 ? void 0 : _c.list);
61954
+ _this.addSeries(secondarySeries, (_d = secondaryOptions === null || secondaryOptions === void 0 ? void 0 : secondaryOptions.series) === null || _d === void 0 ? void 0 : _d.list);
61955
+ // Add Axes
61956
+ _this.addAxes(primaryAxis, (_e = primaryOptions === null || primaryOptions === void 0 ? void 0 : primaryOptions.axis) === null || _e === void 0 ? void 0 : _e.list);
61957
+ _this.addAxes(secondaryAxis, (_f = secondaryOptions === null || secondaryOptions === void 0 ? void 0 : secondaryOptions.axis) === null || _f === void 0 ? void 0 : _f.list);
61958
+ _this.addAxes(axis, (_g = options === null || options === void 0 ? void 0 : options.axis) === null || _g === void 0 ? void 0 : _g.list);
61959
+ // Selection
61960
+ var selection = options === null || options === void 0 ? void 0 : options.selection;
61961
+ if (selection != null) {
61962
+ primarySeries.selection = selection;
61963
+ secondarySeries.selection = selection;
61964
+ selection.bind(series);
61965
+ }
61966
+ return _this;
61967
+ }
61968
+ DChartPlotAreaTwofold.prototype.addSeries = function (series, list) {
61969
+ if (list != null) {
61970
+ var listLength = list.length;
61971
+ if (0 < listLength) {
61972
+ for (var i = 0; i < listLength; ++i) {
61973
+ series.add(list[i]);
61974
+ }
61975
+ series.update();
61976
+ }
61977
+ }
61978
+ };
61979
+ DChartPlotAreaTwofold.prototype.addAxes = function (axis, list) {
61980
+ if (list != null) {
61981
+ for (var i = 0, imax = list.length; i < imax; ++i) {
61982
+ axis.add(list[i]);
61983
+ }
61984
+ }
61985
+ };
61986
+ Object.defineProperty(DChartPlotAreaTwofold.prototype, "primary", {
61987
+ get: function () {
61988
+ return this._primary;
61989
+ },
61990
+ enumerable: false,
61991
+ configurable: true
61992
+ });
61993
+ Object.defineProperty(DChartPlotAreaTwofold.prototype, "secondary", {
61994
+ get: function () {
61995
+ return this._secondary;
61996
+ },
61997
+ enumerable: false,
61998
+ configurable: true
61999
+ });
62000
+ Object.defineProperty(DChartPlotAreaTwofold.prototype, "container", {
62001
+ get: function () {
62002
+ return this.secondary.container;
62003
+ },
62004
+ enumerable: false,
62005
+ configurable: true
62006
+ });
62007
+ DChartPlotAreaTwofold.prototype.onContainerChange = function () {
62008
+ this._isViewDirty = true;
62009
+ this._isContainerBoundsDirty = true;
62010
+ this._primary.toBoundsDirty();
62011
+ this._secondary.toBoundsDirty();
62012
+ DApplications.update(this);
62013
+ };
62014
+ Object.defineProperty(DChartPlotAreaTwofold.prototype, "coordinate", {
62015
+ get: function () {
62016
+ return this._coordinate;
62017
+ },
62018
+ enumerable: false,
62019
+ configurable: true
62020
+ });
62021
+ Object.defineProperty(DChartPlotAreaTwofold.prototype, "series", {
62022
+ get: function () {
62023
+ return this._series;
62024
+ },
62025
+ enumerable: false,
62026
+ configurable: true
62027
+ });
62028
+ Object.defineProperty(DChartPlotAreaTwofold.prototype, "axis", {
62029
+ get: function () {
62030
+ return this._axis;
62031
+ },
62032
+ enumerable: false,
62033
+ configurable: true
62034
+ });
62035
+ DChartPlotAreaTwofold.prototype.newView = function (options) {
62036
+ var _this = this;
62037
+ var viewTarget;
62038
+ var toViewTarget = function () {
62039
+ return (viewTarget !== null && viewTarget !== void 0 ? viewTarget : (viewTarget = new DChartPlotAreaTwofoldViewTarget(_this._primary.container, _this._secondary.container)));
62040
+ };
62041
+ return new DViewImpl(this, toViewTarget, options === null || options === void 0 ? void 0 : options.view);
62042
+ };
62043
+ DChartPlotAreaTwofold.prototype.onViewDirty = function () {
62044
+ this._coordinate.fit();
62045
+ this._axis.onRender();
62046
+ this._series.onRender();
62047
+ };
62048
+ DChartPlotAreaTwofold.prototype.fit = function (duration, domainFrom, domainTo, rangeFrom, rangeTo) {
61031
62049
  if (duration != null && duration <= 0) {
61032
- coordinate.fit(domainFrom, domainTo, rangeFrom, rangeTo);
61033
- axis.update();
61034
- series.update();
62050
+ var primary = this.primary;
62051
+ primary.coordinate.fit(domainFrom, domainTo, rangeFrom, rangeTo);
62052
+ primary.axis.update();
62053
+ primary.series.update();
62054
+ var secondary = this.secondary;
62055
+ secondary.coordinate.fit(domainFrom, domainTo, rangeFrom, rangeTo);
62056
+ secondary.axis.update();
62057
+ secondary.series.update();
61035
62058
  }
61036
62059
  else {
61037
62060
  this._blendDuration = duration != null ? duration : 200;
61038
62061
  this._blendStartTime = Date.now();
61039
- coordinate.mark(domainFrom, domainTo, rangeFrom, rangeTo);
62062
+ this.primary.coordinate.mark(domainFrom, domainTo, rangeFrom, rangeTo);
62063
+ this.secondary.coordinate.mark(domainFrom, domainTo, rangeFrom, rangeTo);
61040
62064
  var blendTimeout = this._blendTimeout;
61041
62065
  if (blendTimeout != null) {
61042
62066
  window.clearTimeout(blendTimeout);
@@ -61045,7 +62069,7 @@
61045
62069
  }
61046
62070
  return this;
61047
62071
  };
61048
- DChartPlotAreaImpl.prototype.onBlend = function () {
62072
+ DChartPlotAreaTwofold.prototype.onBlend = function () {
61049
62073
  var now = Date.now();
61050
62074
  var ratio = (now - this._blendStartTime) / this._blendDuration;
61051
62075
  if (ratio < 1) {
@@ -61055,12 +62079,24 @@
61055
62079
  this._blendTimeout = null;
61056
62080
  ratio = 1;
61057
62081
  }
61058
- this._coordinate.blend(DAnimationTimings.ELASTIC(ratio));
61059
- this._axis.update();
61060
- this._series.update();
62082
+ var t = DAnimationTimings.ELASTIC(ratio);
62083
+ var primary = this.primary;
62084
+ primary.coordinate.blend(t);
62085
+ primary.axis.update();
62086
+ primary.series.update();
62087
+ var secondary = this.secondary;
62088
+ secondary.coordinate.blend(t);
62089
+ secondary.axis.update();
62090
+ secondary.series.update();
62091
+ };
62092
+ DChartPlotAreaTwofold.prototype.destroy = function () {
62093
+ var _a, _b;
62094
+ (_a = this._primary) === null || _a === void 0 ? void 0 : _a.destroy();
62095
+ (_b = this._secondary) === null || _b === void 0 ? void 0 : _b.destroy();
62096
+ this._axis.destroy();
61061
62097
  };
61062
- return DChartPlotAreaImpl;
61063
- }(DBase));
62098
+ return DChartPlotAreaTwofold;
62099
+ }(DChartPlotAreaBase));
61064
62100
 
61065
62101
  /*
61066
62102
  * Copyright (C) 2019 Toshiba Corporation
@@ -61274,18 +62310,14 @@
61274
62310
  var shape = this._shape;
61275
62311
  if (shape) {
61276
62312
  var mappedX = mappedPosition.x;
61277
- var height = container.plotArea.height;
61278
- shape.transform.position.set(mappedX, height * 0.5);
61279
- shape.size.set(0, height);
61280
- shape.visible = this.isVisible(container, position, mappedPosition);
62313
+ var bounds = container.plotArea.getSelectionBoundsX();
62314
+ shape.transform.position.set(mappedX, bounds.y + bounds.height * 0.5);
62315
+ shape.size.set(0, bounds.height);
62316
+ shape.visible = bounds.x <= mappedX && mappedX <= bounds.x + bounds.width;
61281
62317
  return true;
61282
62318
  }
61283
62319
  return false;
61284
62320
  };
61285
- DChartSelectionGridlineX.prototype.isVisible = function (container, position, mappedPosition) {
61286
- var x = mappedPosition.x;
61287
- return 0 <= x && x <= container.plotArea.width;
61288
- };
61289
62321
  DChartSelectionGridlineX.prototype.getType = function () {
61290
62322
  return "DChartSelectionGridlineX";
61291
62323
  };
@@ -61305,18 +62337,14 @@
61305
62337
  var shape = this._shape;
61306
62338
  if (shape) {
61307
62339
  var mappedY = mappedPosition.y;
61308
- var width = container.plotArea.width;
61309
- shape.transform.position.set(width * 0.5, mappedY);
61310
- shape.size.set(width, 0);
61311
- shape.visible = this.isVisible(container, position, mappedPosition);
62340
+ var bounds = container.plotArea.getSelectionBoundsY();
62341
+ shape.transform.position.set(bounds.x + bounds.width * 0.5, mappedY);
62342
+ shape.size.set(bounds.width, 0);
62343
+ shape.visible = bounds.y <= mappedY && mappedY <= bounds.y + bounds.height;
61312
62344
  return true;
61313
62345
  }
61314
62346
  return false;
61315
62347
  };
61316
- DChartSelectionGridlineY.prototype.isVisible = function (container, position, mappedPosition) {
61317
- var y = mappedPosition.y;
61318
- return 0 <= y && y <= container.plotArea.height;
61319
- };
61320
62348
  DChartSelectionGridlineY.prototype.getType = function () {
61321
62349
  return "DChartSelectionGridlineY";
61322
62350
  };
@@ -61344,8 +62372,11 @@
61344
62372
  DChartSelectionMarker.prototype.isVisible = function (container, position, mappedPosition) {
61345
62373
  var x = mappedPosition.x;
61346
62374
  var y = mappedPosition.y;
61347
- var plotArea = container.plotArea;
61348
- return 0 <= x && x <= plotArea.width && 0 <= y && y <= plotArea.height;
62375
+ var bounds = container.plotArea.getPixelBounds();
62376
+ return (bounds.x <= x &&
62377
+ x <= bounds.x + bounds.width &&
62378
+ bounds.y <= y &&
62379
+ y <= bounds.y + bounds.height);
61349
62380
  };
61350
62381
  DChartSelectionMarker.prototype.getType = function () {
61351
62382
  return "DChartSelectionMarker";
@@ -62971,7 +64002,7 @@
62971
64002
  var p1x = NaN;
62972
64003
  var p1y = NaN;
62973
64004
  var threshold = 0.00001;
62974
- var bounds = container.plotArea.getBoundsInContainer();
64005
+ var bounds = container.plotArea.getContainerBounds();
62975
64006
  if (babs <= aabs) {
62976
64007
  var xfrom = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x));
62977
64008
  var xto = xcoordinate.unmap(xcoordinate.transform.unmap(bounds.x + bounds.width));
@@ -63136,10 +64167,8 @@
63136
64167
  DChart.prototype.init = function (options) {
63137
64168
  var _a;
63138
64169
  _super.prototype.init.call(this, options);
63139
- // Plot area
63140
- var plotArea = this.plotArea;
63141
- this.addChild(plotArea);
63142
64170
  // Overflow mask
64171
+ var plotArea = this.plotArea;
63143
64172
  var mask = (_a = options === null || options === void 0 ? void 0 : options.mask) !== null && _a !== void 0 ? _a : this.theme.isOverflowMaskEnabled();
63144
64173
  if (mask) {
63145
64174
  plotArea.axis.container.mask = this.getOverflowMask();
@@ -63155,22 +64184,25 @@
63155
64184
  };
63156
64185
  Object.defineProperty(DChart.prototype, "plotArea", {
63157
64186
  get: function () {
63158
- var result = this._plotArea;
63159
- if (result == null) {
63160
- result = this.newPlotArea();
63161
- this._plotArea = result;
63162
- }
63163
- return result;
64187
+ var _a;
64188
+ return ((_a = this._plotArea) !== null && _a !== void 0 ? _a : (this._plotArea = this.newPlotArea()));
63164
64189
  },
63165
64190
  enumerable: false,
63166
64191
  configurable: true
63167
64192
  });
63168
64193
  DChart.prototype.newPlotArea = function () {
63169
64194
  var _a;
63170
- return new DChartPlotAreaImpl(this, (_a = this._options) === null || _a === void 0 ? void 0 : _a.plotArea);
63171
- };
63172
- DChart.prototype.getType = function () {
63173
- return "DChart";
64195
+ var plotArea = (_a = this._options) === null || _a === void 0 ? void 0 : _a.plotArea;
64196
+ if (plotArea != null && ("primary" in plotArea || "secondary" in plotArea)) {
64197
+ var result = new DChartPlotAreaTwofold(this, plotArea);
64198
+ this.addChild(result);
64199
+ return result;
64200
+ }
64201
+ else {
64202
+ var result = new DChartPlotAreaOnefold(this, plotArea);
64203
+ this.addChild(result);
64204
+ return result;
64205
+ }
63174
64206
  };
63175
64207
  DChart.prototype.destroy = function () {
63176
64208
  var _a;
@@ -63179,6 +64211,9 @@
63179
64211
  _super.prototype.destroy.call(this);
63180
64212
  }
63181
64213
  };
64214
+ DChart.prototype.getType = function () {
64215
+ return "DChart";
64216
+ };
63182
64217
  return DChart;
63183
64218
  }(DBase));
63184
64219
 
@@ -79243,8 +80278,21 @@
79243
80278
  DChartLegendItem: DChartLegendItem,
79244
80279
  DChartLegend: DChartLegend,
79245
80280
  DChartOverview: DChartOverview,
80281
+ DChartPlotAreaBase: DChartPlotAreaBase,
79246
80282
  DChartPlotAreaContainer: DChartPlotAreaContainer,
79247
- DChartPlotAreaImpl: DChartPlotAreaImpl,
80283
+ DChartPlotAreaOnefold: DChartPlotAreaOnefold,
80284
+ DChartPlotAreaTwofoldAxisContainer: DChartPlotAreaTwofoldAxisContainer,
80285
+ DChartPlotAreaTwofoldCoorinateContainerSub: DChartPlotAreaTwofoldCoorinateContainerSub,
80286
+ DChartPlotAreaTwofoldCoorinateContainer: DChartPlotAreaTwofoldCoorinateContainer,
80287
+ DChartPlotAreaTwofoldOverflowMaskPrimary: DChartPlotAreaTwofoldOverflowMaskPrimary,
80288
+ DChartPlotAreaTwofoldOverflowMaskSecondary: DChartPlotAreaTwofoldOverflowMaskSecondary,
80289
+ DChartPlotAreaTwofoldSeriesContainer: DChartPlotAreaTwofoldSeriesContainer,
80290
+ DChartPlotAreaTwofoldSubBase: DChartPlotAreaTwofoldSubBase,
80291
+ DChartPlotAreaTwofoldSubPrimary: DChartPlotAreaTwofoldSubPrimary,
80292
+ DChartPlotAreaTwofoldSubSecondary: DChartPlotAreaTwofoldSubSecondary,
80293
+ DChartPlotAreaTwofoldViewTargetPoint: DChartPlotAreaTwofoldViewTargetPoint,
80294
+ DChartPlotAreaTwofoldViewTarget: DChartPlotAreaTwofoldViewTarget,
80295
+ DChartPlotAreaTwofold: DChartPlotAreaTwofold,
79248
80296
  DChartRegionImplObservable: DChartRegionImplObservable,
79249
80297
  DChartRegionImpl: DChartRegionImpl,
79250
80298
  DChartSelectionContainerImpl: DChartSelectionContainerImpl,