From 9eea74c18e89419a06db8a597b6475903350c616 Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Fri, 13 Oct 2023 13:52:29 +0300
Subject: [PATCH] fix: answer icons

---
 .../FormDraggableList/QuestionPageCard.tsx    | 73 ++++---------------
 .../Questions/Form/FormQuestionsPage.tsx      | 10 ++-
 2 files changed, 21 insertions(+), 62 deletions(-)

diff --git a/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx b/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx
index 255d9afd..cb7735d8 100644
--- a/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx
+++ b/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx
@@ -59,91 +59,46 @@ interface Props {
   isDragging: boolean;
 }
 
-const IconAndrom = (isExpanded: boolean, switchState: string) => {
+const IconAndrom = (switchState: string) => {
   switch (switchState) {
     case "variant":
-      return (
-        <Answer
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
-      );
+      return <Answer color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />;
     case "images":
       return (
-        <OptionsPict
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
+        <OptionsPict color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />
       );
     case "varimg":
       return (
         <OptionsAndPict
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
+          color="#9A9AAF"
           sx={{ height: "22px", width: "20px" }}
         />
       );
     case "emoji":
-      return (
-        <Emoji
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
-      );
+      return <Emoji color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />;
     case "text":
-      return (
-        <Input
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
-      );
+      return <Input color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />;
     case "select":
       return (
-        <DropDown
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
+        <DropDown color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />
       );
     case "date":
-      return (
-        <Date
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
-      );
+      return <Date color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />;
     case "number":
-      return (
-        <Slider
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
-      );
+      return <Slider color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />;
     case "file":
       return (
-        <Download
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
+        <Download color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />
       );
     case "page":
-      return (
-        <Page
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
-      );
+      return <Page color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />;
     case "rating":
       return (
-        <RatingIcon
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
+        <RatingIcon color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />
       );
     default:
       return (
-        <AnswerGroup
-          color={isExpanded ? "#9A9AAF" : "#7E2AEA"}
-          sx={{ height: "22px", width: "20px" }}
-        />
+        <AnswerGroup color="#9A9AAF" sx={{ height: "22px", width: "20px" }} />
       );
   }
 };
@@ -209,7 +164,7 @@ export default function QuestionsPageCard({
                     sx={{ cursor: "pointer" }}
                     onClick={() => setOpen((isOpened) => !isOpened)}
                   >
-                    {IconAndrom(question.expanded, question.type)}
+                    {IconAndrom(question.type)}
                   </InputAdornment>
                   <ChooseAnswerModal
                     open={open}
diff --git a/src/pages/Questions/Form/FormQuestionsPage.tsx b/src/pages/Questions/Form/FormQuestionsPage.tsx
index 9a80c857..d077a214 100644
--- a/src/pages/Questions/Form/FormQuestionsPage.tsx
+++ b/src/pages/Questions/Form/FormQuestionsPage.tsx
@@ -92,9 +92,13 @@ export default function FormQuestionsPage() {
           }}
           onClick={() => {
             createQuestion(quizId);
-            updateQuestionsList<QuizQuestionBase>(quizId, 0, {
-              expanded: true,
-            });
+            updateQuestionsList<QuizQuestionBase>(
+              quizId,
+              listQuestions[quizId].length - 1 || 0,
+              {
+                expanded: true,
+              }
+            );
           }}
         >
           <AddAnswer color="#EEE4FC" />