victory-core 36.3.0 → 36.4.1

package/lib/victory-clip-container/victory-clip-container.js

@@ -21,51 +21,69 @@ var CustomPropTypes = _interopRequireWildcard(require("../victory-util/prop-type
 
 var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
 
+var UserProps = _interopRequireWildcard(require("../victory-util/user-props"));
+
 var _clipPath = _interopRequireDefault(require("../victory-primitives/clip-path"));
 
 var _circle = _interopRequireDefault(require("../victory-primitives/circle"));
 
 var _rect = _interopRequireDefault(require("../victory-primitives/rect"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+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."); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+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); }
 
-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; } }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-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; }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-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; }
+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; }
+
+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; }
+
+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; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 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); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+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); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+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); }; }
+
+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); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-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; }
+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; } }
 
-var VictoryClipContainer =
-/*#__PURE__*/
-function (_React$Component) {
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+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; }
+
+var VictoryClipContainer = /*#__PURE__*/function (_React$Component) {
   _inherits(VictoryClipContainer, _React$Component);
 
+  var _super = _createSuper(VictoryClipContainer);
+
   function VictoryClipContainer(props) {
     var _this;
 
     _classCallCheck(this, VictoryClipContainer);
 
-    _this = _possibleConstructorReturn(this, (VictoryClipContainer.__proto__ || Object.getPrototypeOf(VictoryClipContainer)).call(this, props));
+    _this = _super.call(this, props);
     _this.clipId = !(0, _isObject2.default)(props) || props.clipId === undefined ? (0, _uniqueId2.default)("victory-clip-") : props.clipId;
     return _this;
   }
@@ -97,6 +115,7 @@ function (_React$Component) {
   }, {
     key: "renderClippedGroup",
     value: function renderClippedGroup(props, clipId) {
+      var userProps = UserProps.getSafeUserProps(props);
       var style = props.style,
           events = props.events,
           transform = props.transform,
@@ -112,10 +131,9 @@ function (_React$Component) {
         key: "clipped-group-".concat(clipId),
         clipPath: "url(#".concat(clipId, ")")
       }, events);
-      return _react.default.cloneElement(groupComponent, _objectSpread({}, groupProps, {
-        "aria-label": props["aria-label"],
+      return /*#__PURE__*/_react.default.cloneElement(groupComponent, _objectSpread(_objectSpread({}, groupProps), {}, {
         tabIndex: tabIndex
-      }), [clipComponent].concat(_toConsumableArray(_react.default.Children.toArray(children))));
+      }, userProps), [clipComponent].concat(_toConsumableArray(_react.default.Children.toArray(children))));
     }
   }, {
     key: "renderGroup",
@@ -127,7 +145,7 @@ function (_React$Component) {
           className = props.className,
           groupComponent = props.groupComponent,
           tabIndex = props.tabIndex;
-      return _react.default.cloneElement(groupComponent, (0, _assign2.default)({
+      return /*#__PURE__*/_react.default.cloneElement(groupComponent, (0, _assign2.default)({
         className: className,
         style: style,
         transform: transform,
@@ -169,7 +187,7 @@ function (_React$Component) {
           cx: origin.x - left,
           cy: origin.y - top
         };
-        child = _react.default.cloneElement(circleComponent, circleProps);
+        child = /*#__PURE__*/_react.default.cloneElement(circleComponent, circleProps);
       } else {
         var rectProps = {
           x: translateX - left,
@@ -177,10 +195,10 @@ function (_React$Component) {
           width: Math.max(clipWidth + left + right, 0),
           height: Math.max(clipHeight + top + bottom, 0)
         };
-        child = _react.default.cloneElement(rectComponent, rectProps);
+        child = /*#__PURE__*/_react.default.cloneElement(rectComponent, rectProps);
       }
 
-      return _react.default.cloneElement(clipPathComponent, (0, _assign2.default)({
+      return /*#__PURE__*/_react.default.cloneElement(clipPathComponent, (0, _assign2.default)({
         key: "clip-path-".concat(clipId)
       }, props, {
         clipId: clipId
@@ -242,60 +260,44 @@ function (_React$Component) {
 }(_react.default.Component);
 
 exports.default = VictoryClipContainer;
-Object.defineProperty(VictoryClipContainer, "displayName", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "VictoryClipContainer"
-});
-Object.defineProperty(VictoryClipContainer, "role", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "container"
-});
-Object.defineProperty(VictoryClipContainer, "propTypes", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    "aria-label": _propTypes.default.string,
-    children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
-    circleComponent: _propTypes.default.element,
-    className: _propTypes.default.string,
-    clipHeight: CustomPropTypes.nonNegative,
-    clipId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-    clipPadding: _propTypes.default.shape({
-      top: _propTypes.default.number,
-      bottom: _propTypes.default.number,
-      left: _propTypes.default.number,
-      right: _propTypes.default.number
-    }),
-    clipPathComponent: _propTypes.default.element,
-    clipWidth: CustomPropTypes.nonNegative,
-    events: _propTypes.default.object,
-    groupComponent: _propTypes.default.element,
-    origin: _propTypes.default.shape({
-      x: CustomPropTypes.nonNegative,
-      y: CustomPropTypes.nonNegative
-    }),
-    polar: _propTypes.default.bool,
-    radius: CustomPropTypes.nonNegative,
-    style: _propTypes.default.object,
-    tabIndex: _propTypes.default.number,
-    transform: _propTypes.default.string,
-    translateX: _propTypes.default.number,
-    translateY: _propTypes.default.number
-  }
+
+_defineProperty(VictoryClipContainer, "displayName", "VictoryClipContainer");
+
+_defineProperty(VictoryClipContainer, "role", "container");
+
+_defineProperty(VictoryClipContainer, "propTypes", {
+  "aria-label": _propTypes.default.string,
+  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
+  circleComponent: _propTypes.default.element,
+  className: _propTypes.default.string,
+  clipHeight: CustomPropTypes.nonNegative,
+  clipId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+  clipPadding: _propTypes.default.shape({
+    top: _propTypes.default.number,
+    bottom: _propTypes.default.number,
+    left: _propTypes.default.number,
+    right: _propTypes.default.number
+  }),
+  clipPathComponent: _propTypes.default.element,
+  clipWidth: CustomPropTypes.nonNegative,
+  events: _propTypes.default.object,
+  groupComponent: _propTypes.default.element,
+  origin: _propTypes.default.shape({
+    x: CustomPropTypes.nonNegative,
+    y: CustomPropTypes.nonNegative
+  }),
+  polar: _propTypes.default.bool,
+  radius: CustomPropTypes.nonNegative,
+  style: _propTypes.default.object,
+  tabIndex: _propTypes.default.number,
+  transform: _propTypes.default.string,
+  translateX: _propTypes.default.number,
+  translateY: _propTypes.default.number
 });
-Object.defineProperty(VictoryClipContainer, "defaultProps", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    circleComponent: _react.default.createElement(_circle.default, null),
-    rectComponent: _react.default.createElement(_rect.default, null),
-    clipPathComponent: _react.default.createElement(_clipPath.default, null),
-    groupComponent: _react.default.createElement("g", null)
-  }
+
+_defineProperty(VictoryClipContainer, "defaultProps", {
+  circleComponent: /*#__PURE__*/_react.default.createElement(_circle.default, null),
+  rectComponent: /*#__PURE__*/_react.default.createElement(_rect.default, null),
+  clipPathComponent: /*#__PURE__*/_react.default.createElement(_clipPath.default, null),
+  groupComponent: /*#__PURE__*/_react.default.createElement("g", null)
 });

package/lib/victory-container/victory-container.js

@@ -29,39 +29,53 @@ var _timerContext = _interopRequireDefault(require("../victory-util/timer-contex
 
 var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+var UserProps = _interopRequireWildcard(require("../victory-util/user-props"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-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; }
+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; }
 
-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; }
+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; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 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); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+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); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+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); }; }
+
+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); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-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; }
+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; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+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; }
 
-var VictoryContainer =
-/*#__PURE__*/
-function (_React$Component) {
+var VictoryContainer = /*#__PURE__*/function (_React$Component) {
   _inherits(VictoryContainer, _React$Component);
 
+  var _super = _createSuper(VictoryContainer);
+
   function VictoryContainer(props) {
     var _this;
 
     _classCallCheck(this, VictoryContainer);
 
-    _this = _possibleConstructorReturn(this, (VictoryContainer.__proto__ || Object.getPrototypeOf(VictoryContainer)).call(this, props));
+    _this = _super.call(this, props);
     _this.containerId = !(0, _isObject2.default)(props) || props.containerId === undefined ? (0, _uniqueId2.default)("victory-container-") : props.containerId;
 
     _this.savePortalRef = function (portal) {
@@ -129,11 +143,11 @@ function (_React$Component) {
       var ouiaId = props.ouiaId,
           ouiaSafe = props.ouiaSafe,
           ouiaType = props.ouiaType;
-      return _objectSpread({}, ouiaId && {
+      return _objectSpread(_objectSpread(_objectSpread({}, ouiaId && {
         "data-ouia-component-id": ouiaId
-      }, ouiaType && {
+      }), ouiaType && {
         "data-ouia-component-type": ouiaType
-      }, ouiaSafe !== undefined && {
+      }), ouiaSafe !== undefined && {
         "data-ouia-safe": ouiaSafe
       });
     }
@@ -180,43 +194,44 @@ function (_React$Component) {
         preserveAspectRatio: svgProps.preserveAspectRatio,
         style: portalSvgStyle
       };
-      return _react.default.createElement(_portalContext.default.Provider, {
+      return /*#__PURE__*/_react.default.createElement(_portalContext.default.Provider, {
         value: {
           portalUpdate: this.portalUpdate,
           portalRegister: this.portalRegister,
           portalDeregister: this.portalDeregister
         }
-      }, _react.default.createElement("div", _extends({
+      }, /*#__PURE__*/_react.default.createElement("div", _extends({
         style: (0, _defaults2.default)({}, style, divStyle),
         className: className,
         ref: this.saveContainerRef
-      }, this.getOUIAProps(props)), _react.default.createElement("svg", _extends({}, svgProps, {
+      }, this.getOUIAProps(props)), /*#__PURE__*/_react.default.createElement("svg", _extends({}, svgProps, {
         style: svgStyle
-      }), title ? _react.default.createElement("title", {
+      }), title ? /*#__PURE__*/_react.default.createElement("title", {
         id: this.getIdForElement("title")
-      }, title) : null, desc ? _react.default.createElement("desc", {
+      }, title) : null, desc ? /*#__PURE__*/_react.default.createElement("desc", {
         id: this.getIdForElement("desc")
-      }, desc) : null, children), _react.default.createElement("div", {
+      }, desc) : null, children), /*#__PURE__*/_react.default.createElement("div", {
         style: portalDivStyle
-      }, _react.default.cloneElement(portalComponent, _objectSpread({}, portalProps, {
+      }, /*#__PURE__*/_react.default.cloneElement(portalComponent, _objectSpread(_objectSpread({}, portalProps), {}, {
         ref: this.savePortalRef
       })))));
     }
   }, {
     key: "render",
     value: function render() {
-      var _props = this.props,
-          width = _props.width,
-          height = _props.height,
-          responsive = _props.responsive,
-          events = _props.events,
-          title = _props.title,
-          desc = _props.desc,
-          tabIndex = _props.tabIndex,
-          preserveAspectRatio = _props.preserveAspectRatio,
-          role = _props.role;
+      var _this$props = this.props,
+          width = _this$props.width,
+          height = _this$props.height,
+          responsive = _this$props.responsive,
+          events = _this$props.events,
+          title = _this$props.title,
+          desc = _this$props.desc,
+          tabIndex = _this$props.tabIndex,
+          preserveAspectRatio = _this$props.preserveAspectRatio,
+          role = _this$props.role;
       var style = responsive ? this.props.style : Helpers.omit(this.props.style, ["height", "width"]);
-      var svgProps = (0, _assign2.default)({
+      var userProps = UserProps.getSafeUserProps(this.props);
+      var svgProps = (0, _assign2.default)(_objectSpread({
         width: width,
         height: height,
         tabIndex: tabIndex,
@@ -225,7 +240,7 @@ function (_React$Component) {
         "aria-describedby": [desc && this.getIdForElement("desc"), this.props["aria-describedby"]].filter(Boolean).join(" ") || undefined,
         viewBox: responsive ? "0 0 ".concat(width, " ").concat(height) : undefined,
         preserveAspectRatio: responsive ? preserveAspectRatio : undefined
-      }, events);
+      }, userProps), events);
       return this.renderContainer(this.props, svgProps, style);
     }
   }]);
@@ -234,68 +249,48 @@ function (_React$Component) {
 }(_react.default.Component);
 
 exports.default = VictoryContainer;
-Object.defineProperty(VictoryContainer, "displayName", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "VictoryContainer"
-});
-Object.defineProperty(VictoryContainer, "role", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "container"
-});
-Object.defineProperty(VictoryContainer, "propTypes", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    "aria-describedby": _propTypes.default.string,
-    "aria-labelledby": _propTypes.default.string,
-    children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
-    className: _propTypes.default.string,
-    containerId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-    containerRef: _propTypes.default.func,
-    desc: _propTypes.default.string,
-    events: _propTypes.default.object,
-    height: CustomPropTypes.nonNegative,
-    name: _propTypes.default.string,
-    origin: _propTypes.default.shape({
-      x: CustomPropTypes.nonNegative,
-      y: CustomPropTypes.nonNegative
-    }),
-    ouiaId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-    ouiaSafe: _propTypes.default.bool,
-    ouiaType: _propTypes.default.string,
-    polar: _propTypes.default.bool,
-    portalComponent: _propTypes.default.element,
-    portalZIndex: CustomPropTypes.integer,
-    preserveAspectRatio: _propTypes.default.string,
-    responsive: _propTypes.default.bool,
-    role: _propTypes.default.string,
-    style: _propTypes.default.object,
-    tabIndex: _propTypes.default.number,
-    theme: _propTypes.default.object,
-    title: _propTypes.default.string,
-    width: CustomPropTypes.nonNegative
-  }
+
+_defineProperty(VictoryContainer, "displayName", "VictoryContainer");
+
+_defineProperty(VictoryContainer, "role", "container");
+
+_defineProperty(VictoryContainer, "propTypes", {
+  "aria-describedby": _propTypes.default.string,
+  "aria-labelledby": _propTypes.default.string,
+  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
+  className: _propTypes.default.string,
+  containerId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+  containerRef: _propTypes.default.func,
+  desc: _propTypes.default.string,
+  events: _propTypes.default.object,
+  height: CustomPropTypes.nonNegative,
+  name: _propTypes.default.string,
+  origin: _propTypes.default.shape({
+    x: CustomPropTypes.nonNegative,
+    y: CustomPropTypes.nonNegative
+  }),
+  ouiaId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+  ouiaSafe: _propTypes.default.bool,
+  ouiaType: _propTypes.default.string,
+  polar: _propTypes.default.bool,
+  portalComponent: _propTypes.default.element,
+  portalZIndex: CustomPropTypes.integer,
+  preserveAspectRatio: _propTypes.default.string,
+  responsive: _propTypes.default.bool,
+  role: _propTypes.default.string,
+  style: _propTypes.default.object,
+  tabIndex: _propTypes.default.number,
+  theme: _propTypes.default.object,
+  title: _propTypes.default.string,
+  width: CustomPropTypes.nonNegative
 });
-Object.defineProperty(VictoryContainer, "defaultProps", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    className: "VictoryContainer",
-    portalComponent: _react.default.createElement(_portal.default, null),
-    portalZIndex: 99,
-    responsive: true,
-    role: "img"
-  }
+
+_defineProperty(VictoryContainer, "defaultProps", {
+  className: "VictoryContainer",
+  portalComponent: /*#__PURE__*/_react.default.createElement(_portal.default, null),
+  portalZIndex: 99,
+  responsive: true,
+  role: "img"
 });
-Object.defineProperty(VictoryContainer, "contextType", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: _timerContext.default
-});
+
+_defineProperty(VictoryContainer, "contextType", _timerContext.default);