@hpcc-js/tree 2.34.0 → 2.35.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/index.es6.js +77 -77
- package/dist/index.es6.js.map +1 -1
- package/dist/index.js +80 -80
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +1 -1
- package/package.json +19 -19
- package/src/__package__.ts +2 -2
- package/types/__package__.d.ts +2 -2
- package/types-3.4/__package__.d.ts +2 -2
package/dist/index.es6.js
CHANGED
|
@@ -2,8 +2,8 @@ import { ITree } from '@hpcc-js/api';
|
|
|
2
2
|
import { rgb, d3Event, interpolateZoom, SVGWidget, select, SVGZoomWidget, Utility, PropertyExt, Platform, max as max$1, Palette, HTMLWidget, scaleLinear, scaleSqrt, interpolate } from '@hpcc-js/common';
|
|
3
3
|
|
|
4
4
|
var PKG_NAME = "@hpcc-js/tree";
|
|
5
|
-
var PKG_VERSION = "2.
|
|
6
|
-
var BUILD_VERSION = "2.
|
|
5
|
+
var PKG_VERSION = "2.35.0";
|
|
6
|
+
var BUILD_VERSION = "2.97.0";
|
|
7
7
|
|
|
8
8
|
/*! *****************************************************************************
|
|
9
9
|
Copyright (c) Microsoft Corporation.
|
|
@@ -36,7 +36,7 @@ function __extends(d, b) {
|
|
|
36
36
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
function defaultSeparation(a, b) {
|
|
39
|
+
function defaultSeparation$1(a, b) {
|
|
40
40
|
return a.parent === b.parent ? 1 : 2;
|
|
41
41
|
}
|
|
42
42
|
|
|
@@ -69,7 +69,7 @@ function leafRight(node) {
|
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
function d3Cluster() {
|
|
72
|
-
var separation = defaultSeparation,
|
|
72
|
+
var separation = defaultSeparation$1,
|
|
73
73
|
dx = 1,
|
|
74
74
|
dy = 1,
|
|
75
75
|
nodeSize = false;
|
|
@@ -259,7 +259,7 @@ function node_links() {
|
|
|
259
259
|
}
|
|
260
260
|
|
|
261
261
|
function hierarchy(data, children) {
|
|
262
|
-
var root = new Node(data),
|
|
262
|
+
var root = new Node$1(data),
|
|
263
263
|
valued = +data.value && (root.value = data.value),
|
|
264
264
|
node,
|
|
265
265
|
nodes = [root],
|
|
@@ -275,7 +275,7 @@ function hierarchy(data, children) {
|
|
|
275
275
|
if ((childs = children(node.data)) && (n = childs.length)) {
|
|
276
276
|
node.children = new Array(n);
|
|
277
277
|
for (i = n - 1; i >= 0; --i) {
|
|
278
|
-
nodes.push(child = node.children[i] = new Node(childs[i]));
|
|
278
|
+
nodes.push(child = node.children[i] = new Node$1(childs[i]));
|
|
279
279
|
child.parent = node;
|
|
280
280
|
child.depth = node.depth + 1;
|
|
281
281
|
}
|
|
@@ -303,15 +303,15 @@ function computeHeight(node) {
|
|
|
303
303
|
while ((node = node.parent) && (node.height < ++height));
|
|
304
304
|
}
|
|
305
305
|
|
|
306
|
-
function Node(data) {
|
|
306
|
+
function Node$1(data) {
|
|
307
307
|
this.data = data;
|
|
308
308
|
this.depth =
|
|
309
309
|
this.height = 0;
|
|
310
310
|
this.parent = null;
|
|
311
311
|
}
|
|
312
312
|
|
|
313
|
-
Node.prototype = hierarchy.prototype = {
|
|
314
|
-
constructor: Node,
|
|
313
|
+
Node$1.prototype = hierarchy.prototype = {
|
|
314
|
+
constructor: Node$1,
|
|
315
315
|
count: node_count,
|
|
316
316
|
each: node_each,
|
|
317
317
|
eachAfter: node_eachAfter,
|
|
@@ -498,7 +498,7 @@ function score(node) {
|
|
|
498
498
|
return dx * dx + dy * dy;
|
|
499
499
|
}
|
|
500
500
|
|
|
501
|
-
function Node
|
|
501
|
+
function Node(circle) {
|
|
502
502
|
this._ = circle;
|
|
503
503
|
this.next = null;
|
|
504
504
|
this.previous = null;
|
|
@@ -521,14 +521,14 @@ function packEnclose(circles) {
|
|
|
521
521
|
place(b, a, c = circles[2]);
|
|
522
522
|
|
|
523
523
|
// Initialize the front-chain using the first three circles a, b and c.
|
|
524
|
-
a = new Node
|
|
524
|
+
a = new Node(a), b = new Node(b), c = new Node(c);
|
|
525
525
|
a.next = c.previous = b;
|
|
526
526
|
b.next = a.previous = c;
|
|
527
527
|
c.next = b.previous = a;
|
|
528
528
|
|
|
529
529
|
// Attempt to place each remaining circle…
|
|
530
530
|
pack: for (i = 3; i < n; ++i) {
|
|
531
|
-
place(a._, b._, c = circles[i]), c = new Node
|
|
531
|
+
place(a._, b._, c = circles[i]), c = new Node(c);
|
|
532
532
|
|
|
533
533
|
// Find the closest intersecting circle on the front-chain, if any.
|
|
534
534
|
// “Closeness” is determined by linear distance along the front-chain.
|
|
@@ -585,7 +585,7 @@ function constantZero() {
|
|
|
585
585
|
return 0;
|
|
586
586
|
}
|
|
587
587
|
|
|
588
|
-
function constant(x) {
|
|
588
|
+
function constant$1(x) {
|
|
589
589
|
return function() {
|
|
590
590
|
return x;
|
|
591
591
|
};
|
|
@@ -625,7 +625,7 @@ function d3Pack() {
|
|
|
625
625
|
};
|
|
626
626
|
|
|
627
627
|
pack.padding = function(x) {
|
|
628
|
-
return arguments.length ? (padding = typeof x === "function" ? x : constant(+x), pack) : padding;
|
|
628
|
+
return arguments.length ? (padding = typeof x === "function" ? x : constant$1(+x), pack) : padding;
|
|
629
629
|
};
|
|
630
630
|
|
|
631
631
|
return pack;
|
|
@@ -737,7 +737,7 @@ function d3Parition() {
|
|
|
737
737
|
return partition;
|
|
738
738
|
}
|
|
739
739
|
|
|
740
|
-
function defaultSeparation
|
|
740
|
+
function defaultSeparation(a, b) {
|
|
741
741
|
return a.parent === b.parent ? 1 : 2;
|
|
742
742
|
}
|
|
743
743
|
|
|
@@ -808,7 +808,7 @@ function TreeNode(node, i) {
|
|
|
808
808
|
this.i = i; // number
|
|
809
809
|
}
|
|
810
810
|
|
|
811
|
-
TreeNode.prototype = Object.create(Node.prototype);
|
|
811
|
+
TreeNode.prototype = Object.create(Node$1.prototype);
|
|
812
812
|
|
|
813
813
|
function treeRoot(root) {
|
|
814
814
|
var tree = new TreeNode(root, 0),
|
|
@@ -835,7 +835,7 @@ function treeRoot(root) {
|
|
|
835
835
|
|
|
836
836
|
// Node-link tree diagram using the Reingold-Tilford "tidy" algorithm
|
|
837
837
|
function d3Tree() {
|
|
838
|
-
var separation = defaultSeparation
|
|
838
|
+
var separation = defaultSeparation,
|
|
839
839
|
dx = 1,
|
|
840
840
|
dy = 1,
|
|
841
841
|
nodeSize = null;
|
|
@@ -1114,7 +1114,7 @@ function d3Treemap() {
|
|
|
1114
1114
|
};
|
|
1115
1115
|
|
|
1116
1116
|
treemap.paddingInner = function(x) {
|
|
1117
|
-
return arguments.length ? (paddingInner = typeof x === "function" ? x : constant(+x), treemap) : paddingInner;
|
|
1117
|
+
return arguments.length ? (paddingInner = typeof x === "function" ? x : constant$1(+x), treemap) : paddingInner;
|
|
1118
1118
|
};
|
|
1119
1119
|
|
|
1120
1120
|
treemap.paddingOuter = function(x) {
|
|
@@ -1122,19 +1122,19 @@ function d3Treemap() {
|
|
|
1122
1122
|
};
|
|
1123
1123
|
|
|
1124
1124
|
treemap.paddingTop = function(x) {
|
|
1125
|
-
return arguments.length ? (paddingTop = typeof x === "function" ? x : constant(+x), treemap) : paddingTop;
|
|
1125
|
+
return arguments.length ? (paddingTop = typeof x === "function" ? x : constant$1(+x), treemap) : paddingTop;
|
|
1126
1126
|
};
|
|
1127
1127
|
|
|
1128
1128
|
treemap.paddingRight = function(x) {
|
|
1129
|
-
return arguments.length ? (paddingRight = typeof x === "function" ? x : constant(+x), treemap) : paddingRight;
|
|
1129
|
+
return arguments.length ? (paddingRight = typeof x === "function" ? x : constant$1(+x), treemap) : paddingRight;
|
|
1130
1130
|
};
|
|
1131
1131
|
|
|
1132
1132
|
treemap.paddingBottom = function(x) {
|
|
1133
|
-
return arguments.length ? (paddingBottom = typeof x === "function" ? x : constant(+x), treemap) : paddingBottom;
|
|
1133
|
+
return arguments.length ? (paddingBottom = typeof x === "function" ? x : constant$1(+x), treemap) : paddingBottom;
|
|
1134
1134
|
};
|
|
1135
1135
|
|
|
1136
1136
|
treemap.paddingLeft = function(x) {
|
|
1137
|
-
return arguments.length ? (paddingLeft = typeof x === "function" ? x : constant(+x), treemap) : paddingLeft;
|
|
1137
|
+
return arguments.length ? (paddingLeft = typeof x === "function" ? x : constant$1(+x), treemap) : paddingLeft;
|
|
1138
1138
|
};
|
|
1139
1139
|
|
|
1140
1140
|
return treemap;
|
|
@@ -1251,8 +1251,8 @@ function styleInject(css, ref) {
|
|
|
1251
1251
|
}
|
|
1252
1252
|
}
|
|
1253
1253
|
|
|
1254
|
-
var css_248z = ".tree_CirclePacking circle{fill:#1f77b4;fill-opacity:.25;stroke:#1f77b4;stroke-width:1px}.tree_CirclePacking .leaf circle{fill:#ff7f0e;fill-opacity:1}.tree_CirclePacking .label{fill:#fff;text-anchor:middle}";
|
|
1255
|
-
styleInject(css_248z);
|
|
1254
|
+
var css_248z$4 = ".tree_CirclePacking circle{fill:#1f77b4;fill-opacity:.25;stroke:#1f77b4;stroke-width:1px}.tree_CirclePacking .leaf circle{fill:#ff7f0e;fill-opacity:1}.tree_CirclePacking .label{fill:#fff;text-anchor:middle}";
|
|
1255
|
+
styleInject(css_248z$4);
|
|
1256
1256
|
|
|
1257
1257
|
var CirclePacking = /** @class */ (function (_super) {
|
|
1258
1258
|
__extends(CirclePacking, _super);
|
|
@@ -1351,8 +1351,8 @@ CirclePacking.prototype.publish("paletteDepthVariant", "brighter", "set", "Deter
|
|
|
1351
1351
|
CirclePacking.prototype.publish("paletteID", "default", "set", "Color palette for this widget", CirclePacking.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
|
|
1352
1352
|
CirclePacking.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });
|
|
1353
1353
|
|
|
1354
|
-
var css_248z$
|
|
1355
|
-
styleInject(css_248z$
|
|
1354
|
+
var css_248z$3 = ".tree_Dendrogram .node circle{fill:#dcf1ff;stroke:#1f77b4;stroke-width:1px}.tree_Dendrogram .node.selected circle{stroke:red}.tree_Dendrogram .node.over circle{stroke:orange}.tree_Dendrogram .node.selected.over circle{stroke:red}.tree_Dendrogram .node.selected text{fill:red}.tree_Dendrogram .node.over text{fill:orange}.tree_Dendrogram .node.selected.over text{fill:red}.tree_Dendrogram .node text{font-size:14px}.tree_Dendrogram .link{fill:none;stroke:#656565;stroke-width:1px}";
|
|
1355
|
+
styleInject(css_248z$3);
|
|
1356
1356
|
|
|
1357
1357
|
var DendrogramColumn = /** @class */ (function (_super) {
|
|
1358
1358
|
__extends(DendrogramColumn, _super);
|
|
@@ -1669,9 +1669,9 @@ var DirectoryTree = /** @class */ (function (_super) {
|
|
|
1669
1669
|
var fontFamily = this.fontFamily();
|
|
1670
1670
|
var fontSize = this.fontSize();
|
|
1671
1671
|
var maxWeightWidth = max$1(flatData, function (d) { return _this.textSize(d.weightValue, fontFamily, fontSize).width; });
|
|
1672
|
-
var rowItemPadding = padding
|
|
1672
|
+
var rowItemPadding = "".concat(padding, "px ").concat(padding, "px ").concat(padding / 2, "px ").concat(padding, "px");
|
|
1673
1673
|
var rowEnter = rowSelection.enter().append("div")
|
|
1674
|
-
.attr("class", function (d) { return "directory-row directory-row-depth-"
|
|
1674
|
+
.attr("class", function (d) { return "directory-row directory-row-depth-".concat(d.depth); })
|
|
1675
1675
|
.style("display", "flex")
|
|
1676
1676
|
.style("cursor", "pointer")
|
|
1677
1677
|
.each(function (d) {
|
|
@@ -1683,7 +1683,7 @@ var DirectoryTree = /** @class */ (function (_super) {
|
|
|
1683
1683
|
.attr("class", "row-weight")
|
|
1684
1684
|
.style("padding", rowItemPadding)
|
|
1685
1685
|
.style("color", weightFontColor)
|
|
1686
|
-
.style("box-shadow", "inset 0 0 100px "
|
|
1686
|
+
.style("box-shadow", "inset 0 0 100px ".concat(weightColor))
|
|
1687
1687
|
.style("font-weight", d.bold ? "bold" : "normal")
|
|
1688
1688
|
.style("font-family", fontFamily)
|
|
1689
1689
|
.style("font-size", fontSize + "px")
|
|
@@ -1801,7 +1801,7 @@ DirectoryTree.prototype.publish("folderIconClosed", "fa fa-folder", "string", "C
|
|
|
1801
1801
|
DirectoryTree.prototype.publish("textFileIcon", "fa fa-file-text-o", "string", "Text file icon class");
|
|
1802
1802
|
DirectoryTree.prototype.publish("verticalScroll", true, "boolean", "If true, vertical scroll bar will be shown");
|
|
1803
1803
|
|
|
1804
|
-
var css_248z$2 = ".tree_Indented .node rect{
|
|
1804
|
+
var css_248z$2 = ".tree_Indented .node rect{fill:#fff;stroke:#3182bd;stroke-width:1px;cursor:pointer}.tree_Indented .node text{font:10px sans-serif;pointer-events:none}.tree_Indented path.link{fill:none;stroke:#9ecae1;stroke-width:1.5px}";
|
|
1805
1805
|
styleInject(css_248z$2);
|
|
1806
1806
|
|
|
1807
1807
|
var IndentedColumn = /** @class */ (function (_super) {
|
|
@@ -2032,10 +2032,10 @@ function xmlToJson(xml, id) {
|
|
|
2032
2032
|
return retVal;
|
|
2033
2033
|
}
|
|
2034
2034
|
|
|
2035
|
-
var pi = Math.PI,
|
|
2036
|
-
tau = 2 * pi,
|
|
2037
|
-
epsilon = 1e-6,
|
|
2038
|
-
tauEpsilon = tau - epsilon;
|
|
2035
|
+
var pi$1 = Math.PI,
|
|
2036
|
+
tau$1 = 2 * pi$1,
|
|
2037
|
+
epsilon$1 = 1e-6,
|
|
2038
|
+
tauEpsilon = tau$1 - epsilon$1;
|
|
2039
2039
|
|
|
2040
2040
|
function Path() {
|
|
2041
2041
|
this._x0 = this._y0 = // start of current subpath
|
|
@@ -2086,12 +2086,12 @@ Path.prototype = path.prototype = {
|
|
|
2086
2086
|
}
|
|
2087
2087
|
|
|
2088
2088
|
// Or, is (x1,y1) coincident with (x0,y0)? Do nothing.
|
|
2089
|
-
else if (!(l01_2 > epsilon));
|
|
2089
|
+
else if (!(l01_2 > epsilon$1));
|
|
2090
2090
|
|
|
2091
2091
|
// Or, are (x0,y0), (x1,y1) and (x2,y2) collinear?
|
|
2092
2092
|
// Equivalently, is (x1,y1) coincident with (x2,y2)?
|
|
2093
2093
|
// Or, is the radius zero? Line to (x1,y1).
|
|
2094
|
-
else if (!(Math.abs(y01 * x21 - y21 * x01) > epsilon) || !r) {
|
|
2094
|
+
else if (!(Math.abs(y01 * x21 - y21 * x01) > epsilon$1) || !r) {
|
|
2095
2095
|
this._ += "L" + (this._x1 = x1) + "," + (this._y1 = y1);
|
|
2096
2096
|
}
|
|
2097
2097
|
|
|
@@ -2103,12 +2103,12 @@ Path.prototype = path.prototype = {
|
|
|
2103
2103
|
l20_2 = x20 * x20 + y20 * y20,
|
|
2104
2104
|
l21 = Math.sqrt(l21_2),
|
|
2105
2105
|
l01 = Math.sqrt(l01_2),
|
|
2106
|
-
l = r * Math.tan((pi - Math.acos((l21_2 + l01_2 - l20_2) / (2 * l21 * l01))) / 2),
|
|
2106
|
+
l = r * Math.tan((pi$1 - Math.acos((l21_2 + l01_2 - l20_2) / (2 * l21 * l01))) / 2),
|
|
2107
2107
|
t01 = l / l01,
|
|
2108
2108
|
t21 = l / l21;
|
|
2109
2109
|
|
|
2110
2110
|
// If the start tangent is not coincident with (x0,y0), line to.
|
|
2111
|
-
if (Math.abs(t01 - 1) > epsilon) {
|
|
2111
|
+
if (Math.abs(t01 - 1) > epsilon$1) {
|
|
2112
2112
|
this._ += "L" + (x1 + t01 * x01) + "," + (y1 + t01 * y01);
|
|
2113
2113
|
}
|
|
2114
2114
|
|
|
@@ -2133,7 +2133,7 @@ Path.prototype = path.prototype = {
|
|
|
2133
2133
|
}
|
|
2134
2134
|
|
|
2135
2135
|
// Or, is (x0,y0) not coincident with the previous point? Line to (x0,y0).
|
|
2136
|
-
else if (Math.abs(this._x1 - x0) > epsilon || Math.abs(this._y1 - y0) > epsilon) {
|
|
2136
|
+
else if (Math.abs(this._x1 - x0) > epsilon$1 || Math.abs(this._y1 - y0) > epsilon$1) {
|
|
2137
2137
|
this._ += "L" + x0 + "," + y0;
|
|
2138
2138
|
}
|
|
2139
2139
|
|
|
@@ -2141,7 +2141,7 @@ Path.prototype = path.prototype = {
|
|
|
2141
2141
|
if (!r) return;
|
|
2142
2142
|
|
|
2143
2143
|
// Does the angle go the wrong way? Flip the direction.
|
|
2144
|
-
if (da < 0) da = da % tau + tau;
|
|
2144
|
+
if (da < 0) da = da % tau$1 + tau$1;
|
|
2145
2145
|
|
|
2146
2146
|
// Is this a complete circle? Draw two arcs to complete the circle.
|
|
2147
2147
|
if (da > tauEpsilon) {
|
|
@@ -2149,8 +2149,8 @@ Path.prototype = path.prototype = {
|
|
|
2149
2149
|
}
|
|
2150
2150
|
|
|
2151
2151
|
// Is this arc non-empty? Draw an arc!
|
|
2152
|
-
else if (da > epsilon) {
|
|
2153
|
-
this._ += "A" + r + "," + r + ",0," + (+(da >= pi)) + "," + cw + "," + (this._x1 = x + r * Math.cos(a1)) + "," + (this._y1 = y + r * Math.sin(a1));
|
|
2152
|
+
else if (da > epsilon$1) {
|
|
2153
|
+
this._ += "A" + r + "," + r + ",0," + (+(da >= pi$1)) + "," + cw + "," + (this._x1 = x + r * Math.cos(a1)) + "," + (this._y1 = y + r * Math.sin(a1));
|
|
2154
2154
|
}
|
|
2155
2155
|
},
|
|
2156
2156
|
rect: function(x, y, w, h) {
|
|
@@ -2161,7 +2161,7 @@ Path.prototype = path.prototype = {
|
|
|
2161
2161
|
}
|
|
2162
2162
|
};
|
|
2163
2163
|
|
|
2164
|
-
function constant
|
|
2164
|
+
function constant(x) {
|
|
2165
2165
|
return function constant() {
|
|
2166
2166
|
return x;
|
|
2167
2167
|
};
|
|
@@ -2175,13 +2175,13 @@ var min = Math.min;
|
|
|
2175
2175
|
var sin = Math.sin;
|
|
2176
2176
|
var sqrt = Math.sqrt;
|
|
2177
2177
|
|
|
2178
|
-
var epsilon
|
|
2179
|
-
var pi
|
|
2180
|
-
var halfPi = pi
|
|
2181
|
-
var tau
|
|
2178
|
+
var epsilon = 1e-12;
|
|
2179
|
+
var pi = Math.PI;
|
|
2180
|
+
var halfPi = pi / 2;
|
|
2181
|
+
var tau = 2 * pi;
|
|
2182
2182
|
|
|
2183
2183
|
function acos(x) {
|
|
2184
|
-
return x > 1 ? 0 : x < -1 ? pi
|
|
2184
|
+
return x > 1 ? 0 : x < -1 ? pi : Math.acos(x);
|
|
2185
2185
|
}
|
|
2186
2186
|
|
|
2187
2187
|
function asin(x) {
|
|
@@ -2212,7 +2212,7 @@ function intersect(x0, y0, x1, y1, x2, y2, x3, y3) {
|
|
|
2212
2212
|
var x10 = x1 - x0, y10 = y1 - y0,
|
|
2213
2213
|
x32 = x3 - x2, y32 = y3 - y2,
|
|
2214
2214
|
t = y32 * x10 - x32 * y10;
|
|
2215
|
-
if (t * t < epsilon
|
|
2215
|
+
if (t * t < epsilon) return;
|
|
2216
2216
|
t = (x32 * (y0 - y2) - y32 * (x0 - x2)) / t;
|
|
2217
2217
|
return [x0 + t * x10, y0 + t * y10];
|
|
2218
2218
|
}
|
|
@@ -2263,7 +2263,7 @@ function cornerTangents(x0, y0, x1, y1, r1, rc, cw) {
|
|
|
2263
2263
|
function d3Arc() {
|
|
2264
2264
|
var innerRadius = arcInnerRadius,
|
|
2265
2265
|
outerRadius = arcOuterRadius,
|
|
2266
|
-
cornerRadius = constant
|
|
2266
|
+
cornerRadius = constant(0),
|
|
2267
2267
|
padRadius = null,
|
|
2268
2268
|
startAngle = arcStartAngle,
|
|
2269
2269
|
endAngle = arcEndAngle,
|
|
@@ -2286,13 +2286,13 @@ function d3Arc() {
|
|
|
2286
2286
|
if (r1 < r0) r = r1, r1 = r0, r0 = r;
|
|
2287
2287
|
|
|
2288
2288
|
// Is it a point?
|
|
2289
|
-
if (!(r1 > epsilon
|
|
2289
|
+
if (!(r1 > epsilon)) context.moveTo(0, 0);
|
|
2290
2290
|
|
|
2291
2291
|
// Or is it a circle or annulus?
|
|
2292
|
-
else if (da > tau
|
|
2292
|
+
else if (da > tau - epsilon) {
|
|
2293
2293
|
context.moveTo(r1 * cos(a0), r1 * sin(a0));
|
|
2294
2294
|
context.arc(0, 0, r1, a0, a1, !cw);
|
|
2295
|
-
if (r0 > epsilon
|
|
2295
|
+
if (r0 > epsilon) {
|
|
2296
2296
|
context.moveTo(r0 * cos(a1), r0 * sin(a1));
|
|
2297
2297
|
context.arc(0, 0, r0, a1, a0, cw);
|
|
2298
2298
|
}
|
|
@@ -2307,7 +2307,7 @@ function d3Arc() {
|
|
|
2307
2307
|
da0 = da,
|
|
2308
2308
|
da1 = da,
|
|
2309
2309
|
ap = padAngle.apply(this, arguments) / 2,
|
|
2310
|
-
rp = (ap > epsilon
|
|
2310
|
+
rp = (ap > epsilon) && (padRadius ? +padRadius.apply(this, arguments) : sqrt(r0 * r0 + r1 * r1)),
|
|
2311
2311
|
rc = min(abs(r1 - r0) / 2, +cornerRadius.apply(this, arguments)),
|
|
2312
2312
|
rc0 = rc,
|
|
2313
2313
|
rc1 = rc,
|
|
@@ -2315,12 +2315,12 @@ function d3Arc() {
|
|
|
2315
2315
|
t1;
|
|
2316
2316
|
|
|
2317
2317
|
// Apply padding? Note that since r1 ≥ r0, da1 ≥ da0.
|
|
2318
|
-
if (rp > epsilon
|
|
2318
|
+
if (rp > epsilon) {
|
|
2319
2319
|
var p0 = asin(rp / r0 * sin(ap)),
|
|
2320
2320
|
p1 = asin(rp / r1 * sin(ap));
|
|
2321
|
-
if ((da0 -= p0 * 2) > epsilon
|
|
2321
|
+
if ((da0 -= p0 * 2) > epsilon) p0 *= (cw ? 1 : -1), a00 += p0, a10 -= p0;
|
|
2322
2322
|
else da0 = 0, a00 = a10 = (a0 + a1) / 2;
|
|
2323
|
-
if ((da1 -= p1 * 2) > epsilon
|
|
2323
|
+
if ((da1 -= p1 * 2) > epsilon) p1 *= (cw ? 1 : -1), a01 += p1, a11 -= p1;
|
|
2324
2324
|
else da1 = 0, a01 = a11 = (a0 + a1) / 2;
|
|
2325
2325
|
}
|
|
2326
2326
|
|
|
@@ -2330,7 +2330,7 @@ function d3Arc() {
|
|
|
2330
2330
|
y10 = r0 * sin(a10);
|
|
2331
2331
|
|
|
2332
2332
|
// Apply rounded corners?
|
|
2333
|
-
if (rc > epsilon
|
|
2333
|
+
if (rc > epsilon) {
|
|
2334
2334
|
var x11 = r1 * cos(a11),
|
|
2335
2335
|
y11 = r1 * sin(a11),
|
|
2336
2336
|
x00 = r0 * cos(a00),
|
|
@@ -2338,7 +2338,7 @@ function d3Arc() {
|
|
|
2338
2338
|
oc;
|
|
2339
2339
|
|
|
2340
2340
|
// Restrict the corner radius according to the sector angle.
|
|
2341
|
-
if (da < pi
|
|
2341
|
+
if (da < pi && (oc = intersect(x01, y01, x00, y00, x11, y11, x10, y10))) {
|
|
2342
2342
|
var ax = x01 - oc[0],
|
|
2343
2343
|
ay = y01 - oc[1],
|
|
2344
2344
|
bx = x11 - oc[0],
|
|
@@ -2351,10 +2351,10 @@ function d3Arc() {
|
|
|
2351
2351
|
}
|
|
2352
2352
|
|
|
2353
2353
|
// Is the sector collapsed to a line?
|
|
2354
|
-
if (!(da1 > epsilon
|
|
2354
|
+
if (!(da1 > epsilon)) context.moveTo(x01, y01);
|
|
2355
2355
|
|
|
2356
2356
|
// Does the sector’s outer ring have rounded corners?
|
|
2357
|
-
else if (rc1 > epsilon
|
|
2357
|
+
else if (rc1 > epsilon) {
|
|
2358
2358
|
t0 = cornerTangents(x00, y00, x01, y01, r1, rc1, cw);
|
|
2359
2359
|
t1 = cornerTangents(x11, y11, x10, y10, r1, rc1, cw);
|
|
2360
2360
|
|
|
@@ -2376,10 +2376,10 @@ function d3Arc() {
|
|
|
2376
2376
|
|
|
2377
2377
|
// Is there no inner ring, and it’s a circular sector?
|
|
2378
2378
|
// Or perhaps it’s an annular sector collapsed due to padding?
|
|
2379
|
-
if (!(r0 > epsilon
|
|
2379
|
+
if (!(r0 > epsilon) || !(da0 > epsilon)) context.lineTo(x10, y10);
|
|
2380
2380
|
|
|
2381
2381
|
// Does the sector’s inner ring (or point) have rounded corners?
|
|
2382
|
-
else if (rc0 > epsilon
|
|
2382
|
+
else if (rc0 > epsilon) {
|
|
2383
2383
|
t0 = cornerTangents(x10, y10, x11, y11, r0, -rc0, cw);
|
|
2384
2384
|
t1 = cornerTangents(x01, y01, x00, y00, r0, -rc0, cw);
|
|
2385
2385
|
|
|
@@ -2407,36 +2407,36 @@ function d3Arc() {
|
|
|
2407
2407
|
|
|
2408
2408
|
arc.centroid = function() {
|
|
2409
2409
|
var r = (+innerRadius.apply(this, arguments) + +outerRadius.apply(this, arguments)) / 2,
|
|
2410
|
-
a = (+startAngle.apply(this, arguments) + +endAngle.apply(this, arguments)) / 2 - pi
|
|
2410
|
+
a = (+startAngle.apply(this, arguments) + +endAngle.apply(this, arguments)) / 2 - pi / 2;
|
|
2411
2411
|
return [cos(a) * r, sin(a) * r];
|
|
2412
2412
|
};
|
|
2413
2413
|
|
|
2414
2414
|
arc.innerRadius = function(_) {
|
|
2415
|
-
return arguments.length ? (innerRadius = typeof _ === "function" ? _ : constant
|
|
2415
|
+
return arguments.length ? (innerRadius = typeof _ === "function" ? _ : constant(+_), arc) : innerRadius;
|
|
2416
2416
|
};
|
|
2417
2417
|
|
|
2418
2418
|
arc.outerRadius = function(_) {
|
|
2419
|
-
return arguments.length ? (outerRadius = typeof _ === "function" ? _ : constant
|
|
2419
|
+
return arguments.length ? (outerRadius = typeof _ === "function" ? _ : constant(+_), arc) : outerRadius;
|
|
2420
2420
|
};
|
|
2421
2421
|
|
|
2422
2422
|
arc.cornerRadius = function(_) {
|
|
2423
|
-
return arguments.length ? (cornerRadius = typeof _ === "function" ? _ : constant
|
|
2423
|
+
return arguments.length ? (cornerRadius = typeof _ === "function" ? _ : constant(+_), arc) : cornerRadius;
|
|
2424
2424
|
};
|
|
2425
2425
|
|
|
2426
2426
|
arc.padRadius = function(_) {
|
|
2427
|
-
return arguments.length ? (padRadius = _ == null ? null : typeof _ === "function" ? _ : constant
|
|
2427
|
+
return arguments.length ? (padRadius = _ == null ? null : typeof _ === "function" ? _ : constant(+_), arc) : padRadius;
|
|
2428
2428
|
};
|
|
2429
2429
|
|
|
2430
2430
|
arc.startAngle = function(_) {
|
|
2431
|
-
return arguments.length ? (startAngle = typeof _ === "function" ? _ : constant
|
|
2431
|
+
return arguments.length ? (startAngle = typeof _ === "function" ? _ : constant(+_), arc) : startAngle;
|
|
2432
2432
|
};
|
|
2433
2433
|
|
|
2434
2434
|
arc.endAngle = function(_) {
|
|
2435
|
-
return arguments.length ? (endAngle = typeof _ === "function" ? _ : constant
|
|
2435
|
+
return arguments.length ? (endAngle = typeof _ === "function" ? _ : constant(+_), arc) : endAngle;
|
|
2436
2436
|
};
|
|
2437
2437
|
|
|
2438
2438
|
arc.padAngle = function(_) {
|
|
2439
|
-
return arguments.length ? (padAngle = typeof _ === "function" ? _ : constant
|
|
2439
|
+
return arguments.length ? (padAngle = typeof _ === "function" ? _ : constant(+_), arc) : padAngle;
|
|
2440
2440
|
};
|
|
2441
2441
|
|
|
2442
2442
|
arc.context = function(_) {
|
|
@@ -2446,8 +2446,8 @@ function d3Arc() {
|
|
|
2446
2446
|
return arc;
|
|
2447
2447
|
}
|
|
2448
2448
|
|
|
2449
|
-
var css_248z$
|
|
2450
|
-
styleInject(css_248z$
|
|
2449
|
+
var css_248z$1 = ".tree_Sunburst path{stroke:#fff;stroke-width:.5px;fill-rule:evenodd}";
|
|
2450
|
+
styleInject(css_248z$1);
|
|
2451
2451
|
|
|
2452
2452
|
var SunburstPartition = /** @class */ (function (_super) {
|
|
2453
2453
|
__extends(SunburstPartition, _super);
|
|
@@ -2553,8 +2553,8 @@ SunburstPartition.prototype.implements(ITree.prototype);
|
|
|
2553
2553
|
SunburstPartition.prototype.publish("paletteID", "default", "set", "Color palette for this widget", SunburstPartition.prototype._palette.switch(), { tags: ["Basic", "Shared"] });
|
|
2554
2554
|
SunburstPartition.prototype.publish("useClonedPalette", false, "boolean", "Enable or disable using a cloned palette", null, { tags: ["Intermediate", "Shared"] });
|
|
2555
2555
|
|
|
2556
|
-
var css_248z
|
|
2557
|
-
styleInject(css_248z
|
|
2556
|
+
var css_248z = ".tree_Treemap *{box-sizing:border-box}.tree_Treemap .node{border:1px solid #333;overflow:hidden;position:absolute;text-overflow:ellipsis}.tree_Treemap .node.selected{border-color:red}.tree_Treemap .node.over{border-color:orange}.tree_Treemap .node.selected.over{border-color:red}.tree_Treemap .node>span.treemap-parent-label{display:inline-block;font-weight:700;margin:4px 4px 0}.tree_Treemap .node>span.treemap-parent-value{font-style:italic;font-weight:400;margin:4px 0 0}.tree_Treemap .node>span.treemap-singleton-label{display:block;font-weight:400;margin:4px 0 0 4px}.tree_Treemap .node>span.treemap-singleton-value{display:block;font-style:italic;margin:0 0 0 4px}";
|
|
2557
|
+
styleInject(css_248z);
|
|
2558
2558
|
|
|
2559
2559
|
var TreemapColumn = /** @class */ (function (_super) {
|
|
2560
2560
|
__extends(TreemapColumn, _super);
|
|
@@ -2772,10 +2772,10 @@ var Treemap = /** @class */ (function (_super) {
|
|
|
2772
2772
|
return d.size || 1;
|
|
2773
2773
|
};
|
|
2774
2774
|
Treemap.prototype.parentWeightHTML = function (d) {
|
|
2775
|
-
return this.showParentWeight() ? "<span class=\"treemap-parent-label\">"
|
|
2775
|
+
return this.showParentWeight() ? "<span class=\"treemap-parent-label\">".concat(d.data.label, "</span><span class=\"treemap-parent-value\">").concat(d.value).concat(this.weightSuffix(), "</span>") : "<span class=\"treemap-parent-label\">".concat(d.data.label, "</span>");
|
|
2776
2776
|
};
|
|
2777
2777
|
Treemap.prototype.leafWeightHTML = function (d) {
|
|
2778
|
-
return this.showLeafWeight() ? "<span class=\"treemap-leaf-label\">"
|
|
2778
|
+
return this.showLeafWeight() ? "<span class=\"treemap-leaf-label\">".concat(d.data.label, "</span><span class=\"treemap-leaf-value\">").concat(d.value).concat(this.weightSuffix(), "</span>") : "<span class=\"treemap-leaf-label\">".concat(d.data.label, "</span>");
|
|
2779
2779
|
};
|
|
2780
2780
|
return Treemap;
|
|
2781
2781
|
}(HTMLWidget));
|