Skip to content

refactor(mobile): isolate thread row appearance by platform #12383

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
juliusmarminge merged 2 commits into from
Sep 18, 2026
+129 −124
Merged

refactor(mobile): isolate thread row appearance by platform #12383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b34cdeb
refactor(mobile): isolate thread row appearance by platform
juliusmarminge Sep 18, 2026
b12d9a6
refactor(mobile): remove redundant platform resolution shims
juliusmarminge Sep 18, 2026
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
158 changes: 34 additions & 124 deletions apps/mobile/src/features/threads/thread-list-v2-items.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
import {
THREAD_LIST_V2_MONO_FONT as MONO_FONT,
THREAD_LIST_V2_ROW_CONTENT_CLASS_NAME,
THREAD_LIST_V2_ROW_DIVIDERS,
selectedThreadRowColors,
getThreadListV2NewBranchMenuTitle,
getThreadListV2RowAppearance,
} from "./thread-list-v2-row-appearance";
import { RowPressable } from "../../components/RowPressable";
import { CustomSnoozeSheet } from "./CustomSnoozeSheet";
import { appAtomRegistry } from "../../state/atom-registry";
Expand All @@ -13,7 +21,7 @@ import { canSnooze, resolveSnoozePresets } from "@t3tools/client-runtime/state/t
import { resolveSettledThreadTimestamp } from "@t3tools/client-runtime/state/thread-sort";
import type { MenuAction } from "@react-native-menu/menu";
import { memo, useCallback, useEffect, useMemo, useState, type ComponentProps } from "react";
import { Alert, Platform, Pressable, useWindowDimensions, View } from "react-native";
import { Alert, Pressable, useWindowDimensions, View } from "react-native";
import type { SwipeableMethods } from "react-native-gesture-handler/ReanimatedSwipeable";

import { SymbolView } from "../../components/AppSymbol";
Expand Down Expand Up @@ -48,12 +56,6 @@ import { ThreadSearchMatchExcerpt } from "./thread-search-match";
* hierarchy rather than card fills.
*/

const MONO_FONT = Platform.select({
ios: "Menlo",
android: "monospace",
default: "monospace",
});

// Status hues follow the system-wide convention set by sidebar v1 and the
// Live Activity/widgets (amber approval, indigo input, sky working) so a
// thread reads the same color everywhere it surfaces.
Expand Down Expand Up @@ -476,23 +478,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
const pr = useThreadPr(thread);

const theme = useUniwindTheme();
const screenColor = theme["--color-screen"];
const drawerColor = theme["--color-drawer"];
const selectedBackgroundColor =
theme[Platform.OS === "android" ? "--color-thread-selected" : "--color-user-bubble"];
const sidebarPane = props.pane === "sidebar";
const selected = props.selected === true;
// The provider badge's border blends into the row's own surface, which
// differs by pane and (for the sidebar pane) selection: the sidebar row
// background becomes the selected fill or the drawer surface, while the
// flat "screen" pane rows always sit on the screen background.
const providerIconSurfaceColor = sidebarPane
? selected
? selectedBackgroundColor
: Platform.OS === "android"
? screenColor
: drawerColor
: screenColor;
const rowAppearance = getThreadListV2RowAppearance(theme, sidebarPane, selected);

const status = resolveThreadListV2Status(thread);
const statusLabel = STATUS_LABEL_BY_STATUS[status];
Expand Down Expand Up @@ -784,11 +772,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
<Text
className={cn(
"flex-1 text-sm font-t3-medium",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground-muted"
: "text-user-bubble-foreground-muted"
: "text-foreground-muted",
selected ? selectedThreadRowColors.mutedForegroundClassName : "text-foreground-muted",
)}
numberOfLines={1}
>
Expand All @@ -807,9 +791,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
className={cn(
"text-xs tabular-nums",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground"
: "text-user-bubble-foreground"
? selectedThreadRowColors.foregroundClassName
: (statusLabel?.className ?? "text-foreground-tertiary"),
)}
>
Expand All @@ -819,11 +801,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
<Text
className={cn(
"mt-1 text-base font-t3-medium",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground"
: "text-user-bubble-foreground"
: "text-foreground",
selected ? selectedThreadRowColors.foregroundClassName : "text-foreground",
)}
numberOfLines={2}
>
Expand All @@ -844,9 +822,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
className={cn(
"flex-1 text-xs",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground-muted"
: "text-user-bubble-foreground-muted"
? selectedThreadRowColors.mutedForegroundClassName
: "text-danger-foreground",
)}
numberOfLines={1}
Expand All @@ -865,9 +841,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
className={cn(
"shrink text-xs",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground-muted"
: "text-user-bubble-foreground-muted"
? selectedThreadRowColors.mutedForegroundClassName
: "text-foreground-muted",
)}
numberOfLines={1}
Expand All @@ -877,9 +851,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
className={cn(
"text-xs",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground-muted"
: "text-user-bubble-foreground-muted"
? selectedThreadRowColors.mutedForegroundClassName
: "text-foreground-muted",
)}
style={{ fontFamily: MONO_FONT }}
Expand All @@ -893,9 +865,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
className={cn(
"text-xs",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground-muted"
: "text-user-bubble-foreground-muted"
? selectedThreadRowColors.mutedForegroundClassName
: "text-foreground-tertiary",
)}
>
Expand All @@ -909,9 +879,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
size={11}
tintColorClassName={
selected
? Platform.OS === "android"
? "accent-thread-selected-foreground-muted"
: "accent-user-bubble-foreground-muted"
? selectedThreadRowColors.mutedIconTintClassName
: "accent-foreground-tertiary"
}
/>
Expand All @@ -928,9 +896,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
size={12}
tintColorClassName={
selected
? Platform.OS === "android"
? "accent-thread-selected-foreground"
: "accent-user-bubble-foreground"
? selectedThreadRowColors.iconTintClassName
: pr.state === null || pr.isDraft
? "accent-foreground-muted"
: pr.state === "open"
Expand All @@ -945,11 +911,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
accessibilityLabel={pr.accessibilityLabel}
className={cn(
"text-xs",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground"
: "text-user-bubble-foreground"
: pr.textClassName,
selected ? selectedThreadRowColors.foregroundClassName : pr.textClassName,
)}
style={{ fontFamily: MONO_FONT }}
>
Expand All @@ -964,7 +926,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
displayName={props.providerInstance.displayName}
accentColor={props.providerInstance.accentColor}
showBadge={props.providerInstance.showBadge}
surfaceColor={providerIconSurfaceColor}
surfaceColor={rowAppearance.providerIconSurfaceColor}
/>
) : null}
</View>
Expand All @@ -975,14 +937,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
variant === "card" ? (
<RowPressable
key={`${thread.environmentId}:${thread.id}`}
interactionClassName={
selected && (sidebarPane || Platform.OS === "android")
? Platform.OS === "android"
? "bg-thread-selected-foreground"
: "bg-user-bubble-foreground"
: "bg-primary"
}
className={sidebarPane || Platform.OS === "android" ? undefined : "bg-screen"}
interactionClassName={rowAppearance.interactionClassName}
className={rowAppearance.className}
accessibilityHint={swipeAccessibilityHint}
accessibilityLabel={
props.hasQueuedMessages ? `${thread.title}, messages queued to send` : thread.title
Expand All @@ -993,19 +949,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
close();
onSelectThread(thread);
}}
style={
sidebarPane || Platform.OS === "android"
? {
backgroundColor: selected
? selectedBackgroundColor
: sidebarPane && Platform.OS !== "android"
? drawerColor
: screenColor,
borderRadius: Platform.OS === "android" ? 20 : SIDEBAR_V2_ROW_RADIUS,
...(sidebarPane ? { paddingHorizontal: 12, paddingVertical: 10 } : null),
}
: undefined
}
style={rowAppearance.cardStyle}
>
{sidebarPane ? (
cardContent
Expand All @@ -1015,10 +959,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
separates rows. The opaque screen background stays so swipe
actions reveal behind the row. */
<View>
<View className={Platform.OS === "android" ? "px-3 py-2.5" : "px-5 py-2.5"}>
{cardContent}
</View>
{Platform.OS !== "android" && props.showTrailingDivider !== false ? (
<View className={THREAD_LIST_V2_ROW_CONTENT_CLASS_NAME}>{cardContent}</View>
{THREAD_LIST_V2_ROW_DIVIDERS && props.showTrailingDivider !== false ? (
<View className="ml-5 h-px bg-border-subtle" />
) : null}
</View>
Expand All @@ -1027,36 +969,19 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
) : (
<RowPressable
key={`${thread.environmentId}:${thread.id}`}
interactionClassName={
selected && (sidebarPane || Platform.OS === "android")
? Platform.OS === "android"
? "bg-thread-selected-foreground"
: "bg-user-bubble-foreground"
: "bg-primary"
}
interactionClassName={rowAppearance.interactionClassName}
accessibilityHint={swipeAccessibilityHint}
accessibilityLabel={
props.hasQueuedMessages ? `${thread.title}, messages queued to send` : thread.title
}
accessibilityRole="button"
accessibilityState={{ selected }}
className={sidebarPane || Platform.OS === "android" ? undefined : "bg-screen"}
className={rowAppearance.className}
onPress={() => {
close();
onSelectThread(thread);
}}
style={
sidebarPane || Platform.OS === "android"
? {
backgroundColor: selected
? selectedBackgroundColor
: sidebarPane && Platform.OS !== "android"
? drawerColor
: screenColor,
borderRadius: Platform.OS === "android" ? 20 : SIDEBAR_V2_ROW_RADIUS,
}
: undefined
}
style={rowAppearance.style}
>
{/* Settled history recedes: dimmed favicon + muted title. */}
<View
Expand All @@ -1080,11 +1005,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
<Text
className={cn(
"text-base",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground"
: "text-user-bubble-foreground"
: "text-foreground-muted",
selected ? selectedThreadRowColors.foregroundClassName : "text-foreground-muted",
)}
numberOfLines={1}
>
Expand All @@ -1103,9 +1024,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
className={cn(
"text-sm tabular-nums",
selected
? Platform.OS === "android"
? "text-thread-selected-foreground-muted"
: "text-user-bubble-foreground-muted"
? selectedThreadRowColors.mutedForegroundClassName
: snoozedRow
? "text-foreground-secondary"
: "text-foreground-tertiary",
Expand All @@ -1127,15 +1046,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
)}
<ThreadSwipeable
threadKey={`${thread.environmentId}:${thread.id}`}
backgroundColor={sidebarPane && Platform.OS !== "android" ? drawerColor : screenColor}
backgroundColor={rowAppearance.swipeBackgroundColor}
compactActions={variant === "slim"}
containerStyle={
Platform.OS === "android"
? { borderRadius: 20, overflow: "hidden", marginHorizontal: 8, marginVertical: 2 }
: sidebarPane
? { borderRadius: SIDEBAR_V2_ROW_RADIUS, overflow: "hidden" }
: undefined
}
containerStyle={rowAppearance.swipeContainerStyle}
enableTrackpadSwipe
// Full swipe commits the advertised lifecycle action (Settle /
// Un-settle), never the secondary snooze action.
Expand All @@ -1157,10 +1070,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
? [
{
id: "new-thread-on-branch",
title:
Platform.OS === "ios"
? "New thread on branch"
: `New thread on ${thread.branch}`,
title: getThreadListV2NewBranchMenuTitle(thread.branch),
image: "square.and.pencil",
},
]
Expand Down
46 changes: 46 additions & 0 deletions apps/mobile/src/features/threads/thread-list-v2-row-appearance.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import type { ViewStyle } from "react-native";
import type { MobileThemeVariables } from "../../lib/mobileTheme";

export const THREAD_LIST_V2_MONO_FONT = "monospace";
export const THREAD_LIST_V2_ROW_CONTENT_CLASS_NAME = "px-3 py-2.5";
export const THREAD_LIST_V2_ROW_DIVIDERS = false;

export const selectedThreadRowColors = {
foregroundClassName: "text-thread-selected-foreground",
mutedForegroundClassName: "text-thread-selected-foreground-muted",
iconTintClassName: "accent-thread-selected-foreground",
mutedIconTintClassName: "accent-thread-selected-foreground-muted",
};

export function getThreadListV2NewBranchMenuTitle(branch: string) {
return `New thread on ${branch}`;
}

export function getThreadListV2RowAppearance(
theme: MobileThemeVariables,
sidebarPane: boolean,
selected: boolean,
) {
const selectedBackgroundColor = theme["--color-thread-selected"];
const style: ViewStyle = {
backgroundColor: selected ? selectedBackgroundColor : theme["--color-screen"],
borderRadius: 20,
};
const swipeContainerStyle: ViewStyle = {
borderRadius: 20,
overflow: "hidden",
marginHorizontal: 8,
marginVertical: 2,
};

return {
className: undefined,
interactionClassName: selected ? "bg-thread-selected-foreground" : "bg-primary",
style,
cardStyle: sidebarPane ? { ...style, paddingHorizontal: 12, paddingVertical: 10 } : style,
swipeContainerStyle,
swipeBackgroundColor: theme["--color-screen"],
providerIconSurfaceColor:
sidebarPane && selected ? selectedBackgroundColor : theme["--color-screen"],
};
}
Loading
Loading