victory-tooltip 37.3.2 → 37.3.3
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-tooltip.js +186 -142
- package/dist/victory-tooltip.min.js +1 -1
- package/es/flyout.js +2 -2
- package/es/victory-tooltip.d.ts +2 -2
- package/es/victory-tooltip.js +15 -17
- package/lib/flyout.js +2 -2
- package/lib/victory-tooltip.d.ts +2 -2
- package/lib/victory-tooltip.js +15 -17
- package/package.json +2 -30
- package/src/flyout.tsx +1 -1
- package/src/victory-tooltip.tsx +6 -2
package/lib/victory-tooltip.js
CHANGED
|
@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VictoryTooltip = void 0;
|
|
7
|
-
var _orderBy2 = _interopRequireDefault(require("lodash/orderBy"));
|
|
8
|
-
var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
|
|
9
|
-
var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
|
|
10
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
11
7
|
var _react = _interopRequireDefault(require("react"));
|
|
12
8
|
var _victoryCore = require("victory-core");
|
|
9
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
10
|
+
var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
|
|
11
|
+
var _isPlainObject = _interopRequireDefault(require("lodash/isPlainObject"));
|
|
12
|
+
var _orderBy = _interopRequireDefault(require("lodash/orderBy"));
|
|
13
13
|
var _flyout = require("./flyout");
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
15
|
const fallbackProps = {
|
|
@@ -74,7 +74,7 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
74
74
|
}
|
|
75
75
|
constructor(props) {
|
|
76
76
|
super(props);
|
|
77
|
-
this.id = props.id === undefined ? (0,
|
|
77
|
+
this.id = props.id === undefined ? (0, _uniqueId.default)("tooltip-") : props.id;
|
|
78
78
|
}
|
|
79
79
|
getDefaultOrientation(props) {
|
|
80
80
|
const {
|
|
@@ -115,9 +115,9 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
115
115
|
getStyles(props) {
|
|
116
116
|
const theme = props.theme || _victoryCore.VictoryTheme.grayscale;
|
|
117
117
|
const defaultLabelStyles = theme && theme.tooltip && theme.tooltip.style ? theme.tooltip.style : {};
|
|
118
|
-
const baseLabelStyle = Array.isArray(props.style) ? props.style.map(s => (0,
|
|
118
|
+
const baseLabelStyle = Array.isArray(props.style) ? props.style.map(s => (0, _defaults.default)({}, s, defaultLabelStyles)) : (0, _defaults.default)({}, props.style, defaultLabelStyles);
|
|
119
119
|
const defaultFlyoutStyles = theme && theme.tooltip && theme.tooltip.flyoutStyle ? theme.tooltip.flyoutStyle : {};
|
|
120
|
-
const baseFlyoutStyle = props.flyoutStyle ? (0,
|
|
120
|
+
const baseFlyoutStyle = props.flyoutStyle ? (0, _defaults.default)({}, props.flyoutStyle, defaultFlyoutStyles) : defaultFlyoutStyles;
|
|
121
121
|
const style = Array.isArray(baseLabelStyle) ? baseLabelStyle.map(s => _victoryCore.Helpers.evaluateStyle(s, props)) : _victoryCore.Helpers.evaluateStyle(baseLabelStyle, props);
|
|
122
122
|
const flyoutStyle = _victoryCore.Helpers.evaluateStyle(baseFlyoutStyle, Object.assign({}, props, {
|
|
123
123
|
style
|
|
@@ -164,9 +164,7 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
164
164
|
flyoutStyle,
|
|
165
165
|
orientation
|
|
166
166
|
})) || this.getLabelPadding(style);
|
|
167
|
-
const flyoutPadding = _victoryCore.Helpers.getPadding(
|
|
168
|
-
padding
|
|
169
|
-
});
|
|
167
|
+
const flyoutPadding = _victoryCore.Helpers.getPadding(padding);
|
|
170
168
|
const pointerWidth = _victoryCore.Helpers.evaluateProp(props.pointerWidth, Object.assign({}, props, {
|
|
171
169
|
active,
|
|
172
170
|
text,
|
|
@@ -207,8 +205,8 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
207
205
|
pointerWidth,
|
|
208
206
|
pointerLength
|
|
209
207
|
});
|
|
210
|
-
const offsetX = (0,
|
|
211
|
-
const offsetY = (0,
|
|
208
|
+
const offsetX = (0, _isPlainObject.default)(centerOffset) && centerOffset?.x !== undefined ? _victoryCore.Helpers.evaluateProp(centerOffset.x, evaluatedProps) : 0;
|
|
209
|
+
const offsetY = (0, _isPlainObject.default)(centerOffset) && centerOffset?.y !== undefined ? _victoryCore.Helpers.evaluateProp(centerOffset.y, evaluatedProps) : 0;
|
|
212
210
|
return {
|
|
213
211
|
...evaluatedProps,
|
|
214
212
|
centerOffset: {
|
|
@@ -325,8 +323,8 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
325
323
|
y: orientation === "top" || orientation === "bottom" ? y - ySign * (pointerLength + height / 2 - ySign * dy) : y + dy
|
|
326
324
|
};
|
|
327
325
|
const center = {
|
|
328
|
-
x: (0,
|
|
329
|
-
y: (0,
|
|
326
|
+
x: (0, _isPlainObject.default)(props.center) && props.center.x !== undefined ? props.center.x : flyoutCenter.x,
|
|
327
|
+
y: (0, _isPlainObject.default)(props.center) && props.center.y !== undefined ? props.center.y : flyoutCenter.y
|
|
330
328
|
};
|
|
331
329
|
const centerWithOffset = {
|
|
332
330
|
x: center.x + centerOffset.x,
|
|
@@ -390,7 +388,7 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
390
388
|
const sign = textAnchor === "end" ? -1 : 1;
|
|
391
389
|
return flyoutCenter.x - sign * (labelSize.width / 2);
|
|
392
390
|
};
|
|
393
|
-
return (0,
|
|
391
|
+
return (0, _defaults.default)({}, labelComponent.props, {
|
|
394
392
|
key: `${this.id}-label-${index}`,
|
|
395
393
|
text,
|
|
396
394
|
datum,
|
|
@@ -425,7 +423,7 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
425
423
|
side: "left",
|
|
426
424
|
val: edges.left > point.x ? edges.left - point.x : -1
|
|
427
425
|
}];
|
|
428
|
-
return (0,
|
|
426
|
+
return (0, _orderBy.default)(gaps, "val", "desc")[0].side;
|
|
429
427
|
}
|
|
430
428
|
getFlyoutProps(props, calculatedValues) {
|
|
431
429
|
const {
|
|
@@ -448,7 +446,7 @@ class VictoryTooltip extends _react.default.Component {
|
|
|
448
446
|
flyoutComponent
|
|
449
447
|
} = props;
|
|
450
448
|
const pointerOrientation = _victoryCore.Helpers.evaluateProp(props.pointerOrientation, props);
|
|
451
|
-
return (0,
|
|
449
|
+
return (0, _defaults.default)({}, flyoutComponent.props, {
|
|
452
450
|
x,
|
|
453
451
|
y,
|
|
454
452
|
dx,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "victory-tooltip",
|
|
3
|
-
"version": "37.3.
|
|
3
|
+
"version": "37.3.3",
|
|
4
4
|
"description": "Tooltip Component for Victory",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"data visualization",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"lodash": "^4.17.19",
|
|
24
|
-
"victory-core": "37.3.
|
|
24
|
+
"victory-core": "37.3.3"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
27
|
"react": ">=16.6.0"
|
|
@@ -180,32 +180,6 @@
|
|
|
180
180
|
"pnpm-lock.yaml"
|
|
181
181
|
]
|
|
182
182
|
},
|
|
183
|
-
"format": {
|
|
184
|
-
"command": "nps format:pkg",
|
|
185
|
-
"files": [
|
|
186
|
-
"src/**",
|
|
187
|
-
"*.json",
|
|
188
|
-
"../../.prettierignore",
|
|
189
|
-
"../../.prettierrc.json"
|
|
190
|
-
],
|
|
191
|
-
"output": [],
|
|
192
|
-
"packageLocks": [
|
|
193
|
-
"pnpm-lock.yaml"
|
|
194
|
-
]
|
|
195
|
-
},
|
|
196
|
-
"format:fix": {
|
|
197
|
-
"command": "pnpm run format || nps format:pkg:fix",
|
|
198
|
-
"files": [
|
|
199
|
-
"src/**",
|
|
200
|
-
"*.json",
|
|
201
|
-
"../../.prettierignore",
|
|
202
|
-
"../../.prettierrc.json"
|
|
203
|
-
],
|
|
204
|
-
"output": [],
|
|
205
|
-
"packageLocks": [
|
|
206
|
-
"pnpm-lock.yaml"
|
|
207
|
-
]
|
|
208
|
-
},
|
|
209
183
|
"lint": {
|
|
210
184
|
"command": "eslint src",
|
|
211
185
|
"files": [
|
|
@@ -268,8 +242,6 @@
|
|
|
268
242
|
"check": "wireit",
|
|
269
243
|
"types:check": "wireit",
|
|
270
244
|
"types:create": "wireit",
|
|
271
|
-
"format": "wireit",
|
|
272
|
-
"format:fix": "wireit",
|
|
273
245
|
"lint": "wireit",
|
|
274
246
|
"lint:fix": "wireit",
|
|
275
247
|
"jest": "wireit"
|
package/src/flyout.tsx
CHANGED
package/src/victory-tooltip.tsx
CHANGED
|
@@ -15,7 +15,11 @@ import {
|
|
|
15
15
|
OrientationTypes,
|
|
16
16
|
VictoryThemeDefinition,
|
|
17
17
|
} from "victory-core";
|
|
18
|
-
|
|
18
|
+
|
|
19
|
+
import defaults from "lodash/defaults";
|
|
20
|
+
import uniqueId from "lodash/uniqueId";
|
|
21
|
+
import isPlainObject from "lodash/isPlainObject";
|
|
22
|
+
import orderBy from "lodash/orderBy";
|
|
19
23
|
|
|
20
24
|
import { Flyout } from "./flyout";
|
|
21
25
|
|
|
@@ -240,7 +244,7 @@ export class VictoryTooltip extends React.Component<VictoryTooltipProps> {
|
|
|
240
244
|
}),
|
|
241
245
|
) || this.getLabelPadding(style);
|
|
242
246
|
|
|
243
|
-
const flyoutPadding = Helpers.getPadding(
|
|
247
|
+
const flyoutPadding = Helpers.getPadding(padding);
|
|
244
248
|
|
|
245
249
|
const pointerWidth = Helpers.evaluateProp(
|
|
246
250
|
props.pointerWidth,
|