fix: preview block

This commit is contained in:
IlyaDoronin 2023-10-17 16:24:37 +03:00
parent afdf281631
commit 8c125e4d21
2 changed files with 245 additions and 213 deletions

@ -1,16 +1,14 @@
import { PointsIcon } from "@icons/questionsPage/PointsIcon";
import { Box, IconButton } from "@mui/material"; import { Box, IconButton } from "@mui/material";
import { toggleQuizPreview, useQuizPreviewStore } from "@root/quizPreview"; import { toggleQuizPreview, useQuizPreviewStore } from "@root/quizPreview";
import { useLayoutEffect, useRef } from "react"; import { useLayoutEffect, useRef } from "react";
import { Rnd } from "react-rnd"; import { Rnd } from "react-rnd";
import QuizPreviewLayout from "./QuizPreviewLayout"; import QuizPreviewLayout from "./QuizPreviewLayout";
import ResizeIcon from "./ResizeIcon"; import ResizeIcon from "./ResizeIcon";
import VisibilityIcon from '@mui/icons-material/Visibility'; import VisibilityIcon from "@mui/icons-material/Visibility";
const DRAG_PARENT_MARGIN = 0;
const DRAG_PARENT_MARGIN = 25; const NAVBAR_HEIGHT = 0;
const NAVBAR_HEIGHT = 81; const DRAG_PARENT_BOTTOM_MARGIN = 0;
const DRAG_PARENT_BOTTOM_MARGIN = 65;
interface RndPositionAndSize { interface RndPositionAndSize {
x: number; x: number;
@ -20,16 +18,28 @@ interface RndPositionAndSize {
} }
export default function QuizPreview() { export default function QuizPreview() {
const isPreviewShown = useQuizPreviewStore(state => state.isPreviewShown); const isPreviewShown = useQuizPreviewStore((state) => state.isPreviewShown);
const rndParentRef = useRef<HTMLDivElement>(null); const rndParentRef = useRef<HTMLDivElement>(null);
const rndRef = useRef<Rnd | null>(null); const rndRef = useRef<Rnd | null>(null);
const rndPositionAndSizeRef = useRef<RndPositionAndSize>({ x: 0, y: 0, width: "340", height: "480" }); const rndPositionAndSizeRef = useRef<RndPositionAndSize>({
x: 0,
y: 0,
width: "340",
height: "480",
});
const isFirstShowRef = useRef<boolean>(true); const isFirstShowRef = useRef<boolean>(true);
useLayoutEffect(function stickPreviewToBottomRight() { useLayoutEffect(
function stickPreviewToBottomRight() {
const rnd = rndRef.current; const rnd = rndRef.current;
const rndSelfElement = rnd?.getSelfElement(); const rndSelfElement = rnd?.getSelfElement();
if (!rnd || !rndSelfElement || !rndParentRef.current || !isFirstShowRef.current) return; if (
!rnd ||
!rndSelfElement ||
!rndParentRef.current ||
!isFirstShowRef.current
)
return;
const rndParentRect = rndParentRef.current.getBoundingClientRect(); const rndParentRect = rndParentRef.current.getBoundingClientRect();
const rndRect = rndSelfElement.getBoundingClientRect(); const rndRect = rndSelfElement.getBoundingClientRect();
@ -42,7 +52,9 @@ export default function QuizPreview() {
rndPositionAndSizeRef.current.y = y; rndPositionAndSizeRef.current.y = y;
isFirstShowRef.current = false; isFirstShowRef.current = false;
}, [isPreviewShown]); },
[isPreviewShown]
);
return ( return (
<Box <Box
@ -58,10 +70,10 @@ export default function QuizPreview() {
zIndex: 100, zIndex: 100,
}} }}
> >
{isPreviewShown && {isPreviewShown && (
<Rnd <Rnd
minHeight={300} minHeight={20}
minWidth={340} minWidth={20}
bounds="parent" bounds="parent"
ref={rndRef} ref={rndRef}
dragHandleClassName="quiz-preview-draghandle" dragHandleClassName="quiz-preview-draghandle"
@ -69,7 +81,7 @@ export default function QuizPreview() {
x: rndPositionAndSizeRef.current.x, x: rndPositionAndSizeRef.current.x,
y: rndPositionAndSizeRef.current.y, y: rndPositionAndSizeRef.current.y,
width: rndPositionAndSizeRef.current.width, width: rndPositionAndSizeRef.current.width,
height: rndPositionAndSizeRef.current.height height: rndPositionAndSizeRef.current.height,
}} }}
onResizeStop={(e, direction, ref, delta, position) => { onResizeStop={(e, direction, ref, delta, position) => {
rndPositionAndSizeRef.current.x = position.x; rndPositionAndSizeRef.current.x = position.x;
@ -88,32 +100,22 @@ export default function QuizPreview() {
topLeft: isPreviewShown, topLeft: isPreviewShown,
}} }}
resizeHandleComponent={{ resizeHandleComponent={{
topLeft: <ResizeIcon /> topLeft: <ResizeIcon />,
}} }}
resizeHandleStyles={{ resizeHandleStyles={{
topLeft: { topLeft: {
top: "-1px", top: "-1px",
left: "-1px", left: "-1px",
} },
}} }}
style={{ style={{
overflow: "hidden",
pointerEvents: "auto", pointerEvents: "auto",
}} }}
> >
<QuizPreviewLayout /> <QuizPreviewLayout />
<IconButton
className="quiz-preview-draghandle"
sx={{
position: "absolute",
bottom: -54,
right: 46,
cursor: "move",
}}
>
<PointsIcon style={{ color: "#4D4D4D", fontSize: "30px" }} />
</IconButton>
</Rnd> </Rnd>
} )}
<IconButton <IconButton
onClick={toggleQuizPreview} onClick={toggleQuizPreview}
sx={{ sx={{

@ -1,6 +1,10 @@
import { Box, Button, LinearProgress, Paper, Typography } from "@mui/material"; import { Box, Button, LinearProgress, Paper, Typography } from "@mui/material";
import { questionStore } from "@root/questions"; import { questionStore } from "@root/questions";
import { decrementCurrentQuestionIndex, incrementCurrentQuestionIndex, useQuizPreviewStore } from "@root/quizPreview"; import {
decrementCurrentQuestionIndex,
incrementCurrentQuestionIndex,
useQuizPreviewStore,
} from "@root/quizPreview";
import { DefiniteQuestionType } from "model/questionTypes/shared"; import { DefiniteQuestionType } from "model/questionTypes/shared";
import { FC, useEffect } from "react"; import { FC, useEffect } from "react";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
@ -17,7 +21,6 @@ import Text from "./QuizPreviewQuestionTypes/Text";
import Variant from "./QuizPreviewQuestionTypes/Variant"; import Variant from "./QuizPreviewQuestionTypes/Variant";
import Varimg from "./QuizPreviewQuestionTypes/Varimg"; import Varimg from "./QuizPreviewQuestionTypes/Varimg";
const QuestionPreviewComponentByType: Record<DefiniteQuestionType, FC<any>> = { const QuestionPreviewComponentByType: Record<DefiniteQuestionType, FC<any>> = {
variant: Variant, variant: Variant,
images: Images, images: Images,
@ -34,66 +37,89 @@ const QuestionPreviewComponentByType: Record<DefiniteQuestionType, FC<any>> = {
export default function QuizPreviewLayout() { export default function QuizPreviewLayout() {
const quizId = useParams().quizId ?? 0; const quizId = useParams().quizId ?? 0;
const listQuestions = questionStore(state => state.listQuestions); const listQuestions = questionStore((state) => state.listQuestions);
const currentQuizStep = useQuizPreviewStore(state => state.currentQuestionIndex); const currentQuizStep = useQuizPreviewStore(
(state) => state.currentQuestionIndex
);
const quizQuestions = listQuestions[quizId] ?? []; const quizQuestions = listQuestions[quizId] ?? [];
const nonDeletedQuizQuestions = quizQuestions.filter(question => !question.deleted); const nonDeletedQuizQuestions = quizQuestions.filter(
const maxCurrentQuizStep = nonDeletedQuizQuestions.length > 0 ? nonDeletedQuizQuestions.length - 1 : 0; (question) => !question.deleted
const currentProgress = Math.floor((currentQuizStep / maxCurrentQuizStep) * 100); );
const maxCurrentQuizStep =
nonDeletedQuizQuestions.length > 0 ? nonDeletedQuizQuestions.length - 1 : 0;
const currentProgress = Math.floor(
(currentQuizStep / maxCurrentQuizStep) * 100
);
const currentQuestion = nonDeletedQuizQuestions[currentQuizStep]; const currentQuestion = nonDeletedQuizQuestions[currentQuizStep];
const QuestionComponent = currentQuestion const QuestionComponent = currentQuestion
? QuestionPreviewComponentByType[currentQuestion.type as DefiniteQuestionType] ? QuestionPreviewComponentByType[
currentQuestion.type as DefiniteQuestionType
]
: null; : null;
const questionElement = QuestionComponent const questionElement = QuestionComponent ? (
? <QuestionComponent key={currentQuestion.id} question={currentQuestion} /> <QuestionComponent key={currentQuestion.id} question={currentQuestion} />
: null; ) : null;
useEffect(function resetCurrentQuizStep() { useEffect(
function resetCurrentQuizStep() {
if (currentQuizStep > maxCurrentQuizStep) { if (currentQuizStep > maxCurrentQuizStep) {
decrementCurrentQuestionIndex(); decrementCurrentQuestionIndex();
} }
}, [currentQuizStep, maxCurrentQuizStep]); },
[currentQuizStep, maxCurrentQuizStep]
);
return ( return (
<Paper sx={{ <Paper
className="quiz-preview-draghandle"
sx={{
height: "100%", height: "100%",
display: "flex", display: "flex",
flexDirection: "column", flexDirection: "column",
flexGrow: 1, flexGrow: 1,
borderRadius: "12px", borderRadius: "12px",
pointerEvents: "auto", pointerEvents: "auto",
}}> }}
<Box sx={{ >
<Box
sx={{
p: "16px", p: "16px",
whiteSpace: "break-spaces", whiteSpace: "break-spaces",
overflowY: "auto", overflowY: "auto",
flexGrow: 1, flexGrow: 1,
}}> "&::-webkit-scrollbar": { width: 0 },
}}
>
{questionElement} {questionElement}
</Box> </Box>
<Box sx={{ <Box
sx={{
mt: "auto", mt: "auto",
p: "16px", p: "16px",
display: "flex", display: "flex",
borderTop: "1px solid #E3E3E3", borderTop: "1px solid #E3E3E3",
alignItems: "center", alignItems: "center",
}}> }}
<Box sx={{ >
<Box
sx={{
flexGrow: 1, flexGrow: 1,
display: "flex", display: "flex",
flexDirection: "column", flexDirection: "column",
gap: 1, gap: 1,
}}> }}
>
<Typography> <Typography>
{nonDeletedQuizQuestions.length > 0 {nonDeletedQuizQuestions.length > 0
? `Вопрос ${currentQuizStep + 1} из ${nonDeletedQuizQuestions.length}` ? `Вопрос ${currentQuizStep + 1} из ${
: "Нет вопросов" nonDeletedQuizQuestions.length
} }`
: "Нет вопросов"}
</Typography> </Typography>
{nonDeletedQuizQuestions.length > 0 && {nonDeletedQuizQuestions.length > 0 && (
<LinearProgress <LinearProgress
variant="determinate" variant="determinate"
value={currentProgress} value={currentProgress}
@ -106,13 +132,15 @@ export default function QuizPreviewLayout() {
}, },
}} }}
/> />
} )}
</Box> </Box>
<Box sx={{ <Box
sx={{
ml: 2, ml: 2,
display: "flex", display: "flex",
gap: 1, gap: 1,
}}> }}
>
<Button <Button
variant="outlined" variant="outlined"
onClick={decrementCurrentQuestionIndex} onClick={decrementCurrentQuestionIndex}
@ -125,7 +153,9 @@ export default function QuizPreviewLayout() {
variant="contained" variant="contained"
onClick={() => incrementCurrentQuestionIndex(maxCurrentQuizStep)} onClick={() => incrementCurrentQuestionIndex(maxCurrentQuizStep)}
disabled={currentQuizStep >= maxCurrentQuizStep} disabled={currentQuizStep >= maxCurrentQuizStep}
>Далее</Button> >
Далее
</Button>
</Box> </Box>
</Box> </Box>
</Paper> </Paper>