diff --git a/src/pages/Questions/BranchingMap/CsComponent.tsx b/src/pages/Questions/BranchingMap/CsComponent.tsx index a66cbd02..947ca5a8 100644 --- a/src/pages/Questions/BranchingMap/CsComponent.tsx +++ b/src/pages/Questions/BranchingMap/CsComponent.tsx @@ -96,26 +96,24 @@ function CsComponent({ const crossesContainer = useRef(null); const gearsContainer = useRef(null); - // const { layoutOptions } = usePopper({ - // layoutsContainer, - // plusesContainer, - // crossesContainer, - // gearsContainer, - // setModalQuestionParentContentId, - // setOpenedModalQuestions, - // setStartCreate, - // setStartRemove, - // }); - const layoutOptions = {}; - const removeNode = () => {}; - // const { removeNode } = useRemoveNode({ - // cyRef, - // layoutOptions, - // layoutsContainer, - // plusesContainer, - // crossesContainer, - // gearsContainer, - // }); + const { layoutOptions } = usePopper({ + layoutsContainer, + plusesContainer, + crossesContainer, + gearsContainer, + setModalQuestionParentContentId, + setOpenedModalQuestions, + setStartCreate, + setStartRemove, + }); + const { removeNode } = useRemoveNode({ + cyRef, + layoutOptions, + layoutsContainer, + plusesContainer, + crossesContainer, + gearsContainer, + }); useLayoutEffect(() => { const cy = cyRef?.current; diff --git a/src/pages/Questions/BranchingMap/hooks/usePopper.ts b/src/pages/Questions/BranchingMap/hooks/usePopper.ts index 957beece..c420dca7 100644 --- a/src/pages/Questions/BranchingMap/hooks/usePopper.ts +++ b/src/pages/Questions/BranchingMap/hooks/usePopper.ts @@ -221,7 +221,7 @@ export const usePopper = ({ gearElement.setAttribute("data-id", item.id()); gearElement.style.zIndex = "1"; gearsContainer.current?.appendChild(gearElement); - gearElement.addEventListener("mouseup", (e) => { + gearElement.addEventListener("mouseup", () => { console.log("up"); updateOpenedModalSettingsId(item.id()); }); @@ -393,7 +393,7 @@ export const usePopper = ({ const task = queue.pop(); task.task.data("layer", task.layer); task.task.removeData("subtreeWidth"); - const children = e + const children = node .cy() .edges(`[source="${task.task.id()}"]`) .targets(); @@ -404,14 +404,14 @@ export const usePopper = ({ ); } } - queue.push({ parent: e, children: children }); + queue.push({ parent: node, children: children }); while (queue.length) { const task = queue.pop(); if (task.children.length === 0) { task.parent.data("subtreeWidth", task.parent.height() + 50); continue; } - const unprocessed = task?.children.filter((e) => { + const unprocessed = task?.children.filter((node) => { return node.data("subtreeWidth") === undefined; }); if (unprocessed.length !== 0) { @@ -434,7 +434,7 @@ export const usePopper = ({ const pos = { x: 0, y: 0 }; node.data("oldPos", pos); - queue.push({ task: children, parent: e }); + queue.push({ task: children, parent: node }); while (queue.length) { const task = queue.pop(); const oldPos = task.parent.data("oldPos");