victory-group 36.2.2 → 36.4.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.
@@ -1,22 +1,28 @@
1
1
  import _assign from "lodash/assign";
2
2
 
3
- function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
3
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
4
4
 
5
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
5
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
6
6
 
7
- function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
7
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
8
8
 
9
- function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
9
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
10
10
 
11
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
11
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
12
12
 
13
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
13
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
14
14
 
15
- function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
15
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
16
+
17
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
18
+
19
+ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
16
20
 
17
21
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
18
22
 
19
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
23
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
24
+
25
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
20
26
 
21
27
  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; }
22
28
 
@@ -84,7 +90,7 @@ export function getCalculatedProps(props, childComponents) {
84
90
  var withoutSharedEvents = function (props) {
85
91
  var children = props.children;
86
92
  var modifiedChildren = React.Children.toArray(children).map(function (child) {
87
- return _objectSpread({}, child, {
93
+ return _objectSpread(_objectSpread({}, child), {}, {
88
94
  props: Helpers.omit(child.props, ["sharedEvents"])
89
95
  });
90
96
  });
@@ -226,7 +232,7 @@ export function getChildren(props, childComponents, calculatedProps) {
226
232
  var style = role === "voronoi" || role === "tooltip" || role === "label" ? child.props.style : Wrapper.getChildStyle(child, index, calculatedProps);
227
233
  var labels = props.labels ? getLabels(props, datasets, index) : child.props.labels;
228
234
  var name = child.props.name || "".concat(parentName, "-").concat(role, "-").concat(index);
229
- return React.cloneElement(child, _assign({
235
+ return /*#__PURE__*/React.cloneElement(child, _assign({
230
236
  labels: labels,
231
237
  style: style,
232
238
  key: "".concat(name, "-key-").concat(index),
@@ -2,13 +2,15 @@ import _isEmpty from "lodash/isEmpty";
2
2
  import _defaults from "lodash/defaults";
3
3
  import _assign from "lodash/assign";
4
4
 
5
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
5
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
6
+
7
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
6
8
 
7
9
  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; }
8
10
 
9
11
  import PropTypes from "prop-types";
10
12
  import React from "react";
11
- import { Helpers, VictoryContainer, VictoryTheme, CommonProps, Wrapper, Hooks } from "victory-core";
13
+ import { CommonProps, Helpers, Hooks, UserProps, VictoryContainer, VictoryTheme, Wrapper } from "victory-core";
12
14
  import { VictorySharedEvents } from "victory-shared-events";
13
15
  import { getChildren, useMemoizedProps } from "./helper-methods";
14
16
  import isEqual from "react-fast-compare";
@@ -54,7 +56,7 @@ var VictoryGroup = function (initialProps) {
54
56
  animate: getAnimationProps(props, child, index, "victory-group")
55
57
  }, child.props);
56
58
 
57
- return React.cloneElement(child, childProps);
59
+ return /*#__PURE__*/React.cloneElement(child, childProps);
58
60
  });
59
61
  }, [props, childComponents, calculatedProps, getAnimationProps]);
60
62
  var containerProps = React.useMemo(function () {
@@ -76,15 +78,18 @@ var VictoryGroup = function (initialProps) {
76
78
 
77
79
  return {};
78
80
  }, [standalone, domain, scale, width, height, theme, style, horizontal, polar, origin, name]);
81
+ var userProps = React.useMemo(function () {
82
+ return UserProps.getSafeUserProps(initialProps);
83
+ }, [initialProps]);
79
84
  var container = React.useMemo(function () {
80
85
  if (standalone) {
81
- var defaultContainerProps = _defaults({}, containerComponent.props, containerProps);
86
+ var defaultContainerProps = _defaults({}, containerComponent.props, containerProps, userProps);
82
87
 
83
- return React.cloneElement(containerComponent, defaultContainerProps);
88
+ return /*#__PURE__*/React.cloneElement(containerComponent, defaultContainerProps);
84
89
  }
85
90
 
86
- return groupComponent;
87
- }, [groupComponent, standalone, containerComponent, containerProps]);
91
+ return /*#__PURE__*/React.cloneElement(groupComponent, userProps);
92
+ }, [groupComponent, standalone, containerComponent, containerProps, userProps]);
88
93
  var events = React.useMemo(function () {
89
94
  return Wrapper.getAllEvents(props);
90
95
  }, [props]);
@@ -99,7 +104,7 @@ var VictoryGroup = function (initialProps) {
99
104
  }, [setAnimationState, previousProps, initialProps, props]);
100
105
 
101
106
  if (!_isEmpty(events)) {
102
- return React.createElement(VictorySharedEvents, {
107
+ return /*#__PURE__*/React.createElement(VictorySharedEvents, {
103
108
  container: container,
104
109
  eventKey: eventKey,
105
110
  events: events,
@@ -107,10 +112,10 @@ var VictoryGroup = function (initialProps) {
107
112
  }, newChildren);
108
113
  }
109
114
 
110
- return React.cloneElement(container, container.props, newChildren);
115
+ return /*#__PURE__*/React.cloneElement(container, container.props, newChildren);
111
116
  };
112
117
 
113
- VictoryGroup.propTypes = _objectSpread({}, CommonProps.baseProps, CommonProps.dataProps, {
118
+ VictoryGroup.propTypes = _objectSpread(_objectSpread(_objectSpread({}, CommonProps.baseProps), CommonProps.dataProps), {}, {
114
119
  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
115
120
  color: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
116
121
  colorScale: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.string), PropTypes.oneOf(["grayscale", "qualitative", "heatmap", "warm", "cool", "red", "green", "blue"])]),
@@ -118,8 +123,8 @@ VictoryGroup.propTypes = _objectSpread({}, CommonProps.baseProps, CommonProps.da
118
123
  offset: PropTypes.number
119
124
  });
120
125
  VictoryGroup.defaultProps = {
121
- containerComponent: React.createElement(VictoryContainer, null),
122
- groupComponent: React.createElement("g", null),
126
+ containerComponent: /*#__PURE__*/React.createElement(VictoryContainer, null),
127
+ groupComponent: /*#__PURE__*/React.createElement("g", null),
123
128
  samples: 50,
124
129
  sortOrder: "ascending",
125
130
  standalone: true,
@@ -127,7 +132,7 @@ VictoryGroup.defaultProps = {
127
132
  }; // We need to attatch the static properties to the memoized version, or else
128
133
  // VictoryChart will not be able to get this component's role type
129
134
 
130
- var VictoryGroupMemo = React.memo(VictoryGroup, isEqual);
135
+ var VictoryGroupMemo = /*#__PURE__*/React.memo(VictoryGroup, isEqual);
131
136
  VictoryGroupMemo.displayName = "VictoryGroup";
132
137
  VictoryGroupMemo.role = "group";
133
138
  VictoryGroupMemo.expectedComponents = ["groupComponent", "containerComponent", "labelComponent"];
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.getCalculatedProps = getCalculatedProps;
7
- exports.useMemoizedProps = useMemoizedProps;
8
7
  exports.getChildren = getChildren;
8
+ exports.useMemoizedProps = useMemoizedProps;
9
9
 
10
10
  var _assign2 = _interopRequireDefault(require("lodash/assign"));
11
11
 
@@ -17,23 +17,29 @@ var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
17
17
 
18
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
19
 
20
- function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
20
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
21
+
22
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
21
23
 
22
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
24
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
23
25
 
24
- function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
26
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
25
27
 
26
- function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
28
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
27
29
 
28
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
30
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
29
31
 
30
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
32
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
31
33
 
32
- function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
34
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
35
+
36
+ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
33
37
 
34
38
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
35
39
 
36
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
40
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
41
+
42
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
37
43
 
38
44
  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; }
39
45
 
@@ -107,7 +113,7 @@ var withoutSharedEvents = function (props) {
107
113
  var children = props.children;
108
114
 
109
115
  var modifiedChildren = _react.default.Children.toArray(children).map(function (child) {
110
- return _objectSpread({}, child, {
116
+ return _objectSpread(_objectSpread({}, child), {}, {
111
117
  props: _victoryCore.Helpers.omit(child.props, ["sharedEvents"])
112
118
  });
113
119
  });
@@ -252,7 +258,7 @@ function getChildren(props, childComponents, calculatedProps) {
252
258
  var style = role === "voronoi" || role === "tooltip" || role === "label" ? child.props.style : _victoryCore.Wrapper.getChildStyle(child, index, calculatedProps);
253
259
  var labels = props.labels ? getLabels(props, datasets, index) : child.props.labels;
254
260
  var name = child.props.name || "".concat(parentName, "-").concat(role, "-").concat(index);
255
- return _react.default.cloneElement(child, (0, _assign2.default)({
261
+ return /*#__PURE__*/_react.default.cloneElement(child, (0, _assign2.default)({
256
262
  labels: labels,
257
263
  style: style,
258
264
  key: "".concat(name, "-key-").concat(index),
@@ -25,7 +25,9 @@ var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
25
25
 
26
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
27
27
 
28
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
28
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
29
+
30
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
29
31
 
30
32
  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; }
31
33
 
@@ -75,7 +77,7 @@ var VictoryGroup = function (initialProps) {
75
77
  var childProps = (0, _assign2.default)({
76
78
  animate: getAnimationProps(props, child, index, "victory-group")
77
79
  }, child.props);
78
- return _react.default.cloneElement(child, childProps);
80
+ return /*#__PURE__*/_react.default.cloneElement(child, childProps);
79
81
  });
80
82
  }, [props, childComponents, calculatedProps, getAnimationProps]);
81
83
 
@@ -99,14 +101,18 @@ var VictoryGroup = function (initialProps) {
99
101
  return {};
100
102
  }, [standalone, domain, scale, width, height, theme, style, horizontal, polar, origin, name]);
101
103
 
104
+ var userProps = _react.default.useMemo(function () {
105
+ return _victoryCore.UserProps.getSafeUserProps(initialProps);
106
+ }, [initialProps]);
107
+
102
108
  var container = _react.default.useMemo(function () {
103
109
  if (standalone) {
104
- var defaultContainerProps = (0, _defaults2.default)({}, containerComponent.props, containerProps);
105
- return _react.default.cloneElement(containerComponent, defaultContainerProps);
110
+ var defaultContainerProps = (0, _defaults2.default)({}, containerComponent.props, containerProps, userProps);
111
+ return /*#__PURE__*/_react.default.cloneElement(containerComponent, defaultContainerProps);
106
112
  }
107
113
 
108
- return groupComponent;
109
- }, [groupComponent, standalone, containerComponent, containerProps]);
114
+ return /*#__PURE__*/_react.default.cloneElement(groupComponent, userProps);
115
+ }, [groupComponent, standalone, containerComponent, containerProps, userProps]);
110
116
 
111
117
  var events = _react.default.useMemo(function () {
112
118
  return _victoryCore.Wrapper.getAllEvents(props);
@@ -124,7 +130,7 @@ var VictoryGroup = function (initialProps) {
124
130
  }, [setAnimationState, previousProps, initialProps, props]);
125
131
 
126
132
  if (!(0, _isEmpty2.default)(events)) {
127
- return _react.default.createElement(_victorySharedEvents.VictorySharedEvents, {
133
+ return /*#__PURE__*/_react.default.createElement(_victorySharedEvents.VictorySharedEvents, {
128
134
  container: container,
129
135
  eventKey: eventKey,
130
136
  events: events,
@@ -132,10 +138,10 @@ var VictoryGroup = function (initialProps) {
132
138
  }, newChildren);
133
139
  }
134
140
 
135
- return _react.default.cloneElement(container, container.props, newChildren);
141
+ return /*#__PURE__*/_react.default.cloneElement(container, container.props, newChildren);
136
142
  };
137
143
 
138
- VictoryGroup.propTypes = _objectSpread({}, _victoryCore.CommonProps.baseProps, _victoryCore.CommonProps.dataProps, {
144
+ VictoryGroup.propTypes = _objectSpread(_objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), _victoryCore.CommonProps.dataProps), {}, {
139
145
  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
140
146
  color: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
141
147
  colorScale: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.string), _propTypes.default.oneOf(["grayscale", "qualitative", "heatmap", "warm", "cool", "red", "green", "blue"])]),
@@ -143,8 +149,8 @@ VictoryGroup.propTypes = _objectSpread({}, _victoryCore.CommonProps.baseProps, _
143
149
  offset: _propTypes.default.number
144
150
  });
145
151
  VictoryGroup.defaultProps = {
146
- containerComponent: _react.default.createElement(_victoryCore.VictoryContainer, null),
147
- groupComponent: _react.default.createElement("g", null),
152
+ containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
153
+ groupComponent: /*#__PURE__*/_react.default.createElement("g", null),
148
154
  samples: 50,
149
155
  sortOrder: "ascending",
150
156
  standalone: true,
@@ -152,7 +158,7 @@ VictoryGroup.defaultProps = {
152
158
  }; // We need to attatch the static properties to the memoized version, or else
153
159
  // VictoryChart will not be able to get this component's role type
154
160
 
155
- var VictoryGroupMemo = _react.default.memo(VictoryGroup, _reactFastCompare.default);
161
+ var VictoryGroupMemo = /*#__PURE__*/_react.default.memo(VictoryGroup, _reactFastCompare.default);
156
162
 
157
163
  VictoryGroupMemo.displayName = "VictoryGroup";
158
164
  VictoryGroupMemo.role = "group";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "victory-group",
3
- "version": "36.2.2",
3
+ "version": "36.4.0",
4
4
  "description": "Group Layout Component for Victory",
5
5
  "keywords": [
6
6
  "data visualization",
@@ -22,8 +22,8 @@
22
22
  "lodash": "^4.17.19",
23
23
  "prop-types": "^15.5.8",
24
24
  "react-fast-compare": "^2.0.0",
25
- "victory-core": "^36.2.2",
26
- "victory-shared-events": "^36.2.2"
25
+ "victory-core": "^36.4.0",
26
+ "victory-shared-events": "^36.4.0"
27
27
  },
28
28
  "peerDependencies": {
29
29
  "react": "^16.6.0 || ^17.0.0"
@@ -32,5 +32,5 @@
32
32
  "version": "yarn run nps build-libs && nps build-dists"
33
33
  },
34
34
  "sideEffects": false,
35
- "gitHead": "e09146d4bede80e27ed095fcd7e1167c00fba864"
35
+ "gitHead": "2e05481eeb34f9801a90023a131a21aa7deff082"
36
36
  }
@@ -2,12 +2,13 @@ import { assign, defaults, isEmpty } from "lodash";
2
2
  import PropTypes from "prop-types";
3
3
  import React from "react";
4
4
  import {
5
+ CommonProps,
5
6
  Helpers,
7
+ Hooks,
8
+ UserProps,
6
9
  VictoryContainer,
7
10
  VictoryTheme,
8
- CommonProps,
9
- Wrapper,
10
- Hooks
11
+ Wrapper
11
12
  } from "victory-core";
12
13
  import { VictorySharedEvents } from "victory-shared-events";
13
14
  import { getChildren, useMemoizedProps } from "./helper-methods";
@@ -88,17 +89,30 @@ const VictoryGroup = (initialProps) => {
88
89
  name
89
90
  ]);
90
91
 
92
+ const userProps = React.useMemo(
93
+ () => UserProps.getSafeUserProps(initialProps),
94
+ [initialProps]
95
+ );
96
+
91
97
  const container = React.useMemo(() => {
92
98
  if (standalone) {
93
99
  const defaultContainerProps = defaults(
94
100
  {},
95
101
  containerComponent.props,
96
- containerProps
102
+ containerProps,
103
+ userProps
97
104
  );
98
105
  return React.cloneElement(containerComponent, defaultContainerProps);
99
106
  }
100
- return groupComponent;
101
- }, [groupComponent, standalone, containerComponent, containerProps]);
107
+
108
+ return React.cloneElement(groupComponent, userProps);
109
+ }, [
110
+ groupComponent,
111
+ standalone,
112
+ containerComponent,
113
+ containerProps,
114
+ userProps
115
+ ]);
102
116
 
103
117
  const events = React.useMemo(() => {
104
118
  return Wrapper.getAllEvents(props);