@wcardinal/wcardinal-ui 0.239.0 → 0.241.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.
- package/dist/types/wcardinal/ui/d-button-base.d.ts +5 -2
- package/dist/types/wcardinal/ui/d-chart-axis-base-options-parser.d.ts +1 -0
- package/dist/types/wcardinal/ui/d-chart-axis-base-options.d.ts +2 -0
- package/dist/types/wcardinal/ui/d-chart-axis-base.d.ts +7 -6
- package/dist/types/wcardinal/ui/d-chart-axis-container-impl.d.ts +1 -0
- package/dist/types/wcardinal/ui/d-chart-axis-container.d.ts +1 -0
- package/dist/types/wcardinal/ui/d-chart-axis.d.ts +1 -0
- package/dist/types/wcardinal/ui/d-chart-coordinate-linear-tick.d.ts +3 -4
- package/dist/types/wcardinal/ui/d-chart-coordinate-linear.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-coordinate-log-tick.d.ts +3 -4
- package/dist/types/wcardinal/ui/d-chart-coordinate-log.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-coordinate-tick.d.ts +2 -2
- package/dist/types/wcardinal/ui/d-chart-coordinate.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-gridline-container-impl.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-gridline-container.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-gridline-x.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-gridline-y.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-marker.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-shape-base.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-shape.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-simple.d.ts +1 -0
- package/dist/types/wcardinal/ui/d-chart-selection-sub-impl.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection-sub.d.ts +1 -1
- package/dist/types/wcardinal/ui/d-chart-selection.d.ts +1 -0
- package/dist/types/wcardinal/ui/theme/dark/d-theme-dark-chart-axis-base.d.ts +1 -0
- package/dist/types/wcardinal/ui/theme/dark/d-theme-dark-chart-axis-x-datetime.d.ts +2 -0
- package/dist/types/wcardinal/ui/theme/dark/d-theme-dark-chart-coordinate-tick.d.ts +1 -1
- package/dist/types/wcardinal/ui/theme/white/d-theme-white-chart-axis-base.d.ts +1 -0
- package/dist/types/wcardinal/ui/theme/white/d-theme-white-chart-axis-x-datetime.d.ts +2 -0
- package/dist/types/wcardinal/ui/theme/white/d-theme-white-chart-coordinate-tick.d.ts +1 -1
- package/dist/wcardinal/ui/d-button-base.js +25 -7
- package/dist/wcardinal/ui/d-button-base.js.map +1 -1
- package/dist/wcardinal/ui/d-button-group.js +7 -1
- package/dist/wcardinal/ui/d-button-group.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-axis-base-options-parser.js +7 -4
- package/dist/wcardinal/ui/d-chart-axis-base-options-parser.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-axis-base-options.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-axis-base.js +34 -24
- package/dist/wcardinal/ui/d-chart-axis-base.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-axis-container-impl.js +7 -0
- package/dist/wcardinal/ui/d-chart-axis-container-impl.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-axis-container.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-axis.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-coordinate-linear-tick.js +5 -11
- package/dist/wcardinal/ui/d-chart-coordinate-linear-tick.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-coordinate-linear.js +2 -2
- package/dist/wcardinal/ui/d-chart-coordinate-linear.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-coordinate-log-tick.js +4 -10
- package/dist/wcardinal/ui/d-chart-coordinate-log-tick.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-coordinate-log.js +2 -2
- package/dist/wcardinal/ui/d-chart-coordinate-log.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-coordinate-tick.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-coordinate.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-plot-area-impl.js +2 -2
- package/dist/wcardinal/ui/d-chart-plot-area-impl.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-gridline-container-impl.js +3 -2
- package/dist/wcardinal/ui/d-chart-selection-gridline-container-impl.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-gridline-container.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-gridline-x.js +2 -0
- package/dist/wcardinal/ui/d-chart-selection-gridline-x.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-gridline-y.js +2 -0
- package/dist/wcardinal/ui/d-chart-selection-gridline-y.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-marker.js +2 -0
- package/dist/wcardinal/ui/d-chart-selection-marker.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-shape-base.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-shape.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-simple.js +11 -0
- package/dist/wcardinal/ui/d-chart-selection-simple.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-sub-impl.js +4 -2
- package/dist/wcardinal/ui/d-chart-selection-sub-impl.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection-sub.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-selection.js.map +1 -1
- package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-axis-base.js +4 -1
- package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-axis-base.js.map +1 -1
- package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-axis-x-datetime.js +149 -1
- package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-axis-x-datetime.js.map +1 -1
- package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-coordinate-tick.js +12 -8
- package/dist/wcardinal/ui/theme/dark/d-theme-dark-chart-coordinate-tick.js.map +1 -1
- package/dist/wcardinal/ui/theme/white/d-theme-white-chart-axis-base.js +4 -1
- package/dist/wcardinal/ui/theme/white/d-theme-white-chart-axis-base.js.map +1 -1
- package/dist/wcardinal/ui/theme/white/d-theme-white-chart-axis-x-datetime.js +149 -1
- package/dist/wcardinal/ui/theme/white/d-theme-white-chart-axis-x-datetime.js.map +1 -1
- package/dist/wcardinal/ui/theme/white/d-theme-white-chart-coordinate-tick.js +12 -8
- package/dist/wcardinal/ui/theme/white/d-theme-white-chart-coordinate-tick.js.map +1 -1
- package/dist/wcardinal-ui-theme-dark.js +166 -11
- package/dist/wcardinal-ui-theme-dark.min.js +2 -2
- package/dist/wcardinal-ui-theme-dark.min.js.map +1 -1
- package/dist/wcardinal-ui-theme-white.js +166 -11
- package/dist/wcardinal-ui-theme-white.min.js +2 -2
- package/dist/wcardinal-ui-theme-white.min.js.map +1 -1
- package/dist/wcardinal-ui.cjs.js +449 -88
- package/dist/wcardinal-ui.js +119 -68
- package/dist/wcardinal-ui.min.js +2 -2
- package/dist/wcardinal-ui.min.js.map +1 -1
- package/package.json +1 -1
package/dist/wcardinal-ui.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
Winter Cardinal UI v0.
|
|
2
|
+
Winter Cardinal UI v0.241.0
|
|
3
3
|
Copyright (C) 2019 Toshiba Corporation
|
|
4
4
|
SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
|
|
@@ -28007,7 +28007,17 @@
|
|
|
28007
28007
|
};
|
|
28008
28008
|
Object.defineProperty(DButtonBase.prototype, "isToggle", {
|
|
28009
28009
|
get: function () {
|
|
28010
|
-
return this._isToggle;
|
|
28010
|
+
return !!this._isToggle;
|
|
28011
|
+
},
|
|
28012
|
+
enumerable: false,
|
|
28013
|
+
configurable: true
|
|
28014
|
+
});
|
|
28015
|
+
Object.defineProperty(DButtonBase.prototype, "isGrouped", {
|
|
28016
|
+
get: function () {
|
|
28017
|
+
return !!this._isGrouped;
|
|
28018
|
+
},
|
|
28019
|
+
set: function (isGrouped) {
|
|
28020
|
+
this._isGrouped = isGrouped;
|
|
28011
28021
|
},
|
|
28012
28022
|
enumerable: false,
|
|
28013
28023
|
configurable: true
|
|
@@ -28050,9 +28060,17 @@
|
|
|
28050
28060
|
return _super.prototype.onDblClick.call(this, e, interactionManager);
|
|
28051
28061
|
};
|
|
28052
28062
|
DButtonBase.prototype.activate = function (e) {
|
|
28053
|
-
if (this.
|
|
28054
|
-
this.
|
|
28055
|
-
|
|
28063
|
+
if (this._isToggle) {
|
|
28064
|
+
if (this._isGrouped) {
|
|
28065
|
+
if (!this.state.isActive) {
|
|
28066
|
+
this.onToggleStart(e);
|
|
28067
|
+
this.onToggleEnd(e);
|
|
28068
|
+
}
|
|
28069
|
+
}
|
|
28070
|
+
else {
|
|
28071
|
+
this.onToggleStart(e);
|
|
28072
|
+
this.onToggleEnd(e);
|
|
28073
|
+
}
|
|
28056
28074
|
}
|
|
28057
28075
|
else {
|
|
28058
28076
|
this.onActivate(e);
|
|
@@ -28066,7 +28084,7 @@
|
|
|
28066
28084
|
};
|
|
28067
28085
|
DButtonBase.prototype.toggle = function () {
|
|
28068
28086
|
if (this.state.isActionable) {
|
|
28069
|
-
if (this.
|
|
28087
|
+
if (this._isToggle) {
|
|
28070
28088
|
this.onToggleStart();
|
|
28071
28089
|
this.onToggleEnd();
|
|
28072
28090
|
}
|
|
@@ -28085,7 +28103,7 @@
|
|
|
28085
28103
|
};
|
|
28086
28104
|
DButtonBase.prototype.onActivateKeyDown = function (e) {
|
|
28087
28105
|
if (this.state.isActionable) {
|
|
28088
|
-
if (this.
|
|
28106
|
+
if (this._isToggle) {
|
|
28089
28107
|
this.onToggleStart(e);
|
|
28090
28108
|
}
|
|
28091
28109
|
else {
|
|
@@ -28095,7 +28113,7 @@
|
|
|
28095
28113
|
};
|
|
28096
28114
|
DButtonBase.prototype.onActivateKeyUp = function (e) {
|
|
28097
28115
|
if (this.state.isActionable) {
|
|
28098
|
-
if (this.
|
|
28116
|
+
if (this._isToggle) {
|
|
28099
28117
|
this.onToggleEnd(e);
|
|
28100
28118
|
}
|
|
28101
28119
|
else {
|
|
@@ -28663,6 +28681,7 @@
|
|
|
28663
28681
|
var index = buttons.indexOf(button);
|
|
28664
28682
|
if (index < 0) {
|
|
28665
28683
|
this._buttons.push(button);
|
|
28684
|
+
button.isGrouped = true;
|
|
28666
28685
|
var isEnabled = this._isEnabled;
|
|
28667
28686
|
if (isEnabled != null) {
|
|
28668
28687
|
button.state.isEnabled = isEnabled;
|
|
@@ -28699,6 +28718,7 @@
|
|
|
28699
28718
|
var index = buttons.indexOf(button);
|
|
28700
28719
|
if (0 <= index) {
|
|
28701
28720
|
buttons.splice(index, 1);
|
|
28721
|
+
button.isGrouped = false;
|
|
28702
28722
|
button.off("active", this._onActiveBound);
|
|
28703
28723
|
if (this._active === button) {
|
|
28704
28724
|
this.active = null;
|
|
@@ -28711,7 +28731,11 @@
|
|
|
28711
28731
|
return 0 <= index;
|
|
28712
28732
|
};
|
|
28713
28733
|
DButtonGroup.prototype.clear = function () {
|
|
28714
|
-
this._buttons
|
|
28734
|
+
var buttons = this._buttons;
|
|
28735
|
+
for (var i = 0, imax = buttons.length; i < imax; ++i) {
|
|
28736
|
+
buttons[i].isGrouped = false;
|
|
28737
|
+
}
|
|
28738
|
+
buttons.length = 0;
|
|
28715
28739
|
this.active = null;
|
|
28716
28740
|
};
|
|
28717
28741
|
DButtonGroup.prototype.size = function () {
|
|
@@ -53444,17 +53468,20 @@
|
|
|
53444
53468
|
};
|
|
53445
53469
|
};
|
|
53446
53470
|
DChartAxisBaseOptionParser.prototype.toTickMajor = function (theme, options) {
|
|
53447
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
53471
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
53448
53472
|
var major = options === null || options === void 0 ? void 0 : options.major;
|
|
53449
53473
|
var position = (_b = (_a = major === null || major === void 0 ? void 0 : major.position) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.position) !== null && _b !== void 0 ? _b : theme.getMajorTickPosition();
|
|
53450
53474
|
var optionsStyle = options === null || options === void 0 ? void 0 : options.style;
|
|
53451
53475
|
var style = EShapePointsStyles.from((_d = (_c = major === null || major === void 0 ? void 0 : major.style) !== null && _c !== void 0 ? _c : optionsStyle) !== null && _d !== void 0 ? _d : theme.getMajorTickStyle());
|
|
53452
53476
|
var optionsStroke = options === null || options === void 0 ? void 0 : options.stroke;
|
|
53453
53477
|
var stroke = this.toTickMajorStroke(theme, major === null || major === void 0 ? void 0 : major.stroke, optionsStroke);
|
|
53478
|
+
var count = (_e = major === null || major === void 0 ? void 0 : major.count) !== null && _e !== void 0 ? _e : theme.getMajorTickCount();
|
|
53479
|
+
var capacity = (_f = major === null || major === void 0 ? void 0 : major.capacity) !== null && _f !== void 0 ? _f : theme.getMajorTickCapacity(count);
|
|
53454
53480
|
return {
|
|
53455
|
-
count:
|
|
53456
|
-
|
|
53457
|
-
|
|
53481
|
+
count: count,
|
|
53482
|
+
capacity: capacity,
|
|
53483
|
+
step: (_g = major === null || major === void 0 ? void 0 : major.step) !== null && _g !== void 0 ? _g : theme.getMajorTickStep(),
|
|
53484
|
+
size: (_h = major === null || major === void 0 ? void 0 : major.size) !== null && _h !== void 0 ? _h : theme.getMajorTickSize(),
|
|
53458
53485
|
position: this.toTickPosition(position),
|
|
53459
53486
|
style: style,
|
|
53460
53487
|
stroke: stroke,
|
|
@@ -53753,10 +53780,8 @@
|
|
|
53753
53780
|
this._tick = tick;
|
|
53754
53781
|
this._label = parser.label;
|
|
53755
53782
|
this._bar = parser.bar;
|
|
53756
|
-
|
|
53757
|
-
|
|
53758
|
-
this._majorTicks = new Float64Array(tickMajorCount * 3);
|
|
53759
|
-
this._minorTicks = new Float64Array((tickMajorCount + 1) * tickMinorCount * 3);
|
|
53783
|
+
this._majorTicks = [];
|
|
53784
|
+
this._minorTicks = [];
|
|
53760
53785
|
}
|
|
53761
53786
|
Object.defineProperty(DChartAxisBase.prototype, "position", {
|
|
53762
53787
|
get: function () {
|
|
@@ -53795,25 +53820,27 @@
|
|
|
53795
53820
|
break;
|
|
53796
53821
|
}
|
|
53797
53822
|
shape.allowUploadedUpdate();
|
|
53798
|
-
|
|
53823
|
+
return true;
|
|
53799
53824
|
}
|
|
53825
|
+
return false;
|
|
53800
53826
|
};
|
|
53801
53827
|
DChartAxisBase.prototype.updateTicksX = function (domainMin, domainMax, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionY, transform, plotAreaHeight) {
|
|
53802
53828
|
var tick = this._tick;
|
|
53803
53829
|
var majorTick = tick.major;
|
|
53804
53830
|
var majorCount = majorTick.count;
|
|
53831
|
+
var majorCapacity = majorTick.capacity;
|
|
53805
53832
|
var majorStep = majorTick.step;
|
|
53806
53833
|
var majorFormatter = majorTick.formatter;
|
|
53807
53834
|
var minorTick = tick.minor;
|
|
53808
53835
|
var minorCountPerMajor = minorTick.count;
|
|
53809
|
-
var minorCount = (
|
|
53836
|
+
var minorCount = (majorCapacity + 1) * minorCountPerMajor;
|
|
53810
53837
|
var minorStep = minorTick.step;
|
|
53811
53838
|
var majorTicks = this._majorTicks;
|
|
53812
53839
|
var minorTicks = this._minorTicks;
|
|
53813
|
-
coordinate.ticks(domainMin, domainMax, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
|
|
53840
|
+
coordinate.ticks(domainMin, domainMax, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
|
|
53814
53841
|
var a = transform.a;
|
|
53815
53842
|
var tx = transform.tx;
|
|
53816
|
-
for (var i = 0; i <
|
|
53843
|
+
for (var i = 0; i < majorCapacity; ++i) {
|
|
53817
53844
|
var majorShape = majorShapes[i];
|
|
53818
53845
|
var imajorTick = i * 3;
|
|
53819
53846
|
var majorTickPosition = majorTicks[imajorTick + 0];
|
|
@@ -53857,23 +53884,25 @@
|
|
|
53857
53884
|
minorShape.visible = false;
|
|
53858
53885
|
}
|
|
53859
53886
|
}
|
|
53887
|
+
return true;
|
|
53860
53888
|
};
|
|
53861
53889
|
DChartAxisBase.prototype.updateTicksY = function (domainMin, domainMax, coordinate, majorShapes, minorShapes, gridlineShapes, shapePositionX, transform, plotAreaWidth) {
|
|
53862
53890
|
var tick = this._tick;
|
|
53863
53891
|
var majorTick = tick.major;
|
|
53864
53892
|
var majorCount = majorTick.count;
|
|
53893
|
+
var majorCapacity = majorTick.capacity;
|
|
53865
53894
|
var majorStep = majorTick.step;
|
|
53866
53895
|
var majorFormatter = majorTick.formatter;
|
|
53867
53896
|
var minorTick = tick.minor;
|
|
53868
53897
|
var minorCountPerMajor = minorTick.count;
|
|
53869
|
-
var minorCount = (
|
|
53898
|
+
var minorCount = (majorCapacity + 1) * minorCountPerMajor;
|
|
53870
53899
|
var minorStep = minorTick.step;
|
|
53871
53900
|
var majorTicks = this._majorTicks;
|
|
53872
53901
|
var minorTicks = this._minorTicks;
|
|
53873
|
-
coordinate.ticks(domainMin, domainMax, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
|
|
53902
|
+
coordinate.ticks(domainMin, domainMax, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorTicks, minorTicks);
|
|
53874
53903
|
var d = transform.d;
|
|
53875
53904
|
var ty = transform.ty;
|
|
53876
|
-
for (var i = 0; i <
|
|
53905
|
+
for (var i = 0; i < majorCapacity; ++i) {
|
|
53877
53906
|
var majorShape = majorShapes[i];
|
|
53878
53907
|
var imajorTick = i * 3;
|
|
53879
53908
|
var majorTickPosition = majorTicks[imajorTick + 0];
|
|
@@ -53917,6 +53946,7 @@
|
|
|
53917
53946
|
minorShape.visible = false;
|
|
53918
53947
|
}
|
|
53919
53948
|
}
|
|
53949
|
+
return true;
|
|
53920
53950
|
};
|
|
53921
53951
|
DChartAxisBase.prototype.updateTicks = function (container) {
|
|
53922
53952
|
var tick = this._tick;
|
|
@@ -53937,8 +53967,7 @@
|
|
|
53937
53967
|
var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
|
|
53938
53968
|
var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
|
|
53939
53969
|
var plotAreaHeight = plotArea.height;
|
|
53940
|
-
this.updateTicksX(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - padding, transform, plotAreaHeight);
|
|
53941
|
-
DApplications.update(plotArea);
|
|
53970
|
+
return this.updateTicksX(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - padding, transform, plotAreaHeight);
|
|
53942
53971
|
}
|
|
53943
53972
|
break;
|
|
53944
53973
|
case DChartAxisPosition.BOTTOM:
|
|
@@ -53947,8 +53976,7 @@
|
|
|
53947
53976
|
var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.x));
|
|
53948
53977
|
var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.x + bounds.width));
|
|
53949
53978
|
var plotAreaHeight = plotArea.height;
|
|
53950
|
-
this.updateTicksX(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaHeight + padding, transform, plotAreaHeight);
|
|
53951
|
-
DApplications.update(plotArea);
|
|
53979
|
+
return this.updateTicksX(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaHeight + padding, transform, plotAreaHeight);
|
|
53952
53980
|
}
|
|
53953
53981
|
break;
|
|
53954
53982
|
case DChartAxisPosition.LEFT:
|
|
@@ -53957,8 +53985,7 @@
|
|
|
53957
53985
|
var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
|
|
53958
53986
|
var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
|
|
53959
53987
|
var plotAreaWidth = plotArea.width;
|
|
53960
|
-
this.updateTicksY(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - padding, transform, plotAreaWidth);
|
|
53961
|
-
DApplications.update(plotArea);
|
|
53988
|
+
return this.updateTicksY(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, 0 - padding, transform, plotAreaWidth);
|
|
53962
53989
|
}
|
|
53963
53990
|
break;
|
|
53964
53991
|
case DChartAxisPosition.RIGHT:
|
|
@@ -53967,12 +53994,12 @@
|
|
|
53967
53994
|
var domainFrom = coordinate.unmap(coordinate.transform.unmap(bounds.y));
|
|
53968
53995
|
var domainTo = coordinate.unmap(coordinate.transform.unmap(bounds.y + bounds.height));
|
|
53969
53996
|
var plotAreaWidth = plotArea.width;
|
|
53970
|
-
this.updateTicksY(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaWidth + padding, transform, plotAreaWidth);
|
|
53971
|
-
DApplications.update(plotArea);
|
|
53997
|
+
return this.updateTicksY(domainFrom, domainTo, coordinate, majorShapes, minorShapes, gridlineShapes, plotAreaWidth + padding, transform, plotAreaWidth);
|
|
53972
53998
|
}
|
|
53973
53999
|
break;
|
|
53974
54000
|
}
|
|
53975
54001
|
}
|
|
54002
|
+
return false;
|
|
53976
54003
|
};
|
|
53977
54004
|
DChartAxisBase.prototype.bind = function (container, index) {
|
|
53978
54005
|
this._container = container;
|
|
@@ -54007,9 +54034,9 @@
|
|
|
54007
54034
|
var gridlinePosition = position === DChartAxisPosition.LEFT || position === DChartAxisPosition.RIGHT
|
|
54008
54035
|
? EShapeBarPosition.LEFT
|
|
54009
54036
|
: EShapeBarPosition.TOP;
|
|
54010
|
-
var
|
|
54037
|
+
var gridlineCapacity = tickMajor.capacity;
|
|
54011
54038
|
var gridlineStyle = gridline.style || EShapePointsStyle.NONE;
|
|
54012
|
-
for (var i = 0; i <
|
|
54039
|
+
for (var i = 0; i < gridlineCapacity; ++i) {
|
|
54013
54040
|
var gridlineShape = new EShapeBar();
|
|
54014
54041
|
gridlineShape.points.position = gridlinePosition;
|
|
54015
54042
|
gridlineShape.points.style = gridlineStyle;
|
|
@@ -54027,11 +54054,11 @@
|
|
|
54027
54054
|
if (!tickMajorShapes && tick.enable) {
|
|
54028
54055
|
tickMajorShapes = [];
|
|
54029
54056
|
tickMajor.shapes = tickMajorShapes;
|
|
54030
|
-
var
|
|
54057
|
+
var tickMajorCapacity = tickMajor.capacity;
|
|
54031
54058
|
var tickMajorSize = tickMajor.size;
|
|
54032
54059
|
var tickMajorPosition = tickMajor.position;
|
|
54033
54060
|
var tickMajorStyle = tickMajor.style || EShapePointsStyle.NONE;
|
|
54034
|
-
for (var i = 0; i <
|
|
54061
|
+
for (var i = 0; i < tickMajorCapacity; ++i) {
|
|
54035
54062
|
var tickMajorShape = new EShapeBar();
|
|
54036
54063
|
tickMajorShape.points.position = tickMajorPosition;
|
|
54037
54064
|
tickMajorShape.points.size = tickMajorSize;
|
|
@@ -54057,7 +54084,7 @@
|
|
|
54057
54084
|
var tickMinorSize = tickMinor.size;
|
|
54058
54085
|
var tickMinorPosition = tickMinor.position;
|
|
54059
54086
|
var tickMinorStyle = tickMinor.style || EShapePointsStyle.NONE;
|
|
54060
|
-
for (var i = 0, imax = (tickMajor.
|
|
54087
|
+
for (var i = 0, imax = (tickMajor.capacity + 1) * tickMinorCount; i < imax; ++i) {
|
|
54061
54088
|
var tickMinorShape = new EShapeBar();
|
|
54062
54089
|
tickMinorShape.points.position = tickMinorPosition;
|
|
54063
54090
|
tickMinorShape.points.size = tickMinorSize;
|
|
@@ -54105,6 +54132,16 @@
|
|
|
54105
54132
|
this._container = undefined;
|
|
54106
54133
|
};
|
|
54107
54134
|
DChartAxisBase.prototype.update = function () {
|
|
54135
|
+
var container = this._container;
|
|
54136
|
+
if (container) {
|
|
54137
|
+
var isBarUpdated = this.updateBar(container);
|
|
54138
|
+
var isTicksUpdated = this.updateTicks(container);
|
|
54139
|
+
if (isBarUpdated || isTicksUpdated) {
|
|
54140
|
+
DApplications.update(container.plotArea);
|
|
54141
|
+
}
|
|
54142
|
+
}
|
|
54143
|
+
};
|
|
54144
|
+
DChartAxisBase.prototype.onRender = function () {
|
|
54108
54145
|
var container = this._container;
|
|
54109
54146
|
if (container) {
|
|
54110
54147
|
this.updateBar(container);
|
|
@@ -54238,6 +54275,13 @@
|
|
|
54238
54275
|
}
|
|
54239
54276
|
});
|
|
54240
54277
|
};
|
|
54278
|
+
DChartAxisContainerImpl.prototype.onRender = function () {
|
|
54279
|
+
this._list.forEach(function (axes) {
|
|
54280
|
+
for (var i = 0, imax = axes.length; i < imax; ++i) {
|
|
54281
|
+
axes[i].onRender();
|
|
54282
|
+
}
|
|
54283
|
+
});
|
|
54284
|
+
};
|
|
54241
54285
|
DChartAxisContainerImpl.prototype.destroy = function () {
|
|
54242
54286
|
this._list.forEach(function (axes) {
|
|
54243
54287
|
for (var i = 0, imax = axes.length; i < imax; ++i) {
|
|
@@ -54520,7 +54564,7 @@
|
|
|
54520
54564
|
DChartCoordinateLinearTick.prototype.toMajorStep = function (domainMin, domainMax, majorCount, majorStep) {
|
|
54521
54565
|
if (majorStep == null) {
|
|
54522
54566
|
if (0 < majorCount) {
|
|
54523
|
-
return this.
|
|
54567
|
+
return this._theme.toStep(domainMin, domainMax, majorCount);
|
|
54524
54568
|
}
|
|
54525
54569
|
return -1;
|
|
54526
54570
|
}
|
|
@@ -54531,12 +54575,6 @@
|
|
|
54531
54575
|
return majorStep(domainMin, domainMax, majorCount);
|
|
54532
54576
|
}
|
|
54533
54577
|
};
|
|
54534
|
-
DChartCoordinateLinearTick.prototype.calcStepMajor = function (domainMin, domainMax, majorCount) {
|
|
54535
|
-
var span = Math.abs(domainMax - domainMin) / majorCount;
|
|
54536
|
-
var power = Math.floor(Math.log(span) / Math.LN10);
|
|
54537
|
-
var base = Math.pow(10, power);
|
|
54538
|
-
return this._theme.toStepScale(span / base) * base;
|
|
54539
|
-
};
|
|
54540
54578
|
DChartCoordinateLinearTick.prototype.toMinorStep = function (majorStep, minorCount, minorStep) {
|
|
54541
54579
|
if (minorStep == null) {
|
|
54542
54580
|
if (0 <= majorStep) {
|
|
@@ -54562,7 +54600,7 @@
|
|
|
54562
54600
|
}
|
|
54563
54601
|
}
|
|
54564
54602
|
};
|
|
54565
|
-
DChartCoordinateLinearTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
|
|
54603
|
+
DChartCoordinateLinearTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
|
|
54566
54604
|
if (majorCount <= 0) {
|
|
54567
54605
|
return;
|
|
54568
54606
|
}
|
|
@@ -54574,7 +54612,7 @@
|
|
|
54574
54612
|
majorResult[0] = domainMin;
|
|
54575
54613
|
majorResult[1] = transform.map(coordinate.map(domainMin));
|
|
54576
54614
|
majorResult[2] = 0;
|
|
54577
|
-
for (var i = 1; i <
|
|
54615
|
+
for (var i = 1; i < majorCapacity; ++i) {
|
|
54578
54616
|
var imajorResult = i * 3;
|
|
54579
54617
|
majorResult[imajorResult + 0] = NaN;
|
|
54580
54618
|
majorResult[imajorResult + 1] = NaN;
|
|
@@ -54601,7 +54639,7 @@
|
|
|
54601
54639
|
var iminor = 0;
|
|
54602
54640
|
for (var i = idomainStart; i <= idomainEnd; ++i) {
|
|
54603
54641
|
var majorPosition = i * majorStepMapped;
|
|
54604
|
-
if (imajor <
|
|
54642
|
+
if (imajor < majorCapacity) {
|
|
54605
54643
|
var majorPositionMapped = transform.map(coordinate.map(majorPosition));
|
|
54606
54644
|
if (from <= majorPositionMapped && majorPositionMapped <= to) {
|
|
54607
54645
|
var imajorResult = imajor * 3;
|
|
@@ -54625,7 +54663,7 @@
|
|
|
54625
54663
|
}
|
|
54626
54664
|
}
|
|
54627
54665
|
}
|
|
54628
|
-
for (var i = imajor; i <
|
|
54666
|
+
for (var i = imajor; i < majorCapacity; ++i) {
|
|
54629
54667
|
var imajorResult = i * 3;
|
|
54630
54668
|
majorResult[imajorResult + 0] = NaN;
|
|
54631
54669
|
majorResult[imajorResult + 1] = NaN;
|
|
@@ -54959,8 +54997,8 @@
|
|
|
54959
54997
|
DChartCoordinateLinear.prototype.unmapAll = function (values, ifrom, iend, stride, offset) {
|
|
54960
54998
|
// DO NOTHING
|
|
54961
54999
|
};
|
|
54962
|
-
DChartCoordinateLinear.prototype.ticks = function (domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
|
|
54963
|
-
this._tick.calculate(domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, this);
|
|
55000
|
+
DChartCoordinateLinear.prototype.ticks = function (domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
|
|
55001
|
+
this._tick.calculate(domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, this);
|
|
54964
55002
|
};
|
|
54965
55003
|
DChartCoordinateLinear.prototype.toTheme = function (options) {
|
|
54966
55004
|
return (options && options.theme) || this.getThemeDefault();
|
|
@@ -54985,7 +55023,7 @@
|
|
|
54985
55023
|
DChartCoordinateLogTick.prototype.toMajorStep = function (domainMin, domainMax, majorCount, majorStep) {
|
|
54986
55024
|
if (majorStep == null) {
|
|
54987
55025
|
if (0 < majorCount) {
|
|
54988
|
-
return this.
|
|
55026
|
+
return this._theme.toStep(domainMin, domainMax, majorCount);
|
|
54989
55027
|
}
|
|
54990
55028
|
return -1;
|
|
54991
55029
|
}
|
|
@@ -54996,12 +55034,6 @@
|
|
|
54996
55034
|
return majorStep(domainMin, domainMax, majorCount);
|
|
54997
55035
|
}
|
|
54998
55036
|
};
|
|
54999
|
-
DChartCoordinateLogTick.prototype.calcStepMajor = function (domainMin, domainMax, majorCount) {
|
|
55000
|
-
var span = Math.abs(domainMax - domainMin) / majorCount;
|
|
55001
|
-
var power = Math.floor(Math.log(span) / Math.LN10);
|
|
55002
|
-
var base = Math.pow(10, power);
|
|
55003
|
-
return this._theme.toStepScale(span / base) * base;
|
|
55004
|
-
};
|
|
55005
55037
|
DChartCoordinateLogTick.prototype.toMinorStep = function (majorStep, minorCount, minorStep) {
|
|
55006
55038
|
if (minorStep == null) {
|
|
55007
55039
|
if (0 <= majorStep) {
|
|
@@ -55027,7 +55059,7 @@
|
|
|
55027
55059
|
}
|
|
55028
55060
|
}
|
|
55029
55061
|
};
|
|
55030
|
-
DChartCoordinateLogTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
|
|
55062
|
+
DChartCoordinateLogTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
|
|
55031
55063
|
if (majorCount <= 0) {
|
|
55032
55064
|
return;
|
|
55033
55065
|
}
|
|
@@ -55065,7 +55097,7 @@
|
|
|
55065
55097
|
var iminor = 0;
|
|
55066
55098
|
for (var i = idomainStartMapped; i <= idomainEndMapped; ++i) {
|
|
55067
55099
|
var majorPositionMapped = i * majorStepMapped;
|
|
55068
|
-
if (imajor <
|
|
55100
|
+
if (imajor < majorCapacity) {
|
|
55069
55101
|
if (domainMinMapped <= majorPositionMapped &&
|
|
55070
55102
|
majorPositionMapped <= domainMaxMapped) {
|
|
55071
55103
|
var imajorResult = imajor * 3;
|
|
@@ -55089,7 +55121,7 @@
|
|
|
55089
55121
|
}
|
|
55090
55122
|
}
|
|
55091
55123
|
}
|
|
55092
|
-
for (var i = imajor; i <
|
|
55124
|
+
for (var i = imajor; i < majorCapacity; ++i) {
|
|
55093
55125
|
var imajorResult = i * 3;
|
|
55094
55126
|
majorResult[imajorResult + 0] = NaN;
|
|
55095
55127
|
majorResult[imajorResult + 1] = NaN;
|
|
@@ -55272,8 +55304,8 @@
|
|
|
55272
55304
|
values[i] = Math.pow(10, values[i]);
|
|
55273
55305
|
}
|
|
55274
55306
|
};
|
|
55275
|
-
DChartCoordinateLog.prototype.ticks = function (domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
|
|
55276
|
-
this._tick.calculate(domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, this);
|
|
55307
|
+
DChartCoordinateLog.prototype.ticks = function (domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
|
|
55308
|
+
this._tick.calculate(domainFrom, domainTo, majorCount, majorCapacity, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, this);
|
|
55277
55309
|
};
|
|
55278
55310
|
DChartCoordinateLog.prototype.toTheme = function (options) {
|
|
55279
55311
|
return (options && options.theme) || this.getThemeDefault();
|
|
@@ -55911,10 +55943,10 @@
|
|
|
55911
55943
|
DChartPlotAreaImpl.prototype.render = function (renderer) {
|
|
55912
55944
|
if (this._isViewDirty) {
|
|
55913
55945
|
this._isViewDirty = false;
|
|
55914
|
-
this._axis.
|
|
55946
|
+
this._axis.onRender();
|
|
55915
55947
|
var selection = this._series.selection;
|
|
55916
55948
|
if (selection) {
|
|
55917
|
-
selection.
|
|
55949
|
+
selection.onRender();
|
|
55918
55950
|
}
|
|
55919
55951
|
}
|
|
55920
55952
|
_super.prototype.render.call(this, renderer);
|
|
@@ -56136,7 +56168,9 @@
|
|
|
56136
56168
|
shape.transform.position.set(mappedX, height * 0.5);
|
|
56137
56169
|
shape.size.set(0, height);
|
|
56138
56170
|
shape.visible = this.isVisible(container, mappedX);
|
|
56171
|
+
return true;
|
|
56139
56172
|
}
|
|
56173
|
+
return false;
|
|
56140
56174
|
};
|
|
56141
56175
|
DChartSelectionGridlineX.prototype.isVisible = function (container, mappedX) {
|
|
56142
56176
|
return 0 <= mappedX && mappedX <= container.plotArea.width;
|
|
@@ -56164,7 +56198,9 @@
|
|
|
56164
56198
|
shape.transform.position.set(width * 0.5, mappedY);
|
|
56165
56199
|
shape.size.set(width, 0);
|
|
56166
56200
|
shape.visible = this.isVisible(container, mappedY);
|
|
56201
|
+
return true;
|
|
56167
56202
|
}
|
|
56203
|
+
return false;
|
|
56168
56204
|
};
|
|
56169
56205
|
DChartSelectionGridlineY.prototype.isVisible = function (container, mappedY) {
|
|
56170
56206
|
return 0 <= mappedY && mappedY <= container.plotArea.height;
|
|
@@ -56215,8 +56251,9 @@
|
|
|
56215
56251
|
this._y.unset();
|
|
56216
56252
|
};
|
|
56217
56253
|
DChartSelectionGridlineContainerImpl.prototype.update = function (container, mappedPosition) {
|
|
56218
|
-
this._x.update(container, mappedPosition);
|
|
56219
|
-
this._y.update(container, mappedPosition);
|
|
56254
|
+
var isXUpdated = this._x.update(container, mappedPosition);
|
|
56255
|
+
var isYUpdated = this._y.update(container, mappedPosition);
|
|
56256
|
+
return isXUpdated || isYUpdated;
|
|
56220
56257
|
};
|
|
56221
56258
|
return DChartSelectionGridlineContainerImpl;
|
|
56222
56259
|
}());
|
|
@@ -56235,7 +56272,9 @@
|
|
|
56235
56272
|
if (shape) {
|
|
56236
56273
|
shape.transform.position.copyFrom(mappedPosition);
|
|
56237
56274
|
shape.visible = this.isVisible(container, mappedPosition);
|
|
56275
|
+
return true;
|
|
56238
56276
|
}
|
|
56277
|
+
return false;
|
|
56239
56278
|
};
|
|
56240
56279
|
DChartSelectionMarker.prototype.isVisible = function (container, mappedPosition) {
|
|
56241
56280
|
var x = mappedPosition.x;
|
|
@@ -56416,9 +56455,11 @@
|
|
|
56416
56455
|
var work = this._work;
|
|
56417
56456
|
work.set(coordinateX.transform.map(coordinateX.map(position.x)), coordinateY.transform.map(coordinateY.map(position.y)));
|
|
56418
56457
|
container.plotArea.container.localTransform.apply(work, work);
|
|
56419
|
-
this._gridline.update(container, work);
|
|
56420
|
-
this._marker.update(container, work);
|
|
56458
|
+
var isGridlineUpdated = this._gridline.update(container, work);
|
|
56459
|
+
var isMarkerUpdated = this._marker.update(container, work);
|
|
56460
|
+
return isGridlineUpdated || isMarkerUpdated;
|
|
56421
56461
|
}
|
|
56462
|
+
return false;
|
|
56422
56463
|
};
|
|
56423
56464
|
return DChartSelectionSubImpl;
|
|
56424
56465
|
}(pixi_js.utils.EventEmitter));
|
|
@@ -56553,6 +56594,16 @@
|
|
|
56553
56594
|
configurable: true
|
|
56554
56595
|
});
|
|
56555
56596
|
DChartSelectionSimple.prototype.update = function () {
|
|
56597
|
+
var isSelectedUpdated = this._selected.update();
|
|
56598
|
+
var isHoveredUpdated = this._hovered.update();
|
|
56599
|
+
if (isSelectedUpdated || isHoveredUpdated) {
|
|
56600
|
+
var container = this._container;
|
|
56601
|
+
if (container != null) {
|
|
56602
|
+
DApplications.update(container.plotArea);
|
|
56603
|
+
}
|
|
56604
|
+
}
|
|
56605
|
+
};
|
|
56606
|
+
DChartSelectionSimple.prototype.onRender = function () {
|
|
56556
56607
|
this._selected.update();
|
|
56557
56608
|
this._hovered.update();
|
|
56558
56609
|
};
|