From 7ac4e3a7a9d8197fe2605c8608d2ff16515e6026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= Date: Wed, 11 Jun 2025 10:04:48 +0200 Subject: [PATCH] fix: introspect on all future operating systems, make iOS 26 work --- .changeset/wet-mammals-kiss.md | 5 +++++ .../react-native-bottom-tabs/ios/Extensions.swift | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 .changeset/wet-mammals-kiss.md diff --git a/.changeset/wet-mammals-kiss.md b/.changeset/wet-mammals-kiss.md new file mode 100644 index 00000000..bb7cc4de --- /dev/null +++ b/.changeset/wet-mammals-kiss.md @@ -0,0 +1,5 @@ +--- +'react-native-bottom-tabs': patch +--- + +fix: introspect on all future operating systems, makes iOS 26 work diff --git a/packages/react-native-bottom-tabs/ios/Extensions.swift b/packages/react-native-bottom-tabs/ios/Extensions.swift index bbd7d3e7..454391ac 100644 --- a/packages/react-native-bottom-tabs/ios/Extensions.swift +++ b/packages/react-native-bottom-tabs/ios/Extensions.swift @@ -1,5 +1,6 @@ import Foundation import SwiftUI +@_spi(Advanced) import SwiftUIIntrospect #if os(macOS) import AppKit @@ -54,7 +55,7 @@ extension PlatformImage { } extension View { - + #if os(macOS) @MainActor @ViewBuilder @@ -62,7 +63,7 @@ extension View { self .introspect( .tabView, - on: .macOS(.v11, .v12, .v13, .v14, .v15), + on: .macOS(.v11...), customize: closure ) } @@ -74,15 +75,15 @@ extension View { #if !os(visionOS) .introspect( .tabView, - on: .iOS(.v14, .v15, .v16, .v17, .v18), - .tvOS(.v14,.v15, .v16, .v17, .v18), + on: .iOS(.v14...), + .tvOS(.v14...), customize: closure ) #endif } #endif - - + + @MainActor @ViewBuilder func measureView(onLayout: @escaping (_ size: CGSize) -> Void) -> some View { @@ -97,7 +98,7 @@ extension View { onLayout(geometry.size) } } - .ignoresSafeArea(.all, edges: .all) + .ignoresSafeArea(.all, edges: .all) ) } }