touchstudy-core 0.1.137 → 0.1.138

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
   };
 };
@@ -33779,10 +33768,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 +33791,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 +34290,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,