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): untarget message on click (#4684)

Peter Chinman4a2ee0720d96
diff --git a/js/app/packages/channel/Channel/Channel.tsx b/js/app/packages/channel/Channel/Channel.tsx
index 6759c63fd8..90d0798f94 100644
--- a/js/app/packages/channel/Channel/Channel.tsx
+++ b/js/app/packages/channel/Channel/Channel.tsx
@@ -650,6 +650,7 @@ export function Channel(props: ChannelProps) {
selectedMessageId={selection.selectedId}
onSelectMessage={selectMessage}
onClearSelection={clearSelection}
+ onClearTarget={releaseSelectionAndTarget}
messageListScopeId={messageListScopeId}
/>
)}
diff --git a/js/app/packages/channel/Thread/ChannelThread.tsx b/js/app/packages/channel/Thread/ChannelThread.tsx
index c17ebb78bb..be8eb6eb1d 100644
--- a/js/app/packages/channel/Thread/ChannelThread.tsx
+++ b/js/app/packages/channel/Thread/ChannelThread.tsx
@@ -97,7 +97,21 @@ export function ChannelThread(props: ThreadProps) {
);
const isThreadFocused = () => !!replySelection.selectedId();
+
+ // Channel navigation landed on this root message (and not on one of its
+ // replies).
+ const isRootNavTargeted = () =>
+ !!props.targetThreadId &&
+ props.targetThreadId === props.data().id &&
+ !props.activeTargetReplyId;
+
const selectThreadMessage = () => {
+ // Clicking the navigation-targeted message releases the target instead
+ // of toggling selection.
+ if (isRootNavTargeted()) {
+ props.onClearTarget?.(props.data().id);
+ return;
+ }
// On touch devices, we want to block "click to select"
if (isTouchDevice()) return;
if (isSelected() && !isThreadFocused()) {
@@ -110,6 +124,12 @@ export function ChannelThread(props: ThreadProps) {
};
const selectReply = (replyId: string) => {
+ // Clicking the navigation-targeted reply releases the target instead of
+ // toggling selection.
+ if (props.activeTargetReplyId === replyId) {
+ props.onClearTarget?.(props.data().id);
+ return;
+ }
// On touch devices, we want to block "click to select"
if (isTouchDevice()) return;
if (isSelected() && replySelection.selectedId() === replyId) {
@@ -267,12 +287,8 @@ export function ChannelThread(props: ThreadProps) {
selected={isSelected() && !isThreadFocused()}
targeted={
// The unified input's reply is bound to this root, or
- // channel navigation landed on it (and not on one of its
- // replies).
- unifiedReplyBinding()?.boundToRoot ||
- (!!props.targetThreadId &&
- props.targetThreadId === props.data().id &&
- !props.activeTargetReplyId)
+ // channel navigation landed on it.
+ unifiedReplyBinding()?.boundToRoot || isRootNavTargeted()
}
/>
</DebugSuspense>
diff --git a/js/app/packages/channel/Thread/types.ts b/js/app/packages/channel/Thread/types.ts
index 22d7cc1f0b..afdf9478f9 100644
--- a/js/app/packages/channel/Thread/types.ts
+++ b/js/app/packages/channel/Thread/types.ts
@@ -56,6 +56,8 @@ export type ThreadProps = {
selectedMessageId?: Accessor<string | undefined>;
onSelectMessage?: (messageId: string) => void;
onClearSelection?: () => void;
+ /** Release the navigation target (clicking the targeted message). */
+ onClearTarget?: (threadId: string) => void;
messageListScopeId?: string;
isNewestThread?: boolean;
} & ThreadState;