Skip to content

Commit d7dc4e8

Browse files
refactor(mobile): retire the legacy grouped thread list
The flat Thread List v2 has been the default on every app variant for a while; the grouped v1 list survived only behind the Settings -> Legacy toggle. Keeping two list pipelines meant two row components, two item builders, and a parallel set of sort/group menu states that v2 silently ignored. This deletes the v1 path outright. - HomeScreen and ThreadNavigationSidebar lose the v1 memo pipeline (groups, layout, group display state) and the `threadListV2Enabled` ternaries; only the v2 LegendList remains. - Delete `thread-list-items.tsx` (v1 rows), `homeListItems.ts` (v1 item builder), the v1 group builder in `homeThreadList.ts`, and the `use-thread-list-v2-enabled` hook plus `resolveThreadListV2Enabled`. - Drop the `legacyThreadListEnabled` preference (sanitizing now drops it for everyone, like the earlier v2 flag reset) and the Settings toggle. The Legacy settings section stays for Plan Mode. - Header filter menus keep environment/project filters only; the sort/group submenus were already hidden while v2 was on, and v2 has never honored them. `threadSortOrder` menu plumbing is removed; project sort/grouping preferences remain and keep ordering project scopes. - Keyboard thread-jump items are now just the v2 item union.
1 parent 544145f commit d7dc4e8

21 files changed

Lines changed: 45 additions & 3030 deletions

‎apps/mobile/src/features/home/HomeHeader.android.tsx‎

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import type { MenuAction } from "@react-native-menu/menu";
22
import { useCallback, useMemo } from "react";
33
import { NativeStackScreenOptions } from "../../native/StackHeader";
4-
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
54
import { MaterialThreadListToolbar } from "./MaterialThreadListToolbar";
6-
import {
7-
hasCustomHomeListOptions,
8-
PROJECT_SORT_OPTIONS,
9-
THREAD_SORT_OPTIONS,
10-
} from "./home-list-options";
115
import type { HomeHeaderProps } from "./HomeHeader.types";
126

137
export type { HomeHeaderEnvironment } from "./HomeHeader.types";
@@ -17,13 +11,11 @@ function checkedMenuState(checked: boolean) {
1711
}
1812

1913
export function HomeHeader(props: HomeHeaderProps) {
20-
// Thread List v2 lays the list out in fixed creation order, so the
21-
// sort/group filter controls would be silently ignored — hide them and
22-
// key the "customized" icon state off the environment filter alone.
23-
const threadListV2Enabled = useThreadListV2Enabled();
24-
const hasCustomListOptions = threadListV2Enabled
25-
? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
26-
: hasCustomHomeListOptions(props);
14+
// The list uses a fixed creation order and ignores sort/group options, so
15+
// the filter menu only carries the filters and the "customized" icon state
16+
// keys off those alone.
17+
const hasCustomListOptions =
18+
props.selectedEnvironmentId !== null || props.selectedProjectKey !== null;
2719
const menuActions = useMemo<MenuAction[]>(
2820
() => [
2921
{
@@ -62,37 +54,12 @@ export function HomeHeader(props: HomeHeaderProps) {
6254
],
6355
},
6456
] satisfies MenuAction[])),
65-
...(threadListV2Enabled
66-
? []
67-
: ([
68-
{
69-
id: "project-sort",
70-
title: "Sort projects",
71-
subactions: PROJECT_SORT_OPTIONS.map((option) => ({
72-
id: `project-sort:${option.value}`,
73-
title: option.label,
74-
state: checkedMenuState(props.projectSortOrder === option.value),
75-
})),
76-
},
77-
{
78-
id: "thread-sort",
79-
title: "Sort threads",
80-
subactions: THREAD_SORT_OPTIONS.map((option) => ({
81-
id: `thread-sort:${option.value}`,
82-
title: option.label,
83-
state: checkedMenuState(props.threadSortOrder === option.value),
84-
})),
85-
},
86-
] satisfies MenuAction[])),
8757
],
8858
[
8959
props.environments,
90-
props.projectSortOrder,
9160
props.projects,
9261
props.selectedEnvironmentId,
9362
props.selectedProjectKey,
94-
props.threadSortOrder,
95-
threadListV2Enabled,
9663
],
9764
);
9865
const handleMenuAction = useCallback(
@@ -127,19 +94,6 @@ export function HomeHeader(props: HomeHeaderProps) {
12794
return;
12895
}
12996

130-
const projectSort = PROJECT_SORT_OPTIONS.find(
131-
(option) => id === `project-sort:${option.value}`,
132-
);
133-
if (projectSort) {
134-
props.onProjectSortOrderChange(projectSort.value);
135-
return;
136-
}
137-
138-
const threadSort = THREAD_SORT_OPTIONS.find((option) => id === `thread-sort:${option.value}`);
139-
if (threadSort) {
140-
props.onThreadSortOrderChange(threadSort.value);
141-
return;
142-
}
14397
},
14498
[props],
14599
);

‎apps/mobile/src/features/home/HomeHeader.tsx‎

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,31 @@ import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/Stac
22
import { useCallback, useRef } from "react";
33
import type { SearchBarCommands } from "react-native-screens";
44
import { useUniwindTheme } from "../../lib/useUniwindTheme";
5-
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
65
import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
76
import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
87
import {
98
createNativeMailSearchToolbarItem,
109
NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED,
1110
} from "../layout/native-mail-search-toolbar";
1211
import { buildHomeListFilterMenu } from "./home-list-filter-menu";
13-
import {
14-
hasCustomHomeListOptions,
15-
PROJECT_SORT_OPTIONS,
16-
THREAD_SORT_OPTIONS,
17-
} from "./home-list-options";
1812
import type { HomeHeaderProps } from "./HomeHeader.types";
1913

2014
export type { HomeHeaderEnvironment } from "./HomeHeader.types";
2115

2216
export function HomeHeader(props: HomeHeaderProps) {
2317
const searchBarRef = useRef<SearchBarCommands>(null);
2418
const iconColor = useUniwindTheme()["--color-icon"];
25-
// Thread List v2 lays the list out in fixed creation order, so the
26-
// sort/group filter controls would be silently ignored — hide them and
27-
// key the "customized" icon state off the environment filter alone.
28-
const threadListV2Enabled = useThreadListV2Enabled();
29-
const hasCustomListOptions = threadListV2Enabled
30-
? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
31-
: hasCustomHomeListOptions(props);
19+
// The list uses a fixed creation order and ignores sort/group options, so
20+
// the filter menu only carries the filters and the "customized" icon state
21+
// keys off those alone.
22+
const hasCustomListOptions =
23+
props.selectedEnvironmentId !== null || props.selectedProjectKey !== null;
3224
const focusSearch = useCallback(() => {
3325
searchBarRef.current?.focus();
3426
return searchBarRef.current !== null;
3527
}, []);
3628
useHardwareKeyboardCommand("focusSearch", focusSearch);
37-
const filterMenu = buildHomeListFilterMenu({
38-
...props,
39-
listOrganization: !threadListV2Enabled,
40-
});
29+
const filterMenu = buildHomeListFilterMenu(props);
4130

4231
return (
4332
<>
@@ -100,7 +89,7 @@ export function HomeHeader(props: HomeHeaderProps) {
10089
{NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED ? null : (
10190
<NativeHeaderToolbar placement="bottom">
10291
<NativeHeaderToolbar.Menu
103-
accessibilityLabel="Filter and sort threads"
92+
accessibilityLabel="Filter threads"
10493
icon={
10594
hasCustomListOptions
10695
? "line.3.horizontal.decrease.circle.fill"
@@ -150,36 +139,6 @@ export function HomeHeader(props: HomeHeaderProps) {
150139
))}
151140
</NativeHeaderToolbar.Menu>
152141
) : null}
153-
154-
{threadListV2Enabled ? null : (
155-
<NativeHeaderToolbar.Menu title="Sort projects">
156-
<NativeHeaderToolbar.Label>Sort projects</NativeHeaderToolbar.Label>
157-
{PROJECT_SORT_OPTIONS.map((option) => (
158-
<NativeHeaderToolbar.MenuAction
159-
key={option.value}
160-
isOn={props.projectSortOrder === option.value}
161-
onPress={() => props.onProjectSortOrderChange(option.value)}
162-
>
163-
<NativeHeaderToolbar.Label>{option.label}</NativeHeaderToolbar.Label>
164-
</NativeHeaderToolbar.MenuAction>
165-
))}
166-
</NativeHeaderToolbar.Menu>
167-
)}
168-
169-
{threadListV2Enabled ? null : (
170-
<NativeHeaderToolbar.Menu title="Sort threads">
171-
<NativeHeaderToolbar.Label>Sort threads</NativeHeaderToolbar.Label>
172-
{THREAD_SORT_OPTIONS.map((option) => (
173-
<NativeHeaderToolbar.MenuAction
174-
key={option.value}
175-
isOn={props.threadSortOrder === option.value}
176-
onPress={() => props.onThreadSortOrderChange(option.value)}
177-
>
178-
<NativeHeaderToolbar.Label>{option.label}</NativeHeaderToolbar.Label>
179-
</NativeHeaderToolbar.MenuAction>
180-
))}
181-
</NativeHeaderToolbar.Menu>
182-
)}
183142
</NativeHeaderToolbar.Menu>
184143
<NativeHeaderToolbar.Spacer flexible />
185144
<NativeHeaderToolbar.Button

‎apps/mobile/src/features/home/HomeHeader.types.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
2-
import type { HomeProjectSortOrder } from "./homeThreadList";
1+
import type { EnvironmentId } from "@t3tools/contracts";
32
import type {
43
HomeListFilterMenuEnvironment,
54
HomeListFilterMenuProject,
@@ -13,13 +12,9 @@ export interface HomeHeaderProps {
1312
readonly searchQuery: string;
1413
readonly selectedEnvironmentId: EnvironmentId | null;
1514
readonly selectedProjectKey: string | null;
16-
readonly projectSortOrder: HomeProjectSortOrder;
17-
readonly threadSortOrder: SidebarThreadSortOrder;
1815
readonly onSearchQueryChange: (query: string) => void;
1916
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
2017
readonly onProjectChange: (projectKey: string | null) => void;
21-
readonly onProjectSortOrderChange: (sortOrder: HomeProjectSortOrder) => void;
22-
readonly onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
2318
readonly onOpenEnvironments: () => void;
2419
readonly onOpenSettings: () => void;
2520
readonly onStartNewTask: () => void;

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ export function HomeRouteScreen() {
7979
const {
8080
options: listOptions,
8181
setSelectedEnvironmentId,
82-
setProjectSortOrder,
83-
setThreadSortOrder,
8482
} = useHomeListOptions(availableEnvironmentIds);
8583
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
8684
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
@@ -175,8 +173,6 @@ export function HomeRouteScreen() {
175173
searchQuery={searchQuery}
176174
selectedEnvironmentId={selectedEnvironmentId}
177175
selectedProjectKey={selectedProjectKey}
178-
projectSortOrder={listOptions.projectSortOrder}
179-
threadSortOrder={listOptions.threadSortOrder}
180176
onEnvironmentChange={setSelectedEnvironmentId}
181177
onProjectChange={setSelectedProjectKey}
182178
onOpenEnvironments={() =>
@@ -191,10 +187,8 @@ export function HomeRouteScreen() {
191187
params: { screen: "Settings" },
192188
})
193189
}
194-
onProjectSortOrderChange={setProjectSortOrder}
195190
onSearchQueryChange={setSearchQuery}
196191
onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
197-
onThreadSortOrderChange={setThreadSortOrder}
198192
/>
199193

200194
<HomeScreen
@@ -225,7 +219,6 @@ export function HomeRouteScreen() {
225219
params: { screen: "Settings" },
226220
})
227221
}
228-
onProjectSortOrderChange={setProjectSortOrder}
229222
onSearchQueryChange={setSearchQuery}
230223
onSelectThread={handleSelectThread}
231224
onSelectPendingTask={openPendingTask}
@@ -252,7 +245,6 @@ export function HomeRouteScreen() {
252245
});
253246
}}
254247
onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
255-
onThreadSortOrderChange={setThreadSortOrder}
256248
pendingTasks={pendingTasks}
257249
projectGroupingMode={listOptions.projectGroupingMode}
258250
projects={projects}
@@ -262,7 +254,6 @@ export function HomeRouteScreen() {
262254
selectedEnvironmentId={selectedEnvironmentId}
263255
selectedProjectKey={selectedProjectKey}
264256
threads={threads}
265-
threadSortOrder={listOptions.threadSortOrder}
266257
/>
267258
</>
268259
</AndroidHomeFabLayout>

0 commit comments

Comments
 (0)