chore: fix nativate bug

bytedance · Oct 27, 2022 · a6fe43a · a6fe43a
1 parent aa84efe
commit a6fe43a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/packages/mona-clients/mona-client-web/src/apis/util.ts b/packages/mona-clients/mona-client-web/src/apis/util.ts
@@ -133,7 +133,7 @@ export const webChooseImage: OriginApis['chooseImage'] = (options = {}) => {
     input.dispatchEvent(event);
 
     input.onchange = () => {
-      options?.success?.(input.files as unknown as ChooseImageSuccessCallbackArgs);
+      options?.success?.((input.files as unknown) as ChooseImageSuccessCallbackArgs);
     };
   } catch (e) {
     options.fail?.({ errMsg: 'chooseImage:fail' });
@@ -337,7 +337,7 @@ export const webGetLocation: OriginApis['getLocation'] = options => {
   if (navigator.geolocation) {
     navigator.geolocation.getCurrentPosition(
       position => {
-        options?.success?.(position.coords as unknown as GetLocationSuccessCallbackArgs);
+        options?.success?.((position.coords as unknown) as GetLocationSuccessCallbackArgs);
       },
       err => {
         options?.fail?.({
@@ -357,7 +357,7 @@ export const webGetNetworkType: OriginApis['getNetworkType'] = (options = {}) =>
   if (navigator.connection) {
     // @ts-ignore ignore
     errMsg = navigator.connection.effectiveType;
-    options.success?.({ networkType: errMsg as unknown as NetworkType });
+    options.success?.({ networkType: (errMsg as unknown) as NetworkType });
   } else {
     errMsg = 'getNetworkType call faild';
     options.fail?.({ errMsg });
@@ -399,12 +399,10 @@ export const webNavigateTo: OriginApis['navigateTo'] = options => {
   let errMsg: string;
   try {
     errMsg = 'navigateTo:ok';
-    const monaHistory = window.__mona_history || history;
-    if (options.url.startsWith('..')) {
-      monaHistory.push(formatPath(options.url, monaHistory.location.pathname));
-    } else {
-      monaHistory.push(formatPath(options.url, monaHistory.location.pathname));
-    }
+    const monaHistory = window.__mona_history;
+    const currentPath = monaHistory.location.pathname;
+    const targetPath = formatPath(options.url, currentPath);
+    monaHistory.push(targetPath);
     options.success?.({ errMsg });
   } catch (err) {
     errMsg = `navigateTo:fail${err}`;
@@ -417,8 +415,10 @@ export const webRedirectTo: OriginApis['redirectTo'] = options => {
   let errMsg: string;
   try {
     errMsg = 'redirectTo:ok';
-    const monaHistory = window.__mona_history || history;
-    monaHistory.replace(formatPath(options.url, monaHistory.location.pathname));
+    const monaHistory = window.__mona_history;
+    const currentPath = monaHistory.location.pathname;
+    const targetPath = formatPath(options.url, currentPath);
+    monaHistory.replace(targetPath);
     options.success?.({ errMsg });
   } catch (err) {
     errMsg = `redirectTo:fail${err}`;
@@ -435,7 +435,7 @@ export const webSwitchTab: OriginApis['switchTab'] = ({ url, success, fail, comp
 export const webNavigateBack: OriginApis['navigateBack'] = (options = {}) => {
   let errMsg: string;
   try {
-    const monaHistory = window.__mona_history || history;
+    const monaHistory = window.__mona_history;
     errMsg = 'navigateBack:ok';
     const delta = options.delta || 1;
     monaHistory.go(-delta);

diff --git a/packages/mona-clients/mona-client-web/src/createWebApp.tsx b/packages/mona-clients/mona-client-web/src/createWebApp.tsx
@@ -62,10 +62,7 @@ export const HistorySetWrapper: React.FC = ({ children }) => {
   const history = useHistory();
 
   // set global history to implement navigateTo and redirectTo api
-  useEffect(() => {
-    // @ts-ignore
-    window.__mona_history = history;
-  }, [history]);
+  window.__mona_history = history;
 
   return <>{children}</>;
 };