victory-tooltip 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 +6 -0
- package/dist/victory-tooltip.js +264 -421
- package/dist/victory-tooltip.min.js +1 -1
- package/es/victory-tooltip.js +9 -11
- package/lib/victory-tooltip.js +9 -11
- package/package.json +2 -2
- package/src/victory-tooltip.tsx +31 -10
package/lib/victory-tooltip.js
CHANGED
|
@@ -13,8 +13,6 @@ var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
|
|
|
13
13
|
|
|
14
14
|
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
15
15
|
|
|
16
|
-
var _assign2 = _interopRequireDefault(require("lodash/assign"));
|
|
17
|
-
|
|
18
16
|
var _react = _interopRequireDefault(require("react"));
|
|
19
17
|
|
|
20
18
|
var _victoryCore = require("victory-core");
|
|
@@ -141,7 +139,7 @@ var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
|
|
|
141
139
|
return _victoryCore.Helpers.evaluateStyle(s, props);
|
|
142
140
|
}) : _victoryCore.Helpers.evaluateStyle(baseLabelStyle, props);
|
|
143
141
|
|
|
144
|
-
var flyoutStyle = _victoryCore.Helpers.evaluateStyle(baseFlyoutStyle,
|
|
142
|
+
var flyoutStyle = _victoryCore.Helpers.evaluateStyle(baseFlyoutStyle, Object.assign({}, props, {
|
|
145
143
|
style: style
|
|
146
144
|
}));
|
|
147
145
|
|
|
@@ -160,7 +158,7 @@ var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
|
|
|
160
158
|
|
|
161
159
|
var active = _victoryCore.Helpers.evaluateProp(props.active, props);
|
|
162
160
|
|
|
163
|
-
var text = _victoryCore.Helpers.evaluateProp(props.text,
|
|
161
|
+
var text = _victoryCore.Helpers.evaluateProp(props.text, Object.assign({}, props, {
|
|
164
162
|
active: active
|
|
165
163
|
}));
|
|
166
164
|
|
|
@@ -172,20 +170,20 @@ var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
|
|
|
172
170
|
text = text.toString();
|
|
173
171
|
}
|
|
174
172
|
|
|
175
|
-
var _this$getStyles = this.getStyles(
|
|
173
|
+
var _this$getStyles = this.getStyles(Object.assign({}, props, {
|
|
176
174
|
active: active,
|
|
177
175
|
text: text
|
|
178
176
|
})),
|
|
179
177
|
style = _this$getStyles.style,
|
|
180
178
|
flyoutStyle = _this$getStyles.flyoutStyle;
|
|
181
179
|
|
|
182
|
-
var orientation = _victoryCore.Helpers.evaluateProp(props.orientation,
|
|
180
|
+
var orientation = _victoryCore.Helpers.evaluateProp(props.orientation, Object.assign({}, props, {
|
|
183
181
|
active: active,
|
|
184
182
|
text: text,
|
|
185
183
|
style: style,
|
|
186
184
|
flyoutStyle: flyoutStyle
|
|
187
185
|
})) || this.getDefaultOrientation(props);
|
|
188
|
-
var padding = _victoryCore.Helpers.evaluateProp(props.flyoutPadding,
|
|
186
|
+
var padding = _victoryCore.Helpers.evaluateProp(props.flyoutPadding, Object.assign({}, props, {
|
|
189
187
|
active: active,
|
|
190
188
|
text: text,
|
|
191
189
|
style: style,
|
|
@@ -197,7 +195,7 @@ var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
|
|
|
197
195
|
padding: padding
|
|
198
196
|
});
|
|
199
197
|
|
|
200
|
-
var pointerWidth = _victoryCore.Helpers.evaluateProp(props.pointerWidth,
|
|
198
|
+
var pointerWidth = _victoryCore.Helpers.evaluateProp(props.pointerWidth, Object.assign({}, props, {
|
|
201
199
|
active: active,
|
|
202
200
|
text: text,
|
|
203
201
|
style: style,
|
|
@@ -205,7 +203,7 @@ var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
|
|
|
205
203
|
orientation: orientation
|
|
206
204
|
}));
|
|
207
205
|
|
|
208
|
-
var pointerLength = _victoryCore.Helpers.evaluateProp(props.pointerLength,
|
|
206
|
+
var pointerLength = _victoryCore.Helpers.evaluateProp(props.pointerLength, Object.assign({}, props, {
|
|
209
207
|
active: active,
|
|
210
208
|
text: text,
|
|
211
209
|
style: style,
|
|
@@ -215,7 +213,7 @@ var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
|
|
|
215
213
|
|
|
216
214
|
var labelSize = _victoryCore.TextSize.approximateTextSize(text, style);
|
|
217
215
|
|
|
218
|
-
var _this$getDimensions = this.getDimensions(
|
|
216
|
+
var _this$getDimensions = this.getDimensions(Object.assign({}, props, {
|
|
219
217
|
style: style,
|
|
220
218
|
flyoutStyle: flyoutStyle,
|
|
221
219
|
active: active,
|
|
@@ -228,7 +226,7 @@ var VictoryTooltip = /*#__PURE__*/function (_React$Component) {
|
|
|
228
226
|
flyoutHeight = _this$getDimensions.flyoutHeight,
|
|
229
227
|
flyoutWidth = _this$getDimensions.flyoutWidth;
|
|
230
228
|
|
|
231
|
-
var evaluatedProps =
|
|
229
|
+
var evaluatedProps = Object.assign({}, props, {
|
|
232
230
|
active: active,
|
|
233
231
|
text: text,
|
|
234
232
|
style: style,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "victory-tooltip",
|
|
3
|
-
"version": "36.8.
|
|
3
|
+
"version": "36.8.5",
|
|
4
4
|
"description": "Tooltip Component for Victory",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"data visualization",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"lodash": "^4.17.19",
|
|
24
24
|
"prop-types": "^15.8.1",
|
|
25
|
-
"victory-core": "^36.8.
|
|
25
|
+
"victory-core": "^36.8.5"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"victory-tooltip": "*"
|
package/src/victory-tooltip.tsx
CHANGED
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
OrientationTypes,
|
|
17
17
|
VictoryThemeDefinition,
|
|
18
18
|
} from "victory-core";
|
|
19
|
-
import {
|
|
19
|
+
import { defaults, uniqueId, isPlainObject, orderBy } from "lodash";
|
|
20
20
|
|
|
21
21
|
import { Flyout } from "./flyout";
|
|
22
22
|
|
|
@@ -188,7 +188,7 @@ export class VictoryTooltip extends React.Component<VictoryTooltipProps> {
|
|
|
188
188
|
: Helpers.evaluateStyle(baseLabelStyle, props);
|
|
189
189
|
const flyoutStyle = Helpers.evaluateStyle(
|
|
190
190
|
baseFlyoutStyle,
|
|
191
|
-
assign({}, props, { style }),
|
|
191
|
+
Object.assign({}, props, { style }),
|
|
192
192
|
);
|
|
193
193
|
return { style, flyoutStyle };
|
|
194
194
|
}
|
|
@@ -198,7 +198,10 @@ export class VictoryTooltip extends React.Component<VictoryTooltipProps> {
|
|
|
198
198
|
|
|
199
199
|
const active = Helpers.evaluateProp(props.active, props);
|
|
200
200
|
|
|
201
|
-
let text = Helpers.evaluateProp(
|
|
201
|
+
let text = Helpers.evaluateProp(
|
|
202
|
+
props.text,
|
|
203
|
+
Object.assign({}, props, { active }),
|
|
204
|
+
);
|
|
202
205
|
if (text === undefined || text === null) {
|
|
203
206
|
text = "";
|
|
204
207
|
}
|
|
@@ -207,35 +210,53 @@ export class VictoryTooltip extends React.Component<VictoryTooltipProps> {
|
|
|
207
210
|
}
|
|
208
211
|
|
|
209
212
|
const { style, flyoutStyle } = this.getStyles(
|
|
210
|
-
assign({}, props, { active, text }),
|
|
213
|
+
Object.assign({}, props, { active, text }),
|
|
211
214
|
);
|
|
212
215
|
const orientation =
|
|
213
216
|
Helpers.evaluateProp(
|
|
214
217
|
props.orientation,
|
|
215
|
-
assign({}, props, { active, text, style, flyoutStyle }),
|
|
218
|
+
Object.assign({}, props, { active, text, style, flyoutStyle }),
|
|
216
219
|
) || this.getDefaultOrientation(props);
|
|
217
220
|
|
|
218
221
|
const padding =
|
|
219
222
|
Helpers.evaluateProp(
|
|
220
223
|
props.flyoutPadding,
|
|
221
|
-
assign({}, props, {
|
|
224
|
+
Object.assign({}, props, {
|
|
225
|
+
active,
|
|
226
|
+
text,
|
|
227
|
+
style,
|
|
228
|
+
flyoutStyle,
|
|
229
|
+
orientation,
|
|
230
|
+
}),
|
|
222
231
|
) || this.getLabelPadding(style);
|
|
223
232
|
|
|
224
233
|
const flyoutPadding = Helpers.getPadding({ padding });
|
|
225
234
|
|
|
226
235
|
const pointerWidth = Helpers.evaluateProp(
|
|
227
236
|
props.pointerWidth,
|
|
228
|
-
assign({}, props, {
|
|
237
|
+
Object.assign({}, props, {
|
|
238
|
+
active,
|
|
239
|
+
text,
|
|
240
|
+
style,
|
|
241
|
+
flyoutStyle,
|
|
242
|
+
orientation,
|
|
243
|
+
}),
|
|
229
244
|
);
|
|
230
245
|
|
|
231
246
|
const pointerLength = Helpers.evaluateProp(
|
|
232
247
|
props.pointerLength,
|
|
233
|
-
assign({}, props, {
|
|
248
|
+
Object.assign({}, props, {
|
|
249
|
+
active,
|
|
250
|
+
text,
|
|
251
|
+
style,
|
|
252
|
+
flyoutStyle,
|
|
253
|
+
orientation,
|
|
254
|
+
}),
|
|
234
255
|
);
|
|
235
256
|
const labelSize = TextSize.approximateTextSize(text, style);
|
|
236
257
|
|
|
237
258
|
const { flyoutHeight, flyoutWidth } = this.getDimensions(
|
|
238
|
-
assign({}, props, {
|
|
259
|
+
Object.assign({}, props, {
|
|
239
260
|
style,
|
|
240
261
|
flyoutStyle,
|
|
241
262
|
active,
|
|
@@ -248,7 +269,7 @@ export class VictoryTooltip extends React.Component<VictoryTooltipProps> {
|
|
|
248
269
|
labelSize,
|
|
249
270
|
);
|
|
250
271
|
|
|
251
|
-
const evaluatedProps = assign({}, props, {
|
|
272
|
+
const evaluatedProps = Object.assign({}, props, {
|
|
252
273
|
active,
|
|
253
274
|
text,
|
|
254
275
|
style,
|