fix create container mixin

src/components/containers/brush-helpers.js

@@ -1,6 +1,5 @@
 import { Selection } from "victory-core";
 import { assign, throttle, isFunction, isEqual, defaults, mapValues } from "lodash";
-import { attachId } from "../../helpers/event-handlers";
 
 const Helpers = {
   withinBounds(point, bounds, padding) {
@@ -265,7 +264,7 @@ export default {
   onMouseUp: Helpers.onMouseUp.bind(Helpers),
   onMouseLeave: Helpers.onMouseLeave.bind(Helpers),
   onMouseMove: throttle(
-    attachId(Helpers.onMouseMove.bind(Helpers)),
+    Helpers.onMouseMove.bind(Helpers),
     16, // eslint-disable-line no-magic-numbers
     { leading: true, trailing: false }
   )

src/components/containers/cursor-helpers.js

@@ -1,6 +1,5 @@
 import { Selection } from "victory-core";
 import { throttle, isFunction } from "lodash";
-import { attachId } from "../../helpers/event-handlers";
 import BrushHelpers from "./brush-helpers";
 
 const CursorHelpers = {
@@ -44,7 +43,7 @@ const CursorHelpers = {
 
 export default {
   onMouseMove: throttle(
-    attachId(CursorHelpers.onMouseMove.bind(CursorHelpers)),
+    CursorHelpers.onMouseMove.bind(CursorHelpers),
     32, // eslint-disable-line no-magic-numbers
     { leading: true, trailing: false })
 };

src/components/containers/selection-helpers.js

@@ -1,7 +1,6 @@
 import { Selection, Data, Helpers } from "victory-core";
 import { assign, defaults, throttle, isFunction } from "lodash";
 import React from "react";
-import { attachId } from "../../helpers/event-handlers";
 
 const SelectionHelpers = {
   getDatasets(props) {
@@ -156,7 +155,7 @@ export default {
   onMouseDown: SelectionHelpers.onMouseDown.bind(SelectionHelpers),
   onMouseUp: SelectionHelpers.onMouseUp.bind(SelectionHelpers),
   onMouseMove: throttle(
-    attachId(SelectionHelpers.onMouseMove.bind(SelectionHelpers)),
+    SelectionHelpers.onMouseMove.bind(SelectionHelpers),
     16, // eslint-disable-line no-magic-numbers
     { leading: true, trailing: false })
 };

src/components/containers/victory-brush-container.js

@@ -49,25 +49,11 @@ export const brushContainerMixin = (base) => class VictoryBrushContainer extends
       onTouchStart: (evt, targetProps) => {
         return BrushHelpers.onMouseDown(evt, targetProps);
       },
-      onMouseMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
-        const mutations = BrushHelpers.onMouseMove(evt, targetProps);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+      onMouseMove: (evt, targetProps) => {
+        return BrushHelpers.onMouseMove(evt, targetProps);
       },
-      onTouchMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
-        const mutations = BrushHelpers.onMouseMove(evt, targetProps);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+      onTouchMove: (evt, targetProps) => {
+        return BrushHelpers.onMouseMove(evt, targetProps);
       },
       onMouseUp: (evt, targetProps) => {
         return BrushHelpers.onMouseUp(evt, targetProps);

src/components/containers/victory-cursor-container.js

@@ -46,15 +46,8 @@ export const cursorContainerMixin = (base) => class VictoryCursorContainer exten
       onTouchCancel: () => {
         return [];
       },
-      onMouseMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
-        const mutations = CursorHelpers.onMouseMove(evt, targetProps);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return [];
+      onMouseMove: (evt, targetProps) => {
+        return CursorHelpers.onMouseMove(evt, targetProps);
       },
       onTouchMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
         const mutations = CursorHelpers.onMouseMove(evt, targetProps);

src/components/containers/victory-selection-container.js

@@ -34,25 +34,11 @@ export const selectionContainerMixin = (base) => class VictorySelectionContainer
       onTouchStart: (evt, targetProps) => {
         return SelectionHelpers.onMouseDown(evt, targetProps);
       },
-      onMouseMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
-        const mutations = SelectionHelpers.onMouseMove(evt, targetProps);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+      onMouseMove: (evt, targetProps) => {
+        return SelectionHelpers.onMouseMove(evt, targetProps);
       },
-      onTouchMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
-        const mutations = SelectionHelpers.onMouseMove(evt, targetProps);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+      onTouchMove: (evt, targetProps) => {
+        return SelectionHelpers.onMouseMove(evt, targetProps);
       },
       onMouseUp: (evt, targetProps) => {
         return SelectionHelpers.onMouseUp(evt, targetProps);

src/components/containers/victory-voronoi-container.js

@@ -32,25 +32,11 @@ export const voronoiContainerMixin = (base) => class VictoryVoronoiContainer ext
       onTouchCancel: (evt, targetProps) => {
         return VoronoiHelpers.onMouseLeave(evt, targetProps);
       },
-      onMouseMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
-        const mutations = VoronoiHelpers.onMouseMove(evt, targetProps);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+      onMouseMove: (evt, targetProps) => {
+        return VoronoiHelpers.onMouseMove(evt, targetProps);
       },
-      onTouchMove: function (evt, targetProps) { // eslint-disable-line object-shorthand
-        const mutations = VoronoiHelpers.onMouseMove(evt, targetProps);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+      onTouchMove: (evt, targetProps) => {
+        return VoronoiHelpers.onMouseMove(evt, targetProps);
       }
     }
   }, {

src/components/containers/victory-zoom-container.js

@@ -61,44 +61,20 @@ export const zoomContainerMixin = (base) => class VictoryZoomContainer extends b
       onTouchCancel: (evt, targetProps) => {
         return ZoomHelpers.onMouseLeave(evt, targetProps);
       },
-      // eslint-disable-next-line max-params, object-shorthand
-      onMouseMove: function (evt, targetProps, eventKey, ctx) {
+      onMouseMove: (evt, targetProps, eventKey, ctx) => { // eslint-disable-line max-params
         evt.preventDefault();
-        const mutations = ZoomHelpers.onMouseMove(evt, targetProps, eventKey, ctx);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+        return ZoomHelpers.onMouseMove(evt, targetProps, eventKey, ctx);
       },
-      // eslint-disable-next-line max-params, object-shorthand
-      onTouchMove: function (evt, targetProps, eventKey, ctx) {
+      onTouchMove: (evt, targetProps, eventKey, ctx) => { // eslint-disable-line max-params
         evt.preventDefault();
-        const mutations = ZoomHelpers.onMouseMove(evt, targetProps, eventKey, ctx);
-
-        if (mutations.id !== this.mouseMoveMutationId) {
-          this.mouseMoveMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+        return ZoomHelpers.onMouseMove(evt, targetProps, eventKey, ctx);
       },
-      // eslint-disable-next-line max-params, object-shorthand
-      onWheel: function (evt, targetProps, eventKey, ctx) {
+      // eslint-disable-next-line max-params
+      onWheel: (evt, targetProps, eventKey, ctx) => {
         if (targetProps.allowZoom) {
           evt.preventDefault();
         }
-
-        const mutations = ZoomHelpers.onWheel(evt, targetProps, eventKey, ctx);
-
-        if (mutations.id !== this.wheelMutationId) {
-          this.wheelMutationId = mutations.id;
-          return mutations.mutations;
-        }
-
-        return undefined;
+        return ZoomHelpers.onWheel(evt, targetProps, eventKey, ctx);
       }
     }
   }];

src/components/containers/voronoi-helpers.js

@@ -2,7 +2,6 @@ import { Selection, Data, Helpers } from "victory-core";
 import { assign, throttle, isFunction, groupBy, keys, isEqual, includes } from "lodash";
 import { voronoi as d3Voronoi } from "d3-voronoi";
 import React from "react";
-import { attachId } from "../../helpers/event-handlers";
 
 const VoronoiHelpers = {
   withinBounds(props, point) {
@@ -172,7 +171,7 @@ const VoronoiHelpers = {
 export default {
   onMouseLeave: VoronoiHelpers.onMouseLeave.bind(VoronoiHelpers),
   onMouseMove: throttle(
-    attachId(VoronoiHelpers.onMouseMove.bind(VoronoiHelpers)),
+    VoronoiHelpers.onMouseMove.bind(VoronoiHelpers),
     32, // eslint-disable-line no-magic-numbers
     { leading: true, trailing: false })
 };

src/components/containers/zoom-helpers.js

@@ -2,7 +2,6 @@
 import { Children } from "react";
 import { Selection, Collection } from "victory-core";
 import { throttle, isFunction, defaults } from "lodash";
-import { attachId } from "../../helpers/event-handlers";
 import Wrapper from "../../helpers/wrapper";
 
 const Helpers = {
@@ -291,12 +290,12 @@ export default {
   onMouseUp: Helpers.onMouseUp.bind(Helpers),
   onMouseLeave: Helpers.onMouseLeave.bind(Helpers),
   onMouseMove: throttle(
-    attachId(Helpers.onMouseMove.bind(Helpers)),
+    Helpers.onMouseMove.bind(Helpers),
     16, // eslint-disable-line no-magic-numbers
     { leading: true, trailing: false }
   ),
   onWheel: throttle(
-    attachId(Helpers.onWheel.bind(Helpers)),
+    Helpers.onWheel.bind(Helpers),
     16, // eslint-disable-line no-magic-numbers
     { leading: true, trailing: false }
   )