diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx index 9ea89c9c..dc8a55df 100644 --- a/src/pages/Questions/ButtonsOptions.tsx +++ b/src/pages/Questions/ButtonsOptions.tsx @@ -22,6 +22,7 @@ import type { AnyTypedQuizQuestion } from "../../model/questionTypes/shared"; import { updateOpenedModalSettingsId } from "@root/questions/actions"; import { useCurrentQuiz } from "@root/quizes/hooks"; import {enqueueSnackbar} from "notistack"; +import {useQuestionsStore} from "@root/questions/store"; interface Props { @@ -41,14 +42,13 @@ export default function ButtonsOptions({ const isWrappMiniButtonSetting = useMediaQuery(theme.breakpoints.down(920)); const quiz = useCurrentQuiz(); +const {openBranchingPanel} = useQuestionsStore.getState() const openedModal = () => { updateOpenedModalSettingsId(question.id) }; const handleClickBranching = (_, value) => { const parentId = question.content.rule.parentId - console.log(parentId) - console.log(parentId.length) if (parentId.length === 0 ){ return enqueueSnackbar("Вопрос не учавствует в ветвлении") } @@ -57,6 +57,7 @@ export default function ButtonsOptions({ } if (parentId.length !== 0) { setTimeout(() => updateOpenBranchingPanel(!value), 10) + openedModal() } } @@ -97,7 +98,7 @@ export default function ButtonsOptions({ ), title: "Ветвление", value: "branching", - myFunc: openedModal, handleClickBranching + myFunc: handleClickBranching(question.id, openBranchingPanel), }, ]; diff --git a/src/pages/Questions/ButtonsOptionsAndPict.tsx b/src/pages/Questions/ButtonsOptionsAndPict.tsx index 2323bf7d..8300b737 100644 --- a/src/pages/Questions/ButtonsOptionsAndPict.tsx +++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx @@ -57,8 +57,6 @@ export default function ButtonsOptionsAndPict({ const handleClickBranching = (_, value) => { const parentId = question.content.rule.parentId - console.log(parentId) - console.log(parentId.length) if (parentId.length === 0 ) { return enqueueSnackbar("Вопрос не учавствует в ветвлении") } @@ -67,6 +65,7 @@ export default function ButtonsOptionsAndPict({ } if (parentId.length !== 0) { setTimeout(() => updateOpenBranchingPanel(!value), 10) + updateOpenedModalSettingsId(question.id) } } @@ -206,7 +205,6 @@ export default function ButtonsOptionsAndPict({ onMouseEnter={() => setButtonHover("branching")} onMouseLeave={() => setButtonHover("")} onClick={() => { - updateOpenedModalSettingsId(question.id) handleClickBranching(question.id, openBranchingPanel) }} sx={{ diff --git a/src/pages/Questions/QuestionsPage.tsx b/src/pages/Questions/QuestionsPage.tsx index ed3a81e8..86f877ea 100755 --- a/src/pages/Questions/QuestionsPage.tsx +++ b/src/pages/Questions/QuestionsPage.tsx @@ -24,7 +24,8 @@ export default function QuestionsPage() { const { openedModalSettingsId } = useQuestionsStore(); const isMobile = useMediaQuery(theme.breakpoints.down(660)); const quiz = useCurrentQuiz(); - const openBranchingPanel = useQuestionsStore.getState() + const {openBranchingPanel} = useQuestionsStore.getState() + if (!quiz) return null;