fix(core): do not show open-in-app in mobile web browser (toeverythin…

…g#8694)
tantanorange · Nov 4, 2024 · de7b1ff · de7b1ff
1 parent d35a9cf
commit de7b1ff
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/packages/frontend/apps/web/src/app.tsx b/packages/frontend/apps/web/src/app.tsx
@@ -5,8 +5,10 @@ import { Telemetry } from '@affine/core/components/telemetry';
 import { router } from '@affine/core/desktop/router';
 import { configureCommonModules } from '@affine/core/modules';
 import { I18nProvider } from '@affine/core/modules/i18n';
-import { configureOpenInApp } from '@affine/core/modules/open-in-app';
-import { WebOpenInAppGuard } from '@affine/core/modules/open-in-app/views/open-in-app-guard';
+import {
+  configureOpenInApp,
+  OpenInAppGuard,
+} from '@affine/core/modules/open-in-app';
 import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage';
 import { CustomThemeModifier } from '@affine/core/modules/theme-editor';
 import { PopupWindowProvider } from '@affine/core/modules/url';
@@ -78,13 +80,13 @@ export function App() {
               <Telemetry />
               <CustomThemeModifier />
               <GlobalLoading />
-              <WebOpenInAppGuard>
+              <OpenInAppGuard>
                 <RouterProvider
                   fallbackElement={<AppFallback key="RouterFallback" />}
                   router={router}
                   future={future}
                 />
-              </WebOpenInAppGuard>
+              </OpenInAppGuard>
             </AffineContext>
           </I18nProvider>
         </CacheProvider>

diff --git a/...es/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx b/...es/frontend/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx
@@ -107,7 +107,7 @@ export const AppearanceSettings = () => {
         {enableThemeEditor ? <ThemeEditorSetting /> : null}
       </SettingWrapper>
 
-      {BUILD_CONFIG.isWeb ? (
+      {BUILD_CONFIG.isWeb && !environment.isMobile ? (
         <SettingWrapper title={t['com.affine.setting.appearance.links']()}>
           <SettingRow
             name={t['com.affine.setting.appearance.open-in-app']()}

diff --git a/packages/frontend/core/src/modules/open-in-app/index.ts b/packages/frontend/core/src/modules/open-in-app/index.ts
@@ -8,6 +8,7 @@ import { OpenInAppService } from './services';
 
 export * from './services';
 export * from './utils';
+export * from './views/open-in-app-guard';
 
 export const configureOpenInApp = (framework: Framework) => {
   framework.service(OpenInAppService, [GlobalState, WorkspacesService]);

diff --git a/packages/frontend/core/src/modules/open-in-app/views/open-in-app-guard.tsx b/packages/frontend/core/src/modules/open-in-app/views/open-in-app-guard.tsx
@@ -1,18 +1,14 @@
 import { assertExists } from '@blocksuite/affine/global/utils';
 import { useLiveData, useService } from '@toeverything/infra';
-import { useCallback, useEffect } from 'react';
+import { Fragment, useCallback, useEffect } from 'react';
 
 import { OpenInAppService } from '../services';
 import { OpenInAppPage } from './open-in-app-page';
 
 /**
  * Web only guard to open the URL in desktop app for different conditions
  */
-export const WebOpenInAppGuard = ({
-  children,
-}: {
-  children: React.ReactNode;
-}) => {
+const WebOpenInAppGuard = ({ children }: { children: React.ReactNode }) => {
   assertExists(
     BUILD_CONFIG.isWeb,
     'WebOpenInAppGuard should only be used in web'
@@ -36,9 +32,13 @@ export const WebOpenInAppGuard = ({
     return null;
   }
 
-  return shouldOpenInApp ? (
+  return shouldOpenInApp && !environment.isMobile ? (
     <OpenInAppPage openHereClicked={onOpenHere} />
   ) : (
     children
   );
 };
+
+export const OpenInAppGuard = environment.isMobile
+  ? Fragment
+  : WebOpenInAppGuard;