From 7b1b028364cdbb59b1e2d44ff9821ff33b6411c2 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Thu, 20 Jul 2023 16:49:41 -0300 Subject: [PATCH] Fixed node dragging and selecting text on input --- .../components/parameterComponent/index.tsx | 2 +- src/frontend/src/contexts/undoRedoContext.tsx | 8 ------- src/frontend/src/modals/baseModal/index.tsx | 23 +++++++++---------- .../components/PageComponent/index.tsx | 5 ++-- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index b143304f4..d9960ce7b 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -152,7 +152,7 @@ export default function ParameterComponent({ return (
<>
{ - undo: () => void; - redo: () => void; - takeSnapshot: () => void; - canUndo: boolean; - canRedo: boolean; -}; - type HistoryItem = { nodes: Node[]; edges: Edge[]; diff --git a/src/frontend/src/modals/baseModal/index.tsx b/src/frontend/src/modals/baseModal/index.tsx index 069cd8ee9..bdecd172a 100644 --- a/src/frontend/src/modals/baseModal/index.tsx +++ b/src/frontend/src/modals/baseModal/index.tsx @@ -97,25 +97,24 @@ function BaseModal({ break; } - const { setDisableCopyPaste } = useContext(TabsContext); - const [openInner, setOpenInner] = useState(open ?? false); + const { disableCopyPaste, setDisableCopyPaste } = useContext(TabsContext); + const [keepDisabling, setKeepDisabling] = useState(false); useEffect(() => { - setOpenInner(open); - }, [open]); - - useEffect(() => { - setOpen(openInner); - if (openInner) { + if (keepDisabling) { setDisableCopyPaste(true); - } else { - setDisableCopyPaste(false); } - }, [openInner]); + }, [disableCopyPaste]); + + useEffect(() => { + if (!open) { + setKeepDisabling(false); + } + }, [open]); //UPDATE COLORS AND STYLE CLASSSES return ( - + diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx index f27002847..9e83d11c6 100644 --- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx @@ -379,12 +379,15 @@ export default function Page({ flow }: { flow: FlowType }) { }} edges={edges} onPaneClick={() => { + console.log("enableCopyPastePaneClick"); setDisableCopyPaste(false); }} onPaneMouseLeave={() => { + console.log("enableCopyPastePaneLeave"); setDisableCopyPaste(true); }} onPaneMouseEnter={() => { + console.log("enableCopyPastePaneEnter"); setDisableCopyPaste(false); }} onNodesChange={onNodesChangeMod} @@ -407,8 +410,6 @@ export default function Page({ flow }: { flow: FlowType }) { onDrop={onDrop} onNodesDelete={onDelete} onSelectionChange={onSelectionChange} - nodesDraggable={!disableCopyPaste} - panOnDrag={!disableCopyPaste} zoomOnDoubleClick={!disableCopyPaste} className="theme-attribution" minZoom={0.01}