Skip to content

fix(desktop): keep thread-open affordance in archived channels #4012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlongwell-block merged 1 commit into from
Aug 1, 2026
Merged

fix(desktop): keep thread-open affordance in archived channels #4012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions desktop/src/features/channels/ui/ChannelPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,7 @@ export const ChannelPane = React.memo(function ChannelPane({
onMarkUnread={onMarkUnread}
onMarkRead={onMarkRead}
onReply={activeChannel?.archivedAt ? undefined : onOpenThread}
onOpenThread={onOpenThread}
channelName={activeChannel?.name}
channelType={activeChannel?.channelType ?? null}
isSendingVideoReviewComment={isSending}
Expand Down
4 changes: 3 additions & 1 deletion desktop/src/features/messages/ui/MessageRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export const MessageRow = React.memo(
onMarkRead,
onToggleReaction,
onReply,
onOpenThread,
onEntranceComplete,
playEntrance = false,
onUnfollowThread,
Expand Down Expand Up @@ -135,6 +136,7 @@ export const MessageRow = React.memo(
remove: boolean,
) => Promise<void>;
onReply?: (message: TimelineMessage) => void;
onOpenThread?: (message: TimelineMessage) => void;
onUnfollowThread?: (message: TimelineMessage) => void;
onEntranceComplete?: (messageId: string) => void;
playEntrance?: boolean;
Expand Down Expand Up @@ -335,7 +337,7 @@ export const MessageRow = React.memo(
<HuddleAttachment
channelId={channelId}
message={message}
onOpenThread={onReply}
onOpenThread={onOpenThread}
/>
);
default:
Expand Down
1 change: 1 addition & 0 deletions desktop/src/features/messages/ui/MessageThreadPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,7 @@ export function MessageThreadPanel({
onMarkUnread={onMarkUnread}
onMarkRead={onMarkRead}
onReply={onSelectReplyTarget}
onOpenThread={onExpandReplies}
onToggleReaction={onToggleReaction}
profiles={profiles}
showDepthGuides={shouldShowThreadBranchGuides}
Expand Down
3 changes: 3 additions & 0 deletions desktop/src/features/messages/ui/MessageTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ type MessageTimelineProps = {
onMarkUnread?: (message: TimelineMessage) => void;
onMarkRead?: (message: TimelineMessage) => void;
onReply?: (message: TimelineMessage) => void;
onOpenThread?: (message: TimelineMessage) => void;
isSendingVideoReviewComment?: boolean;
onSendVideoReviewComment?: (
message: TimelineMessage,
Expand Down Expand Up @@ -178,6 +179,7 @@ const MessageTimelineBase = React.forwardRef<
onMarkUnread,
onMarkRead,
onReply,
onOpenThread,
channelName,
channelType,
isSendingVideoReviewComment = false,
Expand Down Expand Up @@ -635,6 +637,7 @@ const MessageTimelineBase = React.forwardRef<
onMarkUnread={onMarkUnread}
onMarkRead={onMarkRead}
onReply={onReply}
onOpenThread={onOpenThread}
isSendingVideoReviewComment={isSendingVideoReviewComment}
onSendVideoReviewComment={onSendVideoReviewComment}
onStartReached={loadOlderViaVirtualizer}
Expand Down
12 changes: 10 additions & 2 deletions desktop/src/features/messages/ui/TimelineMessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ type TimelineMessageListProps = {
onMarkUnread?: (message: TimelineMessage) => void;
onMarkRead?: (message: TimelineMessage) => void;
onReply?: (message: TimelineMessage) => void;
onOpenThread?: (message: TimelineMessage) => void;
isSendingVideoReviewComment?: boolean;
onSendVideoReviewComment?: (
message: TimelineMessage,
Expand Down Expand Up @@ -142,6 +143,7 @@ export const TimelineMessageList = React.memo(function TimelineMessageList({
onMarkUnread,
onMarkRead,
onReply,
onOpenThread,
isSendingVideoReviewComment = false,
onSendVideoReviewComment,
onToggleReaction,
Expand Down Expand Up @@ -255,6 +257,7 @@ export const TimelineMessageList = React.memo(function TimelineMessageList({
onMarkRead={onMarkRead}
onMarkUnread={onMarkUnread}
onReply={onReply}
onOpenThread={onOpenThread}
onToggleReaction={onToggleReaction}
profiles={profiles}
searchActiveMessageId={searchActiveMessageId}
Expand Down Expand Up @@ -286,6 +289,7 @@ export const TimelineMessageList = React.memo(function TimelineMessageList({
onMarkRead,
onMarkUnread,
onReply,
onOpenThread,
onToggleReaction,
profiles,
ownerProfiles,
Expand Down Expand Up @@ -699,6 +703,7 @@ type MessageRowItemProps = Pick<
| "onMarkUnread"
| "onMarkRead"
| "onReply"
| "onOpenThread"
| "onToggleReaction"
| "profiles"
| "searchActiveMessageId"
Expand Down Expand Up @@ -737,6 +742,7 @@ function MessageRowItem({
onMarkUnread,
onMarkRead,
onReply,
onOpenThread,
onToggleReaction,
profiles,
searchActiveMessageId,
Expand All @@ -755,7 +761,7 @@ function MessageRowItem({
const canDelete = canManage && onDelete ? onDelete : undefined;
const canEdit = canManage && onEdit ? onEdit : undefined;

if (summary && onReply) {
if (summary && onOpenThread) {
const isHighlighted = message.id === highlightedMessageId;
return (
<div
Expand Down Expand Up @@ -790,6 +796,7 @@ function MessageRowItem({
onMarkUnread={onMarkUnread}
onToggleReaction={onToggleReaction}
onReply={onReply}
onOpenThread={onOpenThread}
onUnfollowThread={
unfollowThreadById
? () => unfollowThreadById(message.id)
Expand All @@ -802,7 +809,7 @@ function MessageRowItem({
<MessageThreadSummaryRow
depth={message.depth}
message={message}
onOpenThread={onReply}
onOpenThread={onOpenThread}
showDepthGuides={false}
summary={summary}
summaryIndentOffsetRem={-THREAD_REPLY_ROW_MARGIN_INLINE_REM}
Expand Down Expand Up @@ -839,6 +846,7 @@ function MessageRowItem({
onMarkUnread={onMarkUnread}
onToggleReaction={onToggleReaction}
onReply={onReply}
onOpenThread={onOpenThread}
profiles={profiles}
searchQuery={isSearchMatch ? searchQuery : undefined}
showDepthGuides={false}
Expand Down
Loading