From 7a0203052615f69083c807f527976e862bb90595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Dr=C3=B3=C5=BCd=C5=BC?=
<31368152+behenate@users.noreply.github.com>
Date: Mon, 12 Jan 2026 17:56:18 +0100
Subject: [PATCH 1/8] [ncl] Fix camera record/pause screen (#42091)
# Why
Once the recording is finished the app shows the playback screen for a
second and goes back right away on android.
# How
In the recording toggle return when recording is finished. Add a
separate go back button.
# Test Plan
Tested in BareExpo on Android
---
.../Camera/CameraScreenPauseRecording.tsx | 43 +++++++++++--------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/apps/native-component-list/src/screens/Camera/CameraScreenPauseRecording.tsx b/apps/native-component-list/src/screens/Camera/CameraScreenPauseRecording.tsx
index 19432db779ad29..96b5dcdffa3881 100644
--- a/apps/native-component-list/src/screens/Camera/CameraScreenPauseRecording.tsx
+++ b/apps/native-component-list/src/screens/Camera/CameraScreenPauseRecording.tsx
@@ -16,6 +16,7 @@ export default function CameraScreenPauseRecording() {
const recordAsync = async () => {
if (recording) {
camera.current?.stopRecording();
+ return;
}
setRecording(true);
const result = await camera.current?.recordAsync();
@@ -32,25 +33,33 @@ export default function CameraScreenPauseRecording() {
return (
{!uri ? (
-
+ <>
+
+
+
+ {uri &&
+
) : (
-
+ <>
+
+
);
}
From 2a78a3be22741e7305e2d399866be45a2ddefe5d Mon Sep 17 00:00:00 2001
From: Alan Hughes <30924086+alanjhughes@users.noreply.github.com>
Date: Mon, 12 Jan 2026 18:10:19 +0000
Subject: [PATCH 2/8] [ios][expo-go] Clean up home SwiftUI (#42090)
---
.../ios/BareExpo.xcodeproj/project.pbxproj | 8 +-
apps/bare-expo/ios/Podfile.lock | 22 +-
.../Client/SwiftUI/Account/AccountSheet.swift | 33 ++-
.../ios/Client/SwiftUI/DesignSystem.swift | 204 ------------------
.../Client/SwiftUI/DiagnosticsTabView.swift | 10 +-
.../ios/Client/SwiftUI/GraphQL/Errors.swift | 4 +-
.../ios/Client/SwiftUI/HomeRootView.swift | 18 +-
.../ios/Client/SwiftUI/HomeViewModel.swift | 29 ---
.../Services/AuthenticationService.swift | 4 +-
.../ios/Client/SwiftUI/SettingsTabView.swift | 7 +-
.../Views/ProjectsLoadingSection.swift | 1 -
.../SwiftUI/Views/SnacksLoadingSection.swift | 1 -
apps/expo-go/ios/Podfile.lock | 2 +-
13 files changed, 44 insertions(+), 299 deletions(-)
diff --git a/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj b/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj
index 33103369170b4f..96f83908ff0631 100644
--- a/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj
+++ b/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj
@@ -419,12 +419,12 @@
"${PODS_CONFIGURATION_BUILD_DIR}/EXApplication/ExpoApplication_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle",
- "${PODS_CONFIGURATION_BUILD_DIR}/EXNotifications/ExpoNotifications_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoDevice/ExpoDevice_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoLocalization/ExpoLocalization_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoMediaLibrary/ExpoMediaLibrary_privacy.bundle",
+ "${PODS_CONFIGURATION_BUILD_DIR}/ExpoNotifications/ExpoNotifications_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoSystemUI/ExpoSystemUI_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoTaskManager/ExpoTaskManager_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
@@ -442,12 +442,12 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoApplication_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle",
- "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoNotifications_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoDevice_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoLocalization_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoMediaLibrary_privacy.bundle",
+ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoNotifications_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoSystemUI_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoTaskManager_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
@@ -497,12 +497,12 @@
"${PODS_CONFIGURATION_BUILD_DIR}/EXApplication/ExpoApplication_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle",
- "${PODS_CONFIGURATION_BUILD_DIR}/EXNotifications/ExpoNotifications_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoDevice/ExpoDevice_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoLocalization/ExpoLocalization_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoMediaLibrary/ExpoMediaLibrary_privacy.bundle",
+ "${PODS_CONFIGURATION_BUILD_DIR}/ExpoNotifications/ExpoNotifications_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoSystemUI/ExpoSystemUI_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/ExpoTaskManager/ExpoTaskManager_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
@@ -520,12 +520,12 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoApplication_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle",
- "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoNotifications_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoDevice_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoLocalization_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoMediaLibrary_privacy.bundle",
+ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoNotifications_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoSystemUI_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoTaskManager_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
diff --git a/apps/bare-expo/ios/Podfile.lock b/apps/bare-expo/ios/Podfile.lock
index 971049ec4b4585..462a94aaa646d7 100644
--- a/apps/bare-expo/ios/Podfile.lock
+++ b/apps/bare-expo/ios/Podfile.lock
@@ -38,11 +38,6 @@ PODS:
- EXManifests/Tests (1.0.8):
- ExpoModulesCore
- ExpoModulesTestCore
- - EXNotifications (0.32.11):
- - ExpoModulesCore
- - EXNotifications/Tests (0.32.11):
- - ExpoModulesCore
- - ExpoModulesTestCore
- Expo (54.0.8):
- ExpoModulesCore
- hermes-engine
@@ -520,6 +515,11 @@ PODS:
- React-hermes
- ExpoNetwork (8.0.7):
- ExpoModulesCore
+ - ExpoNotifications (0.32.11):
+ - ExpoModulesCore
+ - ExpoNotifications/Tests (0.32.11):
+ - ExpoModulesCore
+ - ExpoModulesTestCore
- ExpoPrint (15.0.7):
- ExpoModulesCore
- ExpoRouter (6.0.6):
@@ -3111,8 +3111,6 @@ DEPENDENCIES:
- EXJSONUtils/Tests (from `../../../packages/expo-json-utils/ios`)
- EXManifests (from `../../../packages/expo-manifests/ios`)
- EXManifests/Tests (from `../../../packages/expo-manifests/ios`)
- - EXNotifications (from `../../../packages/expo-notifications/ios`)
- - EXNotifications/Tests (from `../../../packages/expo-notifications/ios`)
- Expo (from `../../../packages/expo`)
- expo-dev-client (from `../../../packages/expo-dev-client/ios`)
- expo-dev-launcher (from `../../../packages/expo-dev-launcher`)
@@ -3172,6 +3170,8 @@ DEPENDENCIES:
- ExpoModulesJSI/Tests (from `../../../packages/expo-modules-core`)
- ExpoModulesTestCore (from `../../../packages/expo-modules-test-core/ios`)
- ExpoNetwork (from `../../../packages/expo-network/ios`)
+ - ExpoNotifications (from `../../../packages/expo-notifications/ios`)
+ - ExpoNotifications/Tests (from `../../../packages/expo-notifications/ios`)
- ExpoPrint (from `../../../packages/expo-print/ios`)
- ExpoRouter (from `../../../packages/expo-router/ios`)
- ExpoScreenCapture (from `../../../packages/expo-screen-capture/ios`)
@@ -3327,9 +3327,6 @@ EXTERNAL SOURCES:
EXManifests:
inhibit_warnings: false
:path: "../../../packages/expo-manifests/ios"
- EXNotifications:
- inhibit_warnings: false
- :path: "../../../packages/expo-notifications/ios"
Expo:
inhibit_warnings: false
:path: "../../../packages/expo"
@@ -3478,6 +3475,9 @@ EXTERNAL SOURCES:
ExpoNetwork:
inhibit_warnings: false
:path: "../../../packages/expo-network/ios"
+ ExpoNotifications:
+ inhibit_warnings: false
+ :path: "../../../packages/expo-notifications/ios"
ExpoPrint:
inhibit_warnings: false
:path: "../../../packages/expo-print/ios"
@@ -3743,7 +3743,6 @@ SPEC CHECKSUMS:
EXConstants: 59d46d25b89f88cc38291a56dbce4d550758f72d
EXJSONUtils: 1d3e4590438c3ee593684186007028a14b3686cd
EXManifests: 7469efed75d694ce3c43a6da9c6f3886f66d3c26
- EXNotifications: a9eb811deeb51fb8e50ef45569be6ffab3994648
Expo: 9d61298dd8bbd625b62dcd082485fe1692084242
expo-dev-client: b8c16c699a35787e1ac38c6d44ef7552fe3f0334
expo-dev-launcher: 93ab1128548f72825f3fe290ff1c1690114e8def
@@ -3794,6 +3793,7 @@ SPEC CHECKSUMS:
ExpoModulesJSI: c470ea2ed825fce73bdc4ef060c8a22e3f664092
ExpoModulesTestCore: e65555b75a4ed7dd3bcf421ad01d7748bd372c88
ExpoNetwork: 97073786edfe405aba5d0987a544617ed0671ad1
+ ExpoNotifications: ce045fa5f6ab4109f04468e04e6fe6ff0427a6d1
ExpoPrint: ad836bb90da10793509651c0ea1f39e120db001e
ExpoRouter: 84268c2b41722697cb02cd6c377d588b4f71c9b5
ExpoScreenCapture: 0c785ab7e1fa38943f04b16060d54ae8f886544a
diff --git a/apps/expo-go/ios/Client/SwiftUI/Account/AccountSheet.swift b/apps/expo-go/ios/Client/SwiftUI/Account/AccountSheet.swift
index e3737f7b03f425..4489581a386a0e 100644
--- a/apps/expo-go/ios/Client/SwiftUI/Account/AccountSheet.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/Account/AccountSheet.swift
@@ -45,8 +45,7 @@ struct AccountSheet: View {
Button {
dismiss()
- }
- label: {
+ } label: {
Image(systemName: "xmark")
.font(.system(size: 16, weight: .medium))
.foregroundColor(.primary)
@@ -79,17 +78,16 @@ struct AccountSheet: View {
Button {
UIImpactFeedbackGenerator(style: .light).impactOccurred()
viewModel.signOut()
- }
- label: {
+ } label: {
Text("Logout")
- .font(.headline)
- .fontWeight(.bold)
- .foregroundColor(.white)
- .frame(maxWidth: .infinity)
- .padding(.vertical, 12)
- }
- .background(Color.black)
- .cornerRadius(12)
+ .font(.headline)
+ .fontWeight(.bold)
+ .foregroundColor(.white)
+ .frame(maxWidth: .infinity)
+ .padding(.vertical, 12)
+ }
+ .background(Color.black)
+ .cornerRadius(12)
}
}
@@ -117,8 +115,7 @@ struct AccountSheet: View {
Task {
await viewModel.signIn()
}
- }
- label: {
+ } label: {
Text("Log In")
.font(.headline)
.fontWeight(.semibold)
@@ -137,8 +134,7 @@ struct AccountSheet: View {
Task {
await viewModel.signUp()
}
- }
- label: {
+ } label: {
Text("Sign Up")
.font(.headline)
.fontWeight(.semibold)
@@ -146,7 +142,7 @@ struct AccountSheet: View {
.frame(maxWidth: .infinity)
.padding(.vertical, 12)
}
- .background(Color(.white))
+ .background(Color.white)
.cornerRadius(12)
.disabled(viewModel.isAuthenticating)
}
@@ -155,8 +151,7 @@ struct AccountSheet: View {
Button {
UIImpactFeedbackGenerator(style: .light).impactOccurred()
viewModel.selectAccount(accountId: account.id)
- }
- label: {
+ } label: {
HStack(spacing: 12) {
AvatarView(account: account, size: 40)
diff --git a/apps/expo-go/ios/Client/SwiftUI/DesignSystem.swift b/apps/expo-go/ios/Client/SwiftUI/DesignSystem.swift
index 882bb9c6e4992f..b2e088eebd6471 100644
--- a/apps/expo-go/ios/Client/SwiftUI/DesignSystem.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/DesignSystem.swift
@@ -4,165 +4,29 @@ import SwiftUI
import ExpoModulesCore
extension Color {
- // Brand colors
static let expoBlue = Color(red: 0.0, green: 0.46, blue: 1.0)
- static let expoGreen = Color(red: 0.0, green: 0.8, blue: 0.4)
- static let expoOrange = Color(red: 1.0, green: 0.4, blue: 0.0)
- static let expoRed = Color(red: 1.0, green: 0.23, blue: 0.19)
- static let expoPink = Color(red: 1.0, green: 0.18, blue: 0.58)
- static let expoPurple = Color(red: 0.56, green: 0.27, blue: 1.0)
- static let expoPrimaryText = Color(.label)
static let expoSecondaryText = Color(.secondaryLabel)
- static let expoTertiaryText = Color(.tertiaryLabel)
-
- static let expoBorder = Color(.separator)
- static let expoSecondaryBorder = Color(.opaqueSeparator)
static let expoSystemBackground = Color(uiColor: .systemBackground)
static let expoSecondarySystemBackground = Color(uiColor: .secondarySystemBackground)
- static let expoTertiarySystemBackground = Color(uiColor: .tertiarySystemBackground)
- static let expoSystemGroupedBackground = Color(uiColor: .systemGroupedBackground)
static let expoSecondarySystemGroupedBackground = Color(uiColor: .secondarySystemGroupedBackground)
- static let expoTertiarySystemGroupedBackground = Color(uiColor: .tertiarySystemGroupedBackground)
- static let expoSystemGray = Color(uiColor: .systemGray)
- static let expoSystemGray2 = Color(uiColor: .systemGray2)
- static let expoSystemGray3 = Color(uiColor: .systemGray3)
static let expoSystemGray4 = Color(uiColor: .systemGray4)
static let expoSystemGray5 = Color(uiColor: .systemGray5)
static let expoSystemGray6 = Color(uiColor: .systemGray6)
}
extension Font {
- static func expoTitle(_ size: CGFloat = 28) -> Font {
- return .system(size: size, weight: .bold, design: .default)
- }
-
- static func expoHeadline(_ size: CGFloat = 17) -> Font {
- return .system(size: size, weight: .semibold, design: .default)
- }
-
- static func expoBody(_ size: CGFloat = 17) -> Font {
- return .system(size: size, weight: .regular, design: .default)
- }
-
static func expoCaption(_ size: CGFloat = 12) -> Font {
return .system(size: size, weight: .medium, design: .default)
}
-
- static func expoFootnote(_ size: CGFloat = 13) -> Font {
- return .system(size: size, weight: .regular, design: .default)
- }
-}
-
-struct Spacing {
- static let xxs: CGFloat = 2
- static let xs: CGFloat = 4
- static let small: CGFloat = 8
- static let medium: CGFloat = 12
- static let large: CGFloat = 16
- static let xl: CGFloat = 20
- static let xxl: CGFloat = 24
- static let xxxl: CGFloat = 32
}
struct BorderRadius {
static let small: CGFloat = 4
static let medium: CGFloat = 8
static let large: CGFloat = 12
- static let xl: CGFloat = 16
- static let xxl: CGFloat = 20
-}
-
-extension View {
- func expoCardShadow() -> some View {
- self.shadow(
- color: Color.black.opacity(0.08),
- radius: 8,
- x: 0,
- y: 2
- )
- }
-
- func expoButtonShadow() -> some View {
- self.shadow(
- color: Color.black.opacity(0.1),
- radius: 4,
- x: 0,
- y: 2
- )
- }
-
- func expoRowStyle() -> some View {
- self
- .padding()
- .background(Color.expoSecondarySystemBackground)
- .clipShape(RoundedRectangle(cornerRadius: BorderRadius.large))
- }
-}
-
-struct ExpoButtonStyle: ButtonStyle {
- let style: ExpoButtonVariant
-
- enum ExpoButtonVariant {
- case primary
- case secondary
- case ghost
- case danger
- }
-
- func makeBody(configuration: Configuration) -> some View {
- configuration.label
- .font(.expoHeadline())
- .padding(.horizontal, Spacing.large)
- .padding(.vertical, Spacing.medium)
- .background(backgroundColor)
- .foregroundColor(textColor)
- .clipShape(RoundedRectangle(cornerRadius: BorderRadius.medium))
- .scaleEffect(configuration.isPressed ? 0.98 : 1.0)
- .opacity(configuration.isPressed ? 0.8 : 1.0)
- .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
- }
-
- private var backgroundColor: Color {
- switch style {
- case .primary:
- return .expoBlue
- case .secondary:
- return .expoSecondarySystemBackground
- case .ghost:
- return .clear
- case .danger:
- return .expoRed
- }
- }
-
- private var textColor: Color {
- switch style {
- case .primary, .danger:
- return .white
- case .secondary:
- return .expoPrimaryText
- case .ghost:
- return .expoBlue
- }
- }
-}
-
-struct ExpoCardStyle: ViewModifier {
- func body(content: Content) -> some View {
- content
- .background(Color.expoSecondarySystemGroupedBackground)
- .clipShape(RoundedRectangle(cornerRadius: BorderRadius.large))
- .expoCardShadow()
- }
-}
-
-extension View {
- func expoCard() -> some View {
- self.modifier(ExpoCardStyle())
- }
}
struct ExpoSectionHeaderStyle: ViewModifier {
@@ -179,71 +43,3 @@ extension View {
self.modifier(ExpoSectionHeaderStyle())
}
}
-
-struct ExpoListRowStyle: ViewModifier {
- let isFirst: Bool
- let isLast: Bool
-
- init(isFirst: Bool = false, isLast: Bool = false) {
- self.isFirst = isFirst
- self.isLast = isLast
- }
-
- func body(content: Content) -> some View {
- content
- .padding(Spacing.large)
- .background(Color.expoSecondarySystemGroupedBackground)
- .overlay(
- Rectangle()
- .frame(height: 0.5)
- .foregroundColor(.expoBorder)
- .opacity(isFirst ? 0 : 1),
- alignment: .top
- )
- .clipShape(
- RoundedCorners(
- topLeading: isFirst ? BorderRadius.large : 0,
- topTrailing: isFirst ? BorderRadius.large : 0,
- bottomLeading: isLast ? BorderRadius.large : 0,
- bottomTrailing: isLast ? BorderRadius.large : 0
- )
- )
- }
-}
-
-extension View {
- func expoListRow(isFirst: Bool = false, isLast: Bool = false) -> some View {
- self.modifier(ExpoListRowStyle(isFirst: isFirst, isLast: isLast))
- }
-}
-
-struct RoundedCorners: Shape {
- let topLeading: CGFloat
- let topTrailing: CGFloat
- let bottomLeading: CGFloat
- let bottomTrailing: CGFloat
-
- func path(in rect: CGRect) -> Path {
- var path = Path()
-
- let width = rect.size.width
- let height = rect.size.height
-
- path.move(to: CGPoint(x: topLeading, y: 0))
-
- path.addLine(to: CGPoint(x: width - topTrailing, y: 0))
- path.addArc(center: CGPoint(x: width - topTrailing, y: topTrailing), radius: topTrailing, startAngle: Angle(degrees: -90), endAngle: Angle(degrees: 0), clockwise: false)
-
- path.addLine(to: CGPoint(x: width, y: height - bottomTrailing))
- path.addArc(center: CGPoint(x: width - bottomTrailing, y: height - bottomTrailing), radius: bottomTrailing, startAngle: Angle(degrees: 0), endAngle: Angle(degrees: 90), clockwise: false)
-
- path.addLine(to: CGPoint(x: bottomLeading, y: height))
- path.addArc(center: CGPoint(x: bottomLeading, y: height - bottomLeading), radius: bottomLeading, startAngle: Angle(degrees: 90), endAngle: Angle(degrees: 180), clockwise: false)
-
- path.addLine(to: CGPoint(x: 0, y: topLeading))
- path.addArc(center: CGPoint(x: topLeading, y: topLeading), radius: topLeading, startAngle: Angle(degrees: 180), endAngle: Angle(degrees: 270), clockwise: false)
-
- path.closeSubpath()
- return path
- }
-}
diff --git a/apps/expo-go/ios/Client/SwiftUI/DiagnosticsTabView.swift b/apps/expo-go/ios/Client/SwiftUI/DiagnosticsTabView.swift
index 96f328d425b288..a30db26cf36a44 100644
--- a/apps/expo-go/ios/Client/SwiftUI/DiagnosticsTabView.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/DiagnosticsTabView.swift
@@ -11,8 +11,7 @@ struct DiagnosticsTabView: View {
NavigationLink(destination: AudioDiagnosticsView()) {
DiagnosticCard(
title: "Audio",
- description: "On iOS you can play audio in the foreground and background, choose whether it plays when the device is on silent, and set how the audio interacts with audio from other apps. This diagnostic allows you to see the available options.",
- action: {}
+ description: "On iOS you can play audio in the foreground and background, choose whether it plays when the device is on silent, and set how the audio interacts with audio from other apps. This diagnostic allows you to see the available options."
)
}
.buttonStyle(PlainButtonStyle())
@@ -20,8 +19,7 @@ struct DiagnosticsTabView: View {
NavigationLink(destination: LocationDiagnosticsView()) {
DiagnosticCard(
title: "Background location",
- description: "On iOS it's possible to track your location when an app is foregrounded, backgrounded, or even closed. This diagnostic allows you to see what options are available, see the output, and test the functionality on your device. None of the location data will leave your device.",
- action: {}
+ description: "On iOS it's possible to track your location when an app is foregrounded, backgrounded, or even closed. This diagnostic allows you to see what options are available, see the output, and test the functionality on your device. None of the location data will leave your device."
)
}
.buttonStyle(PlainButtonStyle())
@@ -29,8 +27,7 @@ struct DiagnosticsTabView: View {
NavigationLink(destination: GeofencingDiagnosticsView()) {
DiagnosticCard(
title: "Geofencing",
- description: "You can fire actions when your device enters specific geographical regions represented by a longitude, latitude, and a radius. This diagnostic lets you experiment with Geofencing using regions that you specify and shows you the data that is made available. None of the data will leave your device.",
- action: {}
+ description: "You can fire actions when your device enters specific geographical regions represented by a longitude, latitude, and a radius. This diagnostic lets you experiment with Geofencing using regions that you specify and shows you the data that is made available. None of the data will leave your device."
)
}
.buttonStyle(PlainButtonStyle())
@@ -46,7 +43,6 @@ struct DiagnosticsTabView: View {
struct DiagnosticCard: View {
let title: String
let description: String
- let action: () -> Void
var body: some View {
HStack(alignment: .top) {
diff --git a/apps/expo-go/ios/Client/SwiftUI/GraphQL/Errors.swift b/apps/expo-go/ios/Client/SwiftUI/GraphQL/Errors.swift
index 08771f930a9035..60915a40ad4bce 100644
--- a/apps/expo-go/ios/Client/SwiftUI/GraphQL/Errors.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/GraphQL/Errors.swift
@@ -2,7 +2,7 @@
import Foundation
-enum APIError: Error {
+enum APIError: LocalizedError {
case invalidURL
case invalidResponse
case httpError(statusCode: Int, message: String)
@@ -10,7 +10,7 @@ enum APIError: Error {
case networkError(Error)
case authenticationRequired
- var localizedDescription: String {
+ var errorDescription: String? {
switch self {
case .invalidURL:
return "Invalid URL"
diff --git a/apps/expo-go/ios/Client/SwiftUI/HomeRootView.swift b/apps/expo-go/ios/Client/SwiftUI/HomeRootView.swift
index 6c808e30d876cd..23f88d35f55ff5 100644
--- a/apps/expo-go/ios/Client/SwiftUI/HomeRootView.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/HomeRootView.swift
@@ -28,7 +28,6 @@ public struct HomeRootView: View {
Text("Home")
}
.tag(HomeTab.home)
- .navigationBarHidden(true)
NavigationView {
DiagnosticsTabView()
@@ -52,17 +51,12 @@ public struct HomeRootView: View {
AccountSheet()
.environmentObject(viewModel)
}
- .alert("Error", isPresented: Binding(
- get: { viewModel.errorToShow != nil },
- set: { if !$0 { viewModel.clearError() } }
- )) {
- Button("OK") {
- viewModel.clearError()
- }
- } message: {
- if let error = viewModel.errorToShow {
- Text(error.message)
- }
+ .alert(item: $viewModel.errorToShow) { error in
+ Alert(
+ title: Text("Error"),
+ message: Text(error.message),
+ dismissButton: .default(Text("OK"))
+ )
}
}
}
diff --git a/apps/expo-go/ios/Client/SwiftUI/HomeViewModel.swift b/apps/expo-go/ios/Client/SwiftUI/HomeViewModel.swift
index a81fb2b63ab4d4..0f4db9f383745f 100644
--- a/apps/expo-go/ios/Client/SwiftUI/HomeViewModel.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/HomeViewModel.swift
@@ -12,7 +12,6 @@ class HomeViewModel: ObservableObject {
@Published var recentlyOpenedApps: [RecentlyOpenedApp] = []
- @Published var showingAccountSheet = false
@Published var showingFeedbackForm = false
@Published var errorToShow: ErrorInfo?
@Published var isNetworkAvailable = true
@@ -177,26 +176,6 @@ class HomeViewModel: ObservableObject {
openAppViaBridge(url: url)
}
- func extractAppName(from url: String) -> String {
- guard let urlComponents = URL(string: url) else {
- return url
- }
-
- let pathComponents = urlComponents.path.components(separatedBy: "/").filter { !$0.isEmpty }
- if let lastComponent = pathComponents.last, !lastComponent.isEmpty, lastComponent != "@" {
- return lastComponent
- }
-
- if let host = urlComponents.host {
- if let port = urlComponents.port {
- return "\(host):\(port)"
- }
- return host
- }
-
- return url
- }
-
func updateShakeGesture(_ enabled: Bool) {
settingsManager.updateShakeGesture(enabled)
}
@@ -209,10 +188,6 @@ class HomeViewModel: ObservableObject {
settingsManager.updateTheme(themeIndex)
}
- func showAccountSheet() {
- showingAccountSheet = true
- }
-
func showFeedbackForm() {
showingFeedbackForm = true
}
@@ -221,10 +196,6 @@ class HomeViewModel: ObservableObject {
errorToShow = ErrorInfo(message: message, apiError: apiError)
}
- func clearError() {
- errorToShow = nil
- }
-
private func setupSubscriptions() {
authService.$user
.sink { [weak self] in self?.user = $0 }
diff --git a/apps/expo-go/ios/Client/SwiftUI/Services/AuthenticationService.swift b/apps/expo-go/ios/Client/SwiftUI/Services/AuthenticationService.swift
index c56803046ccffa..00a5b0f7ea3fe4 100644
--- a/apps/expo-go/ios/Client/SwiftUI/Services/AuthenticationService.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/Services/AuthenticationService.swift
@@ -13,7 +13,7 @@ class AuthenticationService: ObservableObject {
private let sessionKey = "expo-session-secret"
private let selectedAccountKey = "expo-selected-account-id"
- private let presentationContext = ExpoGoAuthPresentationContext()
+ private let presentationContext = AuthPresentationContextProvider()
var sessionSecret: String? {
UserDefaults.standard.string(forKey: sessionKey)
@@ -161,7 +161,7 @@ class AuthenticationService: ObservableObject {
}
}
-private class ExpoGoAuthPresentationContext: NSObject, ASWebAuthenticationPresentationContextProviding {
+private class AuthPresentationContextProvider: NSObject, ASWebAuthenticationPresentationContextProviding {
func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
let window = UIApplication.shared.connectedScenes
.compactMap { $0 as? UIWindowScene }
diff --git a/apps/expo-go/ios/Client/SwiftUI/SettingsTabView.swift b/apps/expo-go/ios/Client/SwiftUI/SettingsTabView.swift
index 8983acbdb1b048..00de74c57bbb89 100644
--- a/apps/expo-go/ios/Client/SwiftUI/SettingsTabView.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/SettingsTabView.swift
@@ -135,7 +135,7 @@ struct SettingsTabView: View {
}
.frame(maxWidth: .infinity)
.padding()
- .background(Color(.secondarySystemBackground))
+ .background(Color.expoSecondarySystemBackground)
.foregroundColor(.primary)
.clipShape(RoundedRectangle(cornerRadius: BorderRadius.large))
}
@@ -200,11 +200,6 @@ struct SettingsTabView: View {
.task {
await refreshTrackingStatus()
}
- .onAppear {
- Task {
- await refreshTrackingStatus()
- }
- }
}
private func getExpoSDKVersion() -> String {
diff --git a/apps/expo-go/ios/Client/SwiftUI/Views/ProjectsLoadingSection.swift b/apps/expo-go/ios/Client/SwiftUI/Views/ProjectsLoadingSection.swift
index deaab665f5f9f2..d5e984ee89b3db 100644
--- a/apps/expo-go/ios/Client/SwiftUI/Views/ProjectsLoadingSection.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/Views/ProjectsLoadingSection.swift
@@ -39,6 +39,5 @@ struct ProjectSkeletonRow: View {
.padding()
.background(Color.expoSecondarySystemBackground)
.clipShape(RoundedRectangle(cornerRadius: BorderRadius.large))
- .redacted(reason: .placeholder)
}
}
diff --git a/apps/expo-go/ios/Client/SwiftUI/Views/SnacksLoadingSection.swift b/apps/expo-go/ios/Client/SwiftUI/Views/SnacksLoadingSection.swift
index 95bffcf456ed6a..15f6263211250e 100644
--- a/apps/expo-go/ios/Client/SwiftUI/Views/SnacksLoadingSection.swift
+++ b/apps/expo-go/ios/Client/SwiftUI/Views/SnacksLoadingSection.swift
@@ -39,6 +39,5 @@ struct SnackSkeletonRow: View {
.padding()
.background(Color.expoSecondarySystemBackground)
.clipShape(RoundedRectangle(cornerRadius: BorderRadius.large))
- .redacted(reason: .placeholder)
}
}
diff --git a/apps/expo-go/ios/Podfile.lock b/apps/expo-go/ios/Podfile.lock
index 7982016f73f6e2..05d5f87fcf7ac9 100644
--- a/apps/expo-go/ios/Podfile.lock
+++ b/apps/expo-go/ios/Podfile.lock
@@ -4757,7 +4757,7 @@ SPEC CHECKSUMS:
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
- hermes-engine: 452f2dd7422b2fd7973ae9ca103898d28d7744f0
+ hermes-engine: d7a9424b7191b73c5c774d04fc2e147dd400e67f
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
From acc1886bc56d56c64295e7e0f3b6c13559349cde Mon Sep 17 00:00:00 2001
From: Jakub Tkacz <32908614+Ubax@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:24:06 +0100
Subject: [PATCH 3/8] [expo-router] add Toolbar.SearchBarPreferredSlot (#41863)
# Why
# How
1. Add native component implementation
2. Use
[`searchBarPlacementBarButtonItem`](https://developer.apple.com/documentation/uikit/uinavigationitem/searchbarplacementbarbuttonitem)
# Test Plan
1. Manual testing
2. local e2e
# Checklist
- [x] I added a `changelog.md` entry and rebuilt the package sources
according to [this short
guide](https://github.com/expo/expo/blob/main/CONTRIBUTING.md#-before-submitting)
- [ ] This diff will work correctly for `npx expo prebuild` & EAS Build
(eg: updated a module plugin).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
---
.../__tests__/toolbar/search-bar.yml | 26 +++++++
.../__e2e__/native-navigation/app/toolbar.tsx | 51 ++++++++++++-
apps/router-e2e/__e2e__/stack/app/[id].tsx | 9 +--
.../__e2e__/stack/app/test/index.tsx | 9 +--
.../data/unversioned/expo-router-toolbar.json | 2 +-
.../static/data/unversioned/expo-router.json | 2 +-
packages/expo-router/CHANGELOG.md | 1 +
.../build/layouts/StackClient.d.ts | 4 +-
.../build/layouts/StackClient.d.ts.map | 2 +-
.../expo-router/build/layouts/StackClient.js | 1 +
.../build/layouts/StackClient.js.map | 2 +-
.../stack-utils/StackHeaderComponent.d.ts.map | 2 +-
.../stack-utils/StackHeaderComponent.js | 6 +-
.../stack-utils/StackHeaderComponent.js.map | 2 +-
.../stack-utils/StackHeaderSearchBar.d.ts | 7 --
.../stack-utils/StackHeaderSearchBar.d.ts.map | 1 -
.../stack-utils/StackHeaderSearchBar.js | 16 ----
.../stack-utils/StackHeaderSearchBar.js.map | 1 -
.../layouts/stack-utils/StackSearchBar.d.ts | 7 ++
.../stack-utils/StackSearchBar.d.ts.map | 1 +
.../layouts/stack-utils/StackSearchBar.js | 19 +++++
.../layouts/stack-utils/StackSearchBar.js.map | 1 +
.../build/layouts/stack-utils/index.d.ts | 5 +-
.../build/layouts/stack-utils/index.d.ts.map | 2 +-
.../build/layouts/stack-utils/index.js | 7 +-
.../build/layouts/stack-utils/index.js.map | 2 +-
.../expo-router/build/toolbar/elements.d.ts | 49 +++++++++++++
.../build/toolbar/elements.d.ts.map | 2 +-
.../expo-router/build/toolbar/elements.js | 36 ++++++++-
.../expo-router/build/toolbar/elements.js.map | 2 +-
packages/expo-router/build/toolbar/index.d.ts | 7 +-
.../expo-router/build/toolbar/index.d.ts.map | 2 +-
packages/expo-router/build/toolbar/index.js | 4 +-
.../expo-router/build/toolbar/index.js.map | 2 +-
.../build/toolbar/native.types.d.ts | 2 +-
.../build/toolbar/native.types.d.ts.map | 2 +-
.../build/toolbar/native.types.js.map | 2 +-
.../ios/Toolbar/RouterToolbarHostView.swift | 2 +-
.../ios/Toolbar/RouterToolbarItemView.swift | 28 ++++++-
.../expo-router/src/layouts/StackClient.tsx | 2 +
.../stack-utils/StackHeaderComponent.tsx | 9 +--
.../stack-utils/StackHeaderSearchBar.tsx | 20 -----
.../layouts/stack-utils/StackSearchBar.tsx | 27 +++++++
.../__tests__/composition.test.ios.tsx | 4 +-
.../src/layouts/stack-utils/index.tsx | 7 +-
packages/expo-router/src/toolbar/elements.tsx | 73 ++++++++++++++++++-
packages/expo-router/src/toolbar/index.ts | 12 ++-
.../expo-router/src/toolbar/native.types.ts | 2 +-
48 files changed, 371 insertions(+), 113 deletions(-)
create mode 100644 apps/router-e2e/__e2e__/native-navigation/__tests__/toolbar/search-bar.yml
delete mode 100644 packages/expo-router/build/layouts/stack-utils/StackHeaderSearchBar.d.ts
delete mode 100644 packages/expo-router/build/layouts/stack-utils/StackHeaderSearchBar.d.ts.map
delete mode 100644 packages/expo-router/build/layouts/stack-utils/StackHeaderSearchBar.js
delete mode 100644 packages/expo-router/build/layouts/stack-utils/StackHeaderSearchBar.js.map
create mode 100644 packages/expo-router/build/layouts/stack-utils/StackSearchBar.d.ts
create mode 100644 packages/expo-router/build/layouts/stack-utils/StackSearchBar.d.ts.map
create mode 100644 packages/expo-router/build/layouts/stack-utils/StackSearchBar.js
create mode 100644 packages/expo-router/build/layouts/stack-utils/StackSearchBar.js.map
delete mode 100644 packages/expo-router/src/layouts/stack-utils/StackHeaderSearchBar.tsx
create mode 100644 packages/expo-router/src/layouts/stack-utils/StackSearchBar.tsx
diff --git a/apps/router-e2e/__e2e__/native-navigation/__tests__/toolbar/search-bar.yml b/apps/router-e2e/__e2e__/native-navigation/__tests__/toolbar/search-bar.yml
new file mode 100644
index 00000000000000..d9c667a2cc10ba
--- /dev/null
+++ b/apps/router-e2e/__e2e__/native-navigation/__tests__/toolbar/search-bar.yml
@@ -0,0 +1,26 @@
+appId: com.expo.routere2e
+name: Toolbar search bar
+jsEngine: graaljs
+---
+- stopApp: com.expo.routere2e
+- openLink: router-e2e://toolbar?searchBar=true
+- runFlow: ../close-warning.yml
+- assertVisible: "Toolbar E2E Test Screen"
+- tapOn: Search
+- assertVisible: 'Search Text: ""'
+- assertVisible: "Search Focused: Yes"
+- assertVisible: This is toolbar searchbar
+- tapOn: This is toolbar searchbar
+- inputText: Hello World
+- scrollUntilVisible:
+ element: "Search Focused: Yes"
+- assertVisible: 'Search Text: "Hello World"'
+- tapOn: close
+- assertVisible: 'Search Text: ""'
+- assertVisible: "Search Focused: No"
+- tapOn:
+ id: toggle-search-bar
+- assertNotVisible: Search
+- tapOn:
+ id: toggle-search-bar
+- assertVisible: Search
diff --git a/apps/router-e2e/__e2e__/native-navigation/app/toolbar.tsx b/apps/router-e2e/__e2e__/native-navigation/app/toolbar.tsx
index 4d634d7dd0a6a9..42362923691a85 100644
--- a/apps/router-e2e/__e2e__/native-navigation/app/toolbar.tsx
+++ b/apps/router-e2e/__e2e__/native-navigation/app/toolbar.tsx
@@ -1,5 +1,5 @@
import { useImage } from 'expo-image';
-import { Color, useLocalSearchParams } from 'expo-router';
+import { Color, Stack, useLocalSearchParams } from 'expo-router';
import { Toolbar } from 'expo-router/unstable-toolbar';
import { SymbolView } from 'expo-symbols';
import { useState, useRef } from 'react';
@@ -17,6 +17,9 @@ import {
export default function ToolbarScreen() {
const params = useLocalSearchParams();
// State for controlling toolbar items visibility
+ const [showSearchBar, setShowSearchBar] = useState(!!params.searchBar);
+ const [sharesBackgroundSearchBar, setSharesBackgroundSearchBar] = useState(true);
+ const [hidesSharedBackgroundSearchBar, setHidesSharedBackgroundSearchBar] = useState(false);
const [showSearchButton, setShowSearchButton] = useState(!!params.searchButton);
const [sharesBackgroundSearchButton, setSharesBackgroundSearchButton] = useState(true);
const [hidesSharedBackgroundSearchButton, setHidesSharedBackgroundSearchButton] = useState(false);
@@ -91,10 +94,49 @@ export default function ToolbarScreen() {
contentContainerStyle={styles.contentContainer}
contentInsetAdjustmentBehavior="automatic">
Toolbar E2E Test Screen
+
+ setIsSearchFocused(true)}
+ onBlur={() => setIsSearchFocused(false)}
+ onChangeText={(e) => setSearchText(e.nativeEvent.text)}
+ placement="integratedButton"
+ placeholder="This is toolbar searchbar"
+ />
Toolbar Items Visibility
+
+ Show Search Bar
+
+
+
+ {showSearchBar && (
+ <>
+
+ Search Bar Shares Background
+
+
+
+
+ Search Bar Hides Shared Background
+
+
+
+ )}
+
Show Search Button
+ {/* Search bar */}
+
+
{/* Search button */}
-
-
- setSearchText(e.nativeEvent.text)}
- />
-
-
+ setSearchText(e.nativeEvent.text)} />
Modal Search Text: {searchText}