diff --git a/example/package-lock.json b/example/package-lock.json index 17919172..19c40cb0 100644 --- a/example/package-lock.json +++ b/example/package-lock.json @@ -27,7 +27,7 @@ }, "..": { "name": "react-flow-renderer", - "version": "10.0.0-next.36", + "version": "10.0.0-next.37", "license": "MIT", "dependencies": { "@babel/runtime": "^7.16.7", diff --git a/example/src/Interaction/index.tsx b/example/src/Interaction/index.tsx index c31add29..67b23157 100644 --- a/example/src/Interaction/index.tsx +++ b/example/src/Interaction/index.tsx @@ -46,7 +46,7 @@ const InteractionFlow = () => { const [panOnScroll, setPanOnScroll] = useState(false); const [panOnScrollMode, setPanOnScrollMode] = useState(PanOnScrollMode.Free); const [zoomOnDoubleClick, setZoomOnDoubleClick] = useState(false); - const [paneMoveable, setPaneMoveable] = useState(true); + const [panOnDrag, setPanOnDrag] = useState(true); const [captureZoomClick, setCaptureZoomClick] = useState(false); const [captureZoomScroll, setCaptureZoomScroll] = useState(false); const [captureElementClick, setCaptureElementClick] = useState(false); @@ -70,7 +70,7 @@ const InteractionFlow = () => { onEdgeClick={captureElementClick ? onEdgeClick : undefined} onNodeDragStart={onNodeDragStart} onNodeDragStop={onNodeDragStop} - paneMoveable={paneMoveable} + panOnDrag={panOnDrag} onPaneClick={captureZoomClick ? onPaneClick : undefined} onPaneScroll={captureZoomScroll ? onPaneScroll : undefined} onPaneContextMenu={captureZoomClick ? onPaneContextMenu : undefined} @@ -180,14 +180,14 @@ const InteractionFlow = () => {
-
diff --git a/src/container/FlowRenderer/index.tsx b/src/container/FlowRenderer/index.tsx index 35b4674f..57b0ba11 100644 --- a/src/container/FlowRenderer/index.tsx +++ b/src/container/FlowRenderer/index.tsx @@ -50,7 +50,7 @@ const FlowRenderer = ({ panOnScrollSpeed, panOnScrollMode, zoomOnDoubleClick, - paneMoveable, + panOnDrag, defaultPosition, defaultZoom, preventScrolling, @@ -93,7 +93,7 @@ const FlowRenderer = ({ panOnScrollSpeed={panOnScrollSpeed} panOnScrollMode={panOnScrollMode} zoomOnDoubleClick={zoomOnDoubleClick} - paneMoveable={paneMoveable} + panOnDrag={panOnDrag} defaultPosition={defaultPosition} defaultZoom={defaultZoom} zoomActivationKeyCode={zoomActivationKeyCode} diff --git a/src/container/GraphView/index.tsx b/src/container/GraphView/index.tsx index 07b4a872..c7e890a1 100644 --- a/src/container/GraphView/index.tsx +++ b/src/container/GraphView/index.tsx @@ -66,7 +66,7 @@ const GraphView = ({ panOnScrollSpeed, panOnScrollMode, zoomOnDoubleClick, - paneMoveable, + panOnDrag, onPaneClick, onPaneScroll, onPaneContextMenu, @@ -103,7 +103,7 @@ const GraphView = ({ panOnScroll={panOnScroll} panOnScrollSpeed={panOnScrollSpeed} panOnScrollMode={panOnScrollMode} - paneMoveable={paneMoveable} + panOnDrag={panOnDrag} defaultPosition={defaultPosition} defaultZoom={defaultZoom} onSelectionDragStart={onSelectionDragStart} diff --git a/src/container/ReactFlow/index.tsx b/src/container/ReactFlow/index.tsx index 34b57e31..7324eb0f 100644 --- a/src/container/ReactFlow/index.tsx +++ b/src/container/ReactFlow/index.tsx @@ -96,7 +96,7 @@ const ReactFlow = forwardRef( panOnScrollSpeed = 0.5, panOnScrollMode = PanOnScrollMode.Free, zoomOnDoubleClick = true, - paneMoveable = true, + panOnDrag = true, onPaneClick, onPaneScroll, onPaneContextMenu, @@ -167,7 +167,7 @@ const ReactFlow = forwardRef( panOnScroll={panOnScroll} panOnScrollSpeed={panOnScrollSpeed} panOnScrollMode={panOnScrollMode} - paneMoveable={paneMoveable} + panOnDrag={panOnDrag} onPaneClick={onPaneClick} onPaneScroll={onPaneScroll} onPaneContextMenu={onPaneContextMenu} diff --git a/src/container/ZoomPane/index.tsx b/src/container/ZoomPane/index.tsx index 6abc8c0f..c81e6f7d 100644 --- a/src/container/ZoomPane/index.tsx +++ b/src/container/ZoomPane/index.tsx @@ -18,7 +18,7 @@ interface ZoomPaneProps { panOnScrollSpeed?: number; panOnScrollMode?: PanOnScrollMode; zoomOnDoubleClick?: boolean; - paneMoveable?: boolean; + panOnDrag?: boolean; defaultPosition?: [number, number]; defaultZoom?: number; onMove?: (viewport?: Viewport) => void; @@ -60,7 +60,7 @@ const ZoomPane = ({ zoomOnDoubleClick = true, selectionKeyPressed, elementsSelectable, - paneMoveable = true, + panOnDrag = true, defaultPosition = [0, 0], defaultZoom = 1, zoomActivationKeyCode, @@ -216,7 +216,7 @@ const ZoomPane = ({ const pinchZoom = zoomOnPinch && event.ctrlKey; // if all interactions are disabled, we prevent all zoom events - if (!paneMoveable && !zoomScroll && !panOnScroll && !zoomOnDoubleClick && !zoomOnPinch) { + if (!panOnDrag && !zoomScroll && !panOnScroll && !zoomOnDoubleClick && !zoomOnPinch) { return false; } @@ -250,7 +250,7 @@ const ZoomPane = ({ } // if the pane is not movable, we prevent dragging it with mousestart or touchstart - if (!paneMoveable && (event.type === 'mousedown' || event.type === 'touchstart')) { + if (!panOnDrag && (event.type === 'mousedown' || event.type === 'touchstart')) { return false; } @@ -264,7 +264,7 @@ const ZoomPane = ({ zoomOnPinch, panOnScroll, zoomOnDoubleClick, - paneMoveable, + panOnDrag, selectionKeyPressed, elementsSelectable, zoomActivationKeyPressed, diff --git a/src/types/component-props.ts b/src/types/component-props.ts index 0223d548..76fcd954 100644 --- a/src/types/component-props.ts +++ b/src/types/component-props.ts @@ -79,7 +79,7 @@ export interface ReactFlowProps extends HTMLAttributes { nodesConnectable?: boolean; elementsSelectable?: boolean; selectNodesOnDrag?: boolean; - paneMoveable?: boolean; + panOnDrag?: boolean; minZoom?: number; maxZoom?: number; defaultZoom?: number;