Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix: suspense potentially causing mobile blanking issue (#6815)
Peter Chinmane62b46ee151d
diff --git a/apps/web/src/components/app/ContentLoading.tsx b/apps/web/src/components/app/ContentLoading.tsxnew file mode 100644index 0000000000..bd45a5a286--- /dev/null+++ b/apps/web/src/components/app/ContentLoading.tsx@@ -0,0 +1,14 @@+import { LoadingSpinner } from '@core/component/LoadingSpinner';++/** Visible immediately, even when the surrounding mobile chrome is hidden. */+export function ContentLoading() {+ return (+ <div+ role="status"+ aria-label="Loading"+ class="flex size-full min-h-24 items-center justify-center"+ >+ <LoadingSpinner />+ </div>+ );+}diff --git a/apps/web/src/components/app/Layout.tsx b/apps/web/src/components/app/Layout.tsxindex 18aec4dfeb..6b8113d604 100644--- a/apps/web/src/components/app/Layout.tsx+++ b/apps/web/src/components/app/Layout.tsx@@ -80,6 +80,7 @@ import {Suspense,} from 'solid-js';import { BundleUpdateProgressBar } from './BundleUpdateProgressBar';+import { ContentLoading } from './ContentLoading';import GlobalShortcuts from './GlobalHotkeys';import { ItemDndProvider } from './ItemDragAndDrop';import { FloatRegion } from './mobile/float-regions/FloatRegion';@@ -492,7 +493,9 @@ function LayoutInner(props: RouteSectionProps) {</Show> */}<Show when={paywallOpen()}>- <Paywall />+ <Suspense>+ <Paywall />+ </Suspense></Show><div class="max-h-full grow flex">{/* The provider spans the sidebar too so its favorites can register@@ -535,7 +538,8 @@ function LayoutInner(props: RouteSectionProps) {</Show><div class="flex-1 w-full min-h-0 font-sans text-ink caret-current">- {props.children}+ {/* Route loading must not detach the shell or mobile navigation. */}+ <Suspense fallback={<ContentLoading />}>{props.children}</Suspense></div></ItemDndProvider></div>diff --git a/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx b/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsxindex a8b37e4b1c..d980f797db 100644--- a/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx+++ b/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx@@ -1,10 +1,11 @@import { SoupContextProvider } from '@app/features/next-soup/soup-context';+import { ContentLoading } from '@components/app/ContentLoading';import { MobileDrawer } from '@components/app/mobile/MobileDrawer';import clickOutside from '@core/directive/clickOutside';import { registerHotkey, useHotkeyDOMScope } from '@core/hotkey/hotkeys';import { isTouchDevice } from '@core/mobile/isTouchDevice';import { Dialog, Panel } from '@ui';-import { createMemo, createSignal, For, Show } from 'solid-js';+import { createMemo, createSignal, For, Show, Suspense } from 'solid-js';import { Dynamic } from 'solid-js/web';import {type SplitFileMenuActionGroups,@@ -40,10 +41,12 @@ export function PopoverSplitRenderer(props: {return (<For each={activePopovers()}>{(popover) => (- <PopoverSplitModal- popover={popover}- onClose={() => props.onClosePopover?.(popover.id)}- />+ <Suspense>+ <PopoverSplitModal+ popover={popover}+ onClose={() => props.onClosePopover?.(popover.id)}+ />+ </Suspense>)}</For>);@@ -159,7 +162,9 @@ function PopoverSplitModal(props: {<SoupContextProvider><Show when={props.popover.mount}><Panel.Body>- <Dynamic component={props.popover.mount.element} />+ <Suspense fallback={<ContentLoading />}>+ <Dynamic component={props.popover.mount.element} />+ </Suspense></Panel.Body></Show></SoupContextProvider>diff --git a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx b/apps/web/src/components/app/split-layout/components/SplitPanel.tsxindex c7da140348..cf5d073a2a 100644--- a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx+++ b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx@@ -3,6 +3,7 @@ import { createSoupState } from '@app/features/next-soup/create-soup-state';import { SoupContextProvider } from '@app/features/next-soup/soup-context';import { SoupViewContextProvider } from '@app/features/next-soup/soup-view/soup-view-context';import { globalSplitManager } from '@app/signal/splitLayout';+import { ContentLoading } from '@components/app/ContentLoading';import { MobileTopEdgeFade } from '@components/app/mobile/MobileEdgeFade';import { MobilePageActionRow } from '@components/app/mobile/MobilePageActionRow';import { SplitPanelControllerProvider } from '@components/app/split-panel';@@ -185,7 +186,7 @@ export function SplitPanel(props: SplitPanelProps) {close: props.handle.close,}}>- <Suspense>+ <Suspense fallback={<ContentLoading />}><SoupViewContextProvider soup={nextSoup}><Dynamic component={props.split.mount.element} /></SoupViewContextProvider>diff --git a/apps/web/src/components/app/split-layout/mobile/MobileSplitContainer.tsx b/apps/web/src/components/app/split-layout/mobile/MobileSplitContainer.tsxindex 1eb94386b9..9115a244fa 100644--- a/apps/web/src/components/app/split-layout/mobile/MobileSplitContainer.tsx+++ b/apps/web/src/components/app/split-layout/mobile/MobileSplitContainer.tsx@@ -1,3 +1,4 @@+import { ContentLoading } from '@components/app/ContentLoading';import { type Accessor, createMemo, Show, Suspense } from 'solid-js';import { SplitPanel } from '../components/SplitPanel';import type {@@ -10,7 +11,7 @@ import { createMobileSplitMotion } from './createMobileSplitMotion';import type { MobileSwipeLayout } from './createMobileSwipeLayout';export type MobileSplitContainerProps = {- splitManager: SplitManager;+ splitManager: Pick<SplitManager, 'getSplit'>;mobileSwipeLayout: MobileSwipeLayout;splits: Accessor<ReadonlyArray<SplitState>>;panelRefs: Map<SplitId, HTMLDivElement>;@@ -71,7 +72,7 @@ export function MobileSplitContainer(props: MobileSplitContainerProps) {*/}<Show when={a().split.id} keyed>{(_splitId) => (- <Suspense>+ <Suspense fallback={<ContentLoading />}><SplitPanelsplit={a().split}handle={a().handle}@@ -100,7 +101,7 @@ export function MobileSplitContainer(props: MobileSplitContainerProps) {><Show when={b().split.id} keyed>{(_splitId) => (- <Suspense>+ <Suspense fallback={<ContentLoading />}><SplitPanelsplit={b().split}handle={b().handle}diff --git a/apps/web/src/features/block-email/component/Block.tsx b/apps/web/src/features/block-email/component/Block.tsxindex 0f9e3f6af5..f1de5b74c8 100644--- a/apps/web/src/features/block-email/component/Block.tsx+++ b/apps/web/src/features/block-email/component/Block.tsx@@ -1,5 +1,6 @@import { displaySubject } from '@app/features/email-compose/core/subject-text';import { useBlockEntityCommands } from '@app/features/next-soup/actions';+import { ContentLoading } from '@components/app/ContentLoading';import { useGlobalNotificationSource } from '@components/app/GlobalAppState';import { useBlockId } from '@core/block';import { DocumentBlockContainer } from '@core/component/DocumentBlockContainer';@@ -68,7 +69,7 @@ export default function BlockEmail() {};return (- <Suspense>+ <Suspense fallback={<ContentLoading />}><DocumentBlockContainer title={title() ?? 'Email'}><div class="size-full" tabIndex={-1}><EmailThreadLoadGate@@ -81,7 +82,7 @@ export default function BlockEmail() {><Show when={threadId()}>{(id) => (- <Suspense>+ <Suspense fallback={<ContentLoading />}><EmailBlockAdapter title={title()} threadId={id} /></Suspense>)}diff --git a/apps/web/src/features/block-email/component/EmailThreadLoadGate.tsx b/apps/web/src/features/block-email/component/EmailThreadLoadGate.tsxindex b40350b8f9..2e9f02552d 100644--- a/apps/web/src/features/block-email/component/EmailThreadLoadGate.tsx+++ b/apps/web/src/features/block-email/component/EmailThreadLoadGate.tsx@@ -1,3 +1,4 @@+import { ContentLoading } from '@components/app/ContentLoading';import {EntityLoadGate,type EntityLoadResult,@@ -22,7 +23,7 @@ export function EmailThreadLoadGate<Data>(props: EmailThreadLoadGateProps<Data>) {return (- <Suspense>+ <Suspense fallback={<ContentLoading />}><EntityLoadGateresult={props.result}loadErrorTitle="Unable to load this email"diff --git a/apps/web/src/routes/Root.tsx b/apps/web/src/routes/Root.tsxindex 8fd61c6ef0..01125ebec7 100644--- a/apps/web/src/routes/Root.tsx+++ b/apps/web/src/routes/Root.tsx@@ -115,7 +115,6 @@ import {onMount,type ParentProps,Show,- Suspense,} from 'solid-js';import { BasePathComponent } from './BasePath';import { TaskRoute } from './TaskRoute';@@ -618,20 +617,20 @@ export function Root() {<ChatAttachmentsInit /><ReactiveFavicon /><Title>{tabTitle()}</Title>- <Suspense>- <IsomorphicRouter- transformUrl={transformShortIdInUrlPathname}- root={Layout}- rootPreload={rootPreload}- base={ROUTER_BASE}- >- {{- path: '/',- component: TauriRouteListener,- children: ROUTES,- }}- </IsomorphicRouter>- </Suspense>+ {/* Loading boundaries belong inside Layout so+ a pending resource cannot detach the app shell. */}+ <IsomorphicRouter+ transformUrl={transformShortIdInUrlPathname}+ root={Layout}+ rootPreload={rootPreload}+ base={ROUTER_BASE}+ >+ {{+ path: '/',+ component: TauriRouteListener,+ children: ROUTES,+ }}+ </IsomorphicRouter><InitialInteractiveOnboardingModal /><ToastRegion /></SearchProvider>diff --git a/apps/web/tauri/Cargo.lock b/apps/web/tauri/Cargo.lockindex 929d46355d..5368165a36 100644--- a/apps/web/tauri/Cargo.lock+++ b/apps/web/tauri/Cargo.lock@@ -641,6 +641,17 @@ dependencies = ["syn 2.0.117",]+[[package]]+name = "bot_id"+version = "0.1.0"+dependencies = [+ "cowlike",+ "nom",+ "serde",+ "thiserror 2.0.18",+ "uuid",+]+[[package]]name = "branches"version = "0.4.5"@@ -2459,6 +2470,7 @@ dependencies = ["item_filters","macro_user_id","model_file_type",+ "model_owner","notification_state","serde","serde_json",@@ -3101,6 +3113,7 @@ dependencies = ["filter_ast","macro_user_id","model_file_type",+ "model_owner","nom","non_empty","notification_state",@@ -3683,6 +3696,17 @@ dependencies = ["thiserror 2.0.18",]+[[package]]+name = "model_owner"+version = "0.1.0"+dependencies = [+ "bot_id",+ "macro_user_id",+ "serde",+ "thiserror 2.0.18",+ "uuid",+]+[[package]]name = "muda"version = "0.19.3"