From 0e6e31e5d141acb43974544c3fba1fae3c0e270e Mon Sep 17 00:00:00 2001 From: Nastya Date: Wed, 25 Sep 2024 19:52:22 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F,=20?= =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=BE=D0=BB=D0=BB=D0=B1=D0=B0=D1=80=D0=B0,?= =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D1=81=D1=87=D0=B8=D1=82=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D0=B1=D0=B0=D0=BB=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewPublicationPage/PointSystemResultList.tsx | 2 +- .../questions/Emoji/EmojiVariant.tsx | 7 +++++++ .../questions/Images/ImageVariant.tsx | 13 +++++++++++-- .../questions/Variant/VariantItem.tsx | 8 ++++++++ .../questions/Varimg/VarimgVariant.tsx | 7 +++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/lib/components/ViewPublicationPage/PointSystemResultList.tsx b/lib/components/ViewPublicationPage/PointSystemResultList.tsx index c2aef2c..d9b57b8 100644 --- a/lib/components/ViewPublicationPage/PointSystemResultList.tsx +++ b/lib/components/ViewPublicationPage/PointSystemResultList.tsx @@ -62,7 +62,7 @@ export const PointSystemResultList = () => { color: answeredVariant?.points ? "inherit" : theme.palette.grey[500], }} > - {answeredVariant?.points || "0"}/10 + {answeredVariant?.points || "0"}/1 ) => e.stopPropagation()} diff --git a/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx b/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx index 39845ea..e1e4d7b 100644 --- a/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx +++ b/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx @@ -45,6 +45,13 @@ const OwnInput = ({ questionId, variant, largeCheck, ownPlaceholder }: OwnInputP wordSpacing: "-3px", border: "none", outline: "0px none", + //@ts-ignore + "&::-webkit-scrollbar": { + width: "4px", + }, + "&::-webkit-scrollbar-thumb": { + backgroundColor: "#b8babf", + }, }} value={ownAnswer} onClick={(e: React.MouseEvent) => e.stopPropagation()} @@ -156,12 +163,13 @@ export const ImageVariant = ({ justifyContent: "center", position: "relative", height: "80px", - overflow: "auto", "& .MuiFormControlLabel-label": { wordBreak: "break-word", height: variant.answer.length <= 60 ? undefined : "60px", - overflow: "auto", lineHeight: "normal", + overflow: "auto", + maxHeight: "100%", + width: "100%", "&::-webkit-scrollbar": { width: "4px", }, @@ -174,6 +182,7 @@ export const ImageVariant = ({ control={ isMulti ? ( } icon={} diff --git a/lib/components/ViewPublicationPage/questions/Variant/VariantItem.tsx b/lib/components/ViewPublicationPage/questions/Variant/VariantItem.tsx index 817628e..d02e143 100644 --- a/lib/components/ViewPublicationPage/questions/Variant/VariantItem.tsx +++ b/lib/components/ViewPublicationPage/questions/Variant/VariantItem.tsx @@ -44,6 +44,13 @@ const OwnInput = ({ questionId, variant, largeCheck, ownPlaceholder }: OwnInputP wordSpacing: "-3px", border: "none", outline: "0px none", + //@ts-ignore + "&::-webkit-scrollbar": { + width: "4px", + }, + "&::-webkit-scrollbar-thumb": { + backgroundColor: "#b8babf", + }, }} value={ownAnswer} onClick={(e: React.MouseEvent) => e.stopPropagation()} @@ -142,6 +149,7 @@ export const VariantItem = ({ "&.MuiFormControl-root": { width: "100%" }, "& .MuiFormControlLabel-label": { width: "100%", + maxHeight: "100%", wordBreak: "break-word", height: variant.answer.length <= 60 ? undefined : "60px", overflow: "auto", diff --git a/lib/components/ViewPublicationPage/questions/Varimg/VarimgVariant.tsx b/lib/components/ViewPublicationPage/questions/Varimg/VarimgVariant.tsx index c70ea6c..1437471 100644 --- a/lib/components/ViewPublicationPage/questions/Varimg/VarimgVariant.tsx +++ b/lib/components/ViewPublicationPage/questions/Varimg/VarimgVariant.tsx @@ -45,6 +45,13 @@ const OwnInput = ({ questionId, variant, largeCheck, ownPlaceholder }: OwnInputP wordSpacing: "-3px", border: "none", outline: "0px none", + //@ts-ignore + "&::-webkit-scrollbar": { + width: "4px", + }, + "&::-webkit-scrollbar-thumb": { + backgroundColor: "#b8babf", + }, }} value={ownAnswer} onClick={(e: React.MouseEvent) => e.stopPropagation()}