diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx index bf02d151..5addea83 100644 --- a/src/pages/Questions/ButtonsOptions.tsx +++ b/src/pages/Questions/ButtonsOptions.tsx @@ -18,9 +18,13 @@ interface Props { export default function ButtonsOptions({ SSHC, switchState, totalIndex }: Props) { const params = Number(useParams().quizId); - const {listQuestions, updateQuestionsList, createQuestion, removeQuestion} = questionStore() + const {listQuestions, updateQuestionsList, createQuestion, removeQuestion, openedModalSettings, createOpenedModalSettings} = questionStore() + const openedModal = () => { + createOpenedModalSettings({openedModalSettings: "open"}) + console.log(openedModalSettings) + } const theme = useTheme(); - const buttonSetting: { icon: JSX.Element; title: string; value: string }[] = [ + const buttonSetting: { icon: JSX.Element; title: string; value: string; myFunc?: any }[] = [ { icon: , title: "Настройки", @@ -35,6 +39,7 @@ export default function ButtonsOptions({ SSHC, switchState, totalIndex }: Props) icon: , title: "Ветвление", value: "branching", + myFunc: openedModal }, ]; @@ -54,11 +59,12 @@ export default function ButtonsOptions({ SSHC, switchState, totalIndex }: Props) gap: "10px", }} > - {buttonSetting.map(({ icon, title, value }) => ( + {buttonSetting.map(({ icon, title, value, myFunc}) => ( { SSHC(value); + {myFunc()} }} sx={{ backgroundColor: switchState === value ? theme.palette.brightPurple.main : "transparent", diff --git a/src/pages/Questions/ButtonsOptionsAndPict.tsx b/src/pages/Questions/ButtonsOptionsAndPict.tsx index 6746f564..1fe5360e 100644 --- a/src/pages/Questions/ButtonsOptionsAndPict.tsx +++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx @@ -20,9 +20,8 @@ interface Props { export default function ButtonsOptionsAndPict({ SSHC, switchState, totalIndex }: Props) { const params = Number(useParams().quizId); const {listQuestions, updateQuestionsList, createQuestion, removeQuestion, openedModalSettings, createOpenedModalSettings} = questionStore() - const idQuestions = listQuestions[params].id const openedModal = () => { - createOpenedModalSettings({openedModalSettings: "открыто"}) + createOpenedModalSettings({openedModalSettings: "open"}) console.log(openedModalSettings) } const theme = useTheme(); diff --git a/src/pages/Questions/branchingQuestions.tsx b/src/pages/Questions/branchingQuestions.tsx index 9585983e..3d115226 100644 --- a/src/pages/Questions/branchingQuestions.tsx +++ b/src/pages/Questions/branchingQuestions.tsx @@ -21,14 +21,18 @@ import { useState } from "react"; import DeleteIcon from "@icons/questionsPage/deleteIcon"; import RadioCheck from "@ui_kit/RadioCheck"; import RadioIcon from "@ui_kit/RadioIcon"; +import {questionStore} from "@root/questions"; export default function BranchingQuestions() { - const theme = useTheme(); - const [open, setOpen] = useState(false); - const [condition, setCondition] = useState(false); - const handleOpen = () => setOpen(true); - const handleClose = () => setOpen(false); + const {listQuestions, updateQuestionsList, createQuestion, removeQuestion, openedModalSettings, createOpenedModalSettings} = questionStore() + const theme = useTheme(); + const [condition, setCondition] = useState(false); + const handleClose = () => { + createOpenedModalSettings({openedModalSettings: ""}) + console.log(openedModalSettings) + + } const [display, setDisplay] = React.useState("1"); const handleChange = (event: SelectChangeEvent) => { setDisplay(event.target.value); @@ -42,7 +46,7 @@ export default function BranchingQuestions() { return ( <> - Стартовая страница - + 5 MB максимум - {/**/} + {/*Правая сторона*/} ()( state[id] = array set({listQuestions: state}); }, -<<<<<<< HEAD openedModalSettings: "", -======= - openedModalSettings: [], ->>>>>>> 12f9f82 (images from favicon) createOpenedModalSettings: (data:any) => { const oldState = get()