catchup-library-web 2.0.7 → 2.0.9

package/dist/index.js

@@ -132,7 +132,6 @@ __export(index_exports, {
   calculateLevenshteinDistance: () => calculateLevenshteinDistance,
   calculateStartDateOfWeek: () => calculateStartDateOfWeek,
   checkActivityAnswerState: () => checkActivityAnswerState,
-  checkIfAnswerIsEmpty: () => checkIfAnswerIsEmpty,
   constructActivityAnswerMap: () => constructActivityAnswerMap,
   constructActivityAnswerStateList: () => constructActivityAnswerStateList,
   constructActivityData: () => constructActivityData,
@@ -2350,45 +2349,29 @@ var retrieveDefaultOpenEndedMap = () => {
 var retrieveDefaultTrueFalseMap = () => {
   return { trueList: [], falseList: [] };
 };
-var retrieveCurrentDefaultDataMap = (activityTemplate, activityData) => {
-  const defaultDataMap = {
-    activityTemplateId: activityTemplate.id,
-    type: activityTemplate.type
-  };
-  if (activityTemplate.type === "ORDERING") {
-    defaultDataMap.answerMap = retrieveDefaultOrderingDataMap(
-      activityData.orderingMaterialMap
-    );
-  } else if (activityTemplate.type === "DROPDOWN") {
-    defaultDataMap.answerMap = retrieveDefaultDropdownMap(
-      activityData.dropdownMaterialMap
-    );
-  } else if (activityTemplate.type === "MCSA") {
-    defaultDataMap.answerMap = retrieveDefaultMCSAMap(
-      activityData.MCSAMaterialMap
-    );
-  } else if (activityTemplate.type === "MCMA") {
-    defaultDataMap.answerMap = retrieveDefaultMCMAMap(
-      activityData.MCMAMaterialMap
-    );
-  } else if (activityTemplate.type === "MATCHING") {
-    defaultDataMap.answerMap = retrieveDefaultMatchingMap(
-      activityData.matchingMaterialMap
-    );
-  } else if (activityTemplate.type === "GROUPING") {
-    defaultDataMap.answerMap = retrieveDefaultGroupingMap(
-      activityData.groupingMaterialMap
-    );
-  } else if (activityTemplate.type === "FILL_IN_THE_BLANKS") {
-    defaultDataMap.answerMap = retrieveDefaultFillInTheBlanksMap(
+var retrieveCurrentDefaultDataMap = (activityTemplateType, activityData) => {
+  if (activityTemplateType === "ORDERING") {
+    return retrieveDefaultOrderingDataMap(activityData.orderingMaterialMap);
+  } else if (activityTemplateType === "DROPDOWN") {
+    return retrieveDefaultDropdownMap(activityData.dropdownMaterialMap);
+  } else if (activityTemplateType === "MCSA") {
+    return retrieveDefaultMCSAMap(activityData.MCSAMaterialMap);
+  } else if (activityTemplateType === "MCMA") {
+    return retrieveDefaultMCMAMap(activityData.MCMAMaterialMap);
+  } else if (activityTemplateType === "MATCHING") {
+    return retrieveDefaultMatchingMap(activityData.matchingMaterialMap);
+  } else if (activityTemplateType === "GROUPING") {
+    return retrieveDefaultGroupingMap(activityData.groupingMaterialMap);
+  } else if (activityTemplateType === "FILL_IN_THE_BLANKS") {
+    return retrieveDefaultFillInTheBlanksMap(
       activityData.fillInTheBlanksMaterialMap
     );
-  } else if (activityTemplate.type === "OPEN_ENDED") {
-    defaultDataMap.answerMap = retrieveDefaultOpenEndedMap();
-  } else if (activityTemplate.type === "TRUE_FALSE") {
-    defaultDataMap.answerMap = retrieveDefaultTrueFalseMap();
+  } else if (activityTemplateType === "OPEN_ENDED") {
+    return retrieveDefaultOpenEndedMap();
+  } else if (activityTemplateType === "TRUE_FALSE") {
+    return retrieveDefaultTrueFalseMap();
   }
-  return defaultDataMap;
+  return {};
 };
 var constructActivityAnswerMap = (activityTemplate, activityData) => {
   if (activityTemplate.type === "ORDERING") {
@@ -2420,63 +2403,11 @@ var constructActivityAnswerMap = (activityTemplate, activityData) => {
   } else if (activityTemplate.type === "TRUE_FALSE") {
     activityData.trueFalseMaterialMap = { trueList: [], falseList: [] };
   }
-  return retrieveCurrentDefaultDataMap(activityTemplate, activityData);
+  return retrieveCurrentDefaultDataMap(activityTemplate.type, activityData);
 };
 var ignoreMathematicalExpression = (inputText) => {
   return inputText.replaceAll("{", "").replaceAll("}", "").replaceAll("_", "").replaceAll("^", "").replaceAll("\\frac", "").replaceAll("\\text", "").replaceAll("\\sqrt", "");
 };
-var checkIfAnswerIsEmpty = (answer) => {
-  const { data } = answer;
-  if (data && data.length > 0) {
-    const foundAnswer = data[0];
-    const { type, answerMap } = foundAnswer;
-    if (type === "ORDERING") {
-      return false;
-    } else if (type === "DROPDOWN") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key] !== "DEFAULT_OPTION") {
-          return false;
-        }
-      }
-    } else if (type === "MCSA") {
-      const key = Object.keys(answerMap)[0];
-      if (answerMap[key] !== "ANSWER_KEY") {
-        return false;
-      }
-    } else if (type === "MCMA") {
-      const key = Object.keys(answerMap)[0];
-      if (answerMap[key].length !== 0) {
-        return false;
-      }
-    } else if (type === "MATCHING") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key]) {
-          return false;
-        }
-      }
-    } else if (type === "GROUPING") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key].length !== 0) {
-          return false;
-        }
-      }
-    } else if (type === "FILL_IN_THE_BLANKS") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key]) {
-          return false;
-        }
-      }
-    } else if (type === "OPEN_ENDED") {
-      const key = Object.keys(answerMap)[0];
-      if (answerMap[key]) {
-        return false;
-      }
-    } else if (type === "TRUE_FALSE") {
-      return answerMap.trueList.length === 0 && answerMap.falseList.length === 0;
-    }
-  }
-  return true;
-};
 var constructActivityAnswerStateList = (answerList, activityList) => {
   const stateList = [];
   activityList.forEach((activity, index) => {
@@ -2490,7 +2421,7 @@ var constructActivityAnswerStateList = (answerList, activityList) => {
 };
 var retrieveActivityAnswerFromAnswerList = (answerList, activity) => {
   return answerList.find(
-    (answer) => parseFloat(answer.activityDTO.id) === parseFloat(activity.id)
+    (answer) => parseFloat(answer.activityId) === parseFloat(activity.id)
   );
 };
 var checkActivityAnswerState = (answerList, activity) => {
@@ -2672,7 +2603,7 @@ var retrieveClockTimeLeft = (type, value, durationType, durationInMinutes, activ
 var retrieveEachTimeSpentInSeconds = (activityProgressList, activity) => {
   if (!activityProgressList || !activity) return 0;
   const foundActivityProgress = activityProgressList.find(
-    (activityProgress) => parseFloat(activityProgress.activityDTO.id) === parseFloat(activity.id)
+    (activityProgress) => parseFloat(activityProgress.activityId) === parseFloat(activity.id)
   );
   if (foundActivityProgress) {
     return foundActivityProgress.timeSpent / 1e3;
@@ -3042,82 +2973,63 @@ var constructActivityData = (activityTemplateType, contentMap, bodyMap, material
   return constructedData;
 };
 var constructAnswerBasedOnData = (data) => {
-  const answer = { data: [] };
   if (Object.keys(data).find((dataKey) => dataKey === "orderingMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "ORDERING" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "ORDERING" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "dropdownMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "DROPDOWN" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "DROPDOWN" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "MCSAMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "MCSA" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "MCSA" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "MCMAMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "MCMA" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "MCMA" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "matchingMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "MATCHING" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "MATCHING" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "groupingMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "GROUPING" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "GROUPING" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find(
     (dataKey) => dataKey === "fillInTheBlanksMaterialMap"
   )) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "FILL_IN_THE_BLANKS" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "FILL_IN_THE_BLANKS" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "openEndedMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "OPEN_ENDED" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "OPEN_ENDED" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "trueFalseMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "TRUE_FALSE" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "TRUE_FALSE" },
+      JSON.parse(JSON.stringify(data))
     );
   }
-  return answer;
+  return {};
 };
 var constructActivityItemListBodyOnly = (bodyMap) => {
   const itemList = [];
@@ -4668,7 +4580,7 @@ var ShowMaterialMediaByContentType_default = ShowMaterialMediaByContentType;
 var import_jsx_runtime25 = require("react/jsx-runtime");
 var DropdownActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
@@ -4679,27 +4591,16 @@ var DropdownActivityMaterialContent = ({
   const [updated, setUpdated] = (0, import_react16.useState)(false);
   (0, import_react15.useEffect)(() => {
     if (!showCorrectAnswer) return;
-    const foundAnswer = answer.data.find(
-      (answerData) => answerData.type === "DROPDOWN"
-    );
-    if (foundAnswer.answerMap.length === 0) return;
-    if (Object.keys(materialMap).length === 0) return;
-    foundAnswer.answerMap = Object.keys(materialMap).map(
+    answerMap = Object.keys(materialMap).map(
       (materialMapKey, index) => Object.keys(materialMap[materialMapKey])[0]
     );
-    onChange(answer, 0, Object.keys(materialMap[0])[0]);
+    onChange(answerMap, 0, Object.keys(materialMap[0])[0]);
     setUpdated(true);
   }, [showCorrectAnswer]);
   (0, import_react15.useEffect)(() => {
     if (!updated) return;
     setUpdated(false);
   }, [updated]);
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "DROPDOWN"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
   const checkAnswerState = (correctAnswer, learnerAnswer) => {
     if (!isPreview) return null;
     if (correctAnswer === learnerAnswer) {
@@ -4707,7 +4608,6 @@ var DropdownActivityMaterialContent = ({
     }
     return "INCORRECT";
   };
-  const answerMap = retrieveAnswerMap();
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: "flex flex-row flex-wrap items-center", children: [
     /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: "hidden md:block", children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("span", { className: "font-semibold text-xl opacity-60", children: i18n_default.t("please_select_dropdown_text") }) }),
     /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: "hidden md:contents", children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DividerLine_default, {}) }),
@@ -4749,7 +4649,11 @@ var DropdownActivityMaterialContent = ({
                 value: materialOption
               })),
               onChange: (e) => {
-                onChange(answer, materialKey, e.target.value);
+                onChange(
+                  answerMap,
+                  materialKey,
+                  e.target.value
+                );
               }
             }
           ) }) : /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
@@ -4779,7 +4683,7 @@ var DropdownActivityMaterialContent = ({
                   ) }, index2),
                   onClick: (e) => {
                     onChange(
-                      answer,
+                      answerMap,
                       materialKey,
                       e.target.currentSrc
                     );
@@ -4823,7 +4727,7 @@ var DropdownActivityMaterialContent_default = DropdownActivityMaterialContent;
 var import_react17 = require("react");
 var import_jsx_runtime26 = require("react/jsx-runtime");
 var DropdownActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -4834,35 +4738,15 @@ var DropdownActivityContent = ({
   const contentMap = parseContentMapFromData(data);
   const dropdownBodyMap = parseBodyMapFromData(data, "DROPDOWN");
   const dropdownMaterialMap = parseMaterialMapFromData(data, "DROPDOWN");
-  const [currentAnswerMap, setCurrentAnswerMap] = (0, import_react17.useState)(() => {
-    return retrieveCurrentAnswerMap();
-  });
-  function retrieveCurrentAnswerMap() {
-    let foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "DROPDOWN"
-    );
-    return answer.data[foundIndex].answerMap;
-  }
+  const [currentAnswerMap, setCurrentAnswerMap] = (0, import_react17.useState)(answerMap);
   (0, import_react17.useEffect)(() => {
-    setCurrentAnswerMap(retrieveCurrentAnswerMap());
-  }, [answer]);
-  const handleDropdownAnswerOnChange = (answerObj, key, value) => {
+    setCurrentAnswerMap(answerMap);
+  }, [answerMap]);
+  const handleDropdownAnswerOnChange = (answerMap2, key, value) => {
     if (isPreview) return;
-    const newAnswer = __spreadProps(__spreadValues({}, answerObj), {
-      data: answerObj.data.map((item) => {
-        if (item.type === "DROPDOWN") {
-          return __spreadProps(__spreadValues({}, item), {
-            answerMap: __spreadProps(__spreadValues({}, item.answerMap), {
-              [key]: value
-            })
-          });
-        }
-        return item;
-      })
-    });
-    const newAnswerMap = __spreadProps(__spreadValues({}, currentAnswerMap), { [key]: value });
-    setCurrentAnswerMap(newAnswerMap);
-    changeAnswer(newAnswer);
+    answerMap2 = __spreadProps(__spreadValues({}, currentAnswerMap), { [key]: value });
+    setCurrentAnswerMap(answerMap2);
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: "flex flex-row flex-wrap", children: [
     /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: `${isFullScreen ? "w-full" : "w-full md:w-[60%]"}`, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
@@ -4880,7 +4764,7 @@ var DropdownActivityContent = ({
       DropdownActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         materialMap: dropdownMaterialMap,
         contentMap,
         checkCanAnswerQuestion: canAnswerQuestion,
@@ -4925,7 +4809,7 @@ var InputWithSpecialExpression_default = InputWithSpecialExpression;
 var import_jsx_runtime28 = require("react/jsx-runtime");
 var FillInTheBlanksActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   optionList,
   materialMap,
   contentMap,
@@ -4955,22 +4839,11 @@ var FillInTheBlanksActivityMaterialContent = ({
   }, [optionList]);
   (0, import_react18.useEffect)(() => {
     if (!showCorrectAnswer) return;
-    const foundAnswer = answer.data.find(
-      (answerData) => answerData.type === "FILL_IN_THE_BLANKS"
-    );
-    if (!foundAnswer || foundAnswer.answerMap.length === 0) return;
-    if (Object.keys(materialMap).length === 0) return;
-    foundAnswer.answerMap = Object.keys(materialMap).map(
+    answerMap = Object.keys(materialMap).map(
       (materialMapKey) => JSON.parse(materialMap[materialMapKey])[0]
     );
-    onChange(answer, 0, JSON.parse(materialMap[0])[0]);
-  }, [showCorrectAnswer, answer, materialMap, onChange]);
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "FILL_IN_THE_BLANKS"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
+    onChange(answerMap, 0, JSON.parse(materialMap[0])[0]);
+  }, [showCorrectAnswer]);
   const checkAnswerState = (correctAnswerList, learnerAnswer) => {
     if (!isPreview) return null;
     const foundIndex = correctAnswerList.findIndex(
@@ -5004,7 +4877,7 @@ var FillInTheBlanksActivityMaterialContent = ({
   };
   const handleMouseUp = () => {
     if (dropTargetIndex !== null && draggedOption !== null) {
-      onChange(answer, dropTargetIndex, draggedOption);
+      onChange(answerMap, dropTargetIndex, draggedOption);
     }
     setDraggedOption(null);
     setDropTargetIndex(null);
@@ -5035,7 +4908,7 @@ var FillInTheBlanksActivityMaterialContent = ({
   };
   const handleTouchEnd = () => {
     if (dropTargetIndex !== null && draggedOption !== null) {
-      onChange(answer, dropTargetIndex, draggedOption);
+      onChange(answerMap, dropTargetIndex, draggedOption);
     }
     setDraggedOption(null);
     setDropTargetIndex(null);
@@ -5048,11 +4921,10 @@ var FillInTheBlanksActivityMaterialContent = ({
   };
   const handleDropZoneClick = (index) => {
     if (selectedOption !== null) {
-      onChange(answer, index, selectedOption);
+      onChange(answerMap, index, selectedOption);
       setSelectedOption(null);
     }
   };
-  const answerMap = retrieveAnswerMap();
   return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
     "div",
     {
@@ -5191,7 +5063,7 @@ var FillInTheBlanksActivityMaterialContent = ({
                       onClick: (e) => {
                         if (answerMap[materialKey]) {
                           e.stopPropagation();
-                          onChange(answer, materialKey, "");
+                          onChange(answerMap, materialKey, "");
                         }
                       },
                       children: answerMap[materialKey] ? /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
@@ -5230,7 +5102,7 @@ var FillInTheBlanksActivityMaterialContent = ({
                     className: "flex-1 cursor-pointer",
                     onClick: (e) => {
                       e.stopPropagation();
-                      onChange(answer, materialKey, "");
+                      onChange(answerMap, materialKey, "");
                     },
                     children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
                       ShowMaterialMediaByContentType_default,
@@ -5266,7 +5138,7 @@ var FillInTheBlanksActivityMaterialContent_default = FillInTheBlanksActivityMate
 var import_react19 = require("react");
 var import_jsx_runtime29 = require("react/jsx-runtime");
 var FillInTheBlanksActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -5284,18 +5156,10 @@ var FillInTheBlanksActivityContent = ({
     "FILL_IN_THE_BLANKS"
   );
   const fillInTheBlanksIncorrectList = data.fillInTheBlanksIncorrectList ? JSON.parse(data.fillInTheBlanksIncorrectList) : [];
-  const [currentAnswerMap, setCurrentAnswerMap] = (0, import_react19.useState)(() => {
-    return retrieveCurrentAnswerMap();
-  });
-  function retrieveCurrentAnswerMap() {
-    let foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "FILL_IN_THE_BLANKS"
-    );
-    return answer.data[foundIndex].answerMap;
-  }
+  const [currentAnswerMap, setCurrentAnswerMap] = (0, import_react19.useState)(answerMap);
   (0, import_react19.useEffect)(() => {
-    setCurrentAnswerMap(retrieveCurrentAnswerMap());
-  }, [answer]);
+    setCurrentAnswerMap(answerMap);
+  }, [answerMap]);
   const constructAnswerOptionList = () => {
     const optionList = [];
     Object.keys(fillInTheBlanksMaterialMap).forEach((key) => {
@@ -5314,23 +5178,11 @@ var FillInTheBlanksActivityContent = ({
     });
     return optionList;
   };
-  const handleFillInTheBlanksAnswerOnChange = (answerObj, key, value) => {
+  const handleFillInTheBlanksAnswerOnChange = (answerMap2, key, value) => {
     if (isPreview) return;
-    const newAnswer = __spreadProps(__spreadValues({}, answerObj), {
-      data: answerObj.data.map((item) => {
-        if (item.type === "FILL_IN_THE_BLANKS") {
-          return __spreadProps(__spreadValues({}, item), {
-            answerMap: __spreadProps(__spreadValues({}, item.answerMap), {
-              [key]: value
-            })
-          });
-        }
-        return item;
-      })
-    });
-    const newAnswerMap = __spreadProps(__spreadValues({}, currentAnswerMap), { [key]: value });
-    setCurrentAnswerMap(newAnswerMap);
-    changeAnswer(newAnswer);
+    answerMap2 = __spreadProps(__spreadValues({}, currentAnswerMap), { [key]: value });
+    setCurrentAnswerMap(answerMap2);
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: "flex flex-row flex-wrap", children: [
     /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: `${isFullScreen ? "w-full" : "w-full md:w-[60%]"}`, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
@@ -5348,7 +5200,7 @@ var FillInTheBlanksActivityContent = ({
       FillInTheBlanksActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         optionList: constructAnswerOptionList(),
         materialMap: fillInTheBlanksMaterialMap,
         contentMap,
@@ -5368,7 +5220,7 @@ var import_react_katex5 = require("react-katex");
 var import_jsx_runtime30 = require("react/jsx-runtime");
 var GroupingActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
@@ -5418,10 +5270,8 @@ var GroupingActivityMaterialContent = ({
   }, [materialMap, isShuffled]);
   (0, import_react20.useEffect)(() => {
     if (!showCorrectAnswer) return;
-    answer.data.find(
-      (answerData) => answerData.type === "GROUPING"
-    ).answerMap = materialMap;
-  }, [showCorrectAnswer, answer, materialMap]);
+    answerMap = materialMap;
+  }, [showCorrectAnswer, answerMap, materialMap]);
   (0, import_react20.useEffect)(() => {
     if (!dropTargetKey || !dropZoneRefs.current[dropTargetKey]) return;
     const dropZoneElement = dropZoneRefs.current[dropTargetKey];
@@ -5466,13 +5316,6 @@ var GroupingActivityMaterialContent = ({
     };
     requestAnimationFrame(animate);
   }, [dropTargetKey]);
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "GROUPING"
-    );
-    const answerMap2 = answer.data[foundIndex].answerMap;
-    return answerMap2;
-  };
   const retrieveFilteredMaterialList = (answerMap2) => {
     const selectedValueList = [];
     Object.keys(answerMap2).forEach((key) => {
@@ -5517,7 +5360,7 @@ var GroupingActivityMaterialContent = ({
   };
   const handleMouseUp = () => {
     if (dropTargetKey !== null && draggedValue !== null) {
-      onChange(answer, dropTargetKey, draggedValue, null);
+      onChange(answerMap, dropTargetKey, draggedValue, null);
     }
     setDraggedValue(null);
     setDropTargetKey(null);
@@ -5549,7 +5392,7 @@ var GroupingActivityMaterialContent = ({
   };
   const handleTouchEnd = () => {
     if (dropTargetKey !== null && draggedValue !== null) {
-      onChange(answer, dropTargetKey, draggedValue, null);
+      onChange(answerMap, dropTargetKey, draggedValue, null);
     }
     setDraggedValue(null);
     setDropTargetKey(null);
@@ -5563,11 +5406,10 @@ var GroupingActivityMaterialContent = ({
   };
   const handleDropZoneClick = (answerMapKey) => {
     if (selectedValue !== null) {
-      onChange(answer, answerMapKey, selectedValue, null);
+      onChange(answerMap, answerMapKey, selectedValue, null);
       setSelectedValue(null);
     }
   };
-  const answerMap = retrieveAnswerMap();
   const filteredMaterialList = retrieveFilteredMaterialList(answerMap);
   return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)("div", { onMouseMove: handleMouseMove, onMouseUp: handleMouseUp, children: [
     draggedValue && mousePosition.x > 0 && /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
@@ -5715,7 +5557,7 @@ var GroupingActivityMaterialContent = ({
                         e.stopPropagation();
                         if (checkCanAnswerQuestion()) {
                           onChange(
-                            answer,
+                            answerMap,
                             answerMapKey,
                             null,
                             answerMapIndex
@@ -5762,7 +5604,7 @@ var GroupingActivityMaterialContent_default = GroupingActivityMaterialContent;
 // src/components/activities/GroupingActivityContent.tsx
 var import_jsx_runtime31 = require("react/jsx-runtime");
 var GroupingActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -5772,18 +5614,14 @@ var GroupingActivityContent = ({
   const contentMap = parseContentMapFromData(data);
   const groupingBodyMap = parseBodyMapFromData(data, "GROUPING");
   const groupingMaterialMap = parseMaterialMapFromData(data, "GROUPING");
-  const handleGroupingAnswerOnChange = (answer2, key, value, index) => {
+  const handleGroupingAnswerOnChange = (answerMap2, key, value, index) => {
     if (isPreview) return;
-    let foundIndex = answer2.data.findIndex(
-      (answerData) => answerData.type === "GROUPING"
-    );
-    const answerMap = answer2.data[foundIndex].answerMap;
     if (value) {
-      answerMap[key].push(value);
+      answerMap2[key].push(value);
     } else {
-      answerMap[key].splice(index, 1);
+      answerMap2[key].splice(index, 1);
     }
-    changeAnswer(answer2);
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(import_jsx_runtime31.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
@@ -5798,7 +5636,7 @@ var GroupingActivityContent = ({
       GroupingActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         materialMap: groupingMaterialMap,
         contentMap,
         checkCanAnswerQuestion: canAnswerQuestion,
@@ -5817,7 +5655,7 @@ var import_react_katex6 = require("react-katex");
 var import_jsx_runtime32 = require("react/jsx-runtime");
 var MatchingActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
@@ -5865,10 +5703,8 @@ var MatchingActivityMaterialContent = ({
   }, [materialMap, isShuffled]);
   (0, import_react21.useEffect)(() => {
     if (!showCorrectAnswer) return;
-    answer.data.find(
-      (answerData) => answerData.type === "MATCHING"
-    ).answerMap = materialMap;
-  }, [showCorrectAnswer, answer, materialMap]);
+    answerMap = materialMap;
+  }, [showCorrectAnswer]);
   (0, import_react21.useEffect)(() => {
     if (!dropTargetKey || !dropZoneRefs.current[dropTargetKey]) return;
     const dropZoneElement = dropZoneRefs.current[dropTargetKey];
@@ -5913,12 +5749,6 @@ var MatchingActivityMaterialContent = ({
     };
     requestAnimationFrame(animate);
   }, [dropTargetKey]);
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "MATCHING"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
   const retrieveFilteredMaterialList = (answerMap2) => {
     const selectedValueList = [];
     Object.keys(answerMap2).forEach((key) => {
@@ -5957,7 +5787,7 @@ var MatchingActivityMaterialContent = ({
   };
   const handleMouseUp = () => {
     if (dropTargetKey !== null && draggedValue !== null) {
-      onChange(answer, dropTargetKey, draggedValue);
+      onChange(answerMap, dropTargetKey, draggedValue);
     }
     setDraggedValue(null);
     setDropTargetKey(null);
@@ -5989,7 +5819,7 @@ var MatchingActivityMaterialContent = ({
   };
   const handleTouchEnd = () => {
     if (dropTargetKey !== null && draggedValue !== null) {
-      onChange(answer, dropTargetKey, draggedValue);
+      onChange(answerMap, dropTargetKey, draggedValue);
     }
     setDraggedValue(null);
     setDropTargetKey(null);
@@ -6003,11 +5833,10 @@ var MatchingActivityMaterialContent = ({
   };
   const handleDropZoneClick = (answerMapKey) => {
     if (selectedValue !== null) {
-      onChange(answer, answerMapKey, selectedValue);
+      onChange(answerMap, answerMapKey, selectedValue);
       setSelectedValue(null);
     }
   };
-  const answerMap = retrieveAnswerMap();
   const filteredMaterialList = retrieveFilteredMaterialList(answerMap);
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { onMouseMove: handleMouseMove, onMouseUp: handleMouseUp, children: [
     draggedValue && mousePosition.x > 0 && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
@@ -6154,7 +5983,7 @@ var MatchingActivityMaterialContent = ({
                 onClick: (e) => {
                   e.stopPropagation();
                   if (checkCanAnswerQuestion() && answerMap[answerMapKey]) {
-                    onChange(answer, answerMapKey, null);
+                    onChange(answerMap, answerMapKey, null);
                     setSelectedValue(null);
                   }
                 },
@@ -6189,7 +6018,7 @@ var MatchingActivityMaterialContent_default = MatchingActivityMaterialContent;
 // src/components/activities/MatchingActivityContent.tsx
 var import_jsx_runtime33 = require("react/jsx-runtime");
 var MatchingActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -6199,14 +6028,10 @@ var MatchingActivityContent = ({
   const contentMap = parseContentMapFromData(data);
   const matchingBodyMap = parseBodyMapFromData(data, "MATCHING");
   const matchingMaterialMap = parseMaterialMapFromData(data, "MATCHING");
-  const handleMatchingAnswerOnChange = (answer2, key, value) => {
+  const handleMatchingAnswerOnChange = (answerMap2, key, value) => {
     if (isPreview) return;
-    let foundIndex = answer2.data.findIndex(
-      (answerData) => answerData.type === "MATCHING"
-    );
-    const answerMap = answer2.data[foundIndex].answerMap;
-    answerMap[key] = value;
-    changeAnswer(answer2);
+    answerMap2[key] = value;
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(import_jsx_runtime33.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
@@ -6221,7 +6046,7 @@ var MatchingActivityContent = ({
       MatchingActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         materialMap: matchingMaterialMap,
         contentMap,
         checkCanAnswerQuestion: canAnswerQuestion,
@@ -6239,19 +6064,13 @@ var import_react_katex7 = require("react-katex");
 var import_jsx_runtime34 = require("react/jsx-runtime");
 var MCMAActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
   onChange,
   isPreview
 }) => {
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "MCMA"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
   const retrieveCorrectAnswerList = () => {
     return JSON.parse(Object.keys(materialMap)[0]);
   };
@@ -6266,7 +6085,6 @@ var MCMAActivityMaterialContent = ({
     }
     return "INCORRECT";
   };
-  const answerMap = retrieveAnswerMap();
   const correctAnswerList = retrieveCorrectAnswerList();
   return Object.keys(materialMap).map((materialKey, index) => {
     return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: "flex flex-row items-center my-1", children: /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: "flex-1 flex flex-col justify-center border-catchup-lighter-gray rounded-catchup-xlarge px-5 md:px-0", children: [
@@ -6290,7 +6108,7 @@ var MCMAActivityMaterialContent = ({
             {
               className: `w-full flex flex-row items-center justify-center cursor-pointer my-2 gap-x-2 ${learnerAnswerState === "EMPTY" && foundIndex !== -1 || learnerAnswerState === "CORRECT" ? "border-2 border-catchup-green rounded-catchup-xlarge p-2" : learnerAnswerState === "INCORRECT" ? "border-2 border-catchup-red rounded-catchup-xlarge p-2" : ""}`,
               onClick: () => {
-                onChange(answer, materialKey, materialSubKey);
+                onChange(answerMap, materialKey, materialSubKey);
               },
               children: [
                 /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
@@ -6344,7 +6162,7 @@ var MCMAActivityMaterialContent_default = MCMAActivityMaterialContent;
 // src/components/activities/MCMAActivityContent.tsx
 var import_jsx_runtime35 = require("react/jsx-runtime");
 var MCMAActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -6354,21 +6172,17 @@ var MCMAActivityContent = ({
   const contentMap = parseContentMapFromData(data);
   const MCMABodyMap = parseBodyMapFromData(data, "MCMA");
   const MCMAMaterialMap = parseMaterialMapFromData(data, "MCMA");
-  const handleMCMAAnswerOnChange = (answer2, key, value) => {
+  const handleMCMAAnswerOnChange = (answerMap2, key, value) => {
     if (isPreview) return;
-    let foundIndex = answer2.data.findIndex(
-      (answerData) => answerData.type === "MCMA"
-    );
-    const answerMap = answer2.data[foundIndex].answerMap;
-    const foundSubIndex = answerMap[key].findIndex(
+    const foundSubIndex = answerMap2[key].findIndex(
       (answerMaterialKey) => answerMaterialKey === value
     );
     if (foundSubIndex === -1) {
-      answerMap[key].push(value);
+      answerMap2[key].push(value);
     } else {
-      answerMap[key].splice(foundSubIndex, 1);
+      answerMap2[key].splice(foundSubIndex, 1);
     }
-    changeAnswer(answer2);
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: "flex flex-row flex-wrap", children: [
     /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: `${isFullScreen ? "w-full" : "w-full md:w-[60%]"}`, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ActivityBodyContent_default, { bodyMap: MCMABodyMap, templateType: "MCMA" }) }),
@@ -6378,7 +6192,7 @@ var MCMAActivityContent = ({
       MCMAActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         materialMap: MCMAMaterialMap,
         contentMap,
         checkCanAnswerQuestion: canAnswerQuestion,
@@ -6395,19 +6209,13 @@ var import_react_katex8 = require("react-katex");
 var import_jsx_runtime36 = require("react/jsx-runtime");
 var MCSAActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
   onChange,
   isPreview
 }) => {
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "MCSA"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
   const retrieveCorrectAnswer = () => {
     return Object.keys(materialMap)[0];
   };
@@ -6419,7 +6227,6 @@ var MCSAActivityMaterialContent = ({
     }
     return "INCORRECT";
   };
-  const answerMap = retrieveAnswerMap();
   const correctAnswer = retrieveCorrectAnswer();
   return Object.keys(materialMap).map((materialKey, index) => {
     return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: "flex flex-row items-center my-1", children: /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: "flex-1 flex flex-col justify-center border-catchup-lighter-gray rounded-catchup-xlarge px-5 md:px-0", children: [
@@ -6441,7 +6248,7 @@ var MCSAActivityMaterialContent = ({
                 {
                   className: `w-full flex flex-row items-center justify-center cursor-pointer my-2 gap-x-2 ${learnerAnswerState === "EMPTY" && materialSubKey === correctAnswer || learnerAnswerState === "CORRECT" ? "border-2 border-catchup-green rounded-catchup-xlarge p-2" : learnerAnswerState === "INCORRECT" ? "border-2 border-catchup-red rounded-catchup-xlarge p-2" : ""}`,
                   onClick: () => {
-                    onChange(answer, materialKey, materialSubKey);
+                    onChange(answerMap, materialKey, materialSubKey);
                   },
                   children: [
                     /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
@@ -6497,7 +6304,7 @@ var MCSAActivityMaterialContent_default = MCSAActivityMaterialContent;
 // src/components/activities/MCSAActivityContent.tsx
 var import_jsx_runtime37 = require("react/jsx-runtime");
 var MCSAActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -6507,14 +6314,10 @@ var MCSAActivityContent = ({
   const contentMap = parseContentMapFromData(data);
   const MCSABodyMap = parseBodyMapFromData(data, "MCSA");
   const MCSAMaterialMap = parseMaterialMapFromData(data, "MCSA");
-  const handleMCSAAnswerOnChange = (answer2, key, value) => {
+  const handleMCSAAnswerOnChange = (answerMap2, key, value) => {
     if (isPreview) return;
-    let foundIndex = answer2.data.findIndex(
-      (answerData) => answerData.type === "MCSA"
-    );
-    const answerMap = answer2.data[foundIndex].answerMap;
-    answerMap[key] = value;
-    changeAnswer(answer2);
+    answerMap2[key] = value;
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: "flex flex-row flex-wrap", children: [
     /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: `${isFullScreen ? "w-full" : "w-full md:w-[60%]"}`, children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ActivityBodyContent_default, { bodyMap: MCSABodyMap, templateType: "MCSA" }) }),
@@ -6524,7 +6327,7 @@ var MCSAActivityContent = ({
       MCSAActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         materialMap: MCSAMaterialMap,
         contentMap,
         checkCanAnswerQuestion: canAnswerQuestion,
@@ -6567,26 +6370,11 @@ var retrieveDocumentTypeFromExtension = (format) => {
 // src/components/activities/material-contents/OpenEndedActivityMaterialContent.tsx
 var import_jsx_runtime38 = require("react/jsx-runtime");
 var OpenEndedActivityMaterialContent = ({
-  answer,
+  answerMap,
   contentMap,
   checkCanAnswerQuestion,
   onChange
 }) => {
-  const retrieveAnswer = () => {
-    if (!answer)
-      return {
-        answerMap: {
-          ANSWER: ""
-        }
-      };
-    return answer.data.find(
-      (answerData) => answerData.type === "OPEN_ENDED"
-    );
-  };
-  const retrieveAnswerMap = () => {
-    const { answerMap: answerMap2 } = retrieveAnswer();
-    return answerMap2;
-  };
   const RenderTextContent = (answerMap2) => {
     const answerMapAnswer = answerMap2["ANSWER"];
     let documentType = "TEXT";
@@ -6626,7 +6414,7 @@ var OpenEndedActivityMaterialContent = ({
           useMinHeight: true,
           onChange: (e) => {
             if (checkCanAnswerQuestion()) {
-              onChange(answer, e.target.value);
+              onChange(answerMap2, e.target.value);
             }
           }
         }
@@ -6660,7 +6448,6 @@ var OpenEndedActivityMaterialContent = ({
       }
     ) });
   };
-  const answerMap = retrieveAnswerMap();
   return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: "", children: [
     /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: "hidden md:block", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: "font-semibold text-xl opacity-60", children: i18n_default.t("please_select_open_ended_text") }) }),
     /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: "hidden md:contents", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(DividerLine_default, {}) }),
@@ -6672,7 +6459,7 @@ var OpenEndedActivityMaterialContent_default = OpenEndedActivityMaterialContent;
 // src/components/activities/OpenEndedActivityContent.tsx
 var import_jsx_runtime39 = require("react/jsx-runtime");
 var OpenEndedActivityContent = ({
-  answer,
+  answerMap,
   data,
   changeAnswer,
   canAnswerQuestion,
@@ -6682,14 +6469,10 @@ var OpenEndedActivityContent = ({
 }) => {
   const contentMap = parseContentMapFromData(data);
   const openEndedBodyMap = parseBodyMapFromData(data, "OPEN_ENDED");
-  const handleOpenEndedAnswerOnChange = (answer2, value) => {
+  const handleOpenEndedAnswerOnChange = (answerMap2, value) => {
     if (isPreview) return;
-    let foundIndex = answer2.data.findIndex(
-      (answerData) => answerData.type === "OPEN_ENDED"
-    );
-    const answerMap = answer2.data[foundIndex].answerMap;
-    answerMap["ANSWER"] = value;
-    changeAnswer(answer2);
+    answerMap2["ANSWER"] = value;
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "flex flex-row flex-wrap", children: [
     /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
@@ -6717,7 +6500,7 @@ var OpenEndedActivityContent = ({
       /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: `${isFullScreen ? "w-full" : "w-full md:flex-1"}`, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
         OpenEndedActivityMaterialContent_default,
         {
-          answer,
+          answerMap,
           contentMap,
           checkCanAnswerQuestion: canAnswerQuestion,
           onChange: handleOpenEndedAnswerOnChange
@@ -6771,7 +6554,7 @@ var useScreenSize_default = useScreenSize;
 var import_jsx_runtime40 = require("react/jsx-runtime");
 var OrderingActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
@@ -6806,19 +6589,10 @@ var OrderingActivityMaterialContent = ({
   }, [screenSize]);
   (0, import_react23.useEffect)(() => {
     if (!showCorrectAnswer) return;
-    const answerMap2 = answer.data.find(
-      (answerData) => answerData.type === "ORDERING"
-    ).answerMap;
-    Object.keys(answerMap2).forEach((answerKey, index) => {
-      answerMap2[answerKey] = index;
+    Object.keys(answerMap).forEach((answerKey, index) => {
+      answerMap[answerKey] = index;
     });
   }, [showCorrectAnswer]);
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "ORDERING"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
   const checkAnswerState = (correctAnswer, learnerAnswer) => {
     if (!isPreview) return null;
     if (correctAnswer === learnerAnswer) {
@@ -6867,7 +6641,7 @@ var OrderingActivityMaterialContent = ({
   };
   const handleMouseUp = () => {
     if (dropTargetKey !== null && draggedKey !== null && dropTargetKey !== draggedKey) {
-      onChange(answer, draggedKey, dropTargetKey);
+      onChange(answerMap, draggedKey, dropTargetKey);
     }
     setDraggedKey(null);
     setDropTargetKey(null);
@@ -6899,7 +6673,7 @@ var OrderingActivityMaterialContent = ({
   };
   const handleTouchEnd = () => {
     if (dropTargetKey !== null && draggedKey !== null && dropTargetKey !== draggedKey) {
-      onChange(answer, draggedKey, dropTargetKey);
+      onChange(answerMap, draggedKey, dropTargetKey);
     }
     setDraggedKey(null);
     setDropTargetKey(null);
@@ -6913,12 +6687,11 @@ var OrderingActivityMaterialContent = ({
     } else if (selectedKey === materialKey) {
       setSelectedKey(null);
     } else {
-      onChange(answer, selectedKey, materialKey);
+      onChange(answerMap, selectedKey, materialKey);
       setSelectedKey(null);
     }
     setDraggedKey(null);
   };
-  const answerMap = retrieveAnswerMap();
   return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(
     "div",
     {
@@ -7056,7 +6829,7 @@ var OrderingActivityMaterialContent_default = OrderingActivityMaterialContent;
 // src/components/activities/OrderingActivityContent.tsx
 var import_jsx_runtime41 = require("react/jsx-runtime");
 var OrderingActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -7067,16 +6840,12 @@ var OrderingActivityContent = ({
   const contentMap = parseContentMapFromData(data);
   const orderingBodyMap = parseBodyMapFromData(data, "ORDERING");
   const orderingMaterialMap = parseMaterialMapFromData(data, "ORDERING");
-  const handleOrderingAnswerOnChange = (answer2, primaryKey, secondaryKey) => {
+  const handleOrderingAnswerOnChange = (answerMap2, primaryKey, secondaryKey) => {
     if (isPreview) return;
-    let foundIndex = answer2.data.findIndex(
-      (answerData) => answerData.type === "ORDERING"
-    );
-    const answerMap = answer2.data[foundIndex].answerMap;
-    const prevValue = answerMap[primaryKey];
-    answerMap[primaryKey] = answerMap[secondaryKey];
-    answerMap[secondaryKey] = prevValue;
-    changeAnswer(answer2);
+    const prevValue = answerMap2[primaryKey];
+    answerMap2[primaryKey] = answerMap2[secondaryKey];
+    answerMap2[secondaryKey] = prevValue;
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
@@ -7091,7 +6860,7 @@ var OrderingActivityContent = ({
       OrderingActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         materialMap: orderingMaterialMap,
         contentMap,
         checkCanAnswerQuestion: canAnswerQuestion,
@@ -7110,7 +6879,7 @@ var import_react_katex10 = require("react-katex");
 var import_jsx_runtime42 = require("react/jsx-runtime");
 var TrueFalseActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
@@ -7118,7 +6887,6 @@ var TrueFalseActivityMaterialContent = ({
   isPreview,
   showCorrectAnswer
 }) => {
-  const { screenSize } = useScreenSize_default();
   const [shuffleOptionList, setShuffleOptionList] = (0, import_react24.useState)([]);
   (0, import_react24.useEffect)(() => {
     const optionList = [];
@@ -7132,26 +6900,8 @@ var TrueFalseActivityMaterialContent = ({
   }, []);
   (0, import_react24.useEffect)(() => {
     if (!showCorrectAnswer) return;
-    answer.data.find(
-      (answerData) => answerData.type === "TRUE_FALSE"
-    ).answerMap = materialMap;
+    answerMap = materialMap;
   }, [showCorrectAnswer]);
-  const retrieveAnswer = () => {
-    if (!answer)
-      return {
-        answerMap: {
-          trueList: [],
-          falseList: []
-        }
-      };
-    return answer.data.find(
-      (answerData) => answerData.type === "TRUE_FALSE"
-    );
-  };
-  const retrieveAnswerMap = () => {
-    const { answerMap: answerMap2 } = retrieveAnswer();
-    return answerMap2;
-  };
   const checkAnswerState = (correctAnswer, learnerAnswer) => {
     if (!isPreview) return null;
     if (correctAnswer === learnerAnswer) {
@@ -7159,7 +6909,6 @@ var TrueFalseActivityMaterialContent = ({
     }
     return "INCORRECT";
   };
-  const answerMap = retrieveAnswerMap();
   return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: "", children: [
     /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: "hidden md:block", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("span", { className: "font-semibold text-xl opacity-60", children: i18n_default.t("please_select_true_false_text") }) }),
     /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: "hidden md:contents", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(DividerLine_default, {}) }),
@@ -7209,7 +6958,7 @@ var TrueFalseActivityMaterialContent = ({
                   alt: "checkbox",
                   size: "small",
                   onClick: () => {
-                    onChange(answer, "TRUE", shuffleOption);
+                    onChange(answerMap, "TRUE", shuffleOption);
                   }
                 }
               ) }) }),
@@ -7220,7 +6969,7 @@ var TrueFalseActivityMaterialContent = ({
                   alt: "checkbox",
                   size: "small",
                   onClick: () => {
-                    onChange(answer, "FALSE", shuffleOption);
+                    onChange(answerMap, "FALSE", shuffleOption);
                   }
                 }
               ) }) })
@@ -7246,7 +6995,7 @@ var TrueFalseActivityMaterialContent_default = TrueFalseActivityMaterialContent;
 // src/components/activities/TrueFalseActivityContent.tsx
 var import_jsx_runtime43 = require("react/jsx-runtime");
 var TrueFalseActivityContent = ({
-  answer,
+  answerMap,
   data,
   canAnswerQuestion,
   changeAnswer,
@@ -7257,43 +7006,36 @@ var TrueFalseActivityContent = ({
   const contentMap = parseContentMapFromData(data);
   const trueFalseBodyMap = parseBodyMapFromData(data, "TRUE_FALSE");
   const trueFalseMaterialMap = parseMaterialMapFromData(data, "TRUE_FALSE");
-  const retrieveCurrentAnswerMap = () => {
-    let foundIndex = answer.data.findIndex(
-      (answerData) => answerData.type === "TRUE_FALSE"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
-  const handleTrueFalseAnswerOnChange = (answer2, key, value) => {
+  const handleTrueFalseAnswerOnChange = (answerMap2, key, value) => {
     if (isPreview) return;
-    const answerMap = retrieveCurrentAnswerMap();
     if (key === "TRUE") {
-      const foundFalseIndex = answerMap.falseList.findIndex(
+      const foundFalseIndex = answerMap2.falseList.findIndex(
         (item) => item === value
       );
       if (foundFalseIndex !== -1) {
-        answerMap.falseList.splice(foundFalseIndex, 1);
+        answerMap2.falseList.splice(foundFalseIndex, 1);
       }
-      const foundTrueIndex = answerMap.falseList.findIndex(
+      const foundTrueIndex = answerMap2.falseList.findIndex(
         (item) => item === value
       );
       if (foundTrueIndex === -1) {
-        answerMap.trueList.push(value);
+        answerMap2.trueList.push(value);
       }
     } else if (key === "FALSE") {
-      const foundTrueIndex = answerMap.trueList.findIndex(
+      const foundTrueIndex = answerMap2.trueList.findIndex(
         (item) => item === value
       );
       if (foundTrueIndex !== -1) {
-        answerMap.trueList.splice(foundTrueIndex, 1);
+        answerMap2.trueList.splice(foundTrueIndex, 1);
       }
-      const foundFalseIndex = answerMap.falseList.findIndex(
+      const foundFalseIndex = answerMap2.falseList.findIndex(
         (item) => item === value
       );
       if (foundFalseIndex === -1) {
-        answerMap.falseList.push(value);
+        answerMap2.falseList.push(value);
       }
     }
-    changeAnswer(answer2);
+    changeAnswer(answerMap2);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "flex flex-row flex-wrap", children: [
     /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: `${isFullScreen ? "w-full" : "w-full md:w-[40%]"}`, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
@@ -7309,7 +7051,7 @@ var TrueFalseActivityContent = ({
       TrueFalseActivityMaterialContent_default,
       {
         uniqueValue: JSON.stringify(data.contentMap),
-        answer,
+        answerMap,
         materialMap: trueFalseMaterialMap,
         contentMap,
         checkCanAnswerQuestion: canAnswerQuestion,
@@ -7537,7 +7279,7 @@ var ActivityPreviewByData = ({
     }
   }, [data, lockedType, typeOptionList, showDifficulty]);
   if (!data) return;
-  const answer = constructAnswerBasedOnData(data);
+  const answerMap = constructAnswerBasedOnData(data);
   return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("div", { children: [
     showType ? /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(import_jsx_runtime47.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("div", { className: "mb-4", children: [
@@ -7558,7 +7300,7 @@ var ActivityPreviewByData = ({
     selectedType ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("div", { className: "", children: selectedType === "ORDERING" && data["orderingBodyMap"] != null && data["orderingMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       OrderingActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7572,7 +7314,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "DROPDOWN" && data["dropdownBodyMap"] != null && data["dropdownMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       DropdownActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7586,7 +7328,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "MCSA" && data["MCSABodyMap"] != null && data["MCSAMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       MCSAActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7600,7 +7342,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "MCMA" && data["MCMABodyMap"] != null && data["MCMAMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       MCMAActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7614,7 +7356,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "MATCHING" && data["matchingBodyMap"] != null && data["matchingMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       MatchingActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7627,7 +7369,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "GROUPING" && data["groupingBodyMap"] != null && data["groupingMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       GroupingActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7640,7 +7382,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "FILL_IN_THE_BLANKS" && data["fillInTheBlanksBodyMap"] != null && data["fillInTheBlanksMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       FillInTheBlanksActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7654,7 +7396,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "OPEN_ENDED" && data["openEndedBodyMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       OpenEndedActivityContent_default,
       {
-        answer,
+        answerMap,
         canAnswerQuestion: () => false,
         changeAnswer: () => {
         },
@@ -7666,7 +7408,7 @@ var ActivityPreviewByData = ({
     ) : selectedType === "TRUE_FALSE" && data["trueFalseBodyMap"] != null && data["trueFalseMaterialMap"] != null ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       TrueFalseActivityContent_default,
       {
-        answer,
+        answerMap,
         changeAnswer: () => {
         },
         canAnswerQuestion: () => {
@@ -7699,135 +7441,157 @@ var ActivityPreviewByData_default = ActivityPreviewByData;
 // src/components/activities/ActivityPreviewByAnswerData.tsx
 var import_react26 = require("react");
 var import_jsx_runtime48 = require("react/jsx-runtime");
+var ACTIVITY_TEMPLATE_LIST = [
+  { type: "ORDERING", materialMap: "orderingMaterialMap" },
+  { type: "DROPDOWN", materialMap: "dropdownMaterialMap" },
+  { type: "MCSA", materialMap: "MCSAMaterialMap" },
+  { type: "MCMA", materialMap: "MCMAMaterialMap" },
+  { type: "MATCHING", materialMap: "matchingMaterialMap" },
+  { type: "GROUPING", materialMap: "groupingMaterialMap" },
+  {
+    type: "FILL_IN_THE_BLANKS",
+    materialMap: "fillInTheBlanksMaterialMap"
+  },
+  { type: "OPEN_ENDED", materialMap: "openEndedMaterialMap" },
+  { type: "TRUE_FALSE", materialMap: "trueFalseMaterialMap" }
+];
 var ActivityPreviewByAnswerData = ({
   data,
+  answerType = null,
   showType = true,
   showDescription = true,
-  lockedType = null,
-  typeOptionList = [],
+  lockedTypeList = [],
   showSolution = false,
   showEvaluationRubric = false,
   showDifficulty = true,
   isFullScreen = false,
   showCorrectAnswer = false
 }) => {
-  var _a;
-  const [key, setKey] = (0, import_react26.useState)((/* @__PURE__ */ new Date()).getTime());
   const [selectedType, setSelectedType] = (0, import_react26.useState)(null);
   const [optionList, setOptionList] = (0, import_react26.useState)([]);
-  const [answer, setAnswer] = (0, import_react26.useState)({ data: [] });
+  const [answerMapMap, setAnswerMapMap] = (0, import_react26.useState)({});
+  const [activityTemplateTypeList, setActivityTemplateTypeList] = (0, import_react26.useState)([]);
   (0, import_react26.useEffect)(() => {
     if (!data) return;
-    setKey((/* @__PURE__ */ new Date()).getTime());
-  }, [data]);
-  const checkAnswerMapExists = (type) => {
-    if (data && data.answerMap && Array.isArray(data.answerMap)) {
-      const foundAnswer = data.answerMap.find(
-        (answer2) => answer2.type === type
+    let currentActivityTemplateMapList = JSON.parse(
+      JSON.stringify(ACTIVITY_TEMPLATE_LIST)
+    );
+    if (lockedTypeList.length > 0) {
+      currentActivityTemplateMapList = currentActivityTemplateMapList.filter(
+        (activityTemplateMap) => lockedTypeList.includes(activityTemplateMap.type)
       );
-      return foundAnswer || null;
     }
-    return null;
-  };
-  (0, import_react26.useEffect)(() => {
-    if (!data) return;
-    const constructAnswerBasedOnData2 = () => {
-      const newAnswer = { data: [] };
-      const activityTypes = [
-        { type: "ORDERING", materialMap: "orderingMaterialMap" },
-        { type: "DROPDOWN", materialMap: "dropdownMaterialMap" },
-        { type: "MCSA", materialMap: "MCSAMaterialMap" },
-        { type: "MCMA", materialMap: "MCMAMaterialMap" },
-        { type: "MATCHING", materialMap: "matchingMaterialMap" },
-        { type: "GROUPING", materialMap: "groupingMaterialMap" },
-        {
-          type: "FILL_IN_THE_BLANKS",
-          materialMap: "fillInTheBlanksMaterialMap"
-        },
-        { type: "OPEN_ENDED", materialMap: "openEndedMaterialMap" },
-        { type: "TRUE_FALSE", materialMap: "trueFalseMaterialMap" }
-      ];
-      activityTypes.forEach(({ type, materialMap }) => {
-        if (data[materialMap]) {
-          const foundAnswer = checkAnswerMapExists(type);
-          const answerItem = foundAnswer || constructActivityAnswerMap(
-            { type },
-            JSON.parse(JSON.stringify(data))
-          );
-          newAnswer.data.push(answerItem);
-        }
-      });
-      setAnswer(newAnswer);
-      if (newAnswer.data.length > 0) {
-        if (lockedType && newAnswer.data.find((item) => item.type === lockedType)) {
-          setSelectedType(lockedType);
-        } else {
-          setSelectedType(newAnswer.data[0].type);
-        }
+    const currentActivityTemplateTypeList = [];
+    for (const activityTemplateMap of currentActivityTemplateMapList) {
+      if (data[activityTemplateMap.materialMap]) {
+        currentActivityTemplateTypeList.push(activityTemplateMap);
       }
-    };
-    constructAnswerBasedOnData2();
-  }, [data, lockedType]);
-  (0, import_react26.useEffect)(() => {
-    if (!data || !answer.data.length) return;
-    let currentTypeOptionList = typeOptionList || answer.data.map((item) => ({
-      id: item.type,
-      text: i18n_default.t(item.type)
-    }));
-    if (lockedType) {
-      currentTypeOptionList = currentTypeOptionList.filter(
-        (typeOption) => typeOption.id === lockedType
-      );
     }
-    if (showDifficulty) {
-      setOptionList(
-        currentTypeOptionList.map((typeOption) => __spreadProps(__spreadValues({}, typeOption), {
-          subText: i18n_default.t(
-            retrieveDifficultyByActivityTypeFromData(typeOption.id, data)
+    setActivityTemplateTypeList(currentActivityTemplateMapList);
+  }, [data, answerType, lockedTypeList]);
+  (0, import_react26.useEffect)(() => {
+    if (activityTemplateTypeList.length === 0) return;
+    const currentOptionList = [];
+    for (const activityTemplateType of activityTemplateTypeList) {
+      const currentTypeOption = {
+        id: activityTemplateType.type,
+        value: i18n_default.t(activityTemplateType.type)
+      };
+      if (showDifficulty) {
+        currentTypeOption.subText = i18n_default.t(
+          retrieveDifficultyByActivityTypeFromData(
+            activityTemplateType.type,
+            data
           )
-        }))
-      );
-    } else {
-      setOptionList(currentTypeOptionList);
+        );
+      }
+      currentOptionList.push(currentTypeOption);
+    }
+    setOptionList(currentOptionList);
+  }, [activityTemplateTypeList, showDifficulty]);
+  (0, import_react26.useEffect)(() => {
+    if (optionList.length === 0) return;
+    setSelectedType(optionList[0].id);
+  }, [optionList]);
+  (0, import_react26.useEffect)(() => {
+    if (activityTemplateTypeList.length === 0) return;
+    const currentAnswerMapMap = {};
+    for (const activityTemplateMap of activityTemplateTypeList) {
+      if (answerType === activityTemplateMap.type) {
+        currentAnswerMapMap[activityTemplateMap.type] = data.answerMap;
+      } else {
+        currentAnswerMapMap[activityTemplateMap.type] = constructActivityAnswerMap(
+          { type: activityTemplateMap.type },
+          JSON.parse(JSON.stringify(data))
+        );
+      }
     }
-  }, [data, answer.data, lockedType, typeOptionList, showDifficulty]);
+    setAnswerMapMap(currentAnswerMapMap);
+  }, [activityTemplateTypeList]);
   const RenderSelectedActivityContent = () => {
+    if (!selectedType) return null;
     const commonProps = {
-      answer,
+      answerMap: answerMapMap[selectedType],
       data,
       canAnswerQuestion: () => true,
-      // changeAnswer: (newAnswer: Answer) =>
-      //   setAnswer(JSON.parse(JSON.stringify(newAnswer))),
       changeAnswer: () => {
       },
       isPreview: true,
       showCorrectAnswer,
       isFullScreen
     };
+    const isEmpty = answerMapMap[selectedType].isEmpty;
     switch (selectedType) {
       case "ORDERING":
-        return data.orderingBodyMap && data.orderingMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(OrderingActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.orderingBodyMap && data.orderingMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(OrderingActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       case "DROPDOWN":
-        return data.dropdownBodyMap && data.dropdownMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(DropdownActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.dropdownBodyMap && data.dropdownMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(DropdownActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       case "MCSA":
-        return data.MCSABodyMap && data.MCSAMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MCSAActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.MCSABodyMap && data.MCSAMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MCSAActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       case "MCMA":
-        return data.MCMABodyMap && data.MCMAMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MCMAActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.MCMABodyMap && data.MCMAMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MCMAActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       case "MATCHING":
-        return data.matchingBodyMap && data.matchingMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MatchingActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.matchingBodyMap && data.matchingMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MatchingActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       case "GROUPING":
-        return data.groupingBodyMap && data.groupingMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(GroupingActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.groupingBodyMap && data.groupingMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(GroupingActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       case "FILL_IN_THE_BLANKS":
-        return data.fillInTheBlanksBodyMap && data.fillInTheBlanksMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(FillInTheBlanksActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.fillInTheBlanksBodyMap && data.fillInTheBlanksMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(FillInTheBlanksActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       case "OPEN_ENDED":
-        return data.openEndedBodyMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
-          OpenEndedActivityContent_default,
-          __spreadProps(__spreadValues({}, commonProps), {
-            showMaterialContent: true
-          })
-        ) : null;
+        return data.openEndedBodyMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+            OpenEndedActivityContent_default,
+            __spreadProps(__spreadValues({}, commonProps), {
+              showMaterialContent: true
+            })
+          )
+        ] }) : null;
       case "TRUE_FALSE":
-        return data.trueFalseBodyMap && data.trueFalseMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(TrueFalseActivityContent_default, __spreadValues({}, commonProps)) : null;
+        return data.trueFalseBodyMap && data.trueFalseMaterialMap ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+          isEmpty && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(TrueFalseActivityContent_default, __spreadValues({}, commonProps))
+        ] }) : null;
       default:
         return null;
     }
@@ -7850,10 +7614,7 @@ var ActivityPreviewByAnswerData = ({
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(DividerLine_default, {})
     ] }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { className: "flex flex-col my-2 w-full p-5", children: [
-      ((_a = answer == null ? void 0 : answer.data[0]) == null ? void 0 : _a.isEmpty) ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ActivityEmptyContent_default, {}) : null,
-      selectedType ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("div", { children: RenderSelectedActivityContent() }, selectedType) : null
-    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("div", { className: "flex flex-col my-2 w-full p-5", children: RenderSelectedActivityContent() }),
     selectedType && showSolution ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("div", { className: "my-4", children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
       ActivitySolutionContent_default,
       {
@@ -7868,7 +7629,7 @@ var ActivityPreviewByAnswerData = ({
         data
       }
     ) }) : null
-  ] }, key);
+  ] });
 };
 var ActivityPreviewByAnswerData_default = ActivityPreviewByAnswerData;
 
@@ -11046,7 +10807,6 @@ var retrieveActivityMethodologyOptionList = () => {
   calculateLevenshteinDistance,
   calculateStartDateOfWeek,
   checkActivityAnswerState,
-  checkIfAnswerIsEmpty,
   constructActivityAnswerMap,
   constructActivityAnswerStateList,
   constructActivityData,