Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(search): do not block search view render on initial all-soup call (#4894)

gbirman697c4c2a2564
diff --git a/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx b/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx
index e50a48643f..419acd0846 100644
--- a/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx
+++ b/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx
@@ -654,6 +654,13 @@ export const SoupViewContextProvider: FlowComponent<
}
);
+ // Reading `.data` on a query with no data yet suspends the nearest
+ // <Suspense> until the fetch settles. Branch on the loading state first
+ // so a cold initial soup call leaves the view shell rendered and only
+ // the list region waits on data.
+ const itemsQueryData = () =>
+ itemsQuery.isLoading ? undefined : itemsQuery.data;
+
/**
* Unified soup items surface: the reactive urql query when active, the
* TanStack infinite query otherwise. Grouped data (`groups`/`itemsById`)
@@ -661,7 +668,7 @@ export const SoupViewContextProvider: FlowComponent<
*/
const itemsSource = {
data: () =>
- reactiveActive() ? reactiveItemsQuery.data() : itemsQuery.data,
+ reactiveActive() ? reactiveItemsQuery.data() : itemsQueryData(),
isLoading: () =>
reactiveActive() ? reactiveItemsQuery.isLoading() : itemsQuery.isLoading,
isFetching: () =>
@@ -800,8 +807,8 @@ export const SoupViewContextProvider: FlowComponent<
initialPage: createMemo(() => {
if (itemsQuery.isPlaceholderData) return;
- const groups = itemsQuery.data?.groups;
- const items = itemsQuery.data?.itemsById;
+ const groups = itemsQueryData()?.groups;
+ const items = itemsQueryData()?.itemsById;
if (!groups || !items) return;
return { groups, items };
}),