victory-core 37.3.1 → 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 +20 -0
- package/dist/victory-core.js +436 -405
- package/dist/victory-core.min.js +1 -1
- package/es/types/callbacks.d.ts +11 -11
- package/es/types/prop-types.d.ts +28 -28
- package/es/victory-animation/util.js +7 -7
- package/es/victory-animation/victory-animation.d.ts +3 -3
- package/es/victory-clip-container/victory-clip-container.d.ts +6 -1
- package/es/victory-clip-container/victory-clip-container.js +20 -12
- package/es/victory-container/victory-container.js +5 -5
- package/es/victory-label/victory-label.d.ts +3 -3
- package/es/victory-label/victory-label.js +12 -16
- package/es/victory-portal/victory-portal.js +4 -4
- package/es/victory-primitives/arc.js +2 -2
- package/es/victory-primitives/background.js +2 -2
- package/es/victory-primitives/border.js +2 -2
- package/es/victory-primitives/line-segment.js +2 -2
- package/es/victory-primitives/point.js +2 -2
- package/es/victory-primitives/tspan.d.ts +0 -1
- package/es/victory-primitives/types.d.ts +1 -1
- package/es/victory-primitives/whisker.d.ts +1 -1
- package/es/victory-primitives/whisker.js +2 -2
- package/es/victory-theme/types.d.ts +11 -11
- package/es/victory-transition/victory-transition.d.ts +1 -1
- package/es/victory-transition/victory-transition.js +8 -8
- package/es/victory-util/add-events.d.ts +8 -8
- package/es/victory-util/add-events.js +14 -14
- package/es/victory-util/axis.js +12 -12
- package/es/victory-util/data.js +16 -20
- package/es/victory-util/domain.js +13 -16
- package/es/victory-util/events.d.ts +5 -5
- package/es/victory-util/events.js +17 -23
- package/es/victory-util/helpers.d.ts +94 -19
- package/es/victory-util/helpers.js +95 -50
- package/es/victory-util/hooks/use-animation-state.d.ts +2 -2
- package/es/victory-util/hooks/use-animation-state.js +4 -4
- package/es/victory-util/label-helpers.d.ts +4 -3
- package/es/victory-util/label-helpers.js +3 -3
- package/es/victory-util/line-helpers.d.ts +1 -1
- package/es/victory-util/log.js +3 -2
- package/es/victory-util/merge-refs.d.ts +2 -2
- package/es/victory-util/scale.js +2 -3
- package/es/victory-util/selection.d.ts +3 -3
- package/es/victory-util/textsize.js +7 -5
- package/es/victory-util/timer.d.ts +1 -1
- package/es/victory-util/transitions.d.ts +1 -1
- package/es/victory-util/transitions.js +15 -19
- package/es/victory-util/type-helpers.d.ts +0 -1
- package/es/victory-util/type-helpers.js +0 -5
- package/es/victory-util/user-props.d.ts +2 -2
- package/es/victory-util/wrapper.js +12 -13
- package/lib/types/callbacks.d.ts +11 -11
- package/lib/types/prop-types.d.ts +28 -28
- package/lib/victory-animation/util.js +7 -7
- package/lib/victory-animation/victory-animation.d.ts +3 -3
- package/lib/victory-clip-container/victory-clip-container.d.ts +6 -1
- package/lib/victory-clip-container/victory-clip-container.js +20 -12
- package/lib/victory-container/victory-container.js +6 -6
- package/lib/victory-label/victory-label.d.ts +3 -3
- package/lib/victory-label/victory-label.js +12 -16
- package/lib/victory-portal/victory-portal.js +5 -5
- package/lib/victory-primitives/arc.js +2 -2
- package/lib/victory-primitives/background.js +2 -2
- package/lib/victory-primitives/border.js +2 -2
- package/lib/victory-primitives/line-segment.js +2 -2
- package/lib/victory-primitives/point.js +2 -2
- package/lib/victory-primitives/tspan.d.ts +0 -1
- package/lib/victory-primitives/types.d.ts +1 -1
- package/lib/victory-primitives/whisker.d.ts +1 -1
- package/lib/victory-primitives/whisker.js +2 -2
- package/lib/victory-theme/types.d.ts +11 -11
- package/lib/victory-transition/victory-transition.d.ts +1 -1
- package/lib/victory-transition/victory-transition.js +8 -8
- package/lib/victory-util/add-events.d.ts +8 -8
- package/lib/victory-util/add-events.js +14 -14
- package/lib/victory-util/axis.js +12 -12
- package/lib/victory-util/data.js +16 -21
- package/lib/victory-util/domain.js +13 -17
- package/lib/victory-util/events.d.ts +5 -5
- package/lib/victory-util/events.js +17 -24
- package/lib/victory-util/helpers.d.ts +94 -19
- package/lib/victory-util/helpers.js +96 -52
- package/lib/victory-util/hooks/use-animation-state.d.ts +2 -2
- package/lib/victory-util/hooks/use-animation-state.js +4 -4
- package/lib/victory-util/label-helpers.d.ts +4 -3
- package/lib/victory-util/label-helpers.js +3 -5
- package/lib/victory-util/line-helpers.d.ts +1 -1
- package/lib/victory-util/log.js +3 -2
- package/lib/victory-util/merge-refs.d.ts +2 -2
- package/lib/victory-util/scale.js +2 -4
- package/lib/victory-util/selection.d.ts +3 -3
- package/lib/victory-util/textsize.js +5 -5
- package/lib/victory-util/timer.d.ts +1 -1
- package/lib/victory-util/transitions.d.ts +1 -1
- package/lib/victory-util/transitions.js +15 -19
- package/lib/victory-util/type-helpers.d.ts +0 -1
- package/lib/victory-util/type-helpers.js +0 -6
- package/lib/victory-util/user-props.d.ts +2 -2
- package/lib/victory-util/wrapper.js +12 -13
- package/package.json +6 -38
- package/src/victory-animation/util.ts +4 -2
- package/src/victory-clip-container/victory-clip-container.tsx +26 -11
- package/src/victory-container/victory-container.tsx +4 -4
- package/src/victory-label/victory-label.tsx +5 -3
- package/src/victory-portal/victory-portal.tsx +3 -1
- package/src/victory-primitives/arc.tsx +1 -1
- package/src/victory-primitives/background.tsx +1 -1
- package/src/victory-primitives/border.tsx +1 -1
- package/src/victory-primitives/line-segment.tsx +1 -1
- package/src/victory-primitives/point.tsx +3 -3
- package/src/victory-primitives/whisker.tsx +1 -1
- package/src/victory-transition/victory-transition.tsx +5 -3
- package/src/victory-util/add-events.tsx +6 -3
- package/src/victory-util/axis.tsx +8 -4
- package/src/victory-util/common-props.tsx +3 -3
- package/src/victory-util/data.ts +9 -13
- package/src/victory-util/domain.ts +8 -6
- package/src/victory-util/events.ts +18 -13
- package/src/victory-util/helpers.ts +155 -40
- package/src/victory-util/hooks/use-animation-state.ts +1 -1
- package/src/victory-util/label-helpers.ts +1 -2
- package/src/victory-util/log.ts +3 -2
- package/src/victory-util/merge-refs.ts +2 -0
- package/src/victory-util/scale.ts +1 -2
- package/src/victory-util/textsize.ts +2 -1
- package/src/victory-util/transitions.ts +6 -6
- package/src/victory-util/type-helpers.ts +0 -5
- package/src/victory-util/user-props.ts +1 -1
- package/src/victory-util/wrapper.tsx +5 -2
|
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VictoryLabel = void 0;
|
|
7
|
-
var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
|
|
8
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
9
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
|
+
var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
|
|
10
10
|
var _victoryPortal = require("../victory-portal/victory-portal");
|
|
11
11
|
var _rect = require("../victory-primitives/rect");
|
|
12
12
|
var _text = require("../victory-primitives/text");
|
|
@@ -62,7 +62,7 @@ const shouldUseMultilineBackgrounds = props => {
|
|
|
62
62
|
backgroundStyle,
|
|
63
63
|
backgroundPadding
|
|
64
64
|
} = props;
|
|
65
|
-
return Array.isArray(backgroundStyle) && !(0,
|
|
65
|
+
return Array.isArray(backgroundStyle) && !(0, _isEmpty.default)(backgroundStyle) || Array.isArray(backgroundPadding) && !(0, _isEmpty.default)(backgroundPadding);
|
|
66
66
|
};
|
|
67
67
|
const getStyles = (style, props) => {
|
|
68
68
|
if (props.disableInlineStyles) {
|
|
@@ -73,37 +73,33 @@ const getStyles = (style, props) => {
|
|
|
73
73
|
};
|
|
74
74
|
}
|
|
75
75
|
const getSingleStyle = s => {
|
|
76
|
-
const baseStyles = Helpers.evaluateStyle(s ? (0,
|
|
76
|
+
const baseStyles = Helpers.evaluateStyle(s ? (0, _defaults.default)({}, s, defaultStyles) : defaultStyles, props);
|
|
77
77
|
return Object.assign({}, baseStyles, {
|
|
78
78
|
fontSize: getFontSize(baseStyles)
|
|
79
79
|
});
|
|
80
80
|
};
|
|
81
|
-
return Array.isArray(style) && !(0,
|
|
81
|
+
return Array.isArray(style) && !(0, _isEmpty.default)(style) ? style.map(s => getSingleStyle(s)) : getSingleStyle(style);
|
|
82
82
|
};
|
|
83
83
|
const getBackgroundStyles = (style, props) => {
|
|
84
84
|
if (!style) {
|
|
85
85
|
return undefined;
|
|
86
86
|
}
|
|
87
|
-
return Array.isArray(style) && !(0,
|
|
87
|
+
return Array.isArray(style) && !(0, _isEmpty.default)(style) ? style.map(s => Helpers.evaluateStyle(s, props)) : Helpers.evaluateStyle(style, props);
|
|
88
88
|
};
|
|
89
89
|
const getBackgroundPadding = props => {
|
|
90
90
|
if (props.backgroundPadding && Array.isArray(props.backgroundPadding)) {
|
|
91
91
|
return props.backgroundPadding.map(backgroundPadding => {
|
|
92
92
|
const padding = Helpers.evaluateProp(backgroundPadding, props);
|
|
93
|
-
return Helpers.getPadding(
|
|
94
|
-
padding
|
|
95
|
-
});
|
|
93
|
+
return Helpers.getPadding(padding);
|
|
96
94
|
});
|
|
97
95
|
}
|
|
98
96
|
const padding = Helpers.evaluateProp(props.backgroundPadding, props);
|
|
99
|
-
return Helpers.getPadding(
|
|
100
|
-
padding
|
|
101
|
-
});
|
|
97
|
+
return Helpers.getPadding(padding);
|
|
102
98
|
};
|
|
103
99
|
const getLineHeight = props => {
|
|
104
100
|
const lineHeight = Helpers.evaluateProp(props.lineHeight, props);
|
|
105
101
|
if (Array.isArray(lineHeight)) {
|
|
106
|
-
return (0,
|
|
102
|
+
return (0, _isEmpty.default)(lineHeight) ? [1] : lineHeight;
|
|
107
103
|
}
|
|
108
104
|
return lineHeight;
|
|
109
105
|
};
|
|
@@ -223,7 +219,7 @@ const getFullBackground = (calculatedProps, tspanValues) => {
|
|
|
223
219
|
x: inline ? xCoordinate - backgroundPadding.left : xCoordinate + dx - backgroundPadding.left,
|
|
224
220
|
y: yCoordinate
|
|
225
221
|
};
|
|
226
|
-
return /*#__PURE__*/_react.default.cloneElement(backgroundComponent, (0,
|
|
222
|
+
return /*#__PURE__*/_react.default.cloneElement(backgroundComponent, (0, _defaults.default)({}, backgroundComponent.props, backgroundProps));
|
|
227
223
|
};
|
|
228
224
|
const getInlineXOffset = (calculatedProps, textElements, index) => {
|
|
229
225
|
const {
|
|
@@ -293,7 +289,7 @@ const getChildBackgrounds = (calculatedProps, tspanValues) => {
|
|
|
293
289
|
x: xCoord - padding.left,
|
|
294
290
|
y: yCoord
|
|
295
291
|
};
|
|
296
|
-
return /*#__PURE__*/_react.default.cloneElement(backgroundComponent, (0,
|
|
292
|
+
return /*#__PURE__*/_react.default.cloneElement(backgroundComponent, (0, _defaults.default)({}, backgroundComponent.props, backgroundProps));
|
|
297
293
|
});
|
|
298
294
|
};
|
|
299
295
|
const getBackgroundElement = (calculatedProps, tspanValues) => {
|
|
@@ -439,7 +435,7 @@ const defaultProps = {
|
|
|
439
435
|
lineHeight: 1
|
|
440
436
|
};
|
|
441
437
|
const VictoryLabel = initialProps => {
|
|
442
|
-
const props = evaluateProps((0,
|
|
438
|
+
const props = evaluateProps((0, _defaults.default)({}, initialProps, defaultProps));
|
|
443
439
|
if (props.text === null || props.text === undefined) {
|
|
444
440
|
return null;
|
|
445
441
|
}
|
|
@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VictoryPortal = void 0;
|
|
7
|
-
var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
|
|
8
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
9
7
|
var _react = _interopRequireWildcard(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
|
+
var _uniqueId = _interopRequireDefault(require("lodash/uniqueId"));
|
|
10
10
|
var Log = _interopRequireWildcard(require("../victory-util/log"));
|
|
11
11
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
12
12
|
var _portalContext = require("./portal-context");
|
|
13
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
14
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
14
15
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
15
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
16
|
const defaultProps = {
|
|
17
17
|
groupComponent: /*#__PURE__*/_react.default.createElement("g", null)
|
|
18
18
|
};
|
|
@@ -21,7 +21,7 @@ const VictoryPortal = initialProps => {
|
|
|
21
21
|
...defaultProps,
|
|
22
22
|
...initialProps
|
|
23
23
|
};
|
|
24
|
-
const [id] = (0, _react.useState)((0,
|
|
24
|
+
const [id] = (0, _react.useState)((0, _uniqueId.default)());
|
|
25
25
|
const portalContext = (0, _portalContext.usePortalContext)();
|
|
26
26
|
if (!portalContext) {
|
|
27
27
|
const msg = "`renderInPortal` is not supported outside of `VictoryContainer`. " + "Component will be rendered in place";
|
|
@@ -36,7 +36,7 @@ const VictoryPortal = initialProps => {
|
|
|
36
36
|
groupComponent,
|
|
37
37
|
standalone: false
|
|
38
38
|
} : {};
|
|
39
|
-
const newProps = (0,
|
|
39
|
+
const newProps = (0, _defaults.default)(standardProps, childProps, Helpers.omit(props, ["children", "groupComponent"]), {
|
|
40
40
|
key: childProps.key ?? id
|
|
41
41
|
});
|
|
42
42
|
const child = children && /*#__PURE__*/_react.default.cloneElement(children, newProps);
|
|
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.Arc = void 0;
|
|
7
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
8
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
9
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
10
10
|
var _path = require("./path");
|
|
11
11
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
@@ -69,7 +69,7 @@ const defaultProps = {
|
|
|
69
69
|
shapeRendering: "auto"
|
|
70
70
|
};
|
|
71
71
|
const Arc = initialProps => {
|
|
72
|
-
const props = evaluateProps((0,
|
|
72
|
+
const props = evaluateProps((0, _defaults.default)({}, initialProps, defaultProps));
|
|
73
73
|
return /*#__PURE__*/_react.default.cloneElement(props.pathComponent, {
|
|
74
74
|
...props.events,
|
|
75
75
|
"aria-label": props.ariaLabel,
|
|
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.Background = void 0;
|
|
7
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
8
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
9
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
10
10
|
var _rect = require("./rect");
|
|
11
11
|
var _circle = require("./circle");
|
|
@@ -29,7 +29,7 @@ const defaultProps = {
|
|
|
29
29
|
shapeRendering: "auto"
|
|
30
30
|
};
|
|
31
31
|
const Background = initialProps => {
|
|
32
|
-
const props = evaluateProps((0,
|
|
32
|
+
const props = evaluateProps((0, _defaults.default)({}, initialProps, defaultProps));
|
|
33
33
|
return props.polar ? /*#__PURE__*/_react.default.cloneElement(props.circleComponent, {
|
|
34
34
|
...props.events,
|
|
35
35
|
style: props.style,
|
|
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.Border = void 0;
|
|
7
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
8
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
9
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
10
10
|
var _rect = require("./rect");
|
|
11
11
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
@@ -41,7 +41,7 @@ const defaultProps = {
|
|
|
41
41
|
shapeRendering: "auto"
|
|
42
42
|
};
|
|
43
43
|
const Border = initialProps => {
|
|
44
|
-
const props = evaluateProps((0,
|
|
44
|
+
const props = evaluateProps((0, _defaults.default)({}, initialProps, defaultProps));
|
|
45
45
|
return /*#__PURE__*/_react.default.cloneElement(props.rectComponent, {
|
|
46
46
|
...props.events,
|
|
47
47
|
"aria-label": props.ariaLabel,
|
|
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.LineSegment = void 0;
|
|
7
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
8
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
9
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
10
10
|
var _line = require("./line");
|
|
11
11
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
@@ -41,7 +41,7 @@ const defaultProps = {
|
|
|
41
41
|
shapeRendering: "auto"
|
|
42
42
|
};
|
|
43
43
|
const LineSegment = initialProps => {
|
|
44
|
-
const props = evaluateProps((0,
|
|
44
|
+
const props = evaluateProps((0, _defaults.default)({}, initialProps, defaultProps));
|
|
45
45
|
return /*#__PURE__*/_react.default.cloneElement(props.lineComponent, {
|
|
46
46
|
...props.events,
|
|
47
47
|
"aria-label": props.ariaLabel,
|
|
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.Point = void 0;
|
|
7
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
8
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
9
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
10
10
|
var pathHelpers = _interopRequireWildcard(require("../victory-util/point-path-helpers"));
|
|
11
11
|
var UserProps = _interopRequireWildcard(require("../victory-util/user-props"));
|
|
@@ -61,7 +61,7 @@ const defaultProps = {
|
|
|
61
61
|
shapeRendering: "auto"
|
|
62
62
|
};
|
|
63
63
|
const Point = initialProps => {
|
|
64
|
-
const props = evaluateProps((0,
|
|
64
|
+
const props = evaluateProps((0, _defaults.default)({}, initialProps, defaultProps));
|
|
65
65
|
const userProps = UserProps.getSafeUserProps(props);
|
|
66
66
|
return /*#__PURE__*/_react.default.cloneElement(props.pathComponent, {
|
|
67
67
|
...props.events,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { VictoryCommonPrimitiveProps } from "../victory-util/common-props";
|
|
2
|
-
export
|
|
2
|
+
export type ScatterSymbolType = "circle" | "cross" | "diamond" | "plus" | "minus" | "square" | "star" | "triangleDown" | "triangleUp";
|
|
3
3
|
export interface VictoryPrimitiveShapeProps extends VictoryCommonPrimitiveProps {
|
|
4
4
|
desc?: string;
|
|
5
5
|
rx?: number;
|
|
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.Whisker = void 0;
|
|
7
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
8
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
9
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
10
10
|
var _line = require("./line");
|
|
11
11
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
@@ -40,7 +40,7 @@ const defaultProps = {
|
|
|
40
40
|
shapeRendering: "auto"
|
|
41
41
|
};
|
|
42
42
|
const Whisker = initialProps => {
|
|
43
|
-
const props = evaluateProps((0,
|
|
43
|
+
const props = evaluateProps((0, _defaults.default)({}, initialProps, defaultProps));
|
|
44
44
|
const {
|
|
45
45
|
ariaLabel,
|
|
46
46
|
groupComponent,
|
|
@@ -2,22 +2,22 @@ import * as React from "react";
|
|
|
2
2
|
import { VictoryCommonThemeProps, VictoryDatableProps } from "../victory-util/common-props";
|
|
3
3
|
import { NumberOrCallback, OrientationOrCallback, PaddingOrCallback, StringOrNumberOrCallback } from "../types/callbacks";
|
|
4
4
|
import { DomainPropType } from "../types/prop-types";
|
|
5
|
-
export
|
|
5
|
+
export type BlockProps = {
|
|
6
6
|
top?: number;
|
|
7
7
|
bottom?: number;
|
|
8
8
|
left?: number;
|
|
9
9
|
right?: number;
|
|
10
10
|
};
|
|
11
|
-
export
|
|
12
|
-
export
|
|
13
|
-
export
|
|
11
|
+
export type PaddingProps = number | BlockProps;
|
|
12
|
+
export type OrientationTypes = "top" | "bottom" | "left" | "right";
|
|
13
|
+
export type VictoryStyleObject = {
|
|
14
14
|
[K in keyof React.CSSProperties]: StringOrNumberOrCallback;
|
|
15
15
|
};
|
|
16
|
-
export
|
|
16
|
+
export type LabelProps = React.CSSProperties & {
|
|
17
17
|
angle?: number;
|
|
18
18
|
verticalAnchor?: VerticalAnchorType;
|
|
19
19
|
};
|
|
20
|
-
export
|
|
20
|
+
export type VictoryLabelStyleObject = {
|
|
21
21
|
[K in keyof LabelProps]: StringOrNumberOrCallback;
|
|
22
22
|
};
|
|
23
23
|
/**
|
|
@@ -29,10 +29,10 @@ export interface VictoryStyleInterface {
|
|
|
29
29
|
labels?: VictoryLabelStyleObject | VictoryLabelStyleObject[];
|
|
30
30
|
border?: VictoryStyleObject;
|
|
31
31
|
}
|
|
32
|
-
export
|
|
32
|
+
export type TickProps = React.CSSProperties & {
|
|
33
33
|
size?: number;
|
|
34
34
|
};
|
|
35
|
-
export
|
|
35
|
+
export type VictoryTickStyleObject = {
|
|
36
36
|
[K in keyof TickProps]: StringOrNumberOrCallback;
|
|
37
37
|
};
|
|
38
38
|
export interface VictoryAxisCommonProps {
|
|
@@ -59,9 +59,9 @@ export interface VictoryAxisCommonProps {
|
|
|
59
59
|
};
|
|
60
60
|
tickValues?: any[];
|
|
61
61
|
}
|
|
62
|
-
export
|
|
63
|
-
|
|
64
|
-
export
|
|
62
|
+
export type VerticalAnchorType = "start" | "middle" | "end";
|
|
63
|
+
type VictoryThemePaletteKeys = "blue" | "pink" | "teal" | "purple" | "green" | "orange" | "cyan" | "red" | "yellow";
|
|
64
|
+
export type VictoryThemePalette = {
|
|
65
65
|
[key in VictoryThemePaletteKeys]?: string;
|
|
66
66
|
};
|
|
67
67
|
export interface VictoryThemeDefinition {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import TimerContext from "../victory-util/timer-context";
|
|
3
3
|
import Timer from "../victory-util/timer";
|
|
4
|
-
|
|
4
|
+
type VictoryTransitionChild = React.ReactElement<{
|
|
5
5
|
polar?: boolean;
|
|
6
6
|
domain?: number[] | {
|
|
7
7
|
x: number[];
|
|
@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VictoryTransition = void 0;
|
|
7
|
-
var _pick2 = _interopRequireDefault(require("lodash/pick"));
|
|
8
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
9
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
|
+
var _pick = _interopRequireDefault(require("lodash/pick"));
|
|
10
|
+
var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
|
|
10
11
|
var _victoryAnimation = require("../victory-animation/victory-animation");
|
|
11
12
|
var Collection = _interopRequireWildcard(require("../victory-util/collection"));
|
|
12
13
|
var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
|
|
13
14
|
var _timerContext = _interopRequireDefault(require("../victory-util/timer-context"));
|
|
14
15
|
var Transitions = _interopRequireWildcard(require("../victory-util/transitions"));
|
|
15
|
-
var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
|
|
16
16
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
17
17
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -34,7 +34,7 @@ class VictoryTransition extends _react.default.Component {
|
|
|
34
34
|
componentDidMount() {
|
|
35
35
|
this.setState({
|
|
36
36
|
nodesShouldLoad: true
|
|
37
|
-
});
|
|
37
|
+
});
|
|
38
38
|
}
|
|
39
39
|
shouldComponentUpdate(nextProps) {
|
|
40
40
|
if (!(0, _reactFastCompare.default)(this.props, nextProps)) {
|
|
@@ -130,13 +130,13 @@ class VictoryTransition extends _react.default.Component {
|
|
|
130
130
|
y: this.getDomainFromChildren(props, "y")
|
|
131
131
|
};
|
|
132
132
|
const clipWidth = this.getClipWidth(props, child);
|
|
133
|
-
const combinedProps = (0,
|
|
133
|
+
const combinedProps = (0, _defaults.default)({
|
|
134
134
|
domain,
|
|
135
135
|
clipWidth
|
|
136
136
|
}, transitionProps, child.props);
|
|
137
137
|
const animationWhitelist = props.animationWhitelist || [];
|
|
138
138
|
const whitelist = animationWhitelist.concat(["clipWidth"]);
|
|
139
|
-
const propsToAnimate = whitelist.length ? (0,
|
|
139
|
+
const propsToAnimate = whitelist.length ? (0, _pick.default)(combinedProps, whitelist) : combinedProps;
|
|
140
140
|
return /*#__PURE__*/_react.default.createElement(_victoryAnimation.VictoryAnimation, _extends({}, combinedProps.animate, {
|
|
141
141
|
data: propsToAnimate
|
|
142
142
|
}), newProps => {
|
|
@@ -144,13 +144,13 @@ class VictoryTransition extends _react.default.Component {
|
|
|
144
144
|
const groupComponent = this.continuous ? /*#__PURE__*/_react.default.cloneElement(child.props.groupComponent, {
|
|
145
145
|
clipWidth: newProps.clipWidth || 0
|
|
146
146
|
}) : child.props.groupComponent;
|
|
147
|
-
return /*#__PURE__*/_react.default.cloneElement(child, (0,
|
|
147
|
+
return /*#__PURE__*/_react.default.cloneElement(child, (0, _defaults.default)({
|
|
148
148
|
animate: null,
|
|
149
149
|
animating: true,
|
|
150
150
|
groupComponent
|
|
151
151
|
}, newProps, combinedProps));
|
|
152
152
|
}
|
|
153
|
-
return /*#__PURE__*/_react.default.cloneElement(child, (0,
|
|
153
|
+
return /*#__PURE__*/_react.default.cloneElement(child, (0, _defaults.default)({
|
|
154
154
|
animate: null,
|
|
155
155
|
animating: true
|
|
156
156
|
}, newProps, combinedProps));
|
|
@@ -3,7 +3,7 @@ import { VictoryLabelableProps } from "../types/prop-types";
|
|
|
3
3
|
import { VictoryCommonProps, VictoryDatableProps } from "./common-props";
|
|
4
4
|
import type { ComponentEvent } from "./events";
|
|
5
5
|
import * as Events from "./events";
|
|
6
|
-
export
|
|
6
|
+
export type MixinOptions = {
|
|
7
7
|
components?: Array<{
|
|
8
8
|
name: string;
|
|
9
9
|
index?: string | number;
|
|
@@ -24,7 +24,7 @@ export interface EventsMixinClass<TProps> {
|
|
|
24
24
|
renderContainer(component: React.ReactElement, children: React.ReactElement | React.ReactElement[]): React.ReactElement;
|
|
25
25
|
cacheValues<TThis>(this: TThis, obj: Partial<TThis>): void;
|
|
26
26
|
getEventState: typeof Events.getEventState;
|
|
27
|
-
renderData(props: TProps): any;
|
|
27
|
+
renderData(props: TProps, shouldRenderDatum?: () => boolean): any;
|
|
28
28
|
renderContinuousData(props: TProps): any;
|
|
29
29
|
animateComponent(props: TProps, defaultAnimationWhitelist: string[]): React.ReactElement;
|
|
30
30
|
getComponentProps(component: React.ReactNode, type: string, index: string | number): TProps;
|
|
@@ -44,12 +44,12 @@ export interface EventMixinCalculatedValues {
|
|
|
44
44
|
/**
|
|
45
45
|
* These are the common roles that we care about internally.
|
|
46
46
|
*/
|
|
47
|
-
export
|
|
47
|
+
export type VictoryComponentCommonRole = "container" | "group" | "histogram" | "label" | "line" | "portal" | "stack" | "tooltip" | "voronoi";
|
|
48
48
|
/**
|
|
49
49
|
* A component can have any "role",
|
|
50
50
|
* but there are certain ones that we actually care about internally
|
|
51
51
|
*/
|
|
52
|
-
export
|
|
52
|
+
export type VictoryComponentRole = VictoryComponentCommonRole | string;
|
|
53
53
|
/**
|
|
54
54
|
* Static component fields used by Victory for common behavior
|
|
55
55
|
*/
|
|
@@ -111,17 +111,17 @@ export declare function addEvents<TBase extends WrappedComponentClass<TProps>, T
|
|
|
111
111
|
UNSAFE_componentWillReceiveProps?(nextProps: Readonly<TProps>, nextContext: any): void;
|
|
112
112
|
componentWillUpdate?(nextProps: Readonly<TProps>, nextState: Readonly<{}>, nextContext: any): void;
|
|
113
113
|
UNSAFE_componentWillUpdate?(nextProps: Readonly<TProps>, nextState: Readonly<{}>, nextContext: any): void;
|
|
114
|
-
componentEvents: ComponentEvent
|
|
114
|
+
componentEvents: Array<ComponentEvent>;
|
|
115
115
|
getSharedEventState: (key: string, value: string) => unknown;
|
|
116
116
|
baseProps: Record<string, object>;
|
|
117
117
|
dataKeys: string[];
|
|
118
118
|
hasEvents: unknown;
|
|
119
119
|
events: unknown;
|
|
120
120
|
};
|
|
121
|
-
getBaseProps?(props: TProps):
|
|
122
|
-
role?:
|
|
121
|
+
getBaseProps?(props: TProps): EventMixinCalculatedValues["baseProps"];
|
|
122
|
+
role?: VictoryComponentRole;
|
|
123
123
|
expectedComponents?: (string | keyof TProps)[] | undefined;
|
|
124
|
-
getChildren?: ((props: TProps, childComponents?: React.ReactNode
|
|
124
|
+
getChildren?: ((props: TProps, childComponents?: Array<React.ReactNode>, calculatedProps?: TProps | undefined) => void) | undefined;
|
|
125
125
|
animationWhitelist?: (string | keyof TProps)[] | undefined;
|
|
126
126
|
} & TBase;
|
|
127
127
|
//# sourceMappingURL=add-events.d.ts.map
|
|
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.addEvents = addEvents;
|
|
7
|
-
var _pick2 = _interopRequireDefault(require("lodash/pick"));
|
|
8
|
-
var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
|
|
9
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
10
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
9
|
+
var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
|
|
10
|
+
var _pick = _interopRequireDefault(require("lodash/pick"));
|
|
11
11
|
var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
|
|
12
12
|
var _victoryTransition = require("../victory-transition/victory-transition");
|
|
13
13
|
var _collection = require("./collection");
|
|
@@ -69,7 +69,7 @@ const defaultComponents = [{
|
|
|
69
69
|
function addEvents(WrappedComponent, options) {
|
|
70
70
|
if (options === void 0) {
|
|
71
71
|
options = {};
|
|
72
|
-
} // eslint-disable-next-line @typescript-eslint/no-empty-
|
|
72
|
+
} // eslint-disable-next-line @typescript-eslint/no-empty-object-type
|
|
73
73
|
// @ts-expect-error "TS2545: A mixin class must have a constructor with a single rest parameter of type 'any[]'."
|
|
74
74
|
class AddEventsMixin extends WrappedComponent {
|
|
75
75
|
constructor(props) {
|
|
@@ -146,8 +146,8 @@ function addEvents(WrappedComponent, options) {
|
|
|
146
146
|
return {};
|
|
147
147
|
}
|
|
148
148
|
const getState = (key, type) => {
|
|
149
|
-
const result = (0,
|
|
150
|
-
return (0,
|
|
149
|
+
const result = (0, _defaults.default)({}, this.getEventState(key, type), this.getSharedEventState(key, type));
|
|
150
|
+
return (0, _isEmpty.default)(result) ? undefined : result;
|
|
151
151
|
};
|
|
152
152
|
const components = options.components || defaultComponents;
|
|
153
153
|
const stateChanges = components.map(component => {
|
|
@@ -160,7 +160,7 @@ function addEvents(WrappedComponent, options) {
|
|
|
160
160
|
return stateChanges;
|
|
161
161
|
}
|
|
162
162
|
applyExternalMutations(props, externalMutations) {
|
|
163
|
-
if (!(0,
|
|
163
|
+
if (!(0, _isEmpty.default)(externalMutations)) {
|
|
164
164
|
const callbacks = props.externalEventMutations.reduce((memo, mutation) => (0, _helpers.isFunction)(mutation.callback) ? memo.concat(mutation.callback) : memo, []);
|
|
165
165
|
const compiledCallbacks = callbacks.length ? () => {
|
|
166
166
|
callbacks.forEach(c => c());
|
|
@@ -193,7 +193,7 @@ function addEvents(WrappedComponent, options) {
|
|
|
193
193
|
sharedEvents,
|
|
194
194
|
externalEventMutations
|
|
195
195
|
} = props;
|
|
196
|
-
return (0,
|
|
196
|
+
return (0, _isEmpty.default)(externalEventMutations) || sharedEvents ? undefined : Events.getExternalMutations(externalEventMutations, this.baseProps, this.state);
|
|
197
197
|
}
|
|
198
198
|
cacheValues(obj) {
|
|
199
199
|
Object.keys(obj).forEach(key => {
|
|
@@ -204,10 +204,10 @@ function addEvents(WrappedComponent, options) {
|
|
|
204
204
|
const getSharedEventStateFunction = getSharedEventState || this.getSharedEventState.bind(this);
|
|
205
205
|
const sharedParentState = getSharedEventStateFunction("parent", "parent");
|
|
206
206
|
const parentState = this.getEventState("parent", "parent");
|
|
207
|
-
const baseParentProps = (0,
|
|
207
|
+
const baseParentProps = (0, _defaults.default)({}, parentState, sharedParentState);
|
|
208
208
|
const parentPropsList = baseParentProps.parentControlledProps;
|
|
209
|
-
const parentProps = parentPropsList ? (0,
|
|
210
|
-
const modifiedProps = (0,
|
|
209
|
+
const parentProps = parentPropsList ? (0, _pick.default)(baseParentProps, parentPropsList) : {};
|
|
210
|
+
const modifiedProps = (0, _defaults.default)({}, parentProps, props);
|
|
211
211
|
return typeof WrappedComponent.getBaseProps === "function" ? WrappedComponent.getBaseProps(modifiedProps) : {};
|
|
212
212
|
}
|
|
213
213
|
getAllEvents(props) {
|
|
@@ -227,18 +227,18 @@ function addEvents(WrappedComponent, options) {
|
|
|
227
227
|
const currentProps = component && typeof component === "object" && "props" in component ? component.props : undefined;
|
|
228
228
|
if (this.hasEvents) {
|
|
229
229
|
const baseEvents = this.getEvents(this.props, type, key);
|
|
230
|
-
const componentProps = (0,
|
|
230
|
+
const componentProps = (0, _defaults.default)({
|
|
231
231
|
index,
|
|
232
232
|
key: id
|
|
233
233
|
}, this.getEventState(key, type), this.getSharedEventState(key, type), currentProps, baseProps, {
|
|
234
234
|
id
|
|
235
235
|
});
|
|
236
|
-
const events = (0,
|
|
236
|
+
const events = (0, _defaults.default)({}, Events.getPartialEvents(baseEvents, key, componentProps), componentProps.events);
|
|
237
237
|
return Object.assign({}, componentProps, {
|
|
238
238
|
events
|
|
239
239
|
});
|
|
240
240
|
}
|
|
241
|
-
return (0,
|
|
241
|
+
return (0, _defaults.default)({
|
|
242
242
|
index,
|
|
243
243
|
key: id
|
|
244
244
|
}, currentProps, baseProps, {
|
package/lib/victory-util/axis.js
CHANGED
|
@@ -16,11 +16,11 @@ exports.getTicks = getTicks;
|
|
|
16
16
|
exports.isVertical = isVertical;
|
|
17
17
|
exports.modifyProps = modifyProps;
|
|
18
18
|
exports.stringTicks = stringTicks;
|
|
19
|
-
var _orderBy2 = _interopRequireDefault(require("lodash/orderBy"));
|
|
20
|
-
var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
|
|
21
|
-
var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
|
|
22
|
-
var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
|
|
23
19
|
var _react = _interopRequireDefault(require("react"));
|
|
20
|
+
var _defaults = _interopRequireDefault(require("lodash/defaults"));
|
|
21
|
+
var _isObject = _interopRequireDefault(require("lodash/isObject"));
|
|
22
|
+
var _uniq = _interopRequireDefault(require("lodash/uniq"));
|
|
23
|
+
var _orderBy = _interopRequireDefault(require("lodash/orderBy"));
|
|
24
24
|
var Collection = _interopRequireWildcard(require("./collection"));
|
|
25
25
|
var Domain = _interopRequireWildcard(require("./domain"));
|
|
26
26
|
var Helpers = _interopRequireWildcard(require("./helpers"));
|
|
@@ -159,7 +159,7 @@ function getDefaultTickFormat(props) {
|
|
|
159
159
|
return stringTicks(props) ? (x, index) => tickValues[index] : fallbackFormat;
|
|
160
160
|
}
|
|
161
161
|
const invertedStringMap = stringMap && Helpers.invert(stringMap);
|
|
162
|
-
const tickValueArray = (0,
|
|
162
|
+
const tickValueArray = (0, _orderBy.default)(Object.values(stringMap), n => n);
|
|
163
163
|
const dataNames = tickValueArray.map(tick => invertedStringMap[tick]);
|
|
164
164
|
// string ticks should have one tick of padding at the beginning
|
|
165
165
|
const dataTicks = ["", ...dataNames, ""];
|
|
@@ -196,14 +196,14 @@ function getTickArray(props) {
|
|
|
196
196
|
if (tickValues && Collection.containsStrings(tickValues)) {
|
|
197
197
|
ticks = stringMap ? tickValues.map(tick => stringMap[tick]) : Helpers.range(1, tickValues.length + 1);
|
|
198
198
|
}
|
|
199
|
-
const tickArray = ticks ? (0,
|
|
199
|
+
const tickArray = ticks ? (0, _uniq.default)(ticks) : getTicksFromFormat();
|
|
200
200
|
const buildTickArray = arr => {
|
|
201
201
|
const newTickArray = [];
|
|
202
202
|
const domain = props.domain && props.domain[axis] || props.domain;
|
|
203
203
|
if (arr) {
|
|
204
204
|
arr.forEach((t, index) => {
|
|
205
205
|
if (Array.isArray(domain)) {
|
|
206
|
-
if (t >= Collection.getMinValue(domain) && t <= Collection.getMaxValue(domain)) {
|
|
206
|
+
if (t >= Collection.getMinValue(domain).valueOf() && t <= Collection.getMaxValue(domain).valueOf()) {
|
|
207
207
|
newTickArray.push({
|
|
208
208
|
value: t,
|
|
209
209
|
index
|
|
@@ -292,7 +292,7 @@ function getTicks(props, scale, filterZero) {
|
|
|
292
292
|
* @param {String} axis: either x or y
|
|
293
293
|
* @returns {Array} returns a domain from tickValues
|
|
294
294
|
*/
|
|
295
|
-
|
|
295
|
+
|
|
296
296
|
function getDomainFromData(props, axis) {
|
|
297
297
|
const {
|
|
298
298
|
polar,
|
|
@@ -333,17 +333,17 @@ function getAxisValue(props, axis) {
|
|
|
333
333
|
return undefined;
|
|
334
334
|
}
|
|
335
335
|
const scaleAxis = axis === "x" ? "y" : "x";
|
|
336
|
-
const scale = (0,
|
|
336
|
+
const scale = (0, _isObject.default)(props.scale) && Helpers.isFunction(props.scale[scaleAxis]) ? props.scale[scaleAxis] : undefined;
|
|
337
337
|
if (!scale) {
|
|
338
338
|
return undefined;
|
|
339
339
|
}
|
|
340
340
|
const stringMapAxis = axis === "x" ? "y" : "x";
|
|
341
|
-
const stringMap = (0,
|
|
341
|
+
const stringMap = (0, _isObject.default)(props.stringMap) && props.stringMap[stringMapAxis];
|
|
342
342
|
const axisValue = stringMap && typeof props.axisValue === "string" ? stringMap[props.axisValue] : props.axisValue;
|
|
343
343
|
return scale(axisValue);
|
|
344
344
|
}
|
|
345
345
|
function modifyProps(props, fallbackProps) {
|
|
346
|
-
if (!(0,
|
|
346
|
+
if (!(0, _isObject.default)(props.theme)) {
|
|
347
347
|
return Helpers.modifyProps(props, fallbackProps, "axis");
|
|
348
348
|
}
|
|
349
349
|
let role = "axis";
|
|
@@ -355,7 +355,7 @@ function modifyProps(props, fallbackProps) {
|
|
|
355
355
|
if (role === "axis") {
|
|
356
356
|
return Helpers.modifyProps(props, fallbackProps, "axis");
|
|
357
357
|
}
|
|
358
|
-
const axisTheme = (0,
|
|
358
|
+
const axisTheme = (0, _defaults.default)({}, props.theme[role], props.theme.axis);
|
|
359
359
|
const theme = Object.assign({}, props.theme, {
|
|
360
360
|
axis: axisTheme
|
|
361
361
|
});
|