victory-core 36.2.2 → 36.4.0

package/lib/victory-util/add-events.js

@@ -31,30 +31,46 @@ var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
 
 var _victoryTransition = _interopRequireDefault(require("../victory-transition/victory-transition"));
 
-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 _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.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+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 _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 _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 _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-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 _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 _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); }
+
 var datumHasXandY = function (datum) {
   return !(0, _isNil2.default)(datum._x) && !(0, _isNil2.default)(datum._y);
 }; //  used for checking state changes. Expected components can be passed in via options
@@ -70,347 +86,348 @@ var defaultComponents = [{
 }];
 
 var _default = function _default(WrappedComponent, options) {
-  return (
-    /*#__PURE__*/
-    function (_WrappedComponent) {
-      _inherits(addEvents, _WrappedComponent);
+  return /*#__PURE__*/function (_WrappedComponent) {
+    _inherits(addEvents, _WrappedComponent);
 
-      function addEvents(props) {
-        var _this;
+    var _super = _createSuper(addEvents);
 
-        _classCallCheck(this, addEvents);
+    function addEvents(props) {
+      var _this;
 
-        _this = _possibleConstructorReturn(this, (addEvents.__proto__ || Object.getPrototypeOf(addEvents)).call(this, props));
-        var getScopedEvents = Events.getScopedEvents.bind(_assertThisInitialized(_this));
-        var boundGetEvents = Events.getEvents.bind(_assertThisInitialized(_this));
-        _this.state = {};
+      _classCallCheck(this, addEvents);
 
-        _this.getEvents = function (p, target, eventKey) {
-          return boundGetEvents(p, target, eventKey, getScopedEvents);
-        };
+      _this = _super.call(this, props);
+      var getScopedEvents = Events.getScopedEvents.bind(_assertThisInitialized(_this));
+      var boundGetEvents = Events.getEvents.bind(_assertThisInitialized(_this));
+      _this.state = {};
 
-        _this.getEventState = Events.getEventState.bind(_assertThisInitialized(_this));
+      _this.getEvents = function (p, target, eventKey) {
+        return boundGetEvents(p, target, eventKey, getScopedEvents);
+      };
 
-        var calculatedValues = _this.getCalculatedValues(props);
+      _this.getEventState = Events.getEventState.bind(_assertThisInitialized(_this));
 
-        _this.cacheValues(calculatedValues);
+      var calculatedValues = _this.getCalculatedValues(props);
 
-        _this.externalMutations = _this.getExternalMutations(props);
-        _this.calculatedState = _this.getStateChanges(props);
-        _this.globalEvents = {};
-        _this.prevGlobalEventKeys = [];
-        _this.boundGlobalEvents = {};
-        return _this;
-      }
+      _this.cacheValues(calculatedValues);
 
-      _createClass(addEvents, [{
-        key: "shouldComponentUpdate",
-        value: function shouldComponentUpdate(nextProps) {
-          var externalMutations = this.getExternalMutations(nextProps);
-          var animating = this.props.animating || this.props.animate;
-          var newMutation = !(0, _reactFastCompare.default)(externalMutations, this.externalMutations);
-
-          if (animating || newMutation) {
-            this.cacheValues(this.getCalculatedValues(nextProps));
-            this.externalMutations = externalMutations;
-            this.applyExternalMutations(nextProps, externalMutations);
-            return true;
-          }
+      _this.externalMutations = _this.getExternalMutations(props);
+      _this.calculatedState = _this.getStateChanges(props);
+      _this.globalEvents = {};
+      _this.prevGlobalEventKeys = [];
+      _this.boundGlobalEvents = {};
+      return _this;
+    }
 
-          var calculatedState = this.getStateChanges(nextProps);
+    _createClass(addEvents, [{
+      key: "shouldComponentUpdate",
+      value: function shouldComponentUpdate(nextProps) {
+        var externalMutations = this.getExternalMutations(nextProps);
+        var animating = this.props.animating || this.props.animate;
+        var newMutation = !(0, _reactFastCompare.default)(externalMutations, this.externalMutations);
 
-          if (!(0, _reactFastCompare.default)(this.calculatedState, calculatedState)) {
-            this.cacheValues(this.getCalculatedValues(nextProps));
-            return true;
-          }
+        if (animating || newMutation) {
+          this.cacheValues(this.getCalculatedValues(nextProps));
+          this.externalMutations = externalMutations;
+          this.applyExternalMutations(nextProps, externalMutations);
+          return true;
+        }
 
-          if (!(0, _reactFastCompare.default)(this.props, nextProps)) {
-            this.cacheValues(this.getCalculatedValues(nextProps));
-            return true;
-          }
+        var calculatedState = this.getStateChanges(nextProps);
 
-          return false;
-        }
-      }, {
-        key: "componentDidMount",
-        value: function componentDidMount() {
-          var _this2 = this;
-
-          var globalEventKeys = (0, _keys2.default)(this.globalEvents);
-          globalEventKeys.forEach(function (key) {
-            return _this2.addGlobalListener(key);
-          });
-          this.prevGlobalEventKeys = globalEventKeys;
+        if (!(0, _reactFastCompare.default)(this.calculatedState, calculatedState)) {
+          this.cacheValues(this.getCalculatedValues(nextProps));
+          return true;
         }
-      }, {
-        key: "componentDidUpdate",
-        value: function componentDidUpdate(prevProps) {
-          var _this3 = this;
-
-          var calculatedState = this.getStateChanges(prevProps);
-          this.calculatedState = calculatedState;
-          var globalEventKeys = (0, _keys2.default)(this.globalEvents);
-          var removedGlobalEventKeys = (0, _difference2.default)(this.prevGlobalEventKeys, globalEventKeys);
-          removedGlobalEventKeys.forEach(function (key) {
-            return _this3.removeGlobalListener(key);
-          });
-          var addedGlobalEventKeys = (0, _difference2.default)(globalEventKeys, this.prevGlobalEventKeys);
-          addedGlobalEventKeys.forEach(function (key) {
-            return _this3.addGlobalListener(key);
-          });
-          this.prevGlobalEventKeys = globalEventKeys;
-        }
-      }, {
-        key: "componentWillUnmount",
-        value: function componentWillUnmount() {
-          var _this4 = this;
 
-          this.prevGlobalEventKeys.forEach(function (key) {
-            return _this4.removeGlobalListener(key);
-          });
+        if (!(0, _reactFastCompare.default)(this.props, nextProps)) {
+          this.cacheValues(this.getCalculatedValues(nextProps));
+          return true;
         }
-      }, {
-        key: "addGlobalListener",
-        value: function addGlobalListener(key) {
-          var _this5 = this;
-
-          var boundListener = function (event) {
-            var listener = _this5.globalEvents[key];
-            return listener && listener(Events.emulateReactEvent(event));
-          };
-
-          this.boundGlobalEvents[key] = boundListener;
-          window.addEventListener(Events.getGlobalEventNameFromKey(key), boundListener);
-        }
-      }, {
-        key: "removeGlobalListener",
-        value: function removeGlobalListener(key) {
-          window.removeEventListener(Events.getGlobalEventNameFromKey(key), this.boundGlobalEvents[key]);
-        } // compile all state changes from own and parent state. Order doesn't matter, as any state
-        // state change should trigger a re-render
-
-      }, {
-        key: "getStateChanges",
-        value: function getStateChanges(props) {
-          var _this6 = this;
-
-          if (!this.hasEvents) {
-            return {};
-          }
 
-          var getState = function (key, type) {
-            var result = (0, _defaults2.default)({}, _this6.getEventState(key, type), _this6.getSharedEventState(key, type));
-            return (0, _isEmpty2.default)(result) ? undefined : result;
-          };
-
-          options = options || {};
-          var components = options.components || defaultComponents;
-          var stateChanges = components.map(function (component) {
-            if (!props.standalone && component.name === "parent") {
-              // don't check for changes on parent props for non-standalone components
-              return undefined;
-            } else {
-              return component.index !== undefined ? getState(component.index, component.name) : _this6.dataKeys.map(function (key) {
-                return getState(key, component.name);
-              }).filter(Boolean);
-            }
-          }).filter(Boolean);
-          return stateChanges;
-        }
-      }, {
-        key: "applyExternalMutations",
-        value: function applyExternalMutations(props, externalMutations) {
-          if (!(0, _isEmpty2.default)(externalMutations)) {
-            var callbacks = props.externalEventMutations.reduce(function (memo, mutation) {
-              memo = (0, _isFunction2.default)(mutation.callback) ? memo.concat(mutation.callback) : memo;
-              return memo;
-            }, []);
-            var compiledCallbacks = callbacks.length ? function () {
-              callbacks.forEach(function (c) {
-                return c();
-              });
-            } : undefined;
-            this.setState(externalMutations, compiledCallbacks);
-          }
-        }
-      }, {
-        key: "getCalculatedValues",
-        value: function getCalculatedValues(props) {
-          var sharedEvents = props.sharedEvents;
-          var components = WrappedComponent.expectedComponents;
-          var componentEvents = Events.getComponentEvents(props, components);
-          var getSharedEventState = sharedEvents && (0, _isFunction2.default)(sharedEvents.getEventState) ? sharedEvents.getEventState : function () {
-            return undefined;
-          };
-          var baseProps = this.getBaseProps(props, getSharedEventState);
-          var dataKeys = (0, _keys2.default)(baseProps).filter(function (key) {
-            return key !== "parent";
-          });
-          var hasEvents = props.events || props.sharedEvents || componentEvents;
-          var events = this.getAllEvents(props);
-          return {
-            componentEvents: componentEvents,
-            getSharedEventState: getSharedEventState,
-            baseProps: baseProps,
-            dataKeys: dataKeys,
-            hasEvents: hasEvents,
-            events: events
-          };
-        }
-      }, {
-        key: "getExternalMutations",
-        value: function getExternalMutations(props) {
-          var sharedEvents = props.sharedEvents,
-              externalEventMutations = props.externalEventMutations;
-          return (0, _isEmpty2.default)(externalEventMutations) || sharedEvents ? undefined : Events.getExternalMutations(externalEventMutations, this.baseProps, this.state);
-        }
-      }, {
-        key: "cacheValues",
-        value: function cacheValues(obj) {
-          var _this7 = this;
+        return false;
+      }
+    }, {
+      key: "componentDidMount",
+      value: function componentDidMount() {
+        var _this2 = this;
+
+        var globalEventKeys = (0, _keys2.default)(this.globalEvents);
+        globalEventKeys.forEach(function (key) {
+          return _this2.addGlobalListener(key);
+        });
+        this.prevGlobalEventKeys = globalEventKeys;
+      }
+    }, {
+      key: "componentDidUpdate",
+      value: function componentDidUpdate(prevProps) {
+        var _this3 = this;
+
+        var calculatedState = this.getStateChanges(prevProps);
+        this.calculatedState = calculatedState;
+        var globalEventKeys = (0, _keys2.default)(this.globalEvents);
+        var removedGlobalEventKeys = (0, _difference2.default)(this.prevGlobalEventKeys, globalEventKeys);
+        removedGlobalEventKeys.forEach(function (key) {
+          return _this3.removeGlobalListener(key);
+        });
+        var addedGlobalEventKeys = (0, _difference2.default)(globalEventKeys, this.prevGlobalEventKeys);
+        addedGlobalEventKeys.forEach(function (key) {
+          return _this3.addGlobalListener(key);
+        });
+        this.prevGlobalEventKeys = globalEventKeys;
+      }
+    }, {
+      key: "componentWillUnmount",
+      value: function componentWillUnmount() {
+        var _this4 = this;
+
+        this.prevGlobalEventKeys.forEach(function (key) {
+          return _this4.removeGlobalListener(key);
+        });
+      }
+    }, {
+      key: "addGlobalListener",
+      value: function addGlobalListener(key) {
+        var _this5 = this;
+
+        var boundListener = function (event) {
+          var listener = _this5.globalEvents[key];
+          return listener && listener(Events.emulateReactEvent(event));
+        };
 
-          (0, _keys2.default)(obj).forEach(function (key) {
-            _this7[key] = obj[key];
-          });
-        }
-      }, {
-        key: "getBaseProps",
-        value: function getBaseProps(props, getSharedEventState) {
-          getSharedEventState = getSharedEventState || this.getSharedEventState;
-          var sharedParentState = getSharedEventState("parent", "parent");
-          var parentState = this.getEventState("parent", "parent");
-          var baseParentProps = (0, _defaults2.default)({}, parentState, sharedParentState);
-          var parentPropsList = baseParentProps.parentControlledProps;
-          var parentProps = parentPropsList ? (0, _pick2.default)(baseParentProps, parentPropsList) : {};
-          var modifiedProps = (0, _defaults2.default)({}, parentProps, props);
-          return (0, _isFunction2.default)(WrappedComponent.getBaseProps) ? WrappedComponent.getBaseProps(modifiedProps) : {};
+        this.boundGlobalEvents[key] = boundListener;
+        window.addEventListener(Events.getGlobalEventNameFromKey(key), boundListener);
+      }
+    }, {
+      key: "removeGlobalListener",
+      value: function removeGlobalListener(key) {
+        window.removeEventListener(Events.getGlobalEventNameFromKey(key), this.boundGlobalEvents[key]);
+      } // compile all state changes from own and parent state. Order doesn't matter, as any state
+      // state change should trigger a re-render
+
+    }, {
+      key: "getStateChanges",
+      value: function getStateChanges(props) {
+        var _this6 = this;
+
+        if (!this.hasEvents) {
+          return {};
         }
-      }, {
-        key: "getAllEvents",
-        value: function getAllEvents(props) {
-          if (Array.isArray(this.componentEvents)) {
-            var _componentEvents;
 
-            return Array.isArray(props.events) ? (_componentEvents = this.componentEvents).concat.apply(_componentEvents, _toConsumableArray(props.events)) : this.componentEvents;
-          }
+        var getState = function (key, type) {
+          var result = (0, _defaults2.default)({}, _this6.getEventState(key, type), _this6.getSharedEventState(key, type));
+          return (0, _isEmpty2.default)(result) ? undefined : result;
+        };
 
-          return props.events;
-        }
-      }, {
-        key: "getComponentProps",
-        value: function getComponentProps(component, type, index) {
-          var name = this.props.name || WrappedComponent.role;
-          var key = this.dataKeys && this.dataKeys[index] || index;
-          var id = "".concat(name, "-").concat(type, "-").concat(key);
-          var baseProps = this.baseProps[key] && this.baseProps[key][type] || this.baseProps[key];
-
-          if (!baseProps && !this.hasEvents) {
+        options = options || {};
+        var components = options.components || defaultComponents;
+        var stateChanges = components.map(function (component) {
+          if (!props.standalone && component.name === "parent") {
+            // don't check for changes on parent props for non-standalone components
             return undefined;
+          } else {
+            return component.index !== undefined ? getState(component.index, component.name) : _this6.dataKeys.map(function (key) {
+              return getState(key, component.name);
+            }).filter(Boolean);
           }
-
-          if (this.hasEvents) {
-            var baseEvents = this.getEvents(this.props, type, key);
-            var componentProps = (0, _defaults2.default)({
-              index: index,
-              key: id
-            }, this.getEventState(key, type), this.getSharedEventState(key, type), component.props, baseProps, {
-              id: id
-            });
-            var events = (0, _defaults2.default)({}, Events.getPartialEvents(baseEvents, key, componentProps), componentProps.events);
-            return (0, _assign2.default)({}, componentProps, {
-              events: events
+        }).filter(Boolean);
+        return stateChanges;
+      }
+    }, {
+      key: "applyExternalMutations",
+      value: function applyExternalMutations(props, externalMutations) {
+        if (!(0, _isEmpty2.default)(externalMutations)) {
+          var callbacks = props.externalEventMutations.reduce(function (memo, mutation) {
+            memo = (0, _isFunction2.default)(mutation.callback) ? memo.concat(mutation.callback) : memo;
+            return memo;
+          }, []);
+          var compiledCallbacks = callbacks.length ? function () {
+            callbacks.forEach(function (c) {
+              return c();
             });
-          }
+          } : undefined;
+          this.setState(externalMutations, compiledCallbacks);
+        }
+      }
+    }, {
+      key: "getCalculatedValues",
+      value: function getCalculatedValues(props) {
+        var sharedEvents = props.sharedEvents;
+        var components = WrappedComponent.expectedComponents;
+        var componentEvents = Events.getComponentEvents(props, components);
+        var getSharedEventState = sharedEvents && (0, _isFunction2.default)(sharedEvents.getEventState) ? sharedEvents.getEventState : function () {
+          return undefined;
+        };
+        var baseProps = this.getBaseProps(props, getSharedEventState);
+        var dataKeys = (0, _keys2.default)(baseProps).filter(function (key) {
+          return key !== "parent";
+        });
+        var hasEvents = props.events || props.sharedEvents || componentEvents;
+        var events = this.getAllEvents(props);
+        return {
+          componentEvents: componentEvents,
+          getSharedEventState: getSharedEventState,
+          baseProps: baseProps,
+          dataKeys: dataKeys,
+          hasEvents: hasEvents,
+          events: events
+        };
+      }
+    }, {
+      key: "getExternalMutations",
+      value: function getExternalMutations(props) {
+        var sharedEvents = props.sharedEvents,
+            externalEventMutations = props.externalEventMutations;
+        return (0, _isEmpty2.default)(externalEventMutations) || sharedEvents ? undefined : Events.getExternalMutations(externalEventMutations, this.baseProps, this.state);
+      }
+    }, {
+      key: "cacheValues",
+      value: function cacheValues(obj) {
+        var _this7 = this;
+
+        (0, _keys2.default)(obj).forEach(function (key) {
+          _this7[key] = obj[key];
+        });
+      }
+    }, {
+      key: "getBaseProps",
+      value: function getBaseProps(props, getSharedEventState) {
+        getSharedEventState = getSharedEventState || this.getSharedEventState;
+        var sharedParentState = getSharedEventState("parent", "parent");
+        var parentState = this.getEventState("parent", "parent");
+        var baseParentProps = (0, _defaults2.default)({}, parentState, sharedParentState);
+        var parentPropsList = baseParentProps.parentControlledProps;
+        var parentProps = parentPropsList ? (0, _pick2.default)(baseParentProps, parentPropsList) : {};
+        var modifiedProps = (0, _defaults2.default)({}, parentProps, props);
+        return (0, _isFunction2.default)(WrappedComponent.getBaseProps) ? WrappedComponent.getBaseProps(modifiedProps) : {};
+      }
+    }, {
+      key: "getAllEvents",
+      value: function getAllEvents(props) {
+        if (Array.isArray(this.componentEvents)) {
+          var _this$componentEvents;
+
+          return Array.isArray(props.events) ? (_this$componentEvents = this.componentEvents).concat.apply(_this$componentEvents, _toConsumableArray(props.events)) : this.componentEvents;
+        }
 
-          return (0, _defaults2.default)({
+        return props.events;
+      }
+    }, {
+      key: "getComponentProps",
+      value: function getComponentProps(component, type, index) {
+        var name = this.props.name || WrappedComponent.role;
+        var key = this.dataKeys && this.dataKeys[index] || index;
+        var id = "".concat(name, "-").concat(type, "-").concat(key);
+        var baseProps = this.baseProps[key] && this.baseProps[key][type] || this.baseProps[key];
+
+        if (!baseProps && !this.hasEvents) {
+          return undefined;
+        }
+
+        if (this.hasEvents) {
+          var baseEvents = this.getEvents(this.props, type, key);
+          var componentProps = (0, _defaults2.default)({
             index: index,
             key: id
-          }, component.props, baseProps, {
+          }, this.getEventState(key, type), this.getSharedEventState(key, type), component.props, baseProps, {
             id: id
           });
+          var events = (0, _defaults2.default)({}, Events.getPartialEvents(baseEvents, key, componentProps), componentProps.events);
+          return (0, _assign2.default)({}, componentProps, {
+            events: events
+          });
         }
-      }, {
-        key: "renderContainer",
-        value: function renderContainer(component, children) {
-          var isContainer = component.type && component.type.role === "container";
-          var parentProps = isContainer ? this.getComponentProps(component, "parent", "parent") : {};
-
-          if (parentProps.events) {
-            this.globalEvents = Events.getGlobalEvents(parentProps.events);
-            parentProps.events = Events.omitGlobalEvents(parentProps.events);
-          }
 
-          return _react.default.cloneElement(component, parentProps, children);
+        return (0, _defaults2.default)({
+          index: index,
+          key: id
+        }, component.props, baseProps, {
+          id: id
+        });
+      }
+    }, {
+      key: "renderContainer",
+      value: function renderContainer(component, children) {
+        var isContainer = component.type && component.type.role === "container";
+        var parentProps = isContainer ? this.getComponentProps(component, "parent", "parent") : {};
+
+        if (parentProps.events) {
+          this.globalEvents = Events.getGlobalEvents(parentProps.events);
+          parentProps.events = Events.omitGlobalEvents(parentProps.events);
         }
-      }, {
-        key: "animateComponent",
-        value: function animateComponent(props, defaultAnimationWhitelist) {
-          var animationWhitelist = props.animate && props.animate.animationWhitelist ? props.animate.animationWhitelist : defaultAnimationWhitelist;
-          return _react.default.createElement(_victoryTransition.default, {
-            animate: props.animate,
-            animationWhitelist: animationWhitelist
-          }, _react.default.createElement(this.constructor, props));
-        } // Used by `VictoryLine` and `VictoryArea`
-
-      }, {
-        key: "renderContinuousData",
-        value: function renderContinuousData(props) {
-          var _this8 = this;
-
-          var dataComponent = props.dataComponent,
-              labelComponent = props.labelComponent,
-              groupComponent = props.groupComponent;
-          var dataKeys = (0, _without2.default)(this.dataKeys, "all");
-          var labelComponents = dataKeys.reduce(function (memo, key) {
-            var labelProps = _this8.getComponentProps(labelComponent, "labels", key);
-
-            if (labelProps && labelProps.text !== undefined && labelProps.text !== null) {
-              memo = memo.concat(_react.default.cloneElement(labelComponent, labelProps));
-            }
 
-            return memo;
-          }, []);
-          var dataProps = this.getComponentProps(dataComponent, "data", "all");
-          var children = [_react.default.cloneElement(dataComponent, dataProps)].concat(_toConsumableArray(labelComponents));
-          return this.renderContainer(groupComponent, children);
-        }
-      }, {
-        key: "renderData",
-        value: function renderData(props) {
-          var _this9 = this;
-
-          var shouldRenderDatum = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : datumHasXandY;
-          var dataComponent = props.dataComponent,
-              labelComponent = props.labelComponent,
-              groupComponent = props.groupComponent;
-          var dataComponents = this.dataKeys.reduce(function (validDataComponents, _dataKey, index) {
-            var dataProps = _this9.getComponentProps(dataComponent, "data", index);
-
-            if (shouldRenderDatum(dataProps.datum)) {
-              validDataComponents.push(_react.default.cloneElement(dataComponent, dataProps));
-            }
-
-            return validDataComponents;
-          }, []);
-          var labelComponents = this.dataKeys.map(function (_dataKey, index) {
-            var labelProps = _this9.getComponentProps(labelComponent, "labels", index);
+        return /*#__PURE__*/_react.default.cloneElement(component, parentProps, children);
+      }
+    }, {
+      key: "animateComponent",
+      value: function animateComponent(props, defaultAnimationWhitelist) {
+        var animationWhitelist = props.animate && props.animate.animationWhitelist ? props.animate.animationWhitelist : defaultAnimationWhitelist;
+        return /*#__PURE__*/_react.default.createElement(_victoryTransition.default, {
+          animate: props.animate,
+          animationWhitelist: animationWhitelist
+        }, /*#__PURE__*/_react.default.createElement(this.constructor, props));
+      } // Used by `VictoryLine` and `VictoryArea`
+
+    }, {
+      key: "renderContinuousData",
+      value: function renderContinuousData(props) {
+        var _this8 = this;
+
+        var dataComponent = props.dataComponent,
+            labelComponent = props.labelComponent,
+            groupComponent = props.groupComponent;
+        var dataKeys = (0, _without2.default)(this.dataKeys, "all");
+        var labelComponents = dataKeys.reduce(function (memo, key) {
+          var labelProps = _this8.getComponentProps(labelComponent, "labels", key);
+
+          if (labelProps && labelProps.text !== undefined && labelProps.text !== null) {
+            memo = memo.concat( /*#__PURE__*/_react.default.cloneElement(labelComponent, labelProps));
+          }
 
-            if (labelProps.text !== undefined && labelProps.text !== null) {
-              return _react.default.cloneElement(labelComponent, labelProps);
-            }
+          return memo;
+        }, []);
+        var dataProps = this.getComponentProps(dataComponent, "data", "all");
+        var children = [/*#__PURE__*/_react.default.cloneElement(dataComponent, dataProps)].concat(_toConsumableArray(labelComponents));
+        return this.renderContainer(groupComponent, children);
+      }
+    }, {
+      key: "renderData",
+      value: function renderData(props) {
+        var _this9 = this;
+
+        var shouldRenderDatum = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : datumHasXandY;
+        var dataComponent = props.dataComponent,
+            labelComponent = props.labelComponent,
+            groupComponent = props.groupComponent;
+        var userProps = UserProps.getSafeUserProps(props);
+        var dataComponents = this.dataKeys.reduce(function (validDataComponents, _dataKey, index) {
+          var dataProps = _this9.getComponentProps(dataComponent, "data", index);
+
+          if (shouldRenderDatum(dataProps.datum)) {
+            validDataComponents.push( /*#__PURE__*/_react.default.cloneElement(dataComponent, dataProps));
+          }
 
-            return undefined;
-          }).filter(Boolean);
+          return validDataComponents;
+        }, []);
+        var labelComponents = this.dataKeys.map(function (_dataKey, index) {
+          var labelProps = _this9.getComponentProps(labelComponent, "labels", index);
 
-          var children = _toConsumableArray(dataComponents).concat(_toConsumableArray(labelComponents));
+          if (labelProps.text !== undefined && labelProps.text !== null) {
+            return /*#__PURE__*/_react.default.cloneElement(labelComponent, labelProps);
+          }
 
-          return this.renderContainer(groupComponent, children);
-        }
-      }]);
+          return undefined;
+        }).filter(Boolean);
+        var children = [].concat(_toConsumableArray(dataComponents), _toConsumableArray(labelComponents));
+
+        var group = /*#__PURE__*/_react.default.cloneElement(groupComponent, userProps, children);
+
+        return this.renderContainer(group, children);
+      }
+    }]);
 
-      return addEvents;
-    }(WrappedComponent)
-  );
+    return addEvents;
+  }(WrappedComponent);
 };
 
 exports.default = _default;