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.

feat(email): rest latest thread message toward middle of view (#4451)

Evan Hutnik8cbd8464af59
diff --git a/js/app/packages/block-email/component/Email.tsx b/js/app/packages/block-email/component/Email.tsx
index 4d6ec73690..59f43d0e69 100644
--- a/js/app/packages/block-email/component/Email.tsx
+++ b/js/app/packages/block-email/component/Email.tsx
@@ -49,6 +49,8 @@ import { TopBar } from './TopBar';
const TARGET_MESSAGE_HIGHLIGHT_MS = 800;
const SCROLL_ANIMATION_MS = 1000;
const SCROLL_AFTER_SEND_DELAY_MS = 100;
+const SCROLL_SETTLE_STABLE_FRAMES = 15;
+const SCROLL_SETTLE_MAX_MS = 2000;
type EmailViewProps = {
title: string;
@@ -199,6 +201,56 @@ function EmailContent(props: EmailViewProps) {
return true;
};
+ // Message bodies keep resizing briefly after render (images load, inline
+ // cid: images fail and collapse), so a scroll computed against that
+ // transient layout gets displaced — browser scroll anchoring can clamp it
+ // to the very top of the thread. Re-assert the initial scroll whenever the
+ // content height changes until layout settles or the user scrolls.
+ let cancelActiveScrollPin: (() => void) | undefined;
+ const pinInitialScroll = (messageId: string) => {
+ cancelActiveScrollPin?.();
+ const list = untrack(context.messagesListRef);
+ if (!list) return;
+
+ let cancelled = false;
+ let stableFrames = 0;
+ let lastHeight = list.scrollHeight;
+ const startedAt = performance.now();
+
+ const cancel = () => {
+ cancelled = true;
+ list.removeEventListener('wheel', cancel);
+ list.removeEventListener('touchstart', cancel);
+ list.removeEventListener('pointerdown', cancel);
+ };
+ cancelActiveScrollPin = cancel;
+ list.addEventListener('wheel', cancel, { passive: true });
+ list.addEventListener('touchstart', cancel, { passive: true });
+ list.addEventListener('pointerdown', cancel, { passive: true });
+
+ const tick = () => {
+ if (cancelled || !list.isConnected) return cancel();
+ if (list.scrollHeight !== lastHeight) {
+ lastHeight = list.scrollHeight;
+ stableFrames = 0;
+ performScrollToMessage(messageId, {
+ behavior: 'instant',
+ focus: false,
+ });
+ } else {
+ stableFrames++;
+ }
+ if (
+ stableFrames >= SCROLL_SETTLE_STABLE_FRAMES ||
+ performance.now() - startedAt > SCROLL_SETTLE_MAX_MS
+ ) {
+ return cancel();
+ }
+ requestAnimationFrame(tick);
+ };
+ requestAnimationFrame(tick);
+ };
+
const scrollToLastMessage = (
behavior: ScrollBehavior = 'instant',
focus = false
@@ -254,14 +306,17 @@ function EmailContent(props: EmailViewProps) {
const lastUnreadMessageId_ = untrack(firstUnreadMessageId);
// Check if there is an unread message
if (lastUnreadMessageId_) {
- setTimeout(() =>
+ setTimeout(() => {
performScrollToMessage(lastUnreadMessageId_!, {
behavior: 'instant',
- })
- );
+ });
+ pinInitialScroll(lastUnreadMessageId_!);
+ });
context.messages.setFocused(lastUnreadMessageId_!);
} else {
scrollToLastMessage('instant', false);
+ const lastMessageId = untrack(context.messages.list).at(-1)?.db_id;
+ if (lastMessageId) pinInitialScroll(lastMessageId);
}
}
@@ -285,9 +340,10 @@ function EmailContent(props: EmailViewProps) {
fetchNextPage();
await waitForQueryLoad();
// Scroll to the message after DOM updates
- setTimeout(() =>
- performScrollToMessage(messageId, { behavior: 'instant' })
- );
+ setTimeout(() => {
+ performScrollToMessage(messageId, { behavior: 'instant' });
+ pinInitialScroll(messageId);
+ });
} else {
// Message not found, fallback to last message
setTimeout(() => scrollToLastMessage('instant', true));
@@ -301,15 +357,18 @@ function EmailContent(props: EmailViewProps) {
else if (targetIndex === 0) {
fetchNextPage();
await waitForQueryLoad();
- setTimeout(() =>
- performScrollToMessage(messageId, { behavior: 'instant' })
- );
+ setTimeout(() => {
+ performScrollToMessage(messageId, { behavior: 'instant' });
+ pinInitialScroll(messageId);
+ });
}
-
// Case 3: Message is in current batch with sufficient context
- setTimeout(() =>
- performScrollToMessage(messageId, { behavior: 'instant' })
- );
+ else {
+ setTimeout(() => {
+ performScrollToMessage(messageId, { behavior: 'instant' });
+ pinInitialScroll(messageId);
+ });
+ }
}
// If there is a focused message id, but it does not currently exist in the message list, it is because the user has just sent a message. When it does come into existence, we want to scroll to the bottom.
diff --git a/js/app/packages/block-email/component/MessageList.tsx b/js/app/packages/block-email/component/MessageList.tsx
index a972964470..d7c0bc21b6 100644
--- a/js/app/packages/block-email/component/MessageList.tsx
+++ b/js/app/packages/block-email/component/MessageList.tsx
@@ -3,9 +3,20 @@ import { isScrollingToMessage } from '@block-email/signal/scrollState';
import { StaticMarkdownContext } from '@core/component/LexicalMarkdown/component/core/StaticMarkdown';
import { isMobile } from '@core/mobile/isMobile';
import { cn } from '@ui';
-import { createMemo, createSelector, Index, Show } from 'solid-js';
+import {
+ createEffect,
+ createMemo,
+ createSelector,
+ Index,
+ onCleanup,
+ Show,
+} from 'solid-js';
import { MessageContainer } from './MessageContainer';
+// Fraction of the list height reserved below the newest message so it rests
+// toward the middle of the view instead of pinned to the bottom edge.
+const LAST_MESSAGE_REST_FRACTION = 0.4;
+
interface MessageListProps {
initialLoadComplete: boolean;
onScrollPositionChange?: (scrollFromTop: number) => void;
@@ -30,10 +41,28 @@ export function MessageList(props: MessageListProps) {
(a, b) => a === b
);
+ // Since the list is bottom-anchored (col-reverse), extra bottom padding is
+ // the only way to let the newest message rest above the bottom edge. A
+ // thread that fills the screen gets its oldest messages pushed above the
+ // fold (still one scroll away) — the newest message resting at a
+ // consistent height wins over keeping the whole thread in view.
+ createEffect(() => {
+ const list = context.messagesListRef();
+ if (!list || isMobile()) return;
+ const observer = new ResizeObserver(() => {
+ list.style.setProperty(
+ '--thread-bottom-pad',
+ `${Math.round(list.clientHeight * LAST_MESSAGE_REST_FRACTION)}px`
+ );
+ });
+ observer.observe(list);
+ onCleanup(() => observer.disconnect());
+ });
+
return (
<div
class={cn(
- 'pt-1 pb-6 w-full flex flex-col-reverse items-center overflow-y-scroll overflow-x-hidden scrollbar-hidden text-sm gap-1.5',
+ 'pt-1 pb-[calc(1.5rem+var(--thread-bottom-pad,0px))] w-full flex flex-col-reverse items-center overflow-y-scroll overflow-x-hidden scrollbar-hidden text-sm gap-1.5',
// In-scroll top inset: messages rest below the floating split chrome
// but under-scroll it.
'mobile:pt-[calc(var(--mobile-content-inset-top,0)+0.5rem)]',