chore(figma-controls): cleanup

This commit is contained in:
moklick
2022-12-12 16:52:31 +01:00
parent ee2f39f2fe
commit 0a2529d26e
4 changed files with 9 additions and 26 deletions
+3 -19
View File
@@ -1,12 +1,4 @@
import ReactFlow, { import ReactFlow, { Background, BackgroundVariant, Node, Edge, SelectionMode } from 'reactflow';
ReactFlowProvider,
Background,
BackgroundVariant,
Node,
Edge,
useKeyPress,
SelectionMode,
} from 'reactflow';
const MULTI_SELECT_KEY = ['Meta', 'Shift']; const MULTI_SELECT_KEY = ['Meta', 'Shift'];
@@ -23,15 +15,13 @@ const initialEdges: Edge[] = [
]; ];
const BasicFlow = () => { const BasicFlow = () => {
const spaceBarPressed = useKeyPress('Space');
return ( return (
<ReactFlow <ReactFlow
defaultNodes={initialNodes} defaultNodes={initialNodes}
defaultEdges={initialEdges} defaultEdges={initialEdges}
selectionOnDrag selectionOnDrag
selectionMode={SelectionMode.Partial} selectionMode={SelectionMode.Partial}
panOnDrag={spaceBarPressed ? true : 'RightClick'} panOnDrag="RightClick"
panOnScroll panOnScroll
zoomActivationKeyCode="Meta" zoomActivationKeyCode="Meta"
multiSelectionKeyCode={MULTI_SELECT_KEY} multiSelectionKeyCode={MULTI_SELECT_KEY}
@@ -43,10 +33,4 @@ const BasicFlow = () => {
); );
}; };
export default function App() { export default BasicFlow;
return (
<ReactFlowProvider>
<BasicFlow />
</ReactFlowProvider>
);
}
@@ -1,4 +1,4 @@
import { CSSProperties, useCallback, useState } from 'react'; import { useCallback, useState } from 'react';
import ReactFlow, { Controls, addEdge, Position, Connection, useNodesState, useEdgesState, Panel } from 'reactflow'; import ReactFlow, { Controls, addEdge, Position, Connection, useNodesState, useEdgesState, Panel } from 'reactflow';
import NodeResizerNode from './NodeResizerNode'; import NodeResizerNode from './NodeResizerNode';
@@ -57,7 +57,7 @@ const FlowRenderer = ({
panOnScrollSpeed, panOnScrollSpeed,
panOnScrollMode, panOnScrollMode,
zoomOnDoubleClick, zoomOnDoubleClick,
panOnDrag, panOnDrag: _panOnDrag,
defaultViewport, defaultViewport,
translateExtent, translateExtent,
minZoom, minZoom,
@@ -70,6 +70,9 @@ const FlowRenderer = ({
}: FlowRendererProps) => { }: FlowRendererProps) => {
const nodesSelectionActive = useStore(selector); const nodesSelectionActive = useStore(selector);
const selectionKeyPressed = useKeyPress(selectionKeyCode); const selectionKeyPressed = useKeyPress(selectionKeyCode);
const panActivationKeyPressed = useKeyPress(panActivationKeyCode);
const panOnDrag = panActivationKeyPressed || _panOnDrag;
const isSelecting = selectionKeyPressed || (selectionOnDrag && panOnDrag !== true); const isSelecting = selectionKeyPressed || (selectionOnDrag && panOnDrag !== true);
useGlobalKeyHandler({ deleteKeyCode, multiSelectionKeyCode }); useGlobalKeyHandler({ deleteKeyCode, multiSelectionKeyCode });
@@ -92,7 +95,6 @@ const FlowRenderer = ({
translateExtent={translateExtent} translateExtent={translateExtent}
minZoom={minZoom} minZoom={minZoom}
maxZoom={maxZoom} maxZoom={maxZoom}
panActivationKeyCode={panActivationKeyCode}
zoomActivationKeyCode={zoomActivationKeyCode} zoomActivationKeyCode={zoomActivationKeyCode}
preventScrolling={preventScrolling} preventScrolling={preventScrolling}
noWheelClassName={noWheelClassName} noWheelClassName={noWheelClassName}
@@ -53,12 +53,11 @@ const ZoomPane = ({
panOnScrollMode = PanOnScrollMode.Free, panOnScrollMode = PanOnScrollMode.Free,
zoomOnDoubleClick = true, zoomOnDoubleClick = true,
elementsSelectable, elementsSelectable,
panOnDrag: _panOnDrag = true, panOnDrag = true,
defaultViewport, defaultViewport,
translateExtent, translateExtent,
minZoom, minZoom,
maxZoom, maxZoom,
panActivationKeyCode,
zoomActivationKeyCode, zoomActivationKeyCode,
preventScrolling = true, preventScrolling = true,
children, children,
@@ -73,8 +72,6 @@ const ZoomPane = ({
const prevTransform = useRef<Viewport>({ x: 0, y: 0, zoom: 0 }); const prevTransform = useRef<Viewport>({ x: 0, y: 0, zoom: 0 });
const { d3Zoom, d3Selection, d3ZoomHandler, userSelectionActive } = useStore(selector, shallow); const { d3Zoom, d3Selection, d3ZoomHandler, userSelectionActive } = useStore(selector, shallow);
const zoomActivationKeyPressed = useKeyPress(zoomActivationKeyCode); const zoomActivationKeyPressed = useKeyPress(zoomActivationKeyCode);
const panActivationKeyPressed = useKeyPress(panActivationKeyCode);
const panOnDrag = _panOnDrag || panActivationKeyPressed;
useResizeHandler(zoomPane); useResizeHandler(zoomPane);