From 5678ce515dd87ed9c18d9906b8c4332e25106a3a Mon Sep 17 00:00:00 2001 From: Tamara Date: Tue, 5 Dec 2023 18:49:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=85=20=D0=B8=20=D0=B2=D0=BD=D0=B8=D0=B7=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D1=8B=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Questions/BranchingPanel/index.tsx | 22 +++++++++++++++++-- src/pages/Questions/ButtonsOptions.tsx | 3 +-- src/pages/Questions/ButtonsOptionsAndPict.tsx | 3 +-- src/pages/Questions/QuestionsPage.tsx | 22 +++++++++++++++++-- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/pages/Questions/BranchingPanel/index.tsx b/src/pages/Questions/BranchingPanel/index.tsx index 8d838511..254d9edd 100644 --- a/src/pages/Questions/BranchingPanel/index.tsx +++ b/src/pages/Questions/BranchingPanel/index.tsx @@ -1,13 +1,16 @@ -import { Box, Typography, Switch, useTheme } from "@mui/material"; +import {Box, Typography, Switch, useTheme, Button, useMediaQuery} from "@mui/material"; import { QuestionsList } from "./QuestionsList"; import { updateOpenBranchingPanel } from "@root/questions/actions"; import {useQuestionsStore} from "@root/questions/store"; +import {useRef} from "react"; export const BranchingPanel = () => { const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down(660)); const {openBranchingPanel} = useQuestionsStore.getState() + const ref = useRef() return ( { }} /> - + Логика ветвления Настройте связи между вопросами + { openBranchingPanel === true && } diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx index 3a0fa529..929372d2 100644 --- a/src/pages/Questions/ButtonsOptions.tsx +++ b/src/pages/Questions/ButtonsOptions.tsx @@ -56,8 +56,7 @@ const {openBranchingPanel} = useQuestionsStore.getState() return enqueueSnackbar("У корня нет условий ветвления") } if (parentId.length !== 0) { - updateOpenBranchingPanel(!value) - openedModal() + updateOpenBranchingPanel(value) } } diff --git a/src/pages/Questions/ButtonsOptionsAndPict.tsx b/src/pages/Questions/ButtonsOptionsAndPict.tsx index 5ade8e55..6e7ec85a 100644 --- a/src/pages/Questions/ButtonsOptionsAndPict.tsx +++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx @@ -65,8 +65,7 @@ export default function ButtonsOptionsAndPict({ return enqueueSnackbar("У корня нет условий ветвления") } if (parentId.length !== 0) { - updateOpenBranchingPanel(!value) - updateOpenedModalSettingsId(question.id) + updateOpenBranchingPanel(value) } } diff --git a/src/pages/Questions/QuestionsPage.tsx b/src/pages/Questions/QuestionsPage.tsx index e08e222c..cd9913d4 100755 --- a/src/pages/Questions/QuestionsPage.tsx +++ b/src/pages/Questions/QuestionsPage.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect, useLayoutEffect } from "react" +import { useState, useEffect, useLayoutEffect, useRef } from "react" import { Box, Button, @@ -30,12 +30,14 @@ export default function QuestionsPage() { updateOpenBranchingPanel(true) },[]) + const ref = useRef() if (!quiz) return null; return ( <> + +