Merge pull request #520 from FormidableLabs/feature/allow-pan

add allowPan prop for VictoryZoomContainer
FormidableLabs · Sep 29, 2017 · b1308e2 · b1308e2
2 parents 44136ef + 9c3c0c9
commit b1308e2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/components/containers/victory-zoom-container.js b/src/components/containers/victory-zoom-container.js
@@ -13,6 +13,7 @@ export const zoomContainerMixin = (base) => class VictoryZoomContainer extends b
 
   static propTypes = {
     ...VictoryContainer.propTypes,
+    allowPan: PropTypes.bool,
     allowZoom: PropTypes.bool,
     clipContainerComponent: PropTypes.element.isRequired,
     downsample: PropTypes.oneOfType([
@@ -34,6 +35,7 @@ export const zoomContainerMixin = (base) => class VictoryZoomContainer extends b
   static defaultProps = {
     ...VictoryContainer.defaultProps,
     clipContainerComponent: <VictoryClipContainer/>,
+    allowPan: true,
     allowZoom: true,
     zoomActive: false
   };

diff --git a/src/components/containers/zoom-helpers.js b/src/components/containers/zoom-helpers.js
@@ -161,8 +161,11 @@ const Helpers = {
     return defaults({}, childrenDomain, originalDomain, domain);
   },
 
-  onMouseDown(evt) {
+  onMouseDown(evt, targetProps) {
     evt.preventDefault();
+    if (!targetProps.allowPan) {
+      return undefined;
+    }
     const { x, y } = Selection.getSVGEventCoordinates(evt);
     return [{
       target: "parent",
@@ -175,7 +178,10 @@ const Helpers = {
     }];
   },
 
-  onMouseUp() {
+  onMouseUp(evt, targetProps) {
+    if (!targetProps.allowPan) {
+      return undefined;
+    }
     return [{
       target: "parent",
       mutation: () => {
@@ -184,7 +190,10 @@ const Helpers = {
     }];
   },
 
-  onMouseLeave() {
+  onMouseLeave(evt, targetProps) {
+    if (!targetProps.allowPan) {
+      return undefined;
+    }
     return [{
       target: "parent",
       mutation: () => {
@@ -194,7 +203,7 @@ const Helpers = {
   },
 
   onMouseMove(evt, targetProps, eventKey, ctx) { // eslint-disable-line max-params
-    if (targetProps.panning) {
+    if (targetProps.panning && targetProps.allowPan) {
       const { scale, startX, startY, onZoomDomainChange, zoomDimension, zoomDomain } = targetProps;
       const { x, y } = Selection.getSVGEventCoordinates(evt);
       const originalDomain = this.getDomain(targetProps);
@@ -224,7 +233,7 @@ const Helpers = {
 
   onWheel(evt, targetProps, eventKey, ctx) { // eslint-disable-line max-params
     if (!targetProps.allowZoom) {
-      return {};
+      return undefined;
     }
     const { onZoomDomainChange, zoomDimension, zoomDomain } = targetProps;
     const originalDomain = this.getDomain(targetProps);