touchstudy-core 0.1.62 → 0.1.64

package/dist/containers/Login/hooks/useLogin.d.ts

@@ -5,7 +5,7 @@ declare type LoginInfo = {
     captcha: string;
     rememberMe: boolean;
 };
-declare const useLogin: (history: any) => {
+declare const useLogin: () => {
     defaultInfo: LoginInfo;
     openLogin: boolean;
     toggle: () => void;

package/dist/index.js

@@ -499,8 +499,16 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
   };
 };
 
-var pushTo = function pushTo(history, data) {
-  if (history.push) history.push(data);else history(data);
+var pushTo = function pushTo(history, data, isReplace) {
+  if (isReplace === void 0) {
+    isReplace = false;
+  }
+  if (history.push && !isReplace || history.replace && isReplace) {
+    !isReplace && history.push(data);
+    isReplace && history.replace(data);
+  } else history(data, {
+    replace: isReplace
+  });
 };
 
 var getErrorMessage = function getErrorMessage(t, error, defaultErrorMessage) {
@@ -936,7 +944,7 @@ var defaultInfo = {
   captcha: "",
   rememberMe: false
 };
-var useLogin$1 = function useLogin(history) {
+var useLogin$1 = function useLogin() {
   var _useState = React.useState(false),
     openLogin = _useState[0],
     setOpenLogin = _useState[1];
@@ -960,7 +968,7 @@ var useLogin$1 = function useLogin(history) {
   }, [gapiScript.gapi]);
   React.useEffect(function () {
     var token = getAccessToken();
-    if (!!token) pushTo(history, "/");
+    if (token) window.location.href = "/";
   }, []);
   return {
     defaultInfo: defaultInfo,
@@ -1001,8 +1009,6 @@ var getLanguage = (function () {
 });
 
 var useLanguage = function useLanguage(history) {
-  var pathname = window.location.pathname;
-  var search = window.location.search;
   var dispatch = reactRedux.useDispatch();
   var _useTranslation = reactI18next.useTranslation(),
     i18n = _useTranslation.i18n;
@@ -1018,6 +1024,8 @@ var useLanguage = function useLanguage(history) {
     });
   };
   var changeLanguageApp = function changeLanguageApp(languageItem) {
+    var search = window.location.search;
+    var searchParams = new URLSearchParams(search);
     if (!languageItem) {
       var storedLanguage = getLanguage();
       var browserLanguage = navigator.language;
@@ -1027,7 +1035,6 @@ var useLanguage = function useLanguage(history) {
       }) || currentLanguage || DEFAULT_LANGUAGE;
     }
     setCurrentLanguage(languageItem);
-    var searchParams = new URLSearchParams(search);
     i18n.changeLanguage(languageItem.code);
     moment.locale(languageItem.momentLangCode);
     localStorage.setItem(LANGUAGE, languageItem.code);
@@ -1035,9 +1042,10 @@ var useLanguage = function useLanguage(history) {
     searchParams.set("lang", languageItem.code);
     pushTo(history, _extends({}, window.location, {
       search: searchParams.toString()
-    }));
+    }), true);
   };
   var handleChangeLanguageParam = function handleChangeLanguageParam() {
+    var search = window.location.search;
     var searchParams = new URLSearchParams(search);
     var langParam = searchParams.get("lang");
     var languageItem = undefined;
@@ -1057,7 +1065,7 @@ var useLanguage = function useLanguage(history) {
   };
   React.useEffect(function () {
     handleChangeLanguageParam();
-  }, [pathname, search]);
+  }, [window.location.pathname, window.location.search]);
   return {
     dropdownOpen: dropdownOpen,
     currentLanguage: currentLanguage,
@@ -1070,7 +1078,7 @@ var _excluded = ["history"];
 var Login = function Login(_ref) {
   var history = _ref.history,
     rest = _objectWithoutPropertiesLoose(_ref, _excluded);
-  var _useLogin = useLogin$1(history),
+  var _useLogin = useLogin$1(),
     defaultInfo = _useLogin.defaultInfo;
   useLanguage(history);
   return React__default.createElement("div", {
@@ -9466,7 +9474,6 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
   if (isAuthPage === void 0) {
     isAuthPage = true;
   }
-  var search = window.location.search;
   var user = 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.user;
@@ -9476,6 +9483,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
     academyDomain = _ref.academyDomain;
   var pathname = window.location.pathname;
   var changeAcademySearchParams = function changeAcademySearchParams() {
+    var search = window.location.search;
     var searchParams = new URLSearchParams(search);
     var paramAcademyDomain = searchParams.get("domain");
     var domain = getAcademyDomain();
@@ -9496,7 +9504,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         searchParams["delete"]("domain");
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
-        }));
+        }), true);
         return;
       }
     } else {
@@ -9516,14 +9524,14 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         searchParams.set("domain", academyDomain);
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
-        }));
+        }), true);
         return;
       }
     }
   };
   React.useEffect(function () {
     changeAcademySearchParams();
-  }, [pathname, search, isAuthPage, email, academyDomain]);
+  }, [window.location.pathname, window.location.search, isAuthPage, email, academyDomain]);
 };
 
 var DEFAULT_PAGING_RESPONSE = {
@@ -14400,7 +14408,7 @@ var useLogin$2 = function useLogin(_ref) {
   };
   React.useEffect(function () {
     var token = getAccessToken();
-    if (!!token) pushTo(history, "/");
+    if (token) window.location.href = "/";
   }, []);
   return {
     handleSubmit: handleSubmit,