victory-scatter 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.
@@ -2,13 +2,17 @@ import _isNil from "lodash/isNil";
2
2
  import _values from "lodash/values";
3
3
  import _assign from "lodash/assign";
4
4
 
5
- function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
5
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
6
6
 
7
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
7
+ 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."); }
8
8
 
9
- function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
9
+ 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); }
10
10
 
11
- 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; } }
11
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
12
+
13
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
14
+
15
+ 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; }
12
16
 
13
17
  import { Helpers, LabelHelpers, Data, Domain, Scale } from "victory-core";
14
18
  export var getSymbol = function (data, props) {
@@ -1,22 +1,32 @@
1
- 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; }
1
+ 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; }
2
2
 
3
- 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; }
3
+ 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; }
4
4
 
5
5
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
6
6
 
7
7
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
8
8
 
9
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
9
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
10
+
11
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
12
+
13
+ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
14
+
15
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
10
16
 
11
- function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
17
+ function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
12
18
 
13
19
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
14
20
 
15
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
21
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
22
+
23
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
24
+
25
+ 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; }
16
26
 
17
27
  import PropTypes from "prop-types";
18
28
  import React from "react";
19
- import { PropTypes as CustomPropTypes, Helpers, VictoryLabel, addEvents, CommonProps, VictoryContainer, VictoryTheme, DefaultTransitions, Data, Domain, Point } from "victory-core";
29
+ import { PropTypes as CustomPropTypes, Helpers, VictoryLabel, addEvents, CommonProps, VictoryContainer, VictoryTheme, DefaultTransitions, Data, Domain, Point, UserProps } from "victory-core";
20
30
  import { getBaseProps } from "./helper-methods";
21
31
  var fallbackProps = {
22
32
  width: 450,
@@ -26,21 +36,21 @@ var fallbackProps = {
26
36
  symbol: "circle"
27
37
  };
28
38
 
29
- var VictoryScatter =
30
- /*#__PURE__*/
31
- function (_React$Component) {
39
+ var VictoryScatter = /*#__PURE__*/function (_React$Component) {
32
40
  _inherits(VictoryScatter, _React$Component);
33
41
 
42
+ var _super = _createSuper(VictoryScatter);
43
+
34
44
  function VictoryScatter() {
35
45
  _classCallCheck(this, VictoryScatter);
36
46
 
37
- return _possibleConstructorReturn(this, (VictoryScatter.__proto__ || Object.getPrototypeOf(VictoryScatter)).apply(this, arguments));
47
+ return _super.apply(this, arguments);
38
48
  }
39
49
 
40
50
  _createClass(VictoryScatter, [{
41
51
  key: "shouldAnimate",
42
- // Overridden in native versions
43
- value: function shouldAnimate() {
52
+ value: // Overridden in native versions
53
+ function shouldAnimate() {
44
54
  return !!this.props.animate;
45
55
  }
46
56
  }, {
@@ -55,88 +65,49 @@ function (_React$Component) {
55
65
  }
56
66
 
57
67
  var children = this.renderData(props);
58
- return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
68
+ var container = /*#__PURE__*/React.cloneElement(props.containerComponent, UserProps.getSafeUserProps(props));
69
+ return props.standalone ? this.renderContainer(container, children) : children;
59
70
  }
60
71
  }]);
61
72
 
62
73
  return VictoryScatter;
63
74
  }(React.Component);
64
75
 
65
- Object.defineProperty(VictoryScatter, "animationWhitelist", {
66
- configurable: true,
67
- enumerable: true,
68
- writable: true,
69
- value: ["data", "domain", "height", "maxBubbleSize", "padding", "samples", "size", "style", "width"]
70
- });
71
- Object.defineProperty(VictoryScatter, "displayName", {
72
- configurable: true,
73
- enumerable: true,
74
- writable: true,
75
- value: "VictoryScatter"
76
- });
77
- Object.defineProperty(VictoryScatter, "role", {
78
- configurable: true,
79
- enumerable: true,
80
- writable: true,
81
- value: "scatter"
82
- });
83
- Object.defineProperty(VictoryScatter, "defaultTransitions", {
84
- configurable: true,
85
- enumerable: true,
86
- writable: true,
87
- value: DefaultTransitions.discreteTransitions()
88
- });
89
- Object.defineProperty(VictoryScatter, "propTypes", {
90
- configurable: true,
91
- enumerable: true,
92
- writable: true,
93
- value: _objectSpread({}, CommonProps.baseProps, CommonProps.dataProps, {
94
- bubbleProperty: PropTypes.string,
95
- maxBubbleSize: CustomPropTypes.nonNegative,
96
- minBubbleSize: CustomPropTypes.nonNegative,
97
- size: PropTypes.oneOfType([CustomPropTypes.nonNegative, PropTypes.func]),
98
- symbol: PropTypes.oneOfType([PropTypes.oneOf(["circle", "cross", "diamond", "plus", "minus", "square", "star", "triangleDown", "triangleUp"]), PropTypes.func])
99
- })
100
- });
101
- Object.defineProperty(VictoryScatter, "defaultProps", {
102
- configurable: true,
103
- enumerable: true,
104
- writable: true,
105
- value: {
106
- containerComponent: React.createElement(VictoryContainer, null),
107
- dataComponent: React.createElement(Point, null),
108
- labelComponent: React.createElement(VictoryLabel, null),
109
- groupComponent: React.createElement("g", null),
110
- samples: 50,
111
- sortOrder: "ascending",
112
- standalone: true,
113
- theme: VictoryTheme.grayscale
114
- }
115
- });
116
- Object.defineProperty(VictoryScatter, "getDomain", {
117
- configurable: true,
118
- enumerable: true,
119
- writable: true,
120
- value: Domain.getDomain
121
- });
122
- Object.defineProperty(VictoryScatter, "getData", {
123
- configurable: true,
124
- enumerable: true,
125
- writable: true,
126
- value: Data.getData
127
- });
128
- Object.defineProperty(VictoryScatter, "getBaseProps", {
129
- configurable: true,
130
- enumerable: true,
131
- writable: true,
132
- value: function (props) {
133
- return getBaseProps(props, fallbackProps);
134
- }
76
+ _defineProperty(VictoryScatter, "animationWhitelist", ["data", "domain", "height", "maxBubbleSize", "padding", "samples", "size", "style", "width"]);
77
+
78
+ _defineProperty(VictoryScatter, "displayName", "VictoryScatter");
79
+
80
+ _defineProperty(VictoryScatter, "role", "scatter");
81
+
82
+ _defineProperty(VictoryScatter, "defaultTransitions", DefaultTransitions.discreteTransitions());
83
+
84
+ _defineProperty(VictoryScatter, "propTypes", _objectSpread(_objectSpread(_objectSpread({}, CommonProps.baseProps), CommonProps.dataProps), {}, {
85
+ bubbleProperty: PropTypes.string,
86
+ maxBubbleSize: CustomPropTypes.nonNegative,
87
+ minBubbleSize: CustomPropTypes.nonNegative,
88
+ size: PropTypes.oneOfType([CustomPropTypes.nonNegative, PropTypes.func]),
89
+ symbol: PropTypes.oneOfType([PropTypes.oneOf(["circle", "cross", "diamond", "plus", "minus", "square", "star", "triangleDown", "triangleUp"]), PropTypes.func])
90
+ }));
91
+
92
+ _defineProperty(VictoryScatter, "defaultProps", {
93
+ containerComponent: /*#__PURE__*/React.createElement(VictoryContainer, null),
94
+ dataComponent: /*#__PURE__*/React.createElement(Point, null),
95
+ labelComponent: /*#__PURE__*/React.createElement(VictoryLabel, null),
96
+ groupComponent: /*#__PURE__*/React.createElement("g", null),
97
+ samples: 50,
98
+ sortOrder: "ascending",
99
+ standalone: true,
100
+ theme: VictoryTheme.grayscale
135
101
  });
136
- Object.defineProperty(VictoryScatter, "expectedComponents", {
137
- configurable: true,
138
- enumerable: true,
139
- writable: true,
140
- value: ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]
102
+
103
+ _defineProperty(VictoryScatter, "getDomain", Domain.getDomain);
104
+
105
+ _defineProperty(VictoryScatter, "getData", Data.getData);
106
+
107
+ _defineProperty(VictoryScatter, "getBaseProps", function (props) {
108
+ return getBaseProps(props, fallbackProps);
141
109
  });
110
+
111
+ _defineProperty(VictoryScatter, "expectedComponents", ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]);
112
+
142
113
  export default addEvents(VictoryScatter);
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.getBaseProps = exports.getSize = exports.getBubbleSize = exports.getSymbol = void 0;
6
+ exports.getSymbol = exports.getSize = exports.getBubbleSize = exports.getBaseProps = void 0;
7
7
 
8
8
  var _isNil2 = _interopRequireDefault(require("lodash/isNil"));
9
9
 
@@ -15,13 +15,17 @@ var _victoryCore = require("victory-core");
15
15
 
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
17
 
18
- function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
18
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
19
19
 
20
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
20
+ 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
21
 
22
- function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
22
+ 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); }
23
23
 
24
- 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; } }
24
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
25
+
26
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
27
+
28
+ 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; }
25
29
 
26
30
  var getSymbol = function (data, props) {
27
31
  if (props.bubbleProperty) {
@@ -15,21 +15,31 @@ var _helperMethods = require("./helper-methods");
15
15
 
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
17
 
18
- 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; }
18
+ 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; }
19
19
 
20
- 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; }
20
+ 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; }
21
21
 
22
22
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
23
23
 
24
24
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
25
25
 
26
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
26
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
27
+
28
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
29
+
30
+ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
31
+
32
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
27
33
 
28
- function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
34
+ function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
29
35
 
30
36
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
31
37
 
32
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
38
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
39
+
40
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
41
+
42
+ 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; }
33
43
 
34
44
  var fallbackProps = {
35
45
  width: 450,
@@ -39,21 +49,21 @@ var fallbackProps = {
39
49
  symbol: "circle"
40
50
  };
41
51
 
42
- var VictoryScatter =
43
- /*#__PURE__*/
44
- function (_React$Component) {
52
+ var VictoryScatter = /*#__PURE__*/function (_React$Component) {
45
53
  _inherits(VictoryScatter, _React$Component);
46
54
 
55
+ var _super = _createSuper(VictoryScatter);
56
+
47
57
  function VictoryScatter() {
48
58
  _classCallCheck(this, VictoryScatter);
49
59
 
50
- return _possibleConstructorReturn(this, (VictoryScatter.__proto__ || Object.getPrototypeOf(VictoryScatter)).apply(this, arguments));
60
+ return _super.apply(this, arguments);
51
61
  }
52
62
 
53
63
  _createClass(VictoryScatter, [{
54
64
  key: "shouldAnimate",
55
- // Overridden in native versions
56
- value: function shouldAnimate() {
65
+ value: // Overridden in native versions
66
+ function shouldAnimate() {
57
67
  return !!this.props.animate;
58
68
  }
59
69
  }, {
@@ -69,91 +79,53 @@ function (_React$Component) {
69
79
  }
70
80
 
71
81
  var children = this.renderData(props);
72
- return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
82
+
83
+ var container = /*#__PURE__*/_react.default.cloneElement(props.containerComponent, _victoryCore.UserProps.getSafeUserProps(props));
84
+
85
+ return props.standalone ? this.renderContainer(container, children) : children;
73
86
  }
74
87
  }]);
75
88
 
76
89
  return VictoryScatter;
77
90
  }(_react.default.Component);
78
91
 
79
- Object.defineProperty(VictoryScatter, "animationWhitelist", {
80
- configurable: true,
81
- enumerable: true,
82
- writable: true,
83
- value: ["data", "domain", "height", "maxBubbleSize", "padding", "samples", "size", "style", "width"]
84
- });
85
- Object.defineProperty(VictoryScatter, "displayName", {
86
- configurable: true,
87
- enumerable: true,
88
- writable: true,
89
- value: "VictoryScatter"
90
- });
91
- Object.defineProperty(VictoryScatter, "role", {
92
- configurable: true,
93
- enumerable: true,
94
- writable: true,
95
- value: "scatter"
96
- });
97
- Object.defineProperty(VictoryScatter, "defaultTransitions", {
98
- configurable: true,
99
- enumerable: true,
100
- writable: true,
101
- value: _victoryCore.DefaultTransitions.discreteTransitions()
102
- });
103
- Object.defineProperty(VictoryScatter, "propTypes", {
104
- configurable: true,
105
- enumerable: true,
106
- writable: true,
107
- value: _objectSpread({}, _victoryCore.CommonProps.baseProps, _victoryCore.CommonProps.dataProps, {
108
- bubbleProperty: _propTypes.default.string,
109
- maxBubbleSize: _victoryCore.PropTypes.nonNegative,
110
- minBubbleSize: _victoryCore.PropTypes.nonNegative,
111
- size: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
112
- symbol: _propTypes.default.oneOfType([_propTypes.default.oneOf(["circle", "cross", "diamond", "plus", "minus", "square", "star", "triangleDown", "triangleUp"]), _propTypes.default.func])
113
- })
114
- });
115
- Object.defineProperty(VictoryScatter, "defaultProps", {
116
- configurable: true,
117
- enumerable: true,
118
- writable: true,
119
- value: {
120
- containerComponent: _react.default.createElement(_victoryCore.VictoryContainer, null),
121
- dataComponent: _react.default.createElement(_victoryCore.Point, null),
122
- labelComponent: _react.default.createElement(_victoryCore.VictoryLabel, null),
123
- groupComponent: _react.default.createElement("g", null),
124
- samples: 50,
125
- sortOrder: "ascending",
126
- standalone: true,
127
- theme: _victoryCore.VictoryTheme.grayscale
128
- }
129
- });
130
- Object.defineProperty(VictoryScatter, "getDomain", {
131
- configurable: true,
132
- enumerable: true,
133
- writable: true,
134
- value: _victoryCore.Domain.getDomain
135
- });
136
- Object.defineProperty(VictoryScatter, "getData", {
137
- configurable: true,
138
- enumerable: true,
139
- writable: true,
140
- value: _victoryCore.Data.getData
141
- });
142
- Object.defineProperty(VictoryScatter, "getBaseProps", {
143
- configurable: true,
144
- enumerable: true,
145
- writable: true,
146
- value: function (props) {
147
- return (0, _helperMethods.getBaseProps)(props, fallbackProps);
148
- }
92
+ _defineProperty(VictoryScatter, "animationWhitelist", ["data", "domain", "height", "maxBubbleSize", "padding", "samples", "size", "style", "width"]);
93
+
94
+ _defineProperty(VictoryScatter, "displayName", "VictoryScatter");
95
+
96
+ _defineProperty(VictoryScatter, "role", "scatter");
97
+
98
+ _defineProperty(VictoryScatter, "defaultTransitions", _victoryCore.DefaultTransitions.discreteTransitions());
99
+
100
+ _defineProperty(VictoryScatter, "propTypes", _objectSpread(_objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), _victoryCore.CommonProps.dataProps), {}, {
101
+ bubbleProperty: _propTypes.default.string,
102
+ maxBubbleSize: _victoryCore.PropTypes.nonNegative,
103
+ minBubbleSize: _victoryCore.PropTypes.nonNegative,
104
+ size: _propTypes.default.oneOfType([_victoryCore.PropTypes.nonNegative, _propTypes.default.func]),
105
+ symbol: _propTypes.default.oneOfType([_propTypes.default.oneOf(["circle", "cross", "diamond", "plus", "minus", "square", "star", "triangleDown", "triangleUp"]), _propTypes.default.func])
106
+ }));
107
+
108
+ _defineProperty(VictoryScatter, "defaultProps", {
109
+ containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
110
+ dataComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.Point, null),
111
+ labelComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryLabel, null),
112
+ groupComponent: /*#__PURE__*/_react.default.createElement("g", null),
113
+ samples: 50,
114
+ sortOrder: "ascending",
115
+ standalone: true,
116
+ theme: _victoryCore.VictoryTheme.grayscale
149
117
  });
150
- Object.defineProperty(VictoryScatter, "expectedComponents", {
151
- configurable: true,
152
- enumerable: true,
153
- writable: true,
154
- value: ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]
118
+
119
+ _defineProperty(VictoryScatter, "getDomain", _victoryCore.Domain.getDomain);
120
+
121
+ _defineProperty(VictoryScatter, "getData", _victoryCore.Data.getData);
122
+
123
+ _defineProperty(VictoryScatter, "getBaseProps", function (props) {
124
+ return (0, _helperMethods.getBaseProps)(props, fallbackProps);
155
125
  });
156
126
 
127
+ _defineProperty(VictoryScatter, "expectedComponents", ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]);
128
+
157
129
  var _default = (0, _victoryCore.addEvents)(VictoryScatter);
158
130
 
159
131
  exports.default = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "victory-scatter",
3
- "version": "36.2.2",
3
+ "version": "36.4.0",
4
4
  "description": "Scatter Component for Victory",
5
5
  "keywords": [
6
6
  "data visualization",
@@ -21,7 +21,7 @@
21
21
  "dependencies": {
22
22
  "lodash": "^4.17.19",
23
23
  "prop-types": "^15.5.8",
24
- "victory-core": "^36.2.2"
24
+ "victory-core": "^36.4.0"
25
25
  },
26
26
  "peerDependencies": {
27
27
  "react": "^16.6.0 || ^17.0.0"
@@ -30,5 +30,5 @@
30
30
  "version": "yarn run nps build-libs && nps build-dists"
31
31
  },
32
32
  "sideEffects": false,
33
- "gitHead": "e09146d4bede80e27ed095fcd7e1167c00fba864"
33
+ "gitHead": "2e05481eeb34f9801a90023a131a21aa7deff082"
34
34
  }
@@ -11,7 +11,8 @@ import {
11
11
  DefaultTransitions,
12
12
  Data,
13
13
  Domain,
14
- Point
14
+ Point,
15
+ UserProps
15
16
  } from "victory-core";
16
17
  import { getBaseProps } from "./helper-methods";
17
18
 
@@ -98,8 +99,12 @@ class VictoryScatter extends React.Component {
98
99
  }
99
100
 
100
101
  const children = this.renderData(props);
102
+ const container = React.cloneElement(
103
+ props.containerComponent,
104
+ UserProps.getSafeUserProps(props)
105
+ );
101
106
  return props.standalone
102
- ? this.renderContainer(props.containerComponent, children)
107
+ ? this.renderContainer(container, children)
103
108
  : children;
104
109
  }
105
110
  }