dobra jest z focusami

graphql-editor · Feb 7, 2024 · 47ec024 · 47ec024
1 parent 8c1625d
commit 47ec024
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 11 deletions.
diff --git a/packages/editor/src/Relation/PanZoom/LinesDiagram/Node/Field/index.tsx b/packages/editor/src/Relation/PanZoom/LinesDiagram/Node/Field/index.tsx
@@ -38,28 +38,47 @@ type FieldProps = Pick<GrafFieldProps, "node"> & {
 };
 
 export const Field: React.FC<FieldProps> = ({ node }) => {
-  const { parentTypes, setSelectedNodeId, getParentOfField, focusMode } =
-    useTreesState();
+  const {
+    parentTypes,
+    setSelectedNodeId,
+    setSelectedNodeIdThatWillBeAdded,
+    getParentOfField,
+    focusMode,
+  } = useTreesState();
   const { printPreviewActive } = useRelationsState();
-  const { setTypeRelatedNodesToFocusedNode, filteredFocusedNodes } =
-    useRelationNodesState();
+  const {
+    setTypeRelatedNodesToFocusedNode,
+    filteredFocusedNodes,
+    filteredTypeRelatedToFocusedNode,
+  } = useRelationNodesState();
   const nodeClick = (n: ParserField) => {
     const parent = getParentOfField(n);
     if (parent) {
+      const isFocus = !!(focusMode && filteredFocusedNodes);
+      if (isFocus) {
+        setTypeRelatedNodesToFocusedNode(parent);
+        if (
+          !filteredFocusedNodes
+            .concat(filteredTypeRelatedToFocusedNode)
+            .find((ffn) => ffn.id === parent.id)
+        ) {
+          setSelectedNodeIdThatWillBeAdded({
+            source: "relation",
+            value: {
+              id: parent.id,
+              name: parent.name,
+            },
+          });
+          return;
+        }
+      }
       setSelectedNodeId({
         source: "relation",
         value: {
           id: parent.id,
           name: parent.name,
         },
       });
-      const isFocus = !!(focusMode && filteredFocusedNodes);
-      if (isFocus) {
-        setTypeRelatedNodesToFocusedNode(parent);
-        if (!filteredFocusedNodes.find((ffn) => ffn.id === parent.id)) {
-          return;
-        }
-      }
     }
   };
   return (

diff --git a/packages/editor/src/state/containers/trees/index.ts b/packages/editor/src/state/containers/trees/index.ts
@@ -249,6 +249,18 @@ const useTreesStateContainer = createContainer(() => {
     },
     [_setSelectedNodeId, allNodes, selectedNodeId?.value?.id, focusMode]
   );
+  const setSelectedNodeIdThatWillBeAdded = useCallback(
+    (_selectedNodeId: SelectedNodeId) => {
+      const nodeId = _selectedNodeId?.value?.id;
+      if (
+        nodeId !== selectedNodeId?.value?.id ||
+        _selectedNodeId?.justCreated !== selectedNodeId?.justCreated
+      ) {
+        return _setSelectedNodeId(_selectedNodeId);
+      }
+    },
+    [_setSelectedNodeId, allNodes, selectedNodeId?.value?.id, focusMode]
+  );
   const generateTreeFromSchema = async (schema: PassedSchema) => {
     if (!schema.code && !schema.libraries) {
       setTree({ nodes: [] }, true);
@@ -494,6 +506,7 @@ const useTreesStateContainer = createContainer(() => {
     setSnapshots,
     selectedNodeId,
     setSelectedNodeId,
+    setSelectedNodeIdThatWillBeAdded,
     queryNode,
     getParentOfField,
     activeNode,