diff --git a/src/pages/Questions/BranchingMap/CsComponent.tsx b/src/pages/Questions/BranchingMap/CsComponent.tsx index 33cbcf3d..873c5b1f 100644 --- a/src/pages/Questions/BranchingMap/CsComponent.tsx +++ b/src/pages/Questions/BranchingMap/CsComponent.tsx @@ -125,15 +125,17 @@ export const CsComponent = ({ useEffect(() => { if (modalQuestionTargetContentId.length !== 0 && modalQuestionParentContentId.length !== 0) { console.log("был выбран вопрос " + modalQuestionTargetContentId) + addNode({ parentNodeContentId:modalQuestionParentContentId, targetNodeContentId:modalQuestionTargetContentId }) } }, [modalQuestionTargetContentId]) - const addNode = ({ parentNodeContentId }: { parentNodeContentId: string }) => { + const addNode = ({ parentNodeContentId, targetNodeContentId }: { parentNodeContentId: string, targetNodeContentId?: string }) => { console.log("dragQuestionContentId " + dragQuestionContentId) const cy = cyRef?.current const parentNodeChildren = cy?.$('edge[source = "' + parentNodeContentId + '"]')?.length - const targetQuestion = { ...getQuestionByContentId(dragQuestionContentId) } as AnyQuizQuestion + //если есть инфо о выбранном вопросе из модалки - берём родителя из инфо модалки. Иначе из значения дропа + const targetQuestion = { ...getQuestionByContentId(targetNodeContentId || dragQuestionContentId) } as AnyQuizQuestion if (Object.keys(targetQuestion).length !== 0 && Object.keys(targetQuestion).length !== 0 && parentNodeContentId && parentNodeChildren !== undefined) { clearDataAfterAddNode({ parentNodeContentId, targetQuestion, parentNodeChildren }) @@ -274,8 +276,6 @@ export const CsComponent = ({ }, [startRemove]); - - const readyLO = (e) => { e.cy.data('changed', false) //удаляем иконки @@ -473,10 +473,10 @@ export const CsComponent = ({ layoutElement.classList.add("popper-layout"); layoutElement.setAttribute("data-id", item.id()); layoutElement.addEventListener("mouseup", () => { - alert("layout") - } - // setStartCreate(node.id()) - ); + //Узнаём грани, идущие от этой ноды + setModalQuestionParentContentId(item.id()) + setOpenedModalQuestions(true) + }); layoutsContainer.current?.appendChild(layoutElement); return layoutElement; @@ -504,6 +504,7 @@ export const CsComponent = ({ plusElement.addEventListener("mouseup", () => { setStartCreate(node.id()); }); + plusesContainer.current?.appendChild(plusElement); return plusElement;