Skip to content

Commit 76d2c87

Browse files
Revert "refactor(mobile): git sheets use uniwind platform variants instead of className ternaries (#13161)"
This reverts commit ec28eef.
1 parent 3409651 commit 76d2c87

5 files changed

Lines changed: 222 additions & 57 deletions

File tree

‎apps/mobile/src/features/threads/git/GitBranchesSheet.tsx‎

Lines changed: 69 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
6363
return (
6464
<View
6565
collapsable={false}
66-
className="bg-sheet ios:flex-1"
66+
className={Platform.OS === "android" ? "bg-sheet" : "flex-1 bg-sheet"}
6767
style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
6868
>
6969
{Platform.OS === "android" ? (
@@ -83,27 +83,39 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
8383
) : null}
8484
<MaterialScreenContent fitToContents>
8585
<ScrollView
86-
className="android:shrink android:grow-0 ios:flex-1"
86+
className={Platform.OS === "android" ? "shrink grow-0" : "flex-1"}
8787
keyboardShouldPersistTaps="handled"
8888
showsVerticalScrollIndicator={false}
8989
contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
90-
contentContainerClassName="android:gap-2 android:p-2 ios:gap-4 ios:px-5 ios:pt-2"
90+
contentContainerClassName={Platform.OS === "android" ? "gap-2 p-2" : "gap-4 px-5 pt-2"}
9191
contentContainerStyle={
9292
Platform.OS === "android"
9393
? { paddingBottom: Math.max(insets.bottom, 18) + 18 }
9494
: undefined
9595
}
9696
>
97-
<View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
98-
<Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
97+
<View
98+
className={
99+
Platform.OS === "android"
100+
? "gap-3 rounded-[20px] bg-card p-4"
101+
: "gap-2 rounded-[18px] border border-border bg-card px-4 py-4"
102+
}
103+
>
104+
<Text
105+
className={
106+
Platform.OS === "android"
107+
? "text-foreground text-base font-t3-medium"
108+
: "text-foreground-secondary text-2xs font-t3-bold tracking-[1px] uppercase"
109+
}
110+
>
99111
New branch
100112
</Text>
101113
<TextInput
102114
value={newBranchName}
103115
onChangeText={setNewBranchName}
104116
placeholder="feature/mobile-polish"
105117
accessibilityLabel="New branch name"
106-
className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
118+
className={Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[18px]"}
107119
/>
108120
<SheetActionButton
109121
icon="plus"
@@ -121,8 +133,20 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
121133
/>
122134
</View>
123135

124-
<View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
125-
<Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
136+
<View
137+
className={
138+
Platform.OS === "android"
139+
? "gap-3 rounded-[20px] bg-card p-4"
140+
: "gap-2 rounded-[18px] border border-border bg-card px-4 py-4"
141+
}
142+
>
143+
<Text
144+
className={
145+
Platform.OS === "android"
146+
? "text-foreground text-base font-t3-medium"
147+
: "text-foreground-secondary text-2xs font-t3-bold tracking-[1px] uppercase"
148+
}
149+
>
126150
New worktree
127151
</Text>
128152
{Platform.OS === "android" ? (
@@ -133,7 +157,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
133157
onChangeText={setWorktreeBaseBranch}
134158
placeholder="main"
135159
accessibilityLabel="Worktree base branch"
136-
className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
160+
className={Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[18px]"}
137161
/>
138162
{Platform.OS === "android" ? (
139163
<Text className="text-foreground-secondary text-sm">New branch</Text>
@@ -143,7 +167,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
143167
onChangeText={setWorktreeBranchName}
144168
placeholder="feature/mobile-thread"
145169
accessibilityLabel="Worktree branch name"
146-
className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
170+
className={Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[18px]"}
147171
/>
148172
<SheetActionButton
149173
icon="square.split.2x1"
@@ -169,16 +193,32 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
169193
</View>
170194

171195
<View className="gap-2">
172-
<Text className="text-foreground-secondary android:px-4 android:pb-1 android:pt-3 android:text-sm android:font-t3-medium ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
196+
<Text
197+
className={
198+
Platform.OS === "android"
199+
? "px-4 pb-1 pt-3 text-foreground-secondary text-sm font-t3-medium"
200+
: "text-foreground-secondary text-2xs font-t3-bold tracking-[1px] uppercase"
201+
}
202+
>
173203
Existing branches
174204
</Text>
175205
{branchesLoading ? (
176-
<Text className="text-foreground-secondary text-sm font-medium android:px-4">
206+
<Text
207+
className={cn(
208+
"text-foreground-secondary text-sm font-medium",
209+
Platform.OS === "android" && "px-4",
210+
)}
211+
>
177212
Loading branches...
178213
</Text>
179214
) : null}
180215
{!branchesLoading && availableBranches.length === 0 ? (
181-
<Text className="text-foreground-secondary text-sm font-medium android:px-4">
216+
<Text
217+
className={cn(
218+
"text-foreground-secondary text-sm font-medium",
219+
Platform.OS === "android" && "px-4",
220+
)}
221+
>
182222
No local branches found.
183223
</Text>
184224
) : null}
@@ -196,10 +236,16 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
196236
<Pressable
197237
key={branch.name}
198238
className={cn(
199-
"gap-1 px-4 py-3 disabled:opacity-[0.45] android:rounded-[20px] android:active:bg-subtle ios:rounded-[18px] ios:border",
200-
branch.current
201-
? "android:bg-secondary ios:border-subtle-strong"
202-
: "android:bg-card ios:border-border",
239+
"gap-1 px-4 py-3 disabled:opacity-[0.45]",
240+
Platform.OS === "android"
241+
? cn(
242+
"rounded-[20px] active:bg-subtle",
243+
branch.current ? "bg-secondary" : "bg-card",
244+
)
245+
: cn(
246+
"rounded-[18px] border",
247+
branch.current ? "border-subtle-strong" : "border-border",
248+
),
203249
)}
204250
accessibilityRole="button"
205251
accessibilityState={{ selected: branch.current, disabled: busy || disabled }}
@@ -213,7 +259,12 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
213259
{Platform.OS !== "android" ? (
214260
<View className="absolute inset-0 rounded-[18px] bg-card" />
215261
) : null}
216-
<Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
262+
<Text
263+
className={cn(
264+
"text-foreground text-base",
265+
Platform.OS === "android" ? "font-t3-medium" : "font-t3-bold",
266+
)}
267+
>
217268
{branch.name}
218269
</Text>
219270
<Text className="text-foreground-secondary text-xs font-medium">{subtitle}</Text>

‎apps/mobile/src/features/threads/git/GitCommitSheet.tsx‎

Lines changed: 82 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
7272
return (
7373
<View
7474
collapsable={false}
75-
className="bg-sheet ios:flex-1"
75+
className={Platform.OS === "android" ? "bg-sheet" : "flex-1 bg-sheet"}
7676
style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
7777
>
7878
{Platform.OS === "android" ? (
@@ -92,21 +92,35 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
9292
) : null}
9393
<MaterialScreenContent fitToContents>
9494
<ScrollView
95-
className="android:shrink android:grow-0 ios:flex-1"
95+
className={Platform.OS === "android" ? "shrink grow-0" : "flex-1"}
9696
keyboardShouldPersistTaps="handled"
9797
showsVerticalScrollIndicator={false}
9898
contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
99-
contentContainerClassName="android:gap-2 android:p-2 ios:gap-4 ios:px-5 ios:pt-2"
99+
contentContainerClassName={Platform.OS === "android" ? "gap-2 p-2" : "gap-4 px-5 pt-2"}
100100
contentContainerStyle={
101101
Platform.OS === "android"
102102
? { paddingBottom: Math.max(insets.bottom, 18) + 18 }
103103
: undefined
104104
}
105105
>
106-
<View className="gap-3 bg-card p-4 android:rounded-[20px] ios:rounded-[22px] ios:border ios:border-border">
107-
<View className="android:gap-1 ios:flex-row ios:items-center ios:justify-between ios:gap-3">
106+
<View
107+
className={cn(
108+
"gap-3 bg-card p-4",
109+
Platform.OS === "android" ? "rounded-[20px]" : "rounded-[22px] border border-border",
110+
)}
111+
>
112+
<View
113+
className={
114+
Platform.OS === "android" ? "gap-1" : "flex-row items-center justify-between gap-3"
115+
}
116+
>
108117
<Text className="text-foreground-muted text-sm font-medium">Branch</Text>
109-
<Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
118+
<Text
119+
className={cn(
120+
"text-foreground text-base",
121+
Platform.OS === "android" ? "font-t3-medium" : "font-t3-bold",
122+
)}
123+
>
110124
{gitStatus.data?.refName ?? "(detached HEAD)"}
111125
</Text>
112126
</View>
@@ -117,10 +131,20 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
117131
) : null}
118132
</View>
119133

120-
<View className="gap-3 bg-card p-4 android:rounded-[20px] ios:rounded-[22px] ios:border ios:border-border">
134+
<View
135+
className={cn(
136+
"gap-3 bg-card p-4",
137+
Platform.OS === "android" ? "rounded-[20px]" : "rounded-[22px] border border-border",
138+
)}
139+
>
121140
<View className="flex-row items-center justify-between gap-3">
122141
<View className="gap-1">
123-
<Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
142+
<Text
143+
className={cn(
144+
"text-foreground text-base",
145+
Platform.OS === "android" ? "font-t3-medium" : "font-t3-bold",
146+
)}
147+
>
124148
Files
125149
</Text>
126150
<Text className="text-foreground-muted text-xs leading-normal">
@@ -130,19 +154,39 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
130154
<View className="flex-row items-center gap-2">
131155
{!allSelected && isEditingFiles ? (
132156
<Pressable
133-
className="rounded-full px-3 android:min-h-12 android:justify-center android:active:bg-subtle ios:bg-subtle ios:py-2"
157+
className={
158+
Platform.OS === "android"
159+
? "min-h-12 justify-center rounded-full px-3 active:bg-subtle"
160+
: "bg-subtle rounded-full px-3 py-2"
161+
}
134162
onPress={() => setExcludedFiles(new Set())}
135163
>
136-
<Text className="android:text-primary-text android:text-sm android:font-t3-medium ios:text-foreground ios:text-2xs ios:font-t3-bold ios:uppercase">
164+
<Text
165+
className={
166+
Platform.OS === "android"
167+
? "text-primary-text text-sm font-t3-medium"
168+
: "text-foreground text-2xs font-t3-bold uppercase"
169+
}
170+
>
137171
Reset
138172
</Text>
139173
</Pressable>
140174
) : null}
141175
<Pressable
142-
className="rounded-full px-3 android:min-h-12 android:justify-center android:active:bg-subtle ios:bg-subtle ios:py-2"
176+
className={
177+
Platform.OS === "android"
178+
? "min-h-12 justify-center rounded-full px-3 active:bg-subtle"
179+
: "bg-subtle rounded-full px-3 py-2"
180+
}
143181
onPress={() => setIsEditingFiles((current) => !current)}
144182
>
145-
<Text className="android:text-primary-text android:text-sm android:font-t3-medium ios:text-foreground ios:text-2xs ios:font-t3-bold ios:uppercase">
183+
<Text
184+
className={
185+
Platform.OS === "android"
186+
? "text-primary-text text-sm font-t3-medium"
187+
: "text-foreground text-2xs font-t3-bold uppercase"
188+
}
189+
>
146190
{isEditingFiles ? "Done" : "Edit"}
147191
</Text>
148192
</Pressable>
@@ -182,10 +226,15 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
182226
<Pressable
183227
key={file.path}
184228
className={cn(
185-
"px-4 py-3 android:rounded-xl ios:rounded-[18px] ios:border",
186-
included
187-
? "android:bg-subtle ios:border-border"
188-
: "ios:border-border-subtle",
229+
"px-4 py-3",
230+
Platform.OS === "android"
231+
? included
232+
? "rounded-xl bg-subtle"
233+
: "rounded-xl"
234+
: cn(
235+
"rounded-[18px] border",
236+
included ? "border-border" : "border-border-subtle",
237+
),
189238
)}
190239
accessibilityRole="checkbox"
191240
accessibilityLabel={file.path}
@@ -254,8 +303,16 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
254303
)}
255304
</View>
256305

257-
<View className="android:gap-3 android:rounded-[20px] android:bg-card android:p-4 ios:gap-2">
258-
<Text className="text-foreground android:text-base android:font-t3-medium ios:text-sm ios:font-t3-bold">
306+
<View
307+
className={Platform.OS === "android" ? "gap-3 rounded-[20px] bg-card p-4" : "gap-2"}
308+
>
309+
<Text
310+
className={
311+
Platform.OS === "android"
312+
? "text-foreground text-base font-t3-medium"
313+
: "text-foreground text-sm font-t3-bold"
314+
}
315+
>
259316
Commit message
260317
</Text>
261318
<TextInput
@@ -265,20 +322,23 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
265322
onChangeText={setDialogCommitMessage}
266323
placeholder="Leave empty to auto-generate"
267324
textAlignVertical="top"
268-
className="min-h-[128px] px-4 py-3.5 android:rounded-xl android:bg-sheet-solid ios:rounded-[20px]"
325+
className={cn(
326+
"min-h-[128px] px-4 py-3.5",
327+
Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[20px]",
328+
)}
269329
/>
270330
</View>
271331

272-
<View className="android:gap-2 ios:flex-row ios:gap-3">
273-
<View className="ios:flex-1">
332+
<View className={Platform.OS === "android" ? "gap-2" : "flex-row gap-3"}>
333+
<View className={Platform.OS === "android" ? undefined : "flex-1"}>
274334
<SheetActionButton
275335
icon="arrow.branch"
276336
label="Commit on new branch"
277337
disabled={noneSelected || busy}
278338
onPress={() => void runCommitAction(true)}
279339
/>
280340
</View>
281-
<View className="ios:flex-1">
341+
<View className={Platform.OS === "android" ? undefined : "flex-1"}>
282342
<SheetActionButton
283343
icon="checkmark.circle"
284344
label="Commit"

0 commit comments

Comments
 (0)