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): clean up visual bugs with channel thead rails (#6925)

Seamus0375710c2f99
diff --git a/apps/web/src/features/channel/Channel/Channel.tsx b/apps/web/src/features/channel/Channel/Channel.tsx
index 401b2db6d3..fbaa9454bb 100644
--- a/apps/web/src/features/channel/Channel/Channel.tsx
+++ b/apps/web/src/features/channel/Channel/Channel.tsx
@@ -334,11 +334,10 @@ export function Channel(props: ChannelProps) {
// Once there are no older pages left to fetch, the oldest loaded message
// (index 0) is the true first message in the channel.
!messagesQuery.hasNextPage,
- // A reply being composed opens the thread before any reply exists; the
- // rail must already reach it. Signal reads keep this memo live.
+ // Only an inline composer extends the rail before a reply exists.
(message) =>
- threadManager.getOrCreateThreadState(message.id).isReplying() ||
- unifiedInput.replyTarget()?.threadId === message.id
+ !isUnifiedInputMode() &&
+ threadManager.getOrCreateThreadState(message.id).isReplying()
)
);
diff --git a/apps/web/src/features/channel/Thread/ChannelThread.tsx b/apps/web/src/features/channel/Thread/ChannelThread.tsx
index 0c5c3329bd..6462676bc7 100644
--- a/apps/web/src/features/channel/Thread/ChannelThread.tsx
+++ b/apps/web/src/features/channel/Thread/ChannelThread.tsx
@@ -189,6 +189,8 @@ export function ChannelThread(props: ThreadProps) {
// Replying to this thread — inline input open, or the unified input bound.
const isReplyingToThread = () =>
props.isReplying() || unifiedReplyBinding() !== undefined;
+ const hasInlineReplyInput = () =>
+ props.isReplying() && props.inputMode !== 'unified';
const shouldShowCollapsedIndicator = () =>
!isReplyingToThread() && !props.isExpanded() && collapsedRepliesCount() > 0;
const replyAction = () => props.getMessageActions?.(props.data())?.onReply;
@@ -300,7 +302,7 @@ export function ChannelThread(props: ThreadProps) {
messages carry no rail. */}
<div class="relative">
<Thread.RootRail
- visible={hasReplies() || isReplyingToThread()}
+ visible={hasReplies() || hasInlineReplyInput()}
grouped={props.listMeta?.isGroupedWithPrevious}
/>
<MarkMessageNotifications
@@ -326,12 +328,7 @@ export function ChannelThread(props: ThreadProps) {
</DebugSuspense>
</MarkMessageNotifications>
</div>
- <Show
- when={
- hasReplies() ||
- (props.isReplying() && props.inputMode !== 'unified')
- }
- >
+ <Show when={hasReplies() || hasInlineReplyInput()}>
<div class="relative w-full">
<Thread.RepliesBridgeRail />
{/* Terminal branch: the spine's final curve into the footer
@@ -366,12 +363,15 @@ export function ChannelThread(props: ThreadProps) {
isThreadFocused={isThreadFocused}
onSelectReply={selectReply}
monorail={props.monorail}
+ railContinues={
+ hasInlineReplyInput() ||
+ shouldShowCollapsedIndicator() ||
+ shouldShowReplyButton()
+ }
/>
</DebugSuspense>
- <Show
- when={props.isReplying() && props.inputMode !== 'unified'}
- >
+ <Show when={hasInlineReplyInput()}>
<div
ref={(el) => {
attachReplyInputRef(el);
diff --git a/apps/web/src/features/channel/Thread/ThreadReplyList.tsx b/apps/web/src/features/channel/Thread/ThreadReplyList.tsx
index bf3d972f10..680ed8fb32 100644
--- a/apps/web/src/features/channel/Thread/ThreadReplyList.tsx
+++ b/apps/web/src/features/channel/Thread/ThreadReplyList.tsx
@@ -50,6 +50,8 @@ export function ThreadReplyList(props: {
onSelectReply?: (replyId: string) => void;
/** Keep replies on the root's rail instead of branching each one off it. */
monorail?: boolean;
+ /** An inline composer or footer continues the rail after the replies. */
+ railContinues?: boolean;
}) {
const listMetaByReplyId = createMemo(() =>
buildThreadReplyListMeta(props.replies, props.isNewMessage)
@@ -101,6 +103,10 @@ export function ThreadReplyList(props: {
fallback={
<ThreadReplyRail
grouped={listMetaByReplyId()[id].isGroupedWithPrevious}
+ terminal={
+ !props.railContinues &&
+ listMetaByReplyId()[id].index >= lastAvatarIndex()
+ }
/>
}
>
diff --git a/docs/AGENT_GUIDE/channels.md b/docs/AGENT_GUIDE/channels.md
index b3f22cd3ff..0746659103 100644
--- a/docs/AGENT_GUIDE/channels.md
+++ b/docs/AGENT_GUIDE/channels.md
@@ -251,6 +251,13 @@ thread past the chat's right edge.
## Message scrolling and navigation
+Thread rails end at the last reply avatar when there is no inline composer or
+footer below it, including when the parent message was deleted. Grouped replies
+after that avatar do not extend the rail. On mobile (or with the unified
+composer), starting a first reply adds no rail to the parent; replying to an
+existing thread keeps its reply branches without a dangling composer segment.
+Desktop inline replies still connect to their composer.
+
Channels open at the latest message, with short conversations aligned above the
composer. Incoming messages and growing replies stay in view while the channel is
at the bottom. Consecutive sends stay pinned through server acknowledgement and