Skip to content

Commit ccadbdd

Browse files
authored
fix: add bottom accessory view nil check for iOS 26+ compatibility (#479)
* fix: add bottom accessory view nil check for iOS 26+ compatibility * Fix nil check for bottom accessory view on iOS 26+ Add a nil check for bottom accessory view to ensure compatibility with iOS 26 and above.
1 parent 4b6027c commit ccadbdd

File tree

3 files changed

+72
-67
lines changed

3 files changed

+72
-67
lines changed

.changeset/funny-files-explode.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-native-bottom-tabs": patch
3+
---
4+
5+
fix: add bottom accessory view nil check for iOS 26+ compatibility

apps/example/ios/Podfile.lock

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@ PODS:
17481748
- React-RCTFBReactNativeSpec
17491749
- ReactCommon/turbomodule/core
17501750
- SocketRocket
1751-
- react-native-bottom-tabs (1.0.2):
1751+
- react-native-bottom-tabs (1.0.3):
17521752
- boost
17531753
- DoubleConversion
17541754
- fast_float
@@ -1766,7 +1766,7 @@ PODS:
17661766
- React-graphics
17671767
- React-ImageManager
17681768
- React-jsi
1769-
- react-native-bottom-tabs/common (= 1.0.2)
1769+
- react-native-bottom-tabs/common (= 1.0.3)
17701770
- React-NativeModulesApple
17711771
- React-RCTFabric
17721772
- React-renderercss
@@ -1778,7 +1778,7 @@ PODS:
17781778
- SocketRocket
17791779
- SwiftUIIntrospect (~> 1.0)
17801780
- Yoga
1781-
- react-native-bottom-tabs/common (1.0.2):
1781+
- react-native-bottom-tabs/common (1.0.3):
17821782
- boost
17831783
- DoubleConversion
17841784
- fast_float
@@ -2809,81 +2809,81 @@ SPEC CHECKSUMS:
28092809
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
28102810
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
28112811
hermes-engine: 35c763d57c9832d0eef764316ca1c4d043581394
2812-
RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
2812+
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
28132813
RCTDeprecation: c0ed3249a97243002615517dff789bf4666cf585
28142814
RCTRequired: 58719f5124f9267b5f9649c08bf23d9aea845b23
28152815
RCTTypeSafety: 4aefa8328ab1f86da273f08517f1f6b343f6c2cc
28162816
React: 2073376f47c71b7e9a0af7535986a77522ce1049
28172817
React-callinvoker: 751b6f2c83347a0486391c3f266f291f0f53b27e
2818-
React-Core: 7195661f0b48e7ea46c3360ccb575288a20c932c
2819-
React-CoreModules: 14f0054ab46000dd3b816d6528af3bd600d82073
2820-
React-cxxreact: 7f602425c63096c398dac13cd7a300efd7c281ae
2818+
React-Core: dff5d29973349b11dd6631c9498456d75f846d5e
2819+
React-CoreModules: c0ae04452e4c5d30e06f8e94692a49107657f537
2820+
React-cxxreact: 376fd672c95dfb64ad5cc246e6a1e9edb78dec4c
28212821
React-debug: 7b56a0a7da432353287d2eedac727903e35278f5
2822-
React-defaultsnativemodule: 695d8a0b40f735edb3c4031e0f049e567fdac47a
2823-
React-domnativemodule: 6d66c1f61f277d008d98cae650ce2c025b89d3b9
2824-
React-Fabric: 997d4115d688f483cb409a1290171bff3c93dab4
2825-
React-FabricComponents: 8167e5e363ca3a3fe394d8afee355e4072bea1db
2826-
React-FabricImage: f8f9f2c97657116702acc670e3f4357bc842bed3
2827-
React-featureflags: dfb4d0d527d55dd968231370f6832b9197ee653d
2828-
React-featureflagsnativemodule: c63cfd8fe95cd98f12ebb37daa919c4544810a45
2829-
React-graphics: fd795f1c2a1133a08dde31725b20949edd545dca
2830-
React-hermes: 0a167bbb02c242664745e82154578c64e90a88e5
2831-
React-idlecallbacksnativemodule: 1798c6aa33ddc7c2e9fa3c3d67729728639889e9
2832-
React-ImageManager: c498ee6945dffacc82bfa175aa3264212f27c70b
2833-
React-jserrorhandler: 216951fea62fc26c600f4c96f0dc4fd53d1e7a9b
2834-
React-jsi: 9c27d27d3007b73c702ad3fd5a6166557c741020
2835-
React-jsiexecutor: 2b24f4ed4026344a27f717bf947a434cbbeeff7a
2836-
React-jsinspector: 02394b059c48805780f7d977366317a24168d00e
2837-
React-jsinspectorcdp: f4b6d5c5c9db05ef44d082716714f90cfeed96bb
2838-
React-jsinspectornetwork: e7c77d01b5f0664e24c0bec1aea27d5e3d7fb746
2839-
React-jsinspectortracing: aaa96a4e53abb88dc6d47da3b5744c710652fef9
2840-
React-jsitooling: 226e5f4147c7b6f1ae1954a8406ffa713f3da828
2841-
React-jsitracing: 8a2fbeaa9c53c3f0b23904ccffefc890eae48d71
2842-
React-logger: 1767babce2d28c3251039ce05556714a2c8c6ded
2843-
React-Mapbuffer: 33f678ee25b6c0ee2b01b1ecec08e3e02424cefe
2844-
React-microtasksnativemodule: 44b44a4d3cd6ffb85d928abf741acdc26722de2e
2845-
react-native-bottom-tabs: 448809f8b7a7bd14b39769c29287631d51aec171
2846-
react-native-safe-area-context: 6d8a7b750e496e37bda47c938320bf2c734d441f
2847-
React-NativeModulesApple: b5d18bc109c45c9a1c6b71664991b5cc3adc4e48
2822+
React-defaultsnativemodule: 393b81aaa6211408f50a6ef00a277847256dd881
2823+
React-domnativemodule: 5fb5829baa7a7a0f217019cbad1eb226d94f7062
2824+
React-Fabric: a17c4ae35503673b57b91c2d1388429e7cbee452
2825+
React-FabricComponents: a76572ddeba78ebe4ec58615291e9db4a55cd46a
2826+
React-FabricImage: d806eb2695d7ef355ec28d1a21f5a14ac26b1cae
2827+
React-featureflags: 1690ec3c453920b6308e23a4e24eb9c3632f9c75
2828+
React-featureflagsnativemodule: 7b7e8483fc671c5a33aefd699b7c7a3c0bdfdfec
2829+
React-graphics: ea146ee799dc816524a3a0922fc7be0b5a52dcc1
2830+
React-hermes: fcbdc45ecf38259fe3b12642bd0757c52270a107
2831+
React-idlecallbacksnativemodule: a353f9162eaa7ad787e68aba9f52a1cfa8154098
2832+
React-ImageManager: ec5cf55ce9cc81719eb5f1f51d23d04db851c86c
2833+
React-jserrorhandler: 594c593f3d60f527be081e2cace7710c2bd9f524
2834+
React-jsi: 59ec3190dd364cca86a58869e7755477d2468948
2835+
React-jsiexecutor: b87d78a2e8dd7a6f56e9cdac038da45de98c944f
2836+
React-jsinspector: b9204adf1af622c98e78af96ec1bca615c2ce2bd
2837+
React-jsinspectorcdp: 4a356fa69e412d35d3a38c44d4a6cc555c5931e8
2838+
React-jsinspectornetwork: 7820056773178f321cbf18689e1ffcd38276a878
2839+
React-jsinspectortracing: b341c5ef6e031a33e0bd462d67fd397e8e9cd612
2840+
React-jsitooling: 401655e05cb966b0081225c5201d90734a567cb9
2841+
React-jsitracing: 67eff6dea0cb58a1e7bd8b49243012d88c0f511e
2842+
React-logger: a3cb5b29c32b8e447b5a96919340e89334062b48
2843+
React-Mapbuffer: 9d2434a42701d6144ca18f0ca1c4507808ca7696
2844+
React-microtasksnativemodule: 75b6604b667d297292345302cc5bfb6b6aeccc1b
2845+
react-native-bottom-tabs: 9a6f606d07e2e46f2535f1faed915fcb2d4f0269
2846+
react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616
2847+
React-NativeModulesApple: 879fbdc5dcff7136abceb7880fe8a2022a1bd7c3
28482848
React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d
2849-
React-perflogger: a03d913e3205b00aee4128082abe42fd45ce0c98
2850-
React-performancetimeline: 9b5986cc15afafb9bf246d7dd55bdd138df94451
2849+
React-perflogger: 5536d2df3d18fe0920263466f7b46a56351c0510
2850+
React-performancetimeline: 9041c53efa07f537164dcfe7670a36642352f4c2
28512851
React-RCTActionSheet: 42195ae666e6d79b4af2346770f765b7c29435b9
2852-
React-RCTAnimation: 5c10527683128c56ff2c09297fb080f7c35bd293
2853-
React-RCTAppDelegate: c616bd5b0d12f0b21dfacee9cd2d512c6df013aa
2854-
React-RCTBlob: 6e3757bdd7dce6fd9788c0dd675fd6b6c432db9d
2855-
React-RCTFabric: e8f3b9da97477710bf0904a62eb5b5209c964694
2856-
React-RCTFBReactNativeSpec: c042f8d60d44ad9e2c722da89323c0bdab7a37af
2857-
React-RCTImage: a3482fe1ae562d1bab08b42d4670a7c9a21813cd
2858-
React-RCTLinking: d82b9adb141aef9d2b38d446b837ae7017ab60aa
2859-
React-RCTNetwork: fa9350dd99354c5695964f589bd4790bdd4f6a85
2860-
React-RCTRuntime: be99a38cd23388c08921d8969c82a1997a11ec90
2861-
React-RCTSettings: b7f4a03f44dba1d3a4dc6770843547b203ca9129
2862-
React-RCTText: 91dc597a5f6b27fd1048bb287c41ea05eeca9333
2863-
React-RCTVibration: 27b09ddf74bddfa30a58d20e48f885ea6ed6c9d9
2852+
React-RCTAnimation: fa103ccc3503b1ed8dedca7e62e7823937748843
2853+
React-RCTAppDelegate: 665d4baf19424cef08276e9ac0d8771eec4519f9
2854+
React-RCTBlob: 0fa9530c255644db095f2c4fd8d89738d9d9ecc0
2855+
React-RCTFabric: 1fcd8af6e25f92532f56b4ba092e58662c14d156
2856+
React-RCTFBReactNativeSpec: db171247585774f9f0a30f75109cc51568686213
2857+
React-RCTImage: ba824e61ce2e920a239a65d130b83c3a1d426dff
2858+
React-RCTLinking: d2dc199c37e71e6f505d9eca3e5c33be930014d4
2859+
React-RCTNetwork: 87137d4b9bd77e5068f854dd5c1f30d4b072faf6
2860+
React-RCTRuntime: 137fafaa808a8b7e76a510e8be45f9f827899daa
2861+
React-RCTSettings: 71f5c7fd7b5f4e725a4e2114a4b4373d0e46048f
2862+
React-RCTText: b94d4699b49285bee22b8ebf768924d607eccee3
2863+
React-RCTVibration: 6e3993c4f6c36a3899059f9a9ead560ddaf5a7d7
28642864
React-rendererconsistency: b4785e5ed837dc7c242bbc5fdd464b33ef5bfae7
2865-
React-renderercss: cef3f26df2ddec558ce3c0790fc574b4fb62ce67
2866-
React-rendererdebug: e68433ae67738caeb672a6c8cc993e9276b298a9
2867-
React-RuntimeApple: dc1d4709bf847bc695dbe6e8aaf3e22ef25aef02
2868-
React-RuntimeCore: ca3473c8b6578693fa3bad4d44240098d49d6723
2869-
React-runtimeexecutor: 0db3ca0b09cd72489cef3a3729349b3c2cf13320
2870-
React-RuntimeHermes: f92cabaf97ef2546a74360eddfc1c74a34cb9ff8
2871-
React-runtimescheduler: 06aea75069e0d556a75d258bfc89eb0ebd5d557e
2872-
React-timing: 1a90df9a04d8e7fd165ff7fa0918b9595c776373
2873-
React-utils: 92115441fb55ce01ded4abfb5e9336a74cd93e9c
2874-
ReactAppDependencyProvider: b20fba6c3d091a393925890009999472c8f94d95
2875-
ReactCodegen: cf03d376a26d393f818d511240b026fc8c95313c
2876-
ReactCommon: 00df7b9f859c9d02181844255bb89a8bca544374
2877-
ReactNativeHost: 8491ce845ecc9eb31ab529290c0cc21ff21e9fc8
2878-
ReactTestApp-DevSupport: c7bff1aee7663f2fb1eefcf60c41573f02916c41
2865+
React-renderercss: e6fb0ba387b389c595ffa86b8b628716d31f58dc
2866+
React-rendererdebug: 60a03de5c7ea59bf2d39791eb43c4c0f5d8b24e3
2867+
React-RuntimeApple: 3df6788cd9b938bb8cb28298d80b5fbd98a4d852
2868+
React-RuntimeCore: fad8adb4172c414c00ff6980250caf35601a0f5d
2869+
React-runtimeexecutor: d2db7e72d97751855ea0bf5273d2ac84e5ea390c
2870+
React-RuntimeHermes: 04faa4cf9a285136a6d73738787fe36020170613
2871+
React-runtimescheduler: f6a1c9555e7131b4a8b64cce01489ad0405f6e8d
2872+
React-timing: 1e6a8acb66e2b7ac9d418956617fd1fdb19322fd
2873+
React-utils: 52bbb03f130319ef82e4c3bc7a85eaacdb1fec87
2874+
ReactAppDependencyProvider: 433ddfb4536948630aadd5bd925aff8a632d2fe3
2875+
ReactCodegen: 64dbbed4e9e0264d799578ea78492479a66fba4a
2876+
ReactCommon: 394c6b92765cf6d211c2c3f7f6bc601dffb316a6
2877+
ReactNativeHost: 40e374201201cc54f9ef41458f2e412fbdde0d62
2878+
ReactTestApp-DevSupport: 9b7bbba5e8fed998e763809171d9906a1375f9d3
28792879
ReactTestApp-Resources: 4f6dff3b157f879757cd750caccd1d34a7eda647
2880-
RNGestureHandler: 4f7cc97a71d4fe0fcba38c94acdd969f5f17c91c
2881-
RNScreens: 74985ca8e102294a60cec7513fa84c936fa0b20b
2882-
RNVectorIcons: 34d8572dadd436893d712d12c2400cb8c0b610e3
2880+
RNGestureHandler: 3a73f098d74712952870e948b3d9cf7b6cae9961
2881+
RNScreens: 0bbf16c074ae6bb1058a7bf2d1ae017f4306797c
2882+
RNVectorIcons: c13cc1db346e960ecd0aafcdd5d0bb458133b9c1
28832883
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
28842884
SwiftUIIntrospect: fee9aa07293ee280373a591e1824e8ddc869ba5d
28852885
Yoga: a3ed390a19db0459bd6839823a6ac6d9c6db198d
28862886

28872887
PODFILE CHECKSUM: d61a3255405492afdb755f6ddd335fd0f5a84cd3
28882888

2889-
COCOAPODS: 1.15.2
2889+
COCOAPODS: 1.16.2

packages/react-native-bottom-tabs/ios/TabView/NewTabView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ struct ConditionalBottomAccessoryModifier: ViewModifier {
6767
}
6868

6969
func body(content: Content) -> some View {
70-
if #available(iOS 26.0, macOS 26.0, tvOS 26.0, visionOS 3.0, *) {
71-
content
70+
if #available(iOS 26.0, macOS 26.0, tvOS 26.0, visionOS 3.0, *), bottomAccessoryView != nil {
71+
content
7272
.tabViewBottomAccessory {
7373
renderBottomAccessoryView()
7474
}

0 commit comments

Comments
 (0)