victory-chart 18.2.0 → 19.1.1

package/lib/helpers/common-props.js

@@ -0,0 +1,87 @@
+Object.defineProperty(exports,"__esModule",{value:true});var _propTypes=require("prop-types");var _propTypes2=_interopRequireDefault(_propTypes);
+var _victoryCore=require("victory-core");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}exports.default=
+
+{
+DataProps:{
+categories:_propTypes2.default.oneOfType([
+_propTypes2.default.arrayOf(_propTypes2.default.string),
+_propTypes2.default.shape({
+x:_propTypes2.default.arrayOf(_propTypes2.default.string),y:_propTypes2.default.arrayOf(_propTypes2.default.string)})]),
+
+
+data:_propTypes2.default.array,
+dataComponent:_propTypes2.default.element,
+labelComponent:_propTypes2.default.element,
+labels:_propTypes2.default.oneOfType([_propTypes2.default.func,_propTypes2.default.array]),
+samples:_victoryCore.PropTypes.nonNegative,
+sortKey:_propTypes2.default.oneOfType([
+_propTypes2.default.func,
+_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),
+_propTypes2.default.string,
+_propTypes2.default.arrayOf(_propTypes2.default.string)]),
+
+style:_propTypes2.default.shape({
+parent:_propTypes2.default.object,data:_propTypes2.default.object,labels:_propTypes2.default.object}),
+
+x:_propTypes2.default.oneOfType([
+_propTypes2.default.func,
+_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),
+_propTypes2.default.string,
+_propTypes2.default.arrayOf(_propTypes2.default.string)]),
+
+y:_propTypes2.default.oneOfType([
+_propTypes2.default.func,
+_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),
+_propTypes2.default.string,
+_propTypes2.default.arrayOf(_propTypes2.default.string)])},
+
+BaseProps:{
+animate:_propTypes2.default.object,
+containerComponent:_propTypes2.default.element,
+domain:_propTypes2.default.oneOfType([
+_victoryCore.PropTypes.domain,
+_propTypes2.default.shape({x:_victoryCore.PropTypes.domain,y:_victoryCore.PropTypes.domain})]),
+
+domainPadding:_propTypes2.default.oneOfType([
+_propTypes2.default.shape({
+x:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.arrayOf(_propTypes2.default.number)]),
+y:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.arrayOf(_propTypes2.default.number)])}),
+
+_propTypes2.default.number,
+_propTypes2.default.arrayOf(_propTypes2.default.number)]),
+
+eventKey:_propTypes2.default.oneOfType([
+_propTypes2.default.func,
+_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),
+_propTypes2.default.string]),
+
+events:_propTypes2.default.arrayOf(_propTypes2.default.shape({
+target:_propTypes2.default.oneOf(["data","labels","parent"]),
+eventKey:_propTypes2.default.oneOfType([
+_propTypes2.default.array,
+_victoryCore.PropTypes.allOfType([_victoryCore.PropTypes.integer,_victoryCore.PropTypes.nonNegative]),
+_propTypes2.default.string]),
+
+eventHandlers:_propTypes2.default.object})),
+
+groupComponent:_propTypes2.default.element,
+height:_victoryCore.PropTypes.nonNegative,
+name:_propTypes2.default.string,
+padding:_propTypes2.default.oneOfType([
+_propTypes2.default.number,
+_propTypes2.default.shape({
+top:_propTypes2.default.number,bottom:_propTypes2.default.number,
+left:_propTypes2.default.number,right:_propTypes2.default.number})]),
+
+
+scale:_propTypes2.default.oneOfType([
+_victoryCore.PropTypes.scale,
+_propTypes2.default.shape({x:_victoryCore.PropTypes.scale,y:_victoryCore.PropTypes.scale})]),
+
+sharedEvents:_propTypes2.default.shape({
+events:_propTypes2.default.array,
+getEventState:_propTypes2.default.func}),
+
+standalone:_propTypes2.default.bool,
+theme:_propTypes2.default.object,
+width:_victoryCore.PropTypes.nonNegative}};

package/lib/helpers/wrapper.js

@@ -1,4 +1,5 @@
 Object.defineProperty(exports,"__esModule",{value:true});var _some2=require("lodash/some");var _some3=_interopRequireDefault(_some2);var _uniq2=require("lodash/uniq");var _uniq3=_interopRequireDefault(_uniq2);var _partialRight2=require("lodash/partialRight");var _partialRight3=_interopRequireDefault(_partialRight2);var _isFunction2=require("lodash/isFunction");var _isFunction3=_interopRequireDefault(_isFunction2);var _flatten2=require("lodash/flatten");var _flatten3=_interopRequireDefault(_flatten2);var _defaults2=require("lodash/defaults");var _defaults3=_interopRequireDefault(_defaults2);var _assign2=require("lodash/assign");var _assign3=_interopRequireDefault(_assign2);
+
 var _react=require("react");var _react2=_interopRequireDefault(_react);
 var _axis=require("./axis");var _axis2=_interopRequireDefault(_axis);
 var _victoryCore=require("victory-core");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _toConsumableArray(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i];}return arr2;}else{return Array.from(arr);}}exports.default=
@@ -89,7 +90,7 @@ continuous:continuous});
 },
 
 getAllEvents:function getAllEvents(props){
-var components=["groupComponent","containerComponent"];
+var components=["groupComponent","containerComponent","labelComponent"];
 this.componentEvents=_victoryCore.Events.getComponentEvents(props,components);
 if(Array.isArray(this.componentEvents)){var _componentEvents;
 return Array.isArray(props.events)?

package/lib/index.js

@@ -7,11 +7,8 @@ default;}});var _victoryGroup=require("./components/victory-group/victory-group"
 default;}});var _victoryStack=require("./components/victory-stack/victory-stack");Object.defineProperty(exports,"VictoryStack",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryStack).
 default;}});var _victoryErrorbar=require("./components/victory-errorbar/victory-errorbar");Object.defineProperty(exports,"VictoryErrorBar",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryErrorbar).
 default;}});var _victoryVoronoi=require("./components/victory-voronoi/victory-voronoi");Object.defineProperty(exports,"VictoryVoronoi",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryVoronoi).
-default;}});var _victoryVoronoiTooltip=require("./components/victory-voronoi-tooltip/victory-voronoi-tooltip");Object.defineProperty(exports,"VictoryVoronoiTooltip",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryVoronoiTooltip).
-
 default;}});var _victoryCandlestick=require("./components/victory-candlestick/victory-candlestick");Object.defineProperty(exports,"VictoryCandlestick",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryCandlestick).
 
-
 default;}});var _victorySelectionContainer=require("./components/containers/victory-selection-container");Object.defineProperty(exports,"selectionContainerMixin",{enumerable:true,get:function get(){return _victorySelectionContainer.
 
 
@@ -24,6 +21,10 @@ default;}});var _victoryVoronoiContainer=require("./components/containers/victor
 
 
 voronoiContainerMixin;}});Object.defineProperty(exports,"VictoryVoronoiContainer",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryVoronoiContainer).
+default;}});var _victoryCursorContainer=require("./components/containers/victory-cursor-container");Object.defineProperty(exports,"cursorContainerMixin",{enumerable:true,get:function get(){return _victoryCursorContainer.
+
+
+cursorContainerMixin;}});Object.defineProperty(exports,"VictoryCursorContainer",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryCursorContainer).
 default;}});var _victoryZoomContainer=require("./components/containers/victory-zoom-container");Object.defineProperty(exports,"zoomContainerMixin",{enumerable:true,get:function get(){return _victoryZoomContainer.
 
 
@@ -31,11 +32,12 @@ zoomContainerMixin;}});Object.defineProperty(exports,"VictoryZoomContainer",{enu
 default;}});var _createContainer=require("./components/containers/create-container");Object.defineProperty(exports,"combineContainerMixins",{enumerable:true,get:function get(){return _createContainer.
 
 
-combineContainerMixins;}});Object.defineProperty(exports,"createContainer",{enumerable:true,get:function get(){return _interopRequireDefault(_createContainer).
-default;}});var _victoryZoom=require("./components/victory-zoom/victory-zoom");Object.defineProperty(exports,"VictoryZoom",{enumerable:true,get:function get(){return _interopRequireDefault(_victoryZoom).
-
+combineContainerMixins;}});Object.defineProperty(exports,"makeCreateContainerFunction",{enumerable:true,get:function get(){return _createContainer.
+makeCreateContainerFunction;}});Object.defineProperty(exports,"createContainer",{enumerable:true,get:function get(){return _interopRequireDefault(_createContainer).
 default;}});var _brushHelpers=require("./components/containers/brush-helpers");Object.defineProperty(exports,"BrushHelpers",{enumerable:true,get:function get(){return _interopRequireDefault(_brushHelpers).
+
+default;}});var _cursorHelpers=require("./components/containers/cursor-helpers");Object.defineProperty(exports,"CursorHelpers",{enumerable:true,get:function get(){return _interopRequireDefault(_cursorHelpers).
 default;}});var _selectionHelpers=require("./components/containers/selection-helpers");Object.defineProperty(exports,"SelectionHelpers",{enumerable:true,get:function get(){return _interopRequireDefault(_selectionHelpers).
 default;}});var _voronoiHelpers=require("./components/containers/voronoi-helpers");Object.defineProperty(exports,"VoronoiHelpers",{enumerable:true,get:function get(){return _interopRequireDefault(_voronoiHelpers).
 default;}});var _zoomHelpers=require("./components/containers/zoom-helpers");Object.defineProperty(exports,"ZoomHelpers",{enumerable:true,get:function get(){return _interopRequireDefault(_zoomHelpers).
-default;}});function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}
+default;}});Object.defineProperty(exports,"RawZoomHelpers",{enumerable:true,get:function get(){return _zoomHelpers.RawZoomHelpers;}});function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-chart",
-  "version": "18.2.0",
+  "version": "19.1.1",
   "description": "Chart Component for Victory",
   "main": "lib/index.js",
   "repository": {
@@ -28,24 +28,24 @@
   },
   "dependencies": {
     "d3-voronoi": "^1.1.2",
-    "lodash": "^4.12.0",
-    "victory-core": "^14.0.7"
+    "lodash": "^4.17.4",
+    "victory-core": "^15.1.0"
   },
   "devDependencies": {
-    "builder-victory-component-dev": "^3.1.0",
-    "chai": "^3.2.0",
+    "builder-victory-component-dev": "^4.0.0",
+    "chai": "^3.5.0",
     "d3-scale": "^1.0.0",
     "d3-shape": "^1.0.0",
-    "enzyme": "^2.3.0",
-    "mocha": "^2.2.5",
-    "react": "~15.1.0",
-    "react-addons-test-utils": "~15.1.0",
-    "react-dom": "~15.1.0",
-    "react-router": "^2.4.0",
-    "sinon": "^1.17.2",
+    "enzyme": "^2.4.1",
+    "mocha": "^3.0.2",
+    "prop-types": "^15.5.8",
+    "react": "^15.5.4",
+    "react-addons-test-utils": "^15.5.1",
+    "react-dom": "^15.5.4",
+    "sinon": "^1.17.5",
     "sinon-chai": "^2.8.0",
-    "builder": "^3.1.0",
-    "builder-victory-component": "^3.1.0"
+    "builder": "^3.2.1",
+    "builder-victory-component": "^4.0.0"
   },
   "publishr": {
     "dependencies": [

package/src/components/containers/brush-helpers.js

@@ -1,11 +1,12 @@
-import { Selection} from "victory-core";
+/*eslint no-magic-numbers: ["error", { "ignore": [0, 1, 2] }]*/
+import { Selection } from "victory-core";
 import { assign, throttle, isFunction, isEqual, defaults } from "lodash";
 import { attachId } from "../../helpers/event-handlers.js";
 
 const Helpers = {
   withinBounds(point, bounds, padding) {
-    const {x1, x2, y1, y2} = bounds;
-    const {x, y} = point;
+    const { x1, x2, y1, y2 } = bounds;
+    const { x, y } = point;
     padding = padding ? padding / 2 : 0;
     return x + padding >= Math.min(x1, x2) &&
       x - padding <= Math.max(x1, x2) &&
@@ -29,17 +30,17 @@ const Helpers = {
   },
 
   getHandles(props, domainBox) {
-    const {x1, x2, y1, y2} = domainBox;
+    const { x1, x2, y1, y2 } = domainBox;
     const minX = Math.min(x1, x2);
     const maxX = Math.max(x1, x2);
     const minY = Math.min(y1, y2);
     const maxY = Math.max(y1, y2);
     const handleWidth = props.handleWidth / 2;
     return {
-      left: {x1: minX - handleWidth, x2: minX + handleWidth, y1, y2},
-      right: {x1: maxX - handleWidth, x2: maxX + handleWidth, y1, y2},
-      top: {x1, x2, y1: minY + handleWidth, y2: minY - handleWidth},
-      bottom: {x1, x2, y1: maxY + handleWidth, y2: maxY - handleWidth}
+      left: { x1: minX - handleWidth, x2: minX + handleWidth, y1, y2 },
+      right: { x1: maxX - handleWidth, x2: maxX + handleWidth, y1, y2 },
+      top: { x1, x2, y1: minY + handleWidth, y2: minY - handleWidth },
+      bottom: { x1, x2, y1: maxY + handleWidth, y2: maxY - handleWidth }
     };
   },
 
@@ -53,12 +54,12 @@ const Helpers = {
   },
 
   getResizeMutation(box, handles) {
-    const {x1, y1, x2, y2} = box;
+    const { x1, y1, x2, y2 } = box;
     const mutations = {
-      left: {x1: Math.max(x1, x2), x2: Math.min(x1, x2), y1, y2},
-      right: {x1: Math.min(x1, x2), x2: Math.max(x1, x2), y1, y2},
-      top: {y1: Math.max(y1, y2), y2: Math.min(y1, y2), x1, x2},
-      bottom: {y1: Math.min(y1, y2), y2: Math.max(y1, y2), x1, x2}
+      left: { x1: Math.max(x1, x2), x2: Math.min(x1, x2), y1, y2 },
+      right: { x1: Math.min(x1, x2), x2: Math.max(x1, x2), y1, y2 },
+      top: { y1: Math.max(y1, y2), y2: Math.min(y1, y2), x1, x2 },
+      bottom: { y1: Math.min(y1, y2), y2: Math.max(y1, y2), x1, x2 }
     };
     return handles.reduce((memo, current) => {
       return assign(memo, mutations[current]);
@@ -66,12 +67,12 @@ const Helpers = {
   },
 
   getMinimumDomain() {
-    return {x: [0, 1 / Number.MAX_SAFE_INTEGER], y: [0, 1 / Number.MAX_SAFE_INTEGER]};
+    return { x: [0, 1 / Number.MAX_SAFE_INTEGER], y: [0, 1 / Number.MAX_SAFE_INTEGER] };
   },
 
   getSelectionMutation(point, box, dimension) {
-    const {x, y} = point;
-    const {x1, x2, y1, y2} = box;
+    const { x, y } = point;
+    const { x1, x2, y1, y2 } = box;
     return {
       x1: dimension !== "y" ? x : x1,
       y1: dimension !== "x" ? y : y1,
@@ -81,13 +82,13 @@ const Helpers = {
   },
 
   panBox(props, point) {
-    const {dimension, domain, startX, startY} = props;
+    const { dimension, domain, startX, startY } = props;
     const selectedDomain = defaults({}, props.selectedDomain, domain);
     const fullDomain = defaults({}, props.fullDomain, domain);
-    const {x1, x2, y1, y2} = props.x1 ?
+    const { x1, x2, y1, y2 } = props.x1 ?
       props : this.getDomainBox(props, fullDomain, selectedDomain);
 
-    const {x, y} = point;
+    const { x, y } = point;
     const delta = {
       x: startX ? startX - x : 0,
       y: startY ? startY - y : 0
@@ -101,7 +102,7 @@ const Helpers = {
   },
 
   constrainBox(box, fullDomainBox) {
-    const {x1, y1, x2, y2} = fullDomainBox;
+    const { x1, y1, x2, y2 } = fullDomainBox;
     return {
       x1: box.x2 > x2 ? x2 - Math.abs(box.x2 - box.x1) : Math.max(box.x1, x1),
       y1: box.y2 > y2 ? y2 - Math.abs(box.y2 - box.y1) : Math.max(box.y1, y1),
@@ -120,13 +121,13 @@ const Helpers = {
       this.getDomainBox(targetProps, domain);
     const currentDomain = isEqual(selectedDomain, cachedSelectedDomain) ?
       targetProps.currentDomain || selectedDomain || domain : selectedDomain || domain;
-    const {x, y} = Selection.getSVGEventCoordinates(evt);
+    const { x, y } = Selection.getSVGEventCoordinates(evt);
     // Ignore events that occur outside of the maximum domain region
-    if (!this.withinBounds({x, y}, fullDomainBox, handleWidth)) {
+    if (!this.withinBounds({ x, y }, fullDomainBox, handleWidth)) {
       return {};
     }
     const domainBox = this.getDomainBox(targetProps, domain, currentDomain);
-    const activeHandles = this.getActiveHandles({x, y}, targetProps, domainBox);
+    const activeHandles = this.getActiveHandles({ x, y }, targetProps, domainBox);
     // If the event occurs in any of the handle regions, start a resize
     if (activeHandles) {
       return [{
@@ -140,7 +141,7 @@ const Helpers = {
         }
       }];
     } else if (
-        this.withinBounds({x, y}, domainBox) &&
+        this.withinBounds({ x, y }, domainBox) &&
         !isEqual(domain, currentDomain)
       ) {
       // if the event occurs within a selected region start a panning event, unless the whole
@@ -166,7 +167,7 @@ const Helpers = {
             isSelecting: true, domainBox, fullDomainBox,
             cachedSelectedDomain: selectedDomain,
             currentDomain: this.getMinimumDomain(),
-            ...this.getSelectionMutation({x, y}, domainBox, dimension)
+            ...this.getSelectionMutation({ x, y }, domainBox, dimension)
           };
         }
       }];
@@ -181,16 +182,16 @@ const Helpers = {
     const {
       dimension, scale, isPanning, isSelecting, fullDomainBox, onDomainChange
     } = targetProps;
-    const {x, y} = Selection.getSVGEventCoordinates(evt);
+    const { x, y } = Selection.getSVGEventCoordinates(evt);
       // Ignore events that occur outside of the maximum domain region
-    if (!this.withinBounds({x, y}, fullDomainBox)) {
+    if (!this.withinBounds({ x, y }, fullDomainBox)) {
       return {};
     }
     if (isPanning) {
-      const {startX, startY} = targetProps;
-      const pannedBox = this.panBox(targetProps, {x, y});
+      const { startX, startY } = targetProps;
+      const pannedBox = this.panBox(targetProps, { x, y });
       const constrainedBox = this.constrainBox(pannedBox, fullDomainBox);
-      const currentDomain = Selection.getBounds({...constrainedBox, scale});
+      const currentDomain = Selection.getBounds({ ...constrainedBox, scale });
       if (isFunction(onDomainChange)) {
         onDomainChange(currentDomain);
       }
@@ -211,7 +212,7 @@ const Helpers = {
       const x2 = dimension !== "y" ? x : targetProps.x2;
       const y2 = dimension !== "x" ? y : targetProps.y2;
       const currentDomain =
-        Selection.getBounds({x2, y2, x1: targetProps.x1, y1: targetProps.y1, scale});
+        Selection.getBounds({ x2, y2, x1: targetProps.x1, y1: targetProps.y1, scale });
       if (isFunction(onDomainChange)) {
         onDomainChange(currentDomain);
       }
@@ -224,10 +225,11 @@ const Helpers = {
         }
       }];
     }
+    return {};
   },
 
   onMouseUp(evt, targetProps) {
-    const {x1, y1, x2, y2, onDomainChange, domain} = targetProps;
+    const { x1, y1, x2, y2, onDomainChange, domain } = targetProps;
     // if the mouse hasn't moved since a mouseDown event, select the whole domain region
     if (x1 === x2 || y1 === y2) {
       if (isFunction(onDomainChange)) {
@@ -257,12 +259,13 @@ const Helpers = {
 };
 
 export default {
+  ...Helpers,
   onMouseDown: Helpers.onMouseDown.bind(Helpers),
   onMouseUp: Helpers.onMouseUp.bind(Helpers),
   onMouseLeave: Helpers.onMouseLeave.bind(Helpers),
   onMouseMove: throttle(
     attachId(Helpers.onMouseMove.bind(Helpers)),
-    16,
-    {leading: true, trailing: false}
+    16, // eslint-disable-line no-magic-numbers
+    { leading: true, trailing: false }
   )
 };

package/src/components/containers/create-container.js

@@ -1,10 +1,11 @@
-import { toPairs, groupBy, forOwn, includes } from "lodash";
+import { toPairs, groupBy, forOwn, includes, flow } from "lodash";
 import { VictoryContainer, Log } from "victory-core";
 
 import { voronoiContainerMixin } from "./victory-voronoi-container";
 import { zoomContainerMixin } from "./victory-zoom-container";
 import { selectionContainerMixin } from "./victory-selection-container";
 import { brushContainerMixin } from "./victory-brush-container";
+import { cursorContainerMixin } from "./victory-cursor-container";
 
 const ensureArray = (thing) => {
   if (!thing) {
@@ -53,36 +54,48 @@ const combineDefaultEvents = (defaultEvents) => {
   );
 };
 
-export const combineContainerMixins = (mixinA, mixinB, displayName = "CustomVictoryContainer") => {
+export const combineContainerMixins = (mixins, Container) => {
   // similar to Object.assign(A, B), this function will decide conflicts in favor mixinB.
   // this applies to propTypes and defaultProps.
   // getChildren will call A's getChildren() and pass the resulting children to B's.
   // defaultEvents attempts to resolve any conflicts between A and B's defaultEvents.
 
-  const ClassA = mixinA(VictoryContainer);
-  const ClassB = mixinB(VictoryContainer);
-  const instanceA = new ClassA();
-  const instanceB = new ClassB();
+  const Classes = mixins.map((mixin) => mixin(Container));
+  const instances = Classes.map((Class) => new Class());
+  const NaiveCombinedContainer = flow(mixins)(Container);
 
-  const NaiveCombinedContainer = mixinA(mixinB(VictoryContainer));
-  return class VictoryCombinedContainer extends NaiveCombinedContainer {
-    static displayName = displayName;
-
-    static propTypes = {
-      ...ClassA.propTypes,
-      ...ClassB.propTypes
-    };
+  const displayType = Classes.map((Class) => {
+    const match = Class.displayName.match(/Victory(.*)Container/);
+    return match[1] || "";
+  }).join("");
 
-    static defaultProps = {
-      ...ClassA.defaultProps,
-      ...ClassB.defaultProps
-    };
-
-    static defaultEvents = combineDefaultEvents([...ClassA.defaultEvents, ...ClassB.defaultEvents]);
+  return class VictoryCombinedContainer extends NaiveCombinedContainer {
+    static displayName = `Victory${displayType}Container`;
+
+    static propTypes =
+      Classes.reduce(
+        (propTypes, Class) => ({ ...propTypes, ...Class.propTypes }),
+        {}
+      );
+
+    static defaultProps =
+      Classes.reduce(
+        (defaultProps, Class) => ({ ...defaultProps, ...Class.defaultProps }),
+        {}
+      );
+
+    static defaultEvents = combineDefaultEvents(
+      Classes.reduce(
+        (defaultEvents, Class) => ([...defaultEvents, ...Class.defaultEvents]),
+        []
+      )
+    );
 
     getChildren(props) {
-      const children = instanceA.getChildren.call(this, props);
-      return instanceB.getChildren.call(this, {...props, children});
+      return instances.reduce(
+        (children, instance) => instance.getChildren({ ...props, children }),
+        props.children
+      );
     }
   };
 };
@@ -95,34 +108,30 @@ const checkBehaviorName = (behavior, behaviors) => {
   }
 };
 
-export const createContainer = (firstBehavior, secondBehavior, ...invalidParams) => {
-  const containerMixins = {
-    voronoi: voronoiContainerMixin,
-    zoom: zoomContainerMixin,
-    selection: selectionContainerMixin,
-    brush: brushContainerMixin
-  };
-  const behaviors = Object.keys(containerMixins);
+export const makeCreateContainerFunction = (mixinMap, Container) => (behaviorA, behaviorB, ...invalid) => { // eslint-disable-line
+  const behaviors = Object.keys(mixinMap);
 
-  checkBehaviorName(firstBehavior, behaviors);
-  checkBehaviorName(secondBehavior, behaviors);
+  checkBehaviorName(behaviorA, behaviors);
+  checkBehaviorName(behaviorB, behaviors);
 
-  if (invalidParams.length) {
+  if (invalid.length) {
     Log.warn("too many arguments given to createContainer (maximum accepted: 2).");
   }
 
-  const firstMixin = containerMixins[firstBehavior];
-  const secondMixin = containerMixins[secondBehavior];
-
-  if (!firstMixin) {
-    return VictoryContainer;
-  }
+  const firstMixins = mixinMap[behaviorA];
+  const secondMixins = mixinMap[behaviorB] || [];
 
-  if (!secondMixin) {
-    return firstMixin(VictoryContainer); // container inherits from VictoryContainer
+  if (!firstMixins) {
+    return Container;
   }
 
-  return combineContainerMixins(firstMixin, secondMixin);
+  return combineContainerMixins([...firstMixins, ...secondMixins], Container);
 };
 
-export default createContainer;
+export default makeCreateContainerFunction({
+  zoom: [zoomContainerMixin],
+  voronoi: [voronoiContainerMixin],
+  selection: [selectionContainerMixin],
+  cursor: [cursorContainerMixin],
+  brush: [brushContainerMixin]
+}, VictoryContainer);

package/src/components/containers/cursor-helpers.js

@@ -0,0 +1,49 @@
+import { Selection } from "victory-core";
+import { throttle, isFunction } from "lodash";
+import { attachId } from "../../helpers/event-handlers";
+import BrushHelpers from "./brush-helpers";
+
+const CursorHelpers = {
+  onMouseMove(evt, targetProps) {
+    const { onChange, dimension, domain } = targetProps;
+    const cursorSVGPosition = Selection.getSVGEventCoordinates(evt);
+    let cursorValue = Selection.getDataCoordinates(
+      targetProps.scale,
+      cursorSVGPosition.x,
+      cursorSVGPosition.y
+    );
+
+    const inBounds = BrushHelpers.withinBounds(cursorValue, {
+      x1: domain.x[0],
+      x2: domain.x[1],
+      y1: domain.y[0],
+      y2: domain.y[1]
+    });
+
+    if (!inBounds) {
+      cursorValue = null;
+    }
+
+    if (isFunction(onChange)) {
+      if (inBounds) {
+        const value = dimension ? cursorValue[dimension] : cursorValue;
+        onChange(value);
+      } else if (cursorValue !== targetProps.cursorValue) {
+        onChange(targetProps.defaultCursorValue || null);
+      }
+    }
+
+    return [{
+      target: "parent",
+      eventKey: "parent",
+      mutation: () => ({ cursorValue })
+    }];
+  }
+};
+
+export default {
+  onMouseMove: throttle(
+    attachId(CursorHelpers.onMouseMove.bind(CursorHelpers)),
+    32, // eslint-disable-line no-magic-numbers
+    { leading: true, trailing: false })
+};

package/src/components/containers/selection-helpers.js

@@ -6,7 +6,7 @@ import { attachId } from "../../helpers/event-handlers.js";
 const SelectionHelpers = {
   getDatasets(props) {
     if (props.data) {
-      return [{data: props.data}];
+      return [{ data: props.data }];
     }
 
     const getData = (childProps) => {
@@ -20,10 +20,10 @@ const SelectionHelpers = {
       } else if (child.type && isFunction(child.type.getData)) {
         child = parent ? React.cloneElement(child, parent.props) : child;
         const childData = child.props && child.type.getData(child.props);
-        return childData ? {childName, data: childData} : null;
+        return childData ? { childName, data: childData } : null;
       } else {
         const childData = getData(child.props);
-        return childData ? {childName, data: childData} : null;
+        return childData ? { childName, data: childData } : null;
       }
     };
     return Helpers.reduceChildren(React.Children.toArray(props.children), iteratee);
@@ -43,7 +43,7 @@ const SelectionHelpers = {
   },
 
   getSelectedData(dataset, bounds) {
-    const {x, y} = bounds;
+    const { x, y } = bounds;
     const withinBounds = (d) => {
       return d._x >= x[0] && d._x <= x[1] && d._y >= y[0] && d._y <= y[1];
     };
@@ -58,14 +58,14 @@ const SelectionHelpers = {
         count++;
       }
     }
-    return count > 0 ? {eventKey, data} : null;
+    return count > 0 ? { eventKey, data } : null;
   },
 
   onMouseDown(evt, targetProps) {
     evt.preventDefault();
     const { dimension, scale } = targetProps;
     const datasets = targetProps.datasets || [];
-    const {x, y} = Selection.getSVGEventCoordinates(evt);
+    const { x, y } = Selection.getSVGEventCoordinates(evt);
     const x1 = dimension !== "y" ? x : Selection.getDomainCoordinates(scale).x[0];
     const y1 = dimension !== "x" ? y : Selection.getDomainCoordinates(scale).y[0];
     const x2 = dimension !== "y" ? x : Selection.getDomainCoordinates(scale).x[1];
@@ -77,7 +77,7 @@ const SelectionHelpers = {
       {
         target: "parent",
         mutation: () => {
-          return {x1, y1, select: true, x2, y2};
+          return { x1, y1, select: true, x2, y2 };
         }
       }, {
         target: "data",
@@ -89,11 +89,11 @@ const SelectionHelpers = {
   },
 
   onMouseMove(evt, targetProps) {
-    const {dimension, scale, select} = targetProps;
+    const { dimension, scale, select } = targetProps;
     if (!select) {
       return {};
     } else {
-      const {x, y} = Selection.getSVGEventCoordinates(evt);
+      const { x, y } = Selection.getSVGEventCoordinates(evt);
       const x2 = dimension !== "y" ? x : Selection.getDomainCoordinates(scale).x[1];
       const y2 = dimension !== "x" ? y : Selection.getDomainCoordinates(scale).y[1];
       return {
@@ -106,7 +106,7 @@ const SelectionHelpers = {
   },
 
   onMouseUp(evt, targetProps) {
-    const {x2, y2} = targetProps;
+    const { x2, y2 } = targetProps;
     if (!x2 || !y2) {
       return [{
         target: "parent",
@@ -133,7 +133,7 @@ const SelectionHelpers = {
         return {
           childName: d.childName, eventKey: d.eventKey, target: "data",
           mutation: () => {
-            return assign({active: true}, callbackMutation);
+            return assign({ active: true }, callbackMutation);
           }
         };
       }) : [];
@@ -147,6 +147,6 @@ export default {
   onMouseUp: SelectionHelpers.onMouseUp.bind(SelectionHelpers),
   onMouseMove: throttle(
     attachId(SelectionHelpers.onMouseMove.bind(SelectionHelpers)),
-    16,
-    {leading: true, trailing: false})
+    16, // eslint-disable-line no-magic-numbers
+    { leading: true, trailing: false })
 };