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(channels): restore the Macro loading indicator (#8908)

gbirmande66cc95c799
diff --git a/.agents/rules/web/ui.md b/.agents/rules/web/ui.md
index 92c88da3f6..d5d20a33c1 100644
--- a/.agents/rules/web/ui.md
+++ b/.agents/rules/web/ui.md
@@ -42,6 +42,8 @@ Components, styling, and interaction conventions.
## Components
+- Place skeletons at the loaded content's position and dimensions; use the shared
+ Macro `LoadingSpinner` when that geometry is unknown.
- Prefer composition over configurability. Follow slot-based patterns (see
src/features/channel, src/features/entity, or Kobalte).
- Keep reusable components small, atomic, and decoupled from queries/complex
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index a7a6a77c57..6771af6d37 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -358,8 +358,8 @@ Generate APNs validators with `scripts/generate-api-schema.ts`; its compact
`generated/push.ts` entry avoids importing every notification-service schema
on the startup path. Carry known channel root IDs in push navigation (a null
`threadId` means the message itself is the root), prefetch the target window
-alongside channel metadata, and keep the channel loading shell stable until
-that target can be positioned.
+alongside channel metadata, and keep the shared Macro loading indicator visible
+until that target can be positioned.
## macOS notification activation
diff --git a/apps/web/src/features/channel/Channel/ChannelLoading.tsx b/apps/web/src/features/channel/Channel/ChannelLoading.tsx
index c4a0aaa927..f010198e7d 100644
--- a/apps/web/src/features/channel/Channel/ChannelLoading.tsx
+++ b/apps/web/src/features/channel/Channel/ChannelLoading.tsx
@@ -1,33 +1,16 @@
-import { ListSkeleton } from '@app/components/view-shell/ListSkeleton';
-import { For } from 'solid-js';
+import { LoadingSpinner } from '@core/component/LoadingSpinner';
-/** One conversation-shaped placeholder for target resolution and message loading. */
+/** Shared Macro loader for target resolution and message loading. */
export function ChannelLoading() {
return (
<div
role="status"
aria-label="Loading conversation"
- class="flex min-h-0 flex-1 flex-col justify-center overflow-hidden px-5 py-6 touch:pt-(--mobile-content-inset-top) touch:pb-(--mobile-content-inset-bottom)"
+ class="flex min-h-0 flex-1 flex-col items-center justify-center overflow-hidden px-5 py-6 touch:pt-(--mobile-content-inset-top) touch:pb-(--mobile-content-inset-bottom)"
>
<span class="sr-only">Loading conversation</span>
- <div
- aria-hidden="true"
- class="mx-auto flex w-full max-w-160 flex-col gap-7"
- >
- <For each={[64, 86, 73]}>
- {(width) => (
- <div class="flex gap-3">
- <ListSkeleton.Bar class="size-7 shrink-0 rounded-full" />
- <div class="flex min-w-0 flex-1 flex-col gap-3">
- <ListSkeleton.Bar class="w-24" />
- <div style={{ width: `${width}%` }}>
- <ListSkeleton.Bar class="w-full" />
- </div>
- <ListSkeleton.Bar class="w-2/5" />
- </div>
- </div>
- )}
- </For>
+ <div aria-hidden="true">
+ <LoadingSpinner />
</div>
</div>
);
diff --git a/docs/agent-guide/channels.md b/docs/agent-guide/channels.md
index a5465bf877..cdd72dc6d2 100644
--- a/docs/agent-guide/channels.md
+++ b/docs/agent-guide/channels.md
@@ -617,14 +617,14 @@ Press `Escape` to clear selection; the parent Home shortcut is then available
again. Typing `e` in the composer or inline editor should still enter text.
Verify a message link in a fresh browser tab as well as inside an open channel:
the initial page should center the requested message, including older history.
-On a cold notification open, the destination shows one conversation placeholder
+On a cold notification open, the destination shows the three-block Macro loader
while channel metadata and the targeted message window load in parallel. It
must not briefly fetch or display the latest messages before resolving an
uncached message link. Explicit thread replies load their parent window and
replies together; known root messages skip the message-kind lookup. Throttle
-these requests and verify the placeholder transitions directly to the target,
-without a blank body or Macro spinner. A newer link supersedes an unresolved
-one, while a jump inside an already-mounted conversation preserves its composer.
+these requests and verify the loader transitions directly to the target,
+without a blank body or message-shaped placeholders. A newer link supersedes an
+unresolved one, while a jump inside an already-mounted conversation preserves its composer.
Returning through split navigation restores the saved message position and expanded
threads. Switching channel tabs and returning restores the Messages position,
expanded threads, and pending reply from when the tab was left. The `Scroll to bottom` control appears when scrolling down through history;