There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(mobile): mobile app fallback skeleton (#8686)
CatsJuicefe04ab35ccd2
diff --git a/packages/frontend/apps/android/src/app.tsx b/packages/frontend/apps/android/src/app.tsxindex 452494e203..269d79b5d5 100644--- a/packages/frontend/apps/android/src/app.tsx+++ b/packages/frontend/apps/android/src/app.tsx@@ -1,6 +1,6 @@-import { AppFallback } from '@affine/core/components/affine/app-container';import { AffineContext } from '@affine/core/components/context';import { Telemetry } from '@affine/core/components/telemetry';+import { AppFallback } from '@affine/core/mobile/components';import { configureMobileModules } from '@affine/core/mobile/modules';import { router } from '@affine/core/mobile/router';import { configureCommonModules } from '@affine/core/modules';diff --git a/packages/frontend/apps/ios/src/app.tsx b/packages/frontend/apps/ios/src/app.tsxindex dffbc5dafc..eb3ef91e1b 100644--- a/packages/frontend/apps/ios/src/app.tsx+++ b/packages/frontend/apps/ios/src/app.tsx@@ -1,6 +1,6 @@-import { AppFallback } from '@affine/core/components/affine/app-container';import { AffineContext } from '@affine/core/components/context';import { Telemetry } from '@affine/core/components/telemetry';+import { AppFallback } from '@affine/core/mobile/components';import { configureMobileModules } from '@affine/core/mobile/modules';import { router } from '@affine/core/mobile/router';import { configureCommonModules } from '@affine/core/modules';diff --git a/packages/frontend/apps/mobile/src/app.tsx b/packages/frontend/apps/mobile/src/app.tsxindex 416fcf327b..762907f13a 100644--- a/packages/frontend/apps/mobile/src/app.tsx+++ b/packages/frontend/apps/mobile/src/app.tsx@@ -1,6 +1,6 @@-import { AppFallback } from '@affine/core/components/affine/app-container';import { AffineContext } from '@affine/core/components/context';import { Telemetry } from '@affine/core/components/telemetry';+import { AppFallback } from '@affine/core/mobile/components';import { configureMobileModules } from '@affine/core/mobile/modules';import { router } from '@affine/core/mobile/router';import { configureCommonModules } from '@affine/core/modules';diff --git a/packages/frontend/core/src/mobile/components/index.ts b/packages/frontend/core/src/mobile/components/index.tsindex 92f35011f7..d7197cd78b 100644--- a/packages/frontend/core/src/mobile/components/index.ts+++ b/packages/frontend/core/src/mobile/components/index.ts@@ -5,5 +5,6 @@ export * from './rename';export * from './search-input';export * from './search-result';export * from './selector';+export * from './skeletons';export * from './user-plan-tag';export * from './workspace-selector';diff --git a/packages/frontend/core/src/mobile/components/skeletons/app-fallback.tsx b/packages/frontend/core/src/mobile/components/skeletons/app-fallback.tsxnew file mode 100644index 0000000000..273115aac3--- /dev/null+++ b/packages/frontend/core/src/mobile/components/skeletons/app-fallback.tsx@@ -0,0 +1,85 @@+import { SafeArea, Skeleton } from '@affine/component';++import { WorkspaceSelector } from '../workspace-selector';++const SectionTitleFallback = () => {+ return (+ <div style={{ padding: '0 16px' }}>+ <Skeleton+ animation="wave"+ style={{ height: 16, borderRadius: 4, width: 93 }}+ />+ </div>+ );+};+const sectionRows = [127, 238, 191, 102];++const Section = () => {+ return (+ <div style={{ marginBottom: 32 }}>+ <SectionTitleFallback />+ <div+ style={{+ padding: '0 16px',+ display: 'flex',+ flexDirection: 'column',+ gap: 24,+ marginTop: 24,+ }}+ >+ {sectionRows.map((width, i) => {+ return (+ <div+ style={{ display: 'flex', gap: 16, alignItems: 'center' }}+ key={i}+ >+ <Skeleton+ animation="wave"+ style={{ width: 23, height: 23, borderRadius: 4 }}+ />+ <Skeleton+ animation="wave"+ style={{ width, height: 16, borderRadius: 4 }}+ />+ </div>+ );+ })}+ </div>+ </div>+ );+};++export const AppFallback = () => {+ return (+ <SafeArea top bottom style={{ height: '100dvh', overflow: 'hidden' }}>+ {/* setting */}+ <div style={{ padding: 10, display: 'flex', justifyContent: 'end' }}>+ <Skeleton+ animation="wave"+ style={{ width: 23, height: 23, borderRadius: 4 }}+ />+ </div>+ {/* workspace card */}+ <div style={{ padding: '4px 16px' }}>+ <WorkspaceSelector />+ </div>+ {/* search */}+ <div style={{ padding: '10px 16px 15px' }}>+ <Skeleton animation="wave" style={{ height: 44, borderRadius: 10 }} />+ </div>+ {/* recent */}+ <SectionTitleFallback />+ <div style={{ padding: '16px 16px 32px 16px', display: 'flex', gap: 10 }}>+ {[1, 2, 3].map(i => (+ <Skeleton+ key={i}+ animation="wave"+ style={{ width: 172, height: 210, borderRadius: 12 }}+ />+ ))}+ </div>+ <Section />+ <Section />+ </SafeArea>+ );+};diff --git a/packages/frontend/core/src/mobile/components/skeletons/index.tsx b/packages/frontend/core/src/mobile/components/skeletons/index.tsxnew file mode 100644index 0000000000..cc9deefffd--- /dev/null+++ b/packages/frontend/core/src/mobile/components/skeletons/index.tsx@@ -0,0 +1 @@+export * from './app-fallback';diff --git a/packages/frontend/core/src/mobile/components/workspace-selector/current-card.tsx b/packages/frontend/core/src/mobile/components/workspace-selector/current-card.tsxindex fe32b35b7e..515af7de59 100644--- a/packages/frontend/core/src/mobile/components/workspace-selector/current-card.tsx+++ b/packages/frontend/core/src/mobile/components/workspace-selector/current-card.tsx@@ -1,8 +1,9 @@+import { Avatar } from '@affine/component';import { WorkspaceAvatar } from '@affine/component/workspace-avatar';import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';import { ArrowDownSmallIcon } from '@blocksuite/icons/rc';-import { useService, WorkspaceService } from '@toeverything/infra';+import { useServiceOptional, WorkspaceService } from '@toeverything/infra';import clsx from 'clsx';import { forwardRef, type HTMLAttributes } from 'react';@@ -15,8 +16,8 @@ export const CurrentWorkspaceCard = forwardRef<HTMLDivElement,CurrentWorkspaceCardProps>(function CurrentWorkspaceCard({ onClick, className, ...attrs }, ref) {- const currentWorkspace = useService(WorkspaceService).workspace;- const info = useWorkspaceInfo(currentWorkspace.meta);+ const currentWorkspace = useServiceOptional(WorkspaceService)?.workspace;+ const info = useWorkspaceInfo(currentWorkspace?.meta);const name = info?.name ?? UNTITLED_WORKSPACE_NAME;return (@@ -26,15 +27,19 @@ export const CurrentWorkspaceCard = forwardRef<className={clsx(card, className)}{...attrs}>- <WorkspaceAvatar- key={currentWorkspace.id}- meta={currentWorkspace.meta}- rounded={3}- data-testid="workspace-avatar"- size={40}- name={name}- colorfulFallback- />+ {currentWorkspace ? (+ <WorkspaceAvatar+ key={currentWorkspace?.id}+ meta={currentWorkspace?.meta}+ rounded={3}+ data-testid="workspace-avatar"+ size={40}+ name={name}+ colorfulFallback+ />+ ) : (+ <Avatar size={40} rounded={3} colorfulFallback />+ )}<div className={label}>{name}<ArrowDownSmallIcon className={dropdownIcon} />diff --git a/packages/frontend/core/src/mobile/components/workspace-selector/index.tsx b/packages/frontend/core/src/mobile/components/workspace-selector/index.tsxindex 4da2a274e3..23f07a7bed 100644--- a/packages/frontend/core/src/mobile/components/workspace-selector/index.tsx+++ b/packages/frontend/core/src/mobile/components/workspace-selector/index.tsx@@ -1,6 +1,6 @@import { MobileMenu } from '@affine/component';import { track } from '@affine/track';-import { useService, WorkspacesService } from '@toeverything/infra';+import { useServiceOptional, WorkspacesService } from '@toeverything/infra';import { useCallback, useEffect, useState } from 'react';import { CurrentWorkspaceCard } from './current-card';@@ -8,7 +8,7 @@ import { SelectorMenu } from './menu';export const WorkspaceSelector = () => {const [open, setOpen] = useState(false);- const workspaceManager = useService(WorkspacesService);+ const workspaceManager = useServiceOptional(WorkspacesService);const openMenu = useCallback(() => {track.$.navigationPanel.workspaceList.open();@@ -20,7 +20,7 @@ export const WorkspaceSelector = () => {// revalidate workspace list when open workspace listuseEffect(() => {- if (open) workspaceManager.list.revalidate();+ if (open) workspaceManager?.list.revalidate();}, [workspaceManager, open]);return (diff --git a/packages/frontend/core/src/mobile/pages/workspace/layout.tsx b/packages/frontend/core/src/mobile/pages/workspace/layout.tsxindex 6d10c284c1..16750c6264 100644--- a/packages/frontend/core/src/mobile/pages/workspace/layout.tsx+++ b/packages/frontend/core/src/mobile/pages/workspace/layout.tsx@@ -1,5 +1,4 @@import { AffineErrorBoundary } from '@affine/core/components/affine/affine-error-boundary';-import { AppFallback } from '@affine/core/components/affine/app-container';import { WorkspaceLayoutProviders } from '@affine/core/components/layouts/workspace-layout';import { SWRConfigProvider } from '@affine/core/components/providers/swr-config-provider';import type { Workspace, WorkspaceMetadata } from '@toeverything/infra';@@ -17,6 +16,7 @@ import {useState,} from 'react';+import { AppFallback } from '../../components';import { MobileCurrentWorkspaceModals } from '../../provider/model-provider';// TODO(@forehalo): reuse the global context with [core/electron]