From 14efd543698ba87ae4221a76bc3a1f61ba1f5e38 Mon Sep 17 00:00:00 2001
From: Tamara <tamara.zelenko555@yandex.ru>
Date: Mon, 4 Dec 2023 19:33:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D1=84=D1=8B=20=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D0=BA=D0=B8=20=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Questions/ButtonsOptions.tsx        | 7 ++++---
 src/pages/Questions/ButtonsOptionsAndPict.tsx | 3 +--
 src/pages/Questions/QuestionsPage.tsx         | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx
index d7779a07..2fcc0b2a 100644
--- a/src/pages/Questions/ButtonsOptions.tsx
+++ b/src/pages/Questions/ButtonsOptions.tsx
@@ -21,6 +21,7 @@ import SettingIcon from "../../assets/icons/questionsPage/settingIcon";
 import type { AnyTypedQuizQuestion } from "../../model/questionTypes/shared";
 import { updateOpenedModalSettingsId } from "@root/questions/actions";
 import {enqueueSnackbar} from "notistack";
+import {useQuestionsStore} from "@root/questions/store";
 
 
 interface Props {
@@ -38,14 +39,13 @@ export default function ButtonsOptions({
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down(790));
     const isWrappMiniButtonSetting = useMediaQuery(theme.breakpoints.down(920));
-
+    const {openBranchingPanel} = useQuestionsStore.getState()
     const openedModal = () => {
         updateOpenedModalSettingsId(question.id)
     };
 
     const handleClickBranching = (_, value) => {
         const parentId = question.content.rule.parentId
-        console.log(parentId.length)
         if (parentId.length === 0 ){
             return enqueueSnackbar("Вопрос не учавствует в ветвлении")
         }
@@ -54,6 +54,7 @@ export default function ButtonsOptions({
         }
         if (parentId.length !== 0) {
             setTimeout(() => updateOpenBranchingPanel(!value), 10)
+            openedModal()
         }
 
     }
@@ -94,7 +95,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 7f9e07af..58228fc3 100644
--- a/src/pages/Questions/ButtonsOptionsAndPict.tsx
+++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx
@@ -55,7 +55,6 @@ export default function ButtonsOptionsAndPict({
 
     const handleClickBranching = (_, value) => {
         const parentId = question.content.rule.parentId
-        console.log(parentId.length)
         if (parentId.length === 0 ) {
             return enqueueSnackbar("Вопрос не учавствует в ветвлении")
         }
@@ -64,6 +63,7 @@ export default function ButtonsOptionsAndPict({
         }
         if (parentId.length !== 0) {
             setTimeout(() => updateOpenBranchingPanel(!value), 10)
+            updateOpenedModalSettingsId(question.id)
         }
 
     }
@@ -203,7 +203,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 5c492f3e..0f94002c 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;
 
     return (