фикс расположения нижнего меню

src/pages/Questions/QuestionSwitchWindowTool.tsx

@@ -7,20 +7,7 @@ import { useQuestionsStore } from "@root/questions/store";
 import { useUiTools } from "@root/uiTools/store";
 import { useQuestions } from "@root/questions/hooks";
 import { useCurrentQuiz } from "@root/quizes/hooks";
-import { updateSomeWorkBackend } from "@root/uiTools/actions";
 
-import {
-  copyQuestion,
-  deleteQuestion,
-  deleteQuestionWithTimeout,
-  clearRuleForAll,
-  updateQuestion,
-  getQuestionByContentId,
-} from "@root/questions/actions";
-import { updateRootContentId } from "@root/quizes/actions";
-
-import type { AnyTypedQuizQuestion } from "@model/questionTypes/shared";
-import { DeleteFunction } from "@utils/deleteFunc";
 import { deleteTimeoutedQuestions } from "@utils/deleteTimeoutedQuestions";
 
 interface Props {
@@ -28,21 +15,19 @@ interface Props {
   setOpenBranchingPage: (a: boolean) => void;
 }
 
-export const QuestionSwitchWindowTool = ({
+export const QuestionSwitchWindowTool = ({ openBranchingPage, setOpenBranchingPage }: Props) => {
-  openBranchingPage,
-  setOpenBranchingPage}:Props) => {
   const { questions } = useQuestionsStore.getState();
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down(600));
   const quiz = useCurrentQuiz();
-  console.log("Я компонент в котором отвечала")
+  console.log("Я компонент в котором отвечала");
 
   const openBranchingPageHC = () => {
     if (!openBranchingPage) {
-      deleteTimeoutedQuestions(questions, quiz)
+      deleteTimeoutedQuestions(questions, quiz);
-    }
-    setOpenBranchingPage(!openBranchingPage)
     }
+    setOpenBranchingPage(!openBranchingPage);
+  };
 
   return (
     <Box
@@ -53,14 +38,10 @@ export const QuestionSwitchWindowTool = ({
         marginBottom: isMobile ? "20px" : undefined,
       }}
     >
-      <Box sx={{ flexBasis: "796px" }}>
+      <Box sx={{ flexBasis: "796px" }}>{openBranchingPage ? <BranchingMap /> : <DraggableList />}</Box>
-        {openBranchingPage ? <BranchingMap /> : <DraggableList />}
+      {openBranchingPage && (
-      </Box>
+        <SwitchBranchingPanel openBranchingPage={openBranchingPage} setOpenBranchingPage={openBranchingPageHC} />
-      <SwitchBranchingPanel 
+      )}
-        openBranchingPage={openBranchingPage}
-        setOpenBranchingPage={openBranchingPageHC} 
-      
-      />
     </Box>
   );
 };

src/pages/Questions/QuestionsPage.tsx

@@ -18,9 +18,7 @@ interface Props {
   setOpenBranchingPage: (a: boolean) => void;
 }
 
-export default function QuestionsPage({
+export default function QuestionsPage({ openBranchingPage, setOpenBranchingPage }: Props) {
-  openBranchingPage,
-  setOpenBranchingPage}:Props) {
   const theme = useTheme();
   const { openedModalSettingsId, openBranchingPanel } = useUiTools();
   const isMobile = useMediaQuery(theme.breakpoints.down(660));
@@ -62,10 +60,7 @@ export default function QuestionsPage({
           Свернуть всё
         </Button>
       </Box>
-      <QuestionSwitchWindowTool
+      <QuestionSwitchWindowTool openBranchingPage={openBranchingPage} setOpenBranchingPage={setOpenBranchingPage} />
-        openBranchingPage={openBranchingPage}
-        setOpenBranchingPage={setOpenBranchingPage}      
-      />
       <Box
         sx={{
           display: "flex",

src/pages/startPage/EditPage.tsx

@@ -16,13 +16,7 @@ import {
   useMediaQuery,
   useTheme,
 } from "@mui/material";
-import {
+import { decrementCurrentStep, resetEditConfig, setQuizes, updateQuiz, setCurrentStep } from "@root/quizes/actions";
-  decrementCurrentStep,
-  resetEditConfig,
-  setQuizes,
-  updateQuiz,
-  setCurrentStep,
-} from "@root/quizes/actions";
 import { useCurrentQuiz } from "@root/quizes/hooks";
 import { useQuizStore } from "@root/quizes/store";
 import CustomAvatar from "@ui_kit/Header/Avatar";
@@ -38,11 +32,7 @@ import { Link, useNavigate } from "react-router-dom";
 import useSWR from "swr";
 import { useDebouncedCallback } from "use-debounce";
 import { SidebarMobile } from "./Sidebar/SidebarMobile";
-import {
+import { cleanQuestions, createResult, setQuestions } from "@root/questions/actions";
-  cleanQuestions,
-  createResult,
-  setQuestions,
-} from "@root/questions/actions";
 import {
   updateOpenBranchingPanel,
   updateCanCreatePublic,
@@ -65,13 +55,13 @@ import { ConfirmLeaveModal } from "./ConfirmLeaveModal";
 import { checkQuestionHint } from "@utils/checkQuestionHint";
 import { deleteTimeoutedQuestions } from "@utils/deleteTimeoutedQuestions";
 
-let init:() => void
+let init: () => void;
 export default function EditPage() {
   const quiz = useCurrentQuiz();
   const { editQuizId } = useQuizStore();
   const { questions } = useQuestionsStore();
 
-  console.log('quiz ',quiz);
+  console.log("quiz ", quiz);
   console.log(questions);
   useEffect(() => {
     const getData = async () => {
@@ -86,26 +76,18 @@ export default function EditPage() {
 
         if (
           !questions?.find(
-            (q) =>
+            (q) => (q.type === "result" && q.content.includes(':"line"')) || q.content.includes(":'line'")
-              (q.type === "result" && q.content.includes(':"line"')) ||
-              q.content.includes(":'line'")
           )
         ) {
           createResult(quiz?.backendId, "line");
-          console.log("Я не нашёл линейный резулт и собираюсь создать новый")
+          console.log("Я не нашёл линейный резулт и собираюсь создать новый");
         }
       }
-
     };
     getData();
   }, []);
 
-  const {
+  const { openBranchingPanel, whyCantCreatePublic, canCreatePublic, showConfirmLeaveModal } = useUiTools();
-    openBranchingPanel,
-    whyCantCreatePublic,
-    canCreatePublic,
-    showConfirmLeaveModal,
-  } = useUiTools();
   const theme = useTheme();
   const navigate = useNavigate();
   const currentStep = useQuizStore((state) => state.currentStep);
@@ -119,10 +101,10 @@ export default function EditPage() {
 
   const openBranchingPageHC = () => {
     if (!openBranchingPage) {
-      deleteTimeoutedQuestions(questions, quiz)
+      deleteTimeoutedQuestions(questions, quiz);
-    }
-    setOpenBranchingPage(old => !old)
     }
+    setOpenBranchingPage((old) => !old);
+  };
 
   useEffect(() => {
     if (editQuizId === null) navigate("/list");
@@ -137,8 +119,7 @@ export default function EditPage() {
     []
   );
 
-  const updateQuestionHint = useDebouncedCallback(
+  const updateQuestionHint = useDebouncedCallback((questions: AnyTypedQuizQuestion[]) => {
-    (questions: AnyTypedQuizQuestion[]) => {
     const problems = checkQuestionHint(questions);
     useUiTools.setState({ whyCantCreatePublic: problems });
     if (Object.keys(problems).length > 0) {
@@ -149,9 +130,7 @@ export default function EditPage() {
     } else {
       updateCanCreatePublic(true);
     }
-    },
+  }, 600);
-    600
-  );
 
   useEffect(() => {
     updateQuestionHint(questions);
@@ -175,6 +154,8 @@ export default function EditPage() {
   };
 
   if (!quizConfig) return <></>;
+
+  const isConditionMet = [1].includes(currentStep) && !openBranchingPanel && quizConfig.type !== "form";
   return (
     <>
       {/*хедер*/}
@@ -308,9 +289,14 @@ export default function EditPage() {
           sx={{
             background: theme.palette.background.default,
             width: "100%",
-            padding: isMobile ? "16px 16px 140px 16px" : "25px 25px 140px 25px",
+          }}
-            height: "calc(100vh - 80px)",
+        >
+          <Box
+            sx={{
+              padding: isMobile ? "16px 16px 20px 16px" : "25px 25px 20px 25px",
               overflow: "auto",
+              height: `calc(100vh - ${isConditionMet ? "186px" : "156px"})`,
+
               boxSizing: "border-box",
             }}
           >
@@ -329,14 +315,10 @@ export default function EditPage() {
               </>
             )}
           </Box>
-
           <Box
             sx={{
-            position: "absolute",
-            left: 0,
-            bottom: 0,
               width: "100%",
-            padding: isMobile ? "20px 16px" : "20px 40px 20px 250px",
+              padding: isMobile ? "20px 16px" : "20px 20px",
               display: "flex",
               justifyContent: "flex-start",
               alignItems: "center",
@@ -344,9 +326,7 @@ export default function EditPage() {
               background: "#FFF",
             }}
           >
-          {[1].includes(currentStep) &&
+            {isConditionMet && (
-            !openBranchingPanel &&
-            quizConfig.type !== "form" && (
               <Box
                 sx={{
                   display: "flex",
@@ -380,10 +360,7 @@ export default function EditPage() {
                         "&.Mui-disabled + .MuiSwitch-track": { opacity: 0.5 },
                       },
                       "&.Mui-disabled .MuiSwitch-thumb": {
-                        color:
+                        color: theme.palette.mode === "light" ? theme.palette.grey[100] : theme.palette.grey[600],
-                          theme.palette.mode === "light"
-                            ? theme.palette.grey[100]
-                            : theme.palette.grey[600],
                       },
                       "&.Mui-disabled + .MuiSwitch-track": {
                         opacity: theme.palette.mode === "light" ? 0.7 : 0.3,
@@ -396,22 +373,16 @@ export default function EditPage() {
                     },
                     "& .MuiSwitch-track": {
                       borderRadius: 13,
-                      backgroundColor:
+                      backgroundColor: theme.palette.mode === "light" ? "#E9E9EA" : "#39393D",
-                        theme.palette.mode === "light" ? "#E9E9EA" : "#39393D",
                       opacity: 1,
-                      transition: theme.transitions.create(
+                      transition: theme.transitions.create(["background-color"], {
-                        ["background-color"],
-                        {
                         duration: 500,
-                        }
+                      }),
-                      ),
                     },
                   }}
                 />
                 <Box>
-                  <Typography sx={{ fontWeight: "bold", color: "#4D4D4D" }}>
+                  <Typography sx={{ fontWeight: "bold", color: "#4D4D4D" }}>Логика ветвления</Typography>
-                    Логика ветвления
-                  </Typography>
                 </Box>
               </Box>
             )}
@@ -427,20 +398,13 @@ export default function EditPage() {
                   minWidth: "130px",
                 }}
                 onClick={() =>
-                Object.keys(whyCantCreatePublic).length === 0
+                  Object.keys(whyCantCreatePublic).length === 0 ? () => {} : updateModalInfoWhyCantCreate(true)
-                  ? () => { }
-                  : updateModalInfoWhyCantCreate(true)
                 }
               >
                 Тестовый просмотр
               </Button>
             ) : (
-            <a
+              <a href={`/view`} target="_blank" rel="noreferrer" style={{ textDecoration: "none" }}>
-              href={`/view`}
-              target="_blank"
-              rel="noreferrer"
-              style={{ textDecoration: "none" }}
-            >
                 <Button
                   variant="contained"
                   sx={{
@@ -462,21 +426,14 @@ export default function EditPage() {
                 lineHeight: "18px",
                 height: "34px",
                 border: `1px solid ${theme.palette.brightPurple.main}`,
-              backgroundColor:
+                backgroundColor: quiz?.status === "start" ? theme.palette.brightPurple.main : "transparent",
-                quiz?.status === "start"
+                color: quiz?.status === "start" ? "#FFFFFF" : theme.palette.brightPurple.main,
-                  ? theme.palette.brightPurple.main
-                  : "transparent",
-              color:
-                quiz?.status === "start"
-                  ? "#FFFFFF"
-                  : theme.palette.brightPurple.main,
               }}
               onClick={
                 Object.keys(whyCantCreatePublic).length === 0
                   ? () =>
                       updateQuiz(quiz?.id, (state) => {
-                    state.status =
+                        state.status = quiz?.status === "start" ? "stop" : "start";
-                      quiz?.status === "start" ? "stop" : "start";
                       })
                   : () => updateModalInfoWhyCantCreate(true)
               }
@@ -498,6 +455,7 @@ export default function EditPage() {
             )}
           </Box>
         </Box>
+      </Box>
       <ModalInfoWhyCantCreate />
       <ConfirmLeaveModal
         open={showConfirmLeaveModal}