From 5543c9980a8b9b6ff09d8d610e95c695eea7684e Mon Sep 17 00:00:00 2001 From: nflnkr Date: Wed, 10 Jan 2024 13:02:03 +0300 Subject: [PATCH] minor fix --- .../Questions/BranchingMap/CsComponent.tsx | 17 +++-------------- .../Questions/BranchingMap/hooks/usePopper.ts | 9 ++++----- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/pages/Questions/BranchingMap/CsComponent.tsx b/src/pages/Questions/BranchingMap/CsComponent.tsx index faa660d5..1a0d0f6b 100644 --- a/src/pages/Questions/BranchingMap/CsComponent.tsx +++ b/src/pages/Questions/BranchingMap/CsComponent.tsx @@ -24,22 +24,17 @@ import { useRemoveNode } from "./hooks/useRemoveNode"; import "./style/styles.css"; import { stylesheet } from "./style/stylesheet"; + Cytoscape.use(popper); -type PopperInstance = ReturnType>; - function CsComponent() { - const quiz = useCurrentQuiz(); const desireToOpenABranchingModal = useUiTools(state => state.desireToOpenABranchingModal); const canCreatePublic = useUiTools(state => state.canCreatePublic); const modalQuestionParentContentId = useUiTools(state => state.modalQuestionParentContentId); const modalQuestionTargetContentId = useUiTools(state => state.modalQuestionTargetContentId); const trashQuestions = useQuestionsStore(state => state.questions); const [isPanningCy, setIsPanningCy] = useState(false); - const cyRef = useRef(null); - const popperContainerRef = useRef(null); - const popperInstancesRef = useRef([]); const questions = useMemo(() => trashQuestions.filter( (question) => question.type !== "result" && question.type !== null @@ -53,15 +48,9 @@ function CsComponent() { return storeToNodes(q); }, [questions]); - const { createPoppers, removeAllPoppers } = usePopper({ - cyRef, - popperContainerRef, - popperInstancesRef, - }); + const { createPoppers, removeAllPoppers } = usePopper({ cyRef }); - const { removeNode } = useRemoveNode({ - cyRef, - }); + const { removeNode } = useRemoveNode({ cyRef }); useLayoutEffect(() => { const cy = cyRef?.current; diff --git a/src/pages/Questions/BranchingMap/hooks/usePopper.ts b/src/pages/Questions/BranchingMap/hooks/usePopper.ts index 80715108..7093fe13 100644 --- a/src/pages/Questions/BranchingMap/hooks/usePopper.ts +++ b/src/pages/Questions/BranchingMap/hooks/usePopper.ts @@ -1,7 +1,7 @@ import { cleardragQuestionContentId, setModalQuestionParentContentId, setOpenedModalQuestions, updateDeleteId, updateOpenedModalSettingsId } from "@root/uiTools/actions"; import type { AbstractEventObject, Core, NodeSingular, SingularData } from "cytoscape"; import { getPopperInstance } from "cytoscape-popper"; -import { useCallback, type MutableRefObject } from "react"; +import { useCallback, type MutableRefObject, useRef } from "react"; import { addNode } from "../helper"; type PopperItem = { @@ -29,13 +29,12 @@ type NodeSingularWithPopper = NodeSingular & { export const usePopper = ({ cyRef, - popperContainerRef, - popperInstancesRef, }: { cyRef: MutableRefObject; - popperContainerRef: MutableRefObject; - popperInstancesRef: MutableRefObject; }) => { + const popperContainerRef = useRef(null); + const popperInstancesRef = useRef([]); + const removeAllPoppers = useCallback(() => { cyRef.current?.removeListener("zoom render");