Skip to content

Commit 512c66c

Browse files
refactor(mobile): remove redundant platform resolution shims
1 parent 01a1062 commit 512c66c

10 files changed

Lines changed: 1017 additions & 1027 deletions

‎apps/mobile/src/components/ScreenHeader.ios.tsx‎

Lines changed: 0 additions & 156 deletions
This file was deleted.

‎apps/mobile/src/components/ScreenHeader.tsx‎

Lines changed: 157 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,160 @@
1-
export { ScreenHeader } from "./ScreenHeader.ios";
1+
import type { HeaderBarButtonMailSearchToolbarItem } from "react-native-screens";
2+
import { useId } from "react";
3+
import { createNativeHeaderMenu } from "./nativeHeaderMenu.ios";
4+
import { ScreenHeaderButton } from "./ScreenHeaderButton";
5+
import { NativeHeaderToolbar, NativeStackScreenOptions } from "../native/StackHeader";
6+
import { useAdaptiveWorkspaceLayout } from "../features/layout/AdaptiveWorkspaceLayout";
7+
import {
8+
createNativeMailSearchToolbarItem,
9+
NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED,
10+
} from "../features/layout/native-mail-search-toolbar";
11+
import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
12+
import type { ScreenHeaderMenuItem, ScreenHeaderProps } from "./ScreenHeader.types";
13+
import type { AppSymbolName } from "./AppSymbol";
14+
15+
function iosIcon(icon: AppSymbolName) {
16+
return typeof icon === "string" ? icon : icon.ios;
17+
}
18+
19+
type MailMenu = NonNullable<HeaderBarButtonMailSearchToolbarItem["filterMenu"]>;
20+
function mailMenuItems(items: ReadonlyArray<ScreenHeaderMenuItem>): MailMenu["items"] {
21+
return items.map((item) =>
22+
"items" in item
23+
? { type: "submenu", title: item.title ?? "", items: mailMenuItems(item.items) }
24+
: {
25+
type: "action",
26+
title: item.title,
27+
state: item.selected ? "on" : "off",
28+
disabled: item.disabled,
29+
onPress: item.onPress,
30+
},
31+
);
32+
}
33+
34+
export function ScreenHeader(props: ScreenHeaderProps) {
35+
const headerId = useId();
36+
const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
37+
const { themeVariables } = useAppearancePreferences();
38+
const { search, menus } = props;
39+
const menu = menus?.[0];
40+
const compactSearch =
41+
search !== undefined &&
42+
(search.compactToolbar ?? !layout.usesSplitView) &&
43+
NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED;
44+
const visibleMenus = compactSearch ? (menus?.slice(1) ?? []) : (menus ?? []);
45+
const refresh = search?.refreshInToolbar ? search.onRefresh : undefined;
46+
return (
47+
<>
48+
<NativeStackScreenOptions
49+
optionsVersion={[props.optionsVersion, compactSearch ? menu : undefined]}
50+
options={{
51+
headerShown: true,
52+
title: props.title,
53+
unstable_headerSubtitle: props.subtitle || undefined,
54+
...(props.matchSearchSurface
55+
? { contentStyle: { backgroundColor: themeVariables["--color-sheet-solid"] } }
56+
: undefined),
57+
...(search
58+
? {
59+
unstable_headerToolbarItems: compactSearch
60+
? () => [
61+
createNativeMailSearchToolbarItem({
62+
placeholder: search.compactPlaceholder ?? search.placeholder,
63+
onSearchTextChange: search.onChangeText,
64+
searchTextChangeId: `${headerId}-search-text`,
65+
...(refresh
66+
? {
67+
composeButtonId: `${headerId}-refresh`,
68+
composeSystemImageName: "arrow.clockwise",
69+
onComposePress: refresh,
70+
}
71+
: undefined),
72+
...(menu
73+
? {
74+
filterButtonId: `${headerId}-filter`,
75+
filterSystemImageName: iosIcon(menu.icon),
76+
filterMenu: { title: menu.title, items: mailMenuItems(menu.items) },
77+
}
78+
: undefined),
79+
}),
80+
]
81+
: undefined,
82+
headerSearchBarOptions: compactSearch
83+
? undefined
84+
: {
85+
allowToolbarIntegration: true,
86+
...(NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED && search.mode === "inline"
87+
? { placement: "integratedButton" as const }
88+
: undefined),
89+
autoCapitalize: "none",
90+
hideNavigationBar: false,
91+
...(search.mode === "inline" ? { obscureBackground: false } : undefined),
92+
placeholder: search.placeholder,
93+
onChangeText: (event) => search.onChangeText(event.nativeEvent.text),
94+
onCancelButtonPress: () => search.onChangeText(""),
95+
},
96+
}
97+
: undefined),
98+
...props.options,
99+
}}
100+
/>
101+
{props.sidebar !== false && layout.usesSplitView ? (
102+
<NativeHeaderToolbar placement="left">
103+
{props.backInSplitView && props.onBack ? (
104+
<ScreenHeaderButton
105+
{...props.backInSplitView}
106+
onPress={props.backInSplitView.onPress ?? props.onBack}
107+
/>
108+
) : null}
109+
<ScreenHeaderButton
110+
accessibilityLabel={
111+
panes.primarySidebarVisible ? `Maximize ${props.title.toLowerCase()}` : "Show threads"
112+
}
113+
icon={
114+
panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"
115+
}
116+
onPress={togglePrimarySidebar}
117+
separateBackground={
118+
props.backInSplitView ? props.backInSplitView.separateBackground : true
119+
}
120+
/>
121+
</NativeHeaderToolbar>
122+
) : null}
123+
{(props.actions?.length ||
124+
(!compactSearch && refresh) ||
125+
visibleMenus.length ||
126+
props.trailing) &&
127+
props.options?.unstable_headerRightItems === undefined ? (
128+
<NativeHeaderToolbar placement="right">
129+
{props.actions?.map((action) => (
130+
<ScreenHeaderButton
131+
key={action.accessibilityLabel}
132+
{...action}
133+
icon={iosIcon(action.icon)}
134+
separateBackground
135+
/>
136+
))}
137+
{refresh && !compactSearch ? (
138+
<ScreenHeaderButton
139+
accessibilityLabel={search?.refreshAccessibilityLabel}
140+
icon="arrow.clockwise"
141+
onPress={refresh}
142+
separateBackground
143+
/>
144+
) : null}
145+
{visibleMenus.map(createNativeHeaderMenu)}
146+
{props.trailing}
147+
</NativeHeaderToolbar>
148+
) : null}
149+
{search && !compactSearch ? (
150+
<NativeHeaderToolbar placement="bottom">
151+
<NativeHeaderToolbar.SearchBarSlot />
152+
</NativeHeaderToolbar>
153+
) : null}
154+
</>
155+
);
156+
}
157+
2158
export type {
3159
ScreenHeaderAction,
4160
ScreenHeaderMenu,

‎apps/mobile/src/components/ScreenHeaderButton.ios.tsx‎

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
export { ScreenHeaderButton } from "./ScreenHeaderButton.ios";
1+
import { NativeHeaderToolbar } from "../native/StackHeader";
2+
export const ScreenHeaderButton: (
3+
props: Parameters<typeof NativeHeaderToolbar.Button>[0] & { readonly selected?: boolean },
4+
) => ReturnType<typeof NativeHeaderToolbar.Button> = NativeHeaderToolbar.Button;

‎apps/mobile/src/features/threads/ThreadGitControls.android.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import type {
22
ThreadGitControls as IosThreadGitControls,
33
ThreadGitMenu as IosThreadGitMenu,
44
useThreadGitRightHeaderItems as useIosThreadGitRightHeaderItems,
5-
} from "./ThreadGitControls.ios";
5+
} from "./ThreadGitControls";
66

7-
export type { ThreadGitMenuProps } from "./ThreadGitControls.ios";
7+
export type { ThreadGitMenuProps } from "./ThreadGitControls";
88

99
type ThreadGitControlsProps = Parameters<typeof IosThreadGitControls>[0];
1010
const EMPTY_HEADER_ITEMS: ReturnType<typeof useIosThreadGitRightHeaderItems> = [];

0 commit comments

Comments
 (0)