victory-core 36.8.4 → 36.8.5
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/CHANGELOG.md +8 -0
- package/dist/victory-core.js +684 -1046
- package/dist/victory-core.min.js +1 -1
- package/es/victory-clip-container/victory-clip-container.js +3 -6
- package/es/victory-container/victory-container.js +5 -13
- package/es/victory-label/victory-label.js +6 -7
- package/es/victory-primitives/arc.js +2 -4
- package/es/victory-primitives/background.js +1 -3
- package/es/victory-primitives/border.js +2 -4
- package/es/victory-primitives/line-segment.js +2 -4
- package/es/victory-primitives/point.js +1 -3
- package/es/victory-primitives/whisker.js +3 -5
- package/es/victory-theme/grayscale.js +24 -27
- package/es/victory-theme/material.js +27 -30
- package/es/victory-util/add-events.js +1 -2
- package/es/victory-util/axis.js +3 -6
- package/es/victory-util/data.js +5 -10
- package/es/victory-util/events.js +13 -14
- package/es/victory-util/helpers.d.ts +11 -0
- package/es/victory-util/helpers.js +34 -5
- package/es/victory-util/point-path-helpers.js +3 -3
- package/es/victory-util/textsize.js +1 -2
- package/es/victory-util/transitions.js +14 -20
- package/es/victory-util/wrapper.js +7 -10
- package/lib/victory-clip-container/victory-clip-container.js +3 -5
- package/lib/victory-container/victory-container.js +5 -7
- package/lib/victory-label/victory-label.js +6 -8
- package/lib/victory-primitives/arc.js +2 -4
- package/lib/victory-primitives/background.js +1 -3
- package/lib/victory-primitives/border.js +2 -4
- package/lib/victory-primitives/line-segment.js +2 -4
- package/lib/victory-primitives/point.js +1 -3
- package/lib/victory-primitives/whisker.js +3 -5
- package/lib/victory-theme/grayscale.js +24 -29
- package/lib/victory-theme/material.js +27 -32
- package/lib/victory-util/add-events.js +1 -3
- package/lib/victory-util/axis.js +3 -7
- package/lib/victory-util/data.js +5 -9
- package/lib/victory-util/events.js +13 -15
- package/lib/victory-util/helpers.d.ts +11 -0
- package/lib/victory-util/helpers.js +36 -4
- package/lib/victory-util/point-path-helpers.js +6 -3
- package/lib/victory-util/textsize.js +1 -3
- package/lib/victory-util/transitions.js +14 -16
- package/lib/victory-util/wrapper.js +7 -9
- package/package.json +2 -2
- package/src/victory-clip-container/victory-clip-container.tsx +4 -4
- package/src/victory-container/victory-container.tsx +6 -6
- package/src/victory-label/victory-label.tsx +7 -7
- package/src/victory-primitives/arc.tsx +2 -3
- package/src/victory-primitives/background.tsx +1 -2
- package/src/victory-primitives/border.tsx +2 -3
- package/src/victory-primitives/line-segment.tsx +2 -3
- package/src/victory-primitives/point.tsx +1 -2
- package/src/victory-primitives/whisker.tsx +3 -4
- package/src/victory-theme/grayscale.tsx +30 -25
- package/src/victory-theme/material.tsx +33 -28
- package/src/victory-util/add-events.tsx +1 -2
- package/src/victory-util/axis.tsx +3 -5
- package/src/victory-util/data.ts +7 -7
- package/src/victory-util/events.ts +23 -16
- package/src/victory-util/helpers.ts +34 -3
- package/src/victory-util/point-path-helpers.ts +3 -2
- package/src/victory-util/textsize.ts +2 -2
- package/src/victory-util/transitions.ts +22 -15
- package/src/victory-util/wrapper.tsx +11 -8
|
@@ -4,11 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.grayscale = void 0;
|
|
7
|
-
|
|
8
|
-
var _assign2 = _interopRequireDefault(require("lodash/assign"));
|
|
9
|
-
|
|
10
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
|
-
|
|
12
7
|
// *
|
|
13
8
|
// * Colors
|
|
14
9
|
// *
|
|
@@ -41,7 +36,7 @@ var baseLabelStyles = {
|
|
|
41
36
|
fill: charcoal,
|
|
42
37
|
stroke: "transparent"
|
|
43
38
|
};
|
|
44
|
-
var centeredLabelStyles =
|
|
39
|
+
var centeredLabelStyles = Object.assign({
|
|
45
40
|
textAnchor: "middle"
|
|
46
41
|
}, baseLabelStyles); // *
|
|
47
42
|
// * Strokes
|
|
@@ -50,7 +45,7 @@ var centeredLabelStyles = (0, _assign2.default)({
|
|
|
50
45
|
var strokeLinecap = "round";
|
|
51
46
|
var strokeLinejoin = "round";
|
|
52
47
|
var grayscale = {
|
|
53
|
-
area:
|
|
48
|
+
area: Object.assign({
|
|
54
49
|
style: {
|
|
55
50
|
data: {
|
|
56
51
|
fill: charcoal
|
|
@@ -58,7 +53,7 @@ var grayscale = {
|
|
|
58
53
|
labels: baseLabelStyles
|
|
59
54
|
}
|
|
60
55
|
}, baseProps),
|
|
61
|
-
axis:
|
|
56
|
+
axis: Object.assign({
|
|
62
57
|
style: {
|
|
63
58
|
axis: {
|
|
64
59
|
fill: "transparent",
|
|
@@ -67,7 +62,7 @@ var grayscale = {
|
|
|
67
62
|
strokeLinecap: strokeLinecap,
|
|
68
63
|
strokeLinejoin: strokeLinejoin
|
|
69
64
|
},
|
|
70
|
-
axisLabel:
|
|
65
|
+
axisLabel: Object.assign({}, centeredLabelStyles, {
|
|
71
66
|
padding: 25
|
|
72
67
|
}),
|
|
73
68
|
grid: {
|
|
@@ -83,7 +78,7 @@ var grayscale = {
|
|
|
83
78
|
tickLabels: baseLabelStyles
|
|
84
79
|
}
|
|
85
80
|
}, baseProps),
|
|
86
|
-
bar:
|
|
81
|
+
bar: Object.assign({
|
|
87
82
|
style: {
|
|
88
83
|
data: {
|
|
89
84
|
fill: charcoal,
|
|
@@ -93,14 +88,14 @@ var grayscale = {
|
|
|
93
88
|
labels: baseLabelStyles
|
|
94
89
|
}
|
|
95
90
|
}, baseProps),
|
|
96
|
-
boxplot:
|
|
91
|
+
boxplot: Object.assign({
|
|
97
92
|
style: {
|
|
98
93
|
max: {
|
|
99
94
|
padding: 8,
|
|
100
95
|
stroke: charcoal,
|
|
101
96
|
strokeWidth: 1
|
|
102
97
|
},
|
|
103
|
-
maxLabels:
|
|
98
|
+
maxLabels: Object.assign({}, baseLabelStyles, {
|
|
104
99
|
padding: 3
|
|
105
100
|
}),
|
|
106
101
|
median: {
|
|
@@ -108,7 +103,7 @@ var grayscale = {
|
|
|
108
103
|
stroke: charcoal,
|
|
109
104
|
strokeWidth: 1
|
|
110
105
|
},
|
|
111
|
-
medianLabels:
|
|
106
|
+
medianLabels: Object.assign({}, baseLabelStyles, {
|
|
112
107
|
padding: 3
|
|
113
108
|
}),
|
|
114
109
|
min: {
|
|
@@ -116,33 +111,33 @@ var grayscale = {
|
|
|
116
111
|
stroke: charcoal,
|
|
117
112
|
strokeWidth: 1
|
|
118
113
|
},
|
|
119
|
-
minLabels:
|
|
114
|
+
minLabels: Object.assign({}, baseLabelStyles, {
|
|
120
115
|
padding: 3
|
|
121
116
|
}),
|
|
122
117
|
q1: {
|
|
123
118
|
padding: 8,
|
|
124
119
|
fill: grey
|
|
125
120
|
},
|
|
126
|
-
q1Labels:
|
|
121
|
+
q1Labels: Object.assign({}, baseLabelStyles, {
|
|
127
122
|
padding: 3
|
|
128
123
|
}),
|
|
129
124
|
q3: {
|
|
130
125
|
padding: 8,
|
|
131
126
|
fill: grey
|
|
132
127
|
},
|
|
133
|
-
q3Labels:
|
|
128
|
+
q3Labels: Object.assign({}, baseLabelStyles, {
|
|
134
129
|
padding: 3
|
|
135
130
|
})
|
|
136
131
|
},
|
|
137
132
|
boxWidth: 20
|
|
138
133
|
}, baseProps),
|
|
139
|
-
candlestick:
|
|
134
|
+
candlestick: Object.assign({
|
|
140
135
|
style: {
|
|
141
136
|
data: {
|
|
142
137
|
stroke: charcoal,
|
|
143
138
|
strokeWidth: 1
|
|
144
139
|
},
|
|
145
|
-
labels:
|
|
140
|
+
labels: Object.assign({}, baseLabelStyles, {
|
|
146
141
|
padding: 5
|
|
147
142
|
})
|
|
148
143
|
},
|
|
@@ -152,7 +147,7 @@ var grayscale = {
|
|
|
152
147
|
}
|
|
153
148
|
}, baseProps),
|
|
154
149
|
chart: baseProps,
|
|
155
|
-
errorbar:
|
|
150
|
+
errorbar: Object.assign({
|
|
156
151
|
borderWidth: 8,
|
|
157
152
|
style: {
|
|
158
153
|
data: {
|
|
@@ -163,10 +158,10 @@ var grayscale = {
|
|
|
163
158
|
labels: baseLabelStyles
|
|
164
159
|
}
|
|
165
160
|
}, baseProps),
|
|
166
|
-
group:
|
|
161
|
+
group: Object.assign({
|
|
167
162
|
colorScale: colors
|
|
168
163
|
}, baseProps),
|
|
169
|
-
histogram:
|
|
164
|
+
histogram: Object.assign({
|
|
170
165
|
style: {
|
|
171
166
|
data: {
|
|
172
167
|
fill: grey,
|
|
@@ -186,12 +181,12 @@ var grayscale = {
|
|
|
186
181
|
type: "circle"
|
|
187
182
|
},
|
|
188
183
|
labels: baseLabelStyles,
|
|
189
|
-
title:
|
|
184
|
+
title: Object.assign({}, baseLabelStyles, {
|
|
190
185
|
padding: 5
|
|
191
186
|
})
|
|
192
187
|
}
|
|
193
188
|
},
|
|
194
|
-
line:
|
|
189
|
+
line: Object.assign({
|
|
195
190
|
style: {
|
|
196
191
|
data: {
|
|
197
192
|
fill: "transparent",
|
|
@@ -208,7 +203,7 @@ var grayscale = {
|
|
|
208
203
|
stroke: "transparent",
|
|
209
204
|
strokeWidth: 1
|
|
210
205
|
},
|
|
211
|
-
labels:
|
|
206
|
+
labels: Object.assign({}, baseLabelStyles, {
|
|
212
207
|
padding: 20
|
|
213
208
|
})
|
|
214
209
|
},
|
|
@@ -217,7 +212,7 @@ var grayscale = {
|
|
|
217
212
|
height: 400,
|
|
218
213
|
padding: 50
|
|
219
214
|
},
|
|
220
|
-
scatter:
|
|
215
|
+
scatter: Object.assign({
|
|
221
216
|
style: {
|
|
222
217
|
data: {
|
|
223
218
|
fill: charcoal,
|
|
@@ -227,11 +222,11 @@ var grayscale = {
|
|
|
227
222
|
labels: baseLabelStyles
|
|
228
223
|
}
|
|
229
224
|
}, baseProps),
|
|
230
|
-
stack:
|
|
225
|
+
stack: Object.assign({
|
|
231
226
|
colorScale: colors
|
|
232
227
|
}, baseProps),
|
|
233
228
|
tooltip: {
|
|
234
|
-
style:
|
|
229
|
+
style: Object.assign({}, baseLabelStyles, {
|
|
235
230
|
padding: 0,
|
|
236
231
|
pointerEvents: "none"
|
|
237
232
|
}),
|
|
@@ -245,14 +240,14 @@ var grayscale = {
|
|
|
245
240
|
cornerRadius: 5,
|
|
246
241
|
pointerLength: 10
|
|
247
242
|
},
|
|
248
|
-
voronoi:
|
|
243
|
+
voronoi: Object.assign({
|
|
249
244
|
style: {
|
|
250
245
|
data: {
|
|
251
246
|
fill: "transparent",
|
|
252
247
|
stroke: "transparent",
|
|
253
248
|
strokeWidth: 0
|
|
254
249
|
},
|
|
255
|
-
labels:
|
|
250
|
+
labels: Object.assign({}, baseLabelStyles, {
|
|
256
251
|
padding: 5,
|
|
257
252
|
pointerEvents: "none"
|
|
258
253
|
}),
|
|
@@ -4,11 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.material = void 0;
|
|
7
|
-
|
|
8
|
-
var _assign2 = _interopRequireDefault(require("lodash/assign"));
|
|
9
|
-
|
|
10
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
|
-
|
|
12
7
|
// *
|
|
13
8
|
// * Colors
|
|
14
9
|
// *
|
|
@@ -50,7 +45,7 @@ var baseLabelStyles = {
|
|
|
50
45
|
stroke: "transparent",
|
|
51
46
|
strokeWidth: 0
|
|
52
47
|
};
|
|
53
|
-
var centeredLabelStyles =
|
|
48
|
+
var centeredLabelStyles = Object.assign({
|
|
54
49
|
textAnchor: "middle"
|
|
55
50
|
}, baseLabelStyles); // *
|
|
56
51
|
// * Strokes
|
|
@@ -60,7 +55,7 @@ var strokeDasharray = "10, 5";
|
|
|
60
55
|
var strokeLinecap = "round";
|
|
61
56
|
var strokeLinejoin = "round";
|
|
62
57
|
var material = {
|
|
63
|
-
area:
|
|
58
|
+
area: Object.assign({
|
|
64
59
|
style: {
|
|
65
60
|
data: {
|
|
66
61
|
fill: grey900
|
|
@@ -68,7 +63,7 @@ var material = {
|
|
|
68
63
|
labels: baseLabelStyles
|
|
69
64
|
}
|
|
70
65
|
}, baseProps),
|
|
71
|
-
axis:
|
|
66
|
+
axis: Object.assign({
|
|
72
67
|
style: {
|
|
73
68
|
axis: {
|
|
74
69
|
fill: "transparent",
|
|
@@ -77,7 +72,7 @@ var material = {
|
|
|
77
72
|
strokeLinecap: strokeLinecap,
|
|
78
73
|
strokeLinejoin: strokeLinejoin
|
|
79
74
|
},
|
|
80
|
-
axisLabel:
|
|
75
|
+
axisLabel: Object.assign({}, centeredLabelStyles, {
|
|
81
76
|
padding: padding,
|
|
82
77
|
stroke: "transparent"
|
|
83
78
|
}),
|
|
@@ -97,12 +92,12 @@ var material = {
|
|
|
97
92
|
strokeLinecap: strokeLinecap,
|
|
98
93
|
strokeLinejoin: strokeLinejoin
|
|
99
94
|
},
|
|
100
|
-
tickLabels:
|
|
95
|
+
tickLabels: Object.assign({}, baseLabelStyles, {
|
|
101
96
|
fill: blueGrey700
|
|
102
97
|
})
|
|
103
98
|
}
|
|
104
99
|
}, baseProps),
|
|
105
|
-
polarDependentAxis:
|
|
100
|
+
polarDependentAxis: Object.assign({
|
|
106
101
|
style: {
|
|
107
102
|
ticks: {
|
|
108
103
|
fill: "transparent",
|
|
@@ -111,7 +106,7 @@ var material = {
|
|
|
111
106
|
}
|
|
112
107
|
}
|
|
113
108
|
}),
|
|
114
|
-
bar:
|
|
109
|
+
bar: Object.assign({
|
|
115
110
|
style: {
|
|
116
111
|
data: {
|
|
117
112
|
fill: blueGrey700,
|
|
@@ -121,14 +116,14 @@ var material = {
|
|
|
121
116
|
labels: baseLabelStyles
|
|
122
117
|
}
|
|
123
118
|
}, baseProps),
|
|
124
|
-
boxplot:
|
|
119
|
+
boxplot: Object.assign({
|
|
125
120
|
style: {
|
|
126
121
|
max: {
|
|
127
122
|
padding: padding,
|
|
128
123
|
stroke: blueGrey700,
|
|
129
124
|
strokeWidth: 1
|
|
130
125
|
},
|
|
131
|
-
maxLabels:
|
|
126
|
+
maxLabels: Object.assign({}, baseLabelStyles, {
|
|
132
127
|
padding: 3
|
|
133
128
|
}),
|
|
134
129
|
median: {
|
|
@@ -136,7 +131,7 @@ var material = {
|
|
|
136
131
|
stroke: blueGrey700,
|
|
137
132
|
strokeWidth: 1
|
|
138
133
|
},
|
|
139
|
-
medianLabels:
|
|
134
|
+
medianLabels: Object.assign({}, baseLabelStyles, {
|
|
140
135
|
padding: 3
|
|
141
136
|
}),
|
|
142
137
|
min: {
|
|
@@ -144,32 +139,32 @@ var material = {
|
|
|
144
139
|
stroke: blueGrey700,
|
|
145
140
|
strokeWidth: 1
|
|
146
141
|
},
|
|
147
|
-
minLabels:
|
|
142
|
+
minLabels: Object.assign({}, baseLabelStyles, {
|
|
148
143
|
padding: 3
|
|
149
144
|
}),
|
|
150
145
|
q1: {
|
|
151
146
|
padding: padding,
|
|
152
147
|
fill: blueGrey700
|
|
153
148
|
},
|
|
154
|
-
q1Labels:
|
|
149
|
+
q1Labels: Object.assign({}, baseLabelStyles, {
|
|
155
150
|
padding: 3
|
|
156
151
|
}),
|
|
157
152
|
q3: {
|
|
158
153
|
padding: padding,
|
|
159
154
|
fill: blueGrey700
|
|
160
155
|
},
|
|
161
|
-
q3Labels:
|
|
156
|
+
q3Labels: Object.assign({}, baseLabelStyles, {
|
|
162
157
|
padding: 3
|
|
163
158
|
})
|
|
164
159
|
},
|
|
165
160
|
boxWidth: 20
|
|
166
161
|
}, baseProps),
|
|
167
|
-
candlestick:
|
|
162
|
+
candlestick: Object.assign({
|
|
168
163
|
style: {
|
|
169
164
|
data: {
|
|
170
165
|
stroke: blueGrey700
|
|
171
166
|
},
|
|
172
|
-
labels:
|
|
167
|
+
labels: Object.assign({}, baseLabelStyles, {
|
|
173
168
|
padding: 5
|
|
174
169
|
})
|
|
175
170
|
},
|
|
@@ -179,7 +174,7 @@ var material = {
|
|
|
179
174
|
}
|
|
180
175
|
}, baseProps),
|
|
181
176
|
chart: baseProps,
|
|
182
|
-
errorbar:
|
|
177
|
+
errorbar: Object.assign({
|
|
183
178
|
borderWidth: 8,
|
|
184
179
|
style: {
|
|
185
180
|
data: {
|
|
@@ -191,10 +186,10 @@ var material = {
|
|
|
191
186
|
labels: baseLabelStyles
|
|
192
187
|
}
|
|
193
188
|
}, baseProps),
|
|
194
|
-
group:
|
|
189
|
+
group: Object.assign({
|
|
195
190
|
colorScale: colors
|
|
196
191
|
}, baseProps),
|
|
197
|
-
histogram:
|
|
192
|
+
histogram: Object.assign({
|
|
198
193
|
style: {
|
|
199
194
|
data: {
|
|
200
195
|
fill: blueGrey700,
|
|
@@ -214,12 +209,12 @@ var material = {
|
|
|
214
209
|
type: "circle"
|
|
215
210
|
},
|
|
216
211
|
labels: baseLabelStyles,
|
|
217
|
-
title:
|
|
212
|
+
title: Object.assign({}, baseLabelStyles, {
|
|
218
213
|
padding: 5
|
|
219
214
|
})
|
|
220
215
|
}
|
|
221
216
|
},
|
|
222
|
-
line:
|
|
217
|
+
line: Object.assign({
|
|
223
218
|
style: {
|
|
224
219
|
data: {
|
|
225
220
|
fill: "transparent",
|
|
@@ -230,7 +225,7 @@ var material = {
|
|
|
230
225
|
labels: baseLabelStyles
|
|
231
226
|
}
|
|
232
227
|
}, baseProps),
|
|
233
|
-
pie:
|
|
228
|
+
pie: Object.assign({
|
|
234
229
|
colorScale: colors,
|
|
235
230
|
style: {
|
|
236
231
|
data: {
|
|
@@ -238,12 +233,12 @@ var material = {
|
|
|
238
233
|
stroke: blueGrey50,
|
|
239
234
|
strokeWidth: 1
|
|
240
235
|
},
|
|
241
|
-
labels:
|
|
236
|
+
labels: Object.assign({}, baseLabelStyles, {
|
|
242
237
|
padding: 20
|
|
243
238
|
})
|
|
244
239
|
}
|
|
245
240
|
}, baseProps),
|
|
246
|
-
scatter:
|
|
241
|
+
scatter: Object.assign({
|
|
247
242
|
style: {
|
|
248
243
|
data: {
|
|
249
244
|
fill: blueGrey700,
|
|
@@ -254,11 +249,11 @@ var material = {
|
|
|
254
249
|
labels: baseLabelStyles
|
|
255
250
|
}
|
|
256
251
|
}, baseProps),
|
|
257
|
-
stack:
|
|
252
|
+
stack: Object.assign({
|
|
258
253
|
colorScale: colors
|
|
259
254
|
}, baseProps),
|
|
260
255
|
tooltip: {
|
|
261
|
-
style:
|
|
256
|
+
style: Object.assign({}, baseLabelStyles, {
|
|
262
257
|
padding: 0,
|
|
263
258
|
pointerEvents: "none"
|
|
264
259
|
}),
|
|
@@ -272,14 +267,14 @@ var material = {
|
|
|
272
267
|
cornerRadius: 5,
|
|
273
268
|
pointerLength: 10
|
|
274
269
|
},
|
|
275
|
-
voronoi:
|
|
270
|
+
voronoi: Object.assign({
|
|
276
271
|
style: {
|
|
277
272
|
data: {
|
|
278
273
|
fill: "transparent",
|
|
279
274
|
stroke: "transparent",
|
|
280
275
|
strokeWidth: 0
|
|
281
276
|
},
|
|
282
|
-
labels:
|
|
277
|
+
labels: Object.assign({}, baseLabelStyles, {
|
|
283
278
|
padding: 5,
|
|
284
279
|
pointerEvents: "none"
|
|
285
280
|
}),
|
|
@@ -21,8 +21,6 @@ var _difference2 = _interopRequireDefault(require("lodash/difference"));
|
|
|
21
21
|
|
|
22
22
|
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
23
23
|
|
|
24
|
-
var _assign2 = _interopRequireDefault(require("lodash/assign"));
|
|
25
|
-
|
|
26
24
|
var _react = _interopRequireDefault(require("react"));
|
|
27
25
|
|
|
28
26
|
var Events = _interopRequireWildcard(require("./events"));
|
|
@@ -336,7 +334,7 @@ function addEvents(WrappedComponent) {
|
|
|
336
334
|
id: id
|
|
337
335
|
});
|
|
338
336
|
var events = (0, _defaults2.default)({}, Events.getPartialEvents(baseEvents, key, componentProps), componentProps.events);
|
|
339
|
-
return
|
|
337
|
+
return Object.assign({}, componentProps, {
|
|
340
338
|
events: events
|
|
341
339
|
});
|
|
342
340
|
}
|
package/lib/victory-util/axis.js
CHANGED
|
@@ -25,8 +25,6 @@ var _values2 = _interopRequireDefault(require("lodash/values"));
|
|
|
25
25
|
|
|
26
26
|
var _orderBy2 = _interopRequireDefault(require("lodash/orderBy"));
|
|
27
27
|
|
|
28
|
-
var _range2 = _interopRequireDefault(require("lodash/range"));
|
|
29
|
-
|
|
30
28
|
var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
|
|
31
29
|
|
|
32
30
|
var _invert2 = _interopRequireDefault(require("lodash/invert"));
|
|
@@ -39,8 +37,6 @@ var _identity2 = _interopRequireDefault(require("lodash/identity"));
|
|
|
39
37
|
|
|
40
38
|
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
41
39
|
|
|
42
|
-
var _assign2 = _interopRequireDefault(require("lodash/assign"));
|
|
43
|
-
|
|
44
40
|
var _react = _interopRequireDefault(require("react"));
|
|
45
41
|
|
|
46
42
|
var Collection = _interopRequireWildcard(require("./collection"));
|
|
@@ -263,7 +259,7 @@ function getTickArray(props) {
|
|
|
263
259
|
if (tickValues && Collection.containsStrings(tickValues)) {
|
|
264
260
|
ticks = stringMap ? tickValues.map(function (tick) {
|
|
265
261
|
return stringMap[tick];
|
|
266
|
-
}) :
|
|
262
|
+
}) : Helpers.range(1, tickValues.length + 1);
|
|
267
263
|
}
|
|
268
264
|
|
|
269
265
|
var tickArray = ticks ? (0, _uniq2.default)(ticks) : getTicksFromFormat();
|
|
@@ -473,10 +469,10 @@ function modifyProps(props, fallbackProps) {
|
|
|
473
469
|
}
|
|
474
470
|
|
|
475
471
|
var axisTheme = (0, _defaults2.default)({}, props.theme[role], props.theme.axis);
|
|
476
|
-
var theme =
|
|
472
|
+
var theme = Object.assign({}, props.theme, {
|
|
477
473
|
axis: axisTheme
|
|
478
474
|
});
|
|
479
|
-
return Helpers.modifyProps(
|
|
475
|
+
return Helpers.modifyProps(Object.assign({}, props, {
|
|
480
476
|
theme: theme
|
|
481
477
|
}), fallbackProps, "axis");
|
|
482
478
|
}
|
package/lib/victory-util/data.js
CHANGED
|
@@ -35,12 +35,8 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
|
|
35
35
|
|
|
36
36
|
var _last2 = _interopRequireDefault(require("lodash/last"));
|
|
37
37
|
|
|
38
|
-
var _range2 = _interopRequireDefault(require("lodash/range"));
|
|
39
|
-
|
|
40
38
|
var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
|
|
41
39
|
|
|
42
|
-
var _assign2 = _interopRequireDefault(require("lodash/assign"));
|
|
43
|
-
|
|
44
40
|
var _react = _interopRequireDefault(require("react"));
|
|
45
41
|
|
|
46
42
|
var Helpers = _interopRequireWildcard(require("./helpers"));
|
|
@@ -90,7 +86,7 @@ function generateDataArray(props, axis) {
|
|
|
90
86
|
var domainMax = Math.max.apply(Math, _toConsumableArray(domain));
|
|
91
87
|
var domainMin = Math.min.apply(Math, _toConsumableArray(domain));
|
|
92
88
|
var step = (domainMax - domainMin) / samples;
|
|
93
|
-
var values =
|
|
89
|
+
var values = Helpers.range(domainMin, domainMax, step);
|
|
94
90
|
return (0, _last2.default)(values) === domainMax ? values : values.concat(domainMax);
|
|
95
91
|
} // Returns sorted data. If no sort keys are provided, data is returned unaltered.
|
|
96
92
|
|
|
@@ -136,7 +132,7 @@ function cleanData(dataset, props) {
|
|
|
136
132
|
|
|
137
133
|
var _y0 = rules(datum, "y0") ? datum._y0 : smallNumber;
|
|
138
134
|
|
|
139
|
-
return
|
|
135
|
+
return Object.assign({}, datum, {
|
|
140
136
|
_x: _x,
|
|
141
137
|
_y: _y,
|
|
142
138
|
_y0: _y0
|
|
@@ -177,7 +173,7 @@ function addEventKeys(props, data) {
|
|
|
177
173
|
return datum;
|
|
178
174
|
} else if (hasEventKeyAccessor) {
|
|
179
175
|
var eventKey = eventKeyAccessor(datum, index);
|
|
180
|
-
return eventKey !== undefined ?
|
|
176
|
+
return eventKey !== undefined ? Object.assign({
|
|
181
177
|
eventKey: eventKey
|
|
182
178
|
}, datum) : datum;
|
|
183
179
|
}
|
|
@@ -233,7 +229,7 @@ function formatDataFromDomain(dataset, domain, defaultBaseline) {
|
|
|
233
229
|
if (isUnderMinY(baseline) && !isUnderMinY(value)) _y0 = minDomainY; // baseline and value with only baseline above max, set baseline to maxDomainY
|
|
234
230
|
|
|
235
231
|
if (isOverMaxY(baseline) && !isOverMaxY(value)) _y0 = maxDomainY;
|
|
236
|
-
return
|
|
232
|
+
return Object.assign({}, datum, (0, _omitBy2.default)({
|
|
237
233
|
_x: _x,
|
|
238
234
|
_y: _y,
|
|
239
235
|
_y0: _y0,
|
|
@@ -350,7 +346,7 @@ function formatData(dataset, props, expectedKeys) {
|
|
|
350
346
|
|
|
351
347
|
return memo;
|
|
352
348
|
}, {});
|
|
353
|
-
var formattedDatum =
|
|
349
|
+
var formattedDatum = Object.assign({}, processedValues, parsedDatum);
|
|
354
350
|
|
|
355
351
|
if (!(0, _isEmpty2.default)(formattedDatum)) {
|
|
356
352
|
dataArr.push(formattedDatum);
|
|
@@ -32,8 +32,6 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
|
|
|
32
32
|
|
|
33
33
|
var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
|
|
34
34
|
|
|
35
|
-
var _assign6 = _interopRequireDefault(require("lodash/assign"));
|
|
36
|
-
|
|
37
35
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
38
36
|
|
|
39
37
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
@@ -94,7 +92,7 @@ getScopedEvents) {
|
|
|
94
92
|
|
|
95
93
|
var selectedEvents = getSelectedEvents();
|
|
96
94
|
return Array.isArray(selectedEvents) && selectedEvents.reduce(function (memo, event) {
|
|
97
|
-
return event ?
|
|
95
|
+
return event ? Object.assign(memo, event.eventHandlers) : memo;
|
|
98
96
|
}, {});
|
|
99
97
|
};
|
|
100
98
|
/* Returns all events from props and defaultEvents from components. Events handlers
|
|
@@ -127,7 +125,7 @@ getScopedEvents) {
|
|
|
127
125
|
|
|
128
126
|
var getSharedEvents = props.sharedEvents.getEvents;
|
|
129
127
|
var sharedEvents = props.sharedEvents.events && getSharedEvents(getEventsByTarget(props.sharedEvents.events), target);
|
|
130
|
-
return
|
|
128
|
+
return Object.assign({}, sharedEvents, ownEvents);
|
|
131
129
|
}
|
|
132
130
|
/* Returns a modified events object where each event handler is replaced by a new
|
|
133
131
|
* function that calls the original handler and then calls setState with the return
|
|
@@ -197,7 +195,7 @@ function getScopedEvents(events, namespace, childType, baseProps) {
|
|
|
197
195
|
key: key,
|
|
198
196
|
target: target
|
|
199
197
|
}, "state");
|
|
200
|
-
var mutatedProps = eventReturn.mutation(
|
|
198
|
+
var mutatedProps = eventReturn.mutation(Object.assign({}, mutationTargetProps, mutationTargetState), newBaseProps);
|
|
201
199
|
var childState = baseState[childName] || {};
|
|
202
200
|
|
|
203
201
|
var filterState = function (state) {
|
|
@@ -213,35 +211,35 @@ function getScopedEvents(events, namespace, childType, baseProps) {
|
|
|
213
211
|
};
|
|
214
212
|
|
|
215
213
|
var extendState = function (state) {
|
|
216
|
-
return target === "parent" ?
|
|
214
|
+
return target === "parent" ? Object.assign(state, _defineProperty({}, key, Object.assign(state[key] || {}, mutatedProps))) : Object.assign(state, _defineProperty({}, key, Object.assign(state[key] || {}, _defineProperty({}, target, mutatedProps))));
|
|
217
215
|
};
|
|
218
216
|
|
|
219
217
|
var updateState = function (state) {
|
|
220
218
|
return mutatedProps ? extendState(state) : filterState(state);
|
|
221
219
|
};
|
|
222
220
|
|
|
223
|
-
return childName !== undefined && childName !== null ?
|
|
221
|
+
return childName !== undefined && childName !== null ? Object.assign(baseState, _defineProperty({}, childName, updateState(childState))) : updateState(baseState);
|
|
224
222
|
}; // returns entire mutated state for a given childName
|
|
225
223
|
|
|
226
224
|
|
|
227
225
|
var getReturnByChild = function (childName) {
|
|
228
226
|
var mutationKeys = getKeys(childName);
|
|
229
227
|
return Array.isArray(mutationKeys) ? mutationKeys.reduce(function (memo, key) {
|
|
230
|
-
return
|
|
228
|
+
return Object.assign(memo, getMutationObject(key, childName));
|
|
231
229
|
}, {}) : getMutationObject(mutationKeys, childName);
|
|
232
230
|
}; // returns an entire mutated state for all children
|
|
233
231
|
|
|
234
232
|
|
|
235
233
|
var allChildNames = childNames === "all" ? (0, _without2.default)((0, _keys2.default)(newBaseProps), "parent") : childNames;
|
|
236
234
|
return Array.isArray(allChildNames) ? allChildNames.reduce(function (memo, childName) {
|
|
237
|
-
return
|
|
235
|
+
return Object.assign(memo, getReturnByChild(childName));
|
|
238
236
|
}, {}) : getReturnByChild(allChildNames);
|
|
239
237
|
}; // Parses an array of event returns into a single state mutation
|
|
240
238
|
|
|
241
239
|
|
|
242
240
|
var parseEventReturn = function (eventReturn, eventKey) {
|
|
243
241
|
return Array.isArray(eventReturn) ? eventReturn.reduce(function (memo, props) {
|
|
244
|
-
return
|
|
242
|
+
return Object.assign({}, memo, parseEvent(props, eventKey));
|
|
245
243
|
}, {}) : parseEvent(eventReturn, eventKey);
|
|
246
244
|
};
|
|
247
245
|
|
|
@@ -370,7 +368,7 @@ function getExternalMutations(mutations) {
|
|
|
370
368
|
target: "parent"
|
|
371
369
|
};
|
|
372
370
|
var mutation = getExternalMutation(mutations, keyProps, keyState, identifier);
|
|
373
|
-
memo[eventKey] = mutation !== undefined ?
|
|
371
|
+
memo[eventKey] = mutation !== undefined ? Object.assign({}, keyState, mutation) : keyState;
|
|
374
372
|
} else {
|
|
375
373
|
// use keys from both state and props so that elements not intially included in baseProps
|
|
376
374
|
// will be used. (i.e. labels)
|
|
@@ -382,7 +380,7 @@ function getExternalMutations(mutations) {
|
|
|
382
380
|
childName: childName
|
|
383
381
|
};
|
|
384
382
|
var mutation = getExternalMutation(mutations, keyProps[target], keyState[target], identifier);
|
|
385
|
-
m[target] = mutation !== undefined ?
|
|
383
|
+
m[target] = mutation !== undefined ? Object.assign({}, keyState[target], mutation) : keyState[target];
|
|
386
384
|
return (0, _pickBy2.default)(m, function (v) {
|
|
387
385
|
return !(0, _isEmpty2.default)(v);
|
|
388
386
|
});
|
|
@@ -451,8 +449,8 @@ function getExternalMutation(mutations, baseProps, baseState, identifier) {
|
|
|
451
449
|
var mutationFunction = curr && (0, _isFunction2.default)(curr.mutation) ? curr.mutation : function () {
|
|
452
450
|
return undefined;
|
|
453
451
|
};
|
|
454
|
-
var currentMutation = mutationFunction(
|
|
455
|
-
return
|
|
452
|
+
var currentMutation = mutationFunction(Object.assign({}, baseProps, baseState));
|
|
453
|
+
return Object.assign({}, memo, currentMutation);
|
|
456
454
|
}, {});
|
|
457
455
|
}
|
|
458
456
|
/* Returns an array of defaultEvents from sub-components of a given component.
|
|
@@ -492,7 +490,7 @@ var omitGlobalEvents = function (events) {
|
|
|
492
490
|
exports.omitGlobalEvents = omitGlobalEvents;
|
|
493
491
|
|
|
494
492
|
var emulateReactEvent = function (event) {
|
|
495
|
-
return
|
|
493
|
+
return Object.assign(event, {
|
|
496
494
|
nativeEvent: event
|
|
497
495
|
});
|
|
498
496
|
};
|
|
@@ -44,6 +44,17 @@ export declare function modifyProps(props: any, fallbackProps?: any, role?: any)
|
|
|
44
44
|
* @returns {String} the dimension appropriate for the axis given its props "x" or "y"
|
|
45
45
|
*/
|
|
46
46
|
export declare function getCurrentAxis(axis: any, horizontal: any): any;
|
|
47
|
+
/**
|
|
48
|
+
* Creates an array of numbers (positive and/or negative) progressing
|
|
49
|
+
* from start up to, but not including, end.
|
|
50
|
+
* A step of -1 is used if a negative start is specified without an end or step.
|
|
51
|
+
* If end is not specified, it's set to start with start then set to 0.
|
|
52
|
+
*
|
|
53
|
+
* @param start The length of the array to create, or the start value
|
|
54
|
+
* @param end [The end value] If this is defined, start is the start value
|
|
55
|
+
* @returns An array of the given length
|
|
56
|
+
*/
|
|
57
|
+
export declare function range(start: number, end?: number, increment?: number): number[];
|
|
47
58
|
/**
|
|
48
59
|
* @param {Array} children: an array of child components
|
|
49
60
|
* @param {Function} iteratee: a function with arguments "child", "childName", and "parent"
|