touchstudy-core 0.1.137 → 0.1.139

package/dist/containers/PreparedExam/components/ChapterDetail.d.ts

@@ -6,7 +6,8 @@ declare type Props = {
     theme: Theme;
     isEnglish: boolean;
     chapter: ChapterResponse;
+    isStudying: boolean;
     handleOpenChapterDialog: (chapter: ChapterResponse) => void;
 };
-declare const ChapterDetail: ({ t, theme, isEnglish, chapter, handleOpenChapterDialog }: Props) => React.JSX.Element;
+declare const ChapterDetail: ({ t, theme, isEnglish, chapter, isStudying, handleOpenChapterDialog }: Props) => React.JSX.Element;
 export default ChapterDetail;

package/dist/index.js

@@ -3596,7 +3596,7 @@ var elementary_school_2nd_grade$1 = "Elementary school 2nd grade";
 var elementary_school_3rd_grade$1 = "Elementary school 3rd grade";
 var elementary_school_4th_grade$1 = "Elementary school 4th grade";
 var elementary_school_5th_grade$1 = "Elementary school 5th grade";
-var elementary_school_6th_grade$1 = "Elementary school th grade";
+var elementary_school_6th_grade$1 = "Elementary school 6th grade";
 var middle_school_1st_grade$1 = "Middle school 1st grade";
 var middle_school_2nd_grade$1 = "Middle school 2nd grade";
 var middle_school_3rd_grade$1 = "Middle school 3rd grade";
@@ -6549,7 +6549,10 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
   };
 };
 
-var useLanguage = function useLanguage(history) {
+var useLanguage = function useLanguage(history, init) {
+  if (init === void 0) {
+    init = true;
+  }
   var language = reactRedux.useSelector(function (state) {
     var _state$common;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.language;
@@ -6557,17 +6560,6 @@ var useLanguage = function useLanguage(history) {
   var dispatch = reactRedux.useDispatch();
   var _useTranslation = reactI18next.useTranslation(),
     i18n = _useTranslation.i18n;
-  var _useState = React.useState(false),
-    dropdownOpen = _useState[0],
-    setDropdownOpen = _useState[1];
-  var _useState2 = React.useState(),
-    currentLanguage = _useState2[0],
-    setCurrentLanguage = _useState2[1];
-  var toggle = function toggle() {
-    return setDropdownOpen(function (prevState) {
-      return !prevState;
-    });
-  };
   var changeLanguageApp = function changeLanguageApp(languageItem) {
     var search = window.location.search;
     var searchParams = new URLSearchParams(search);
@@ -6578,13 +6570,13 @@ var useLanguage = function useLanguage(history) {
       var defaultLanguageCode = storedLanguage || browserLanguage;
       languageItem = LANGUAGES.find(function (i) {
         return i.code === defaultLanguageCode;
-      }) || currentLanguage || DEFAULT_LANGUAGE;
+      }) || DEFAULT_LANGUAGE;
     }
-    setCurrentLanguage(languageItem);
     i18n.changeLanguage(languageItem.code);
     moment.locale(languageItem.momentLangCode);
     localStorage.setItem(LANGUAGE, languageItem.code);
     dispatch(setLanguage(languageItem.code));
+    if (!history) return;
     if (window.location.pathname === LOGIN_URL) searchParams["delete"]("lang");else searchParams.set("lang", languageItem.code);
     pushTo(history, _extends({}, window.location, {
       search: searchParams.toString()
@@ -6610,13 +6602,10 @@ var useLanguage = function useLanguage(history) {
     changeLanguageApp(languageItem);
   };
   React.useEffect(function () {
-    handleChangeLanguageParam();
-  }, [window.location.pathname, window.location.search]);
+    init && handleChangeLanguageParam();
+  }, [window.location.pathname, window.location.search, init]);
   return {
     language: language,
-    dropdownOpen: dropdownOpen,
-    currentLanguage: currentLanguage,
-    toggle: toggle,
     handleChangeItemLanguage: handleChangeItemLanguage
   };
 };
@@ -23803,9 +23792,6 @@ var useExamDetailView = function useExamDetailView(props) {
   React.useEffect(function () {
     getCategoryList();
   }, [exam.subjectId]);
-  console.log({
-    exam: exam
-  });
   var examGroupByArticle = React.useMemo(function () {
     if (!exam) return [];
     var articles = [];
@@ -28842,17 +28828,22 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
     setOpen(groupIndex === open ? undefined : groupIndex);
   };
   var handleGetNewQuestionGroup = function handleGetNewQuestionGroup() {
-    var questionGroup = isMath ? DEFAULT_MATH_QUESTION_GROUP : DEFAULT_QUESTION_GROUP;
+    var newQuestionGroup = isMath ? DEFAULT_MATH_QUESTION_GROUP : DEFAULT_QUESTION_GROUP;
     var lastQuestionGroups = questionGroups.length ? questionGroups[questionGroups.length - 1] : undefined;
-    if (!lastQuestionGroups) return questionGroup;else {
+    newQuestionGroup.questions = newQuestionGroup.questions.map(function (i, index) {
+      return _extends({}, i, {
+        questionOrder: index
+      });
+    });
+    if (!lastQuestionGroups) return newQuestionGroup;else {
       var _lastQuestionGroups$q, _lastQuestionGroups$q2, _lastQuestionGroups$q3;
       var lastOrder = (_lastQuestionGroups$q = (_lastQuestionGroups$q2 = lastQuestionGroups.questions) === null || _lastQuestionGroups$q2 === void 0 ? void 0 : (_lastQuestionGroups$q3 = _lastQuestionGroups$q2[lastQuestionGroups.questions.length - 1]) === null || _lastQuestionGroups$q3 === void 0 ? void 0 : _lastQuestionGroups$q3.questionOrder) != null ? _lastQuestionGroups$q : 0;
-      questionGroup.questions = questionGroup.questions.map(function (q, index) {
+      newQuestionGroup.questions = newQuestionGroup.questions.map(function (q, index) {
         return _extends({}, q, {
           questionOrder: lastOrder + index + 1
         });
       });
-      return questionGroup;
+      return newQuestionGroup;
     }
   };
   var handelChanngeQuestionCount = function handelChanngeQuestionCount(questionCount, index) {
@@ -28991,7 +28982,8 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
         startIcon: React__default.createElement(io.IoIosAdd, null),
         onClick: function onClick() {
           var length = questionGroups.length;
-          arrayHelpers.push(handleGetNewQuestionGroup());
+          var addedGroup = handleGetNewQuestionGroup();
+          arrayHelpers.push(addedGroup);
           handleToggle(length);
         }
       }, t("question_group"))));
@@ -30420,10 +30412,6 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     dirty = formikProps.dirty,
     submitCount = formikProps.submitCount,
     setValues = formikProps.setValues;
-  console.log({
-    values: values,
-    errors: errors
-  });
   React.useEffect(function () {
     var handleBeforeUnload = function handleBeforeUnload(event) {
       var message = i18n.t("are_you_sure_you_want_to_quit_yours_changes_may_not_be_saved");
@@ -31683,6 +31671,7 @@ var ChapterDetail = function ChapterDetail(_ref) {
     theme = _ref.theme,
     isEnglish = _ref.isEnglish,
     chapter = _ref.chapter,
+    isStudying = _ref.isStudying,
     handleOpenChapterDialog = _ref.handleOpenChapterDialog;
   var _useExpand = useExpand(),
     expanded = _useExpand.expanded,
@@ -31797,6 +31786,7 @@ var ChapterDetail = function ChapterDetail(_ref) {
     },
     variant: "contained",
     startIcon: React__default.createElement(io5.IoReceiptSharp, null),
+    disabled: !isStudying,
     onClick: function onClick() {
       return handleOpenChapterDialog(chapter);
     }
@@ -32111,6 +32101,7 @@ var Statistic = function Statistic(_ref) {
 };
 
 var TextbookDrawer = function TextbookDrawer(_ref) {
+  var _textbook$chapters, _textbook$chapters2;
   var isOpen = _ref.isOpen,
     onClose = _ref.onClose,
     textbookId = _ref.textbookId,
@@ -32349,12 +32340,13 @@ var TextbookDrawer = function TextbookDrawer(_ref) {
     sx: {
       gap: "16px"
     }
-  }, textbook === null || textbook === void 0 ? void 0 : textbook.chapters.map(function (chapter) {
+  }, textbook === null || textbook === void 0 ? void 0 : (_textbook$chapters = textbook.chapters) === null || _textbook$chapters === void 0 ? void 0 : _textbook$chapters.map(function (chapter) {
     return React__default.createElement(ChapterDetail, {
       t: t,
       isEnglish: isEnglish,
       theme: theme,
       chapter: chapter,
+      isStudying: !!(textbook !== null && textbook !== void 0 && textbook.isStudying),
       handleOpenChapterDialog: handleOpenChapterDialog
     });
   })))), React__default.createElement(CustomTabPanel, {
@@ -32370,7 +32362,7 @@ var TextbookDrawer = function TextbookDrawer(_ref) {
       m: "24px",
       gap: "8px"
     }
-  }, textbook === null || textbook === void 0 ? void 0 : textbook.chapters.map(function (chapter) {
+  }, textbook === null || textbook === void 0 ? void 0 : (_textbook$chapters2 = textbook.chapters) === null || _textbook$chapters2 === void 0 ? void 0 : _textbook$chapters2.map(function (chapter) {
     return React__default.createElement(Statistic, {
       t: t,
       isEnglish: isEnglish,
@@ -33779,10 +33771,9 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
   }, t("logout"))))));
 };
 
-var TheLanguageDropdown = function TheLanguageDropdown(_ref) {
-  var history = _ref.history;
-  var _useLanguage = useLanguage(history),
-    currentLanguage = _useLanguage.currentLanguage,
+var TheLanguageDropdown = function TheLanguageDropdown() {
+  var _useLanguage = useLanguage(null, false),
+    language = _useLanguage.language,
     handleChangeItemLanguage = _useLanguage.handleChangeItemLanguage;
   var _useState = React.useState(null),
     open = _useState[0],
@@ -33803,6 +33794,11 @@ var TheLanguageDropdown = function TheLanguageDropdown(_ref) {
     mx: 1,
     bgcolor: open ? "action.selected" : undefined
   };
+  var currentLanguage = React.useMemo(function () {
+    return LANGUAGES.find(function (i) {
+      return i.code === language;
+    });
+  }, [language]);
   return React__default.createElement(React.Fragment, null, React__default.createElement(IconButton, {
     onClick: handleOpen,
     sx: _extends({}, popoverStyle)
@@ -34297,9 +34293,7 @@ var Header = function Header(_ref) {
   }, React__default.createElement(singleLogo, null))), React__default.createElement(material.Stack, {
     className: "me-2",
     display: "none"
-  }, React__default.createElement(TheLanguageDropdown, {
-    history: history
-  }))));
+  }, React__default.createElement(TheLanguageDropdown, null))));
 };
 var HeaderLink = function HeaderLink(_ref3) {
   var data = _ref3.data,