From bb3844c4124495b3a592c05750152bc597f4aab8 Mon Sep 17 00:00:00 2001 From: Nastya Date: Mon, 8 Sep 2025 01:10:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=81=D0=BA=D1=80=D0=BE=D0=BB=D0=BB=D0=B1=D0=B0=D1=80?= =?UTF-8?q?=20=D0=B2=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=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/DesignPage/DesignFilling.tsx | 12 +++--------- src/pages/startPage/EditPage.tsx | 4 +++- src/utils/pinkScrollbar.ts | 13 +++++++++++++ 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 src/utils/pinkScrollbar.ts diff --git a/src/pages/DesignPage/DesignFilling.tsx b/src/pages/DesignPage/DesignFilling.tsx index 706898dc..9a7a5f89 100644 --- a/src/pages/DesignPage/DesignFilling.tsx +++ b/src/pages/DesignPage/DesignFilling.tsx @@ -10,6 +10,7 @@ import { updateQuiz } from "@root/quizes/actions"; import { useCurrentQuiz } from "@root/quizes/hooks"; import type { DesignItem } from "./DesignGroup"; import { DesignGroup } from "./DesignGroup"; +import pinkScrollbar from "@utils/pinkScrollbar"; import Desgin1 from "@icons/designs/smallSize/design1.jpg"; import Desgin2 from "@icons/designs/smallSize/design2.jpg"; @@ -133,15 +134,7 @@ export const DesignFilling = ({ padding: "20px", height: "100%", overflow: "auto", - scrollbarWidth: "auto", - "&::-webkit-scrollbar": { - display: "block", - width: "8px", - }, - "&::-webkit-scrollbar-thumb": { - backgroundColor: theme.palette.brightPurple.main, - borderRadius: "4px", - }, + ...pinkScrollbar(theme) }} > @@ -199,3 +192,4 @@ export const DesignFilling = ({ ); }; + diff --git a/src/pages/startPage/EditPage.tsx b/src/pages/startPage/EditPage.tsx index 89dabfc4..053ec38a 100755 --- a/src/pages/startPage/EditPage.tsx +++ b/src/pages/startPage/EditPage.tsx @@ -22,7 +22,7 @@ import { ModalInfoWhyCantCreate } from "./ModalInfoWhyCantCreate"; import { ConfirmLeaveModal } from "./ConfirmLeaveModal"; import { checkQuestionHint } from "@utils/checkQuestionHint"; import AmoTokenExpiredDialog from "../IntegrationsPage/IntegrationsModal/Amo/AmoTokenExpiredDialog"; -import { useAmoAccount } from "@/api/integration"; +import pinkScrollbar from "@utils/pinkScrollbar"; interface Props { openBranchingPage: boolean; @@ -121,6 +121,7 @@ export default function EditPage({ }} > {quizConfig && ( diff --git a/src/utils/pinkScrollbar.ts b/src/utils/pinkScrollbar.ts new file mode 100644 index 00000000..4247218a --- /dev/null +++ b/src/utils/pinkScrollbar.ts @@ -0,0 +1,13 @@ +import { Theme } from "@mui/material"; + +export default (theme: Theme) => ({ + scrollbarWidth: "auto", + "&::-webkit-scrollbar": { + display: "block", + width: "8px", + }, + "&::-webkit-scrollbar-thumb": { + backgroundColor: theme.palette.brightPurple.main, + borderRadius: "4px", + } +}); \ No newline at end of file