Skip to content

Commit 2ed5290

Browse files
committed
fix: adjust fixes from codereview
1 parent 3fcb1e5 commit 2ed5290

File tree

4 files changed

+101
-13
lines changed

4 files changed

+101
-13
lines changed

apps/example/ios/Podfile.lock

Lines changed: 98 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,71 @@ PODS:
12051205
- SwiftUIIntrospect (~> 1.0)
12061206
- Yoga
12071207
- react-native-safe-area-context (5.2.0):
1208+
- DoubleConversion
1209+
- glog
1210+
- RCT-Folly (= 2024.11.18.00)
1211+
- RCTRequired
1212+
- RCTTypeSafety
12081213
- React-Core
1214+
- React-debug
1215+
- React-Fabric
1216+
- React-featureflags
1217+
- React-graphics
1218+
- React-ImageManager
1219+
- React-jsi
1220+
- react-native-safe-area-context/common (= 5.2.0)
1221+
- react-native-safe-area-context/fabric (= 5.2.0)
1222+
- React-NativeModulesApple
1223+
- React-RCTFabric
1224+
- React-rendererdebug
1225+
- React-utils
1226+
- ReactCodegen
1227+
- ReactCommon/turbomodule/bridging
1228+
- ReactCommon/turbomodule/core
1229+
- Yoga
1230+
- react-native-safe-area-context/common (5.2.0):
1231+
- DoubleConversion
1232+
- glog
1233+
- RCT-Folly (= 2024.11.18.00)
1234+
- RCTRequired
1235+
- RCTTypeSafety
1236+
- React-Core
1237+
- React-debug
1238+
- React-Fabric
1239+
- React-featureflags
1240+
- React-graphics
1241+
- React-ImageManager
1242+
- React-jsi
1243+
- React-NativeModulesApple
1244+
- React-RCTFabric
1245+
- React-rendererdebug
1246+
- React-utils
1247+
- ReactCodegen
1248+
- ReactCommon/turbomodule/bridging
1249+
- ReactCommon/turbomodule/core
1250+
- Yoga
1251+
- react-native-safe-area-context/fabric (5.2.0):
1252+
- DoubleConversion
1253+
- glog
1254+
- RCT-Folly (= 2024.11.18.00)
1255+
- RCTRequired
1256+
- RCTTypeSafety
1257+
- React-Core
1258+
- React-debug
1259+
- React-Fabric
1260+
- React-featureflags
1261+
- React-graphics
1262+
- React-ImageManager
1263+
- React-jsi
1264+
- react-native-safe-area-context/common
1265+
- React-NativeModulesApple
1266+
- React-RCTFabric
1267+
- React-rendererdebug
1268+
- React-utils
1269+
- ReactCodegen
1270+
- ReactCommon/turbomodule/bridging
1271+
- ReactCommon/turbomodule/core
1272+
- Yoga
12091273
- React-nativeconfig (0.77.1)
12101274
- React-NativeModulesApple (0.77.1):
12111275
- glog
@@ -1493,6 +1557,7 @@ PODS:
14931557
- React-ImageManager
14941558
- React-jsi
14951559
- React-NativeModulesApple
1560+
- React-RCTAppDelegate
14961561
- React-RCTFabric
14971562
- React-rendererdebug
14981563
- React-utils
@@ -1526,6 +1591,29 @@ PODS:
15261591
- ReactCommon/turbomodule/core
15271592
- Yoga
15281593
- RNScreens (4.9.1):
1594+
- DoubleConversion
1595+
- glog
1596+
- RCT-Folly (= 2024.11.18.00)
1597+
- RCTRequired
1598+
- RCTTypeSafety
1599+
- React-Core
1600+
- React-debug
1601+
- React-Fabric
1602+
- React-featureflags
1603+
- React-graphics
1604+
- React-ImageManager
1605+
- React-jsi
1606+
- React-NativeModulesApple
1607+
- React-RCTFabric
1608+
- React-RCTImage
1609+
- React-rendererdebug
1610+
- React-utils
1611+
- ReactCodegen
1612+
- ReactCommon/turbomodule/bridging
1613+
- ReactCommon/turbomodule/core
1614+
- RNScreens/common (= 4.9.1)
1615+
- Yoga
1616+
- RNScreens/common (4.9.1):
15291617
- DoubleConversion
15301618
- glog
15311619
- RCT-Folly (= 2024.11.18.00)
@@ -1607,6 +1695,7 @@ DEPENDENCIES:
16071695
- React-idlecallbacksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/idlecallbacks`)
16081696
- React-ImageManager (from `../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`)
16091697
- React-jsc (from `../node_modules/react-native/ReactCommon/jsc`)
1698+
- React-jsc/Fabric (from `../node_modules/react-native/ReactCommon/jsc`)
16101699
- React-jserrorhandler (from `../node_modules/react-native/ReactCommon/jserrorhandler`)
16111700
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
16121701
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
@@ -1842,18 +1931,18 @@ SPEC CHECKSUMS:
18421931
React-logger: e7eeebaed32b88dcc29b10901aa8c5822dc397c4
18431932
React-Mapbuffer: 73dd1210c4ecf0dfb4e2d4e06f2a13f824a801a9
18441933
React-microtasksnativemodule: dece61f766f8d326099d217603b1ebb50d6bb707
1845-
react-native-bottom-tabs: 537b63b00fc50b296da66c1e5199cde4efce9e88
1846-
react-native-safe-area-context: 3e33e7c43c8b74dba436a5a32651cb8d7064c740
1934+
react-native-bottom-tabs: 9cfaa0350a9632efff1e7ce16e732e32f06c6117
1935+
react-native-safe-area-context: 7f3dfe7a0e269ffccac6f1a8377e85e8237b47be
18471936
React-nativeconfig: cb207ebba7cafce30657c7ad9f1587a8f32e4564
18481937
React-NativeModulesApple: 38f252170af5351c88bc2e94d697359cd8c031e6
18491938
React-perflogger: c4c3b7c18f8a50cdbe2bcdd2f15705ba029a5a02
18501939
React-performancetimeline: 38bda258bd9f9da19b27615e8edfbec064aa42cc
18511940
React-RCTActionSheet: 0fdf55fb8724856d63ca8c63cdb4e2325e15e8ec
18521941
React-RCTAnimation: b2fcc7c462f1fb5e195a5547f6e405ec9a60d80f
1853-
React-RCTAppDelegate: 7691b8fe13c1c329cfcb44252cd1abf4409c0fcf
1942+
React-RCTAppDelegate: a569d1037a16f4911bcf4d0b874598c7722fe2d5
18541943
React-RCTBlob: f6620374c96915ce1762405b1504e607e239c518
1855-
React-RCTFabric: 8b25a4b9e5b62b4e263a2e85e10bd3215bee6b32
1856-
React-RCTFBReactNativeSpec: bc3fb34e6f7736cabda3c3de2444b928e3a3dd55
1944+
React-RCTFabric: d74ed998450607ebaf701e38969c04d85a54a1b2
1945+
React-RCTFBReactNativeSpec: cf67e0c357ed8de018a1ed5b33a8b258de651f5e
18571946
React-RCTImage: f189ae651e3c97879b4cdefcba1d4cffe55439da
18581947
React-RCTLinking: 759ac5e4aed95ac3c29849f98ff3f3b5ece830ed
18591948
React-RCTNetwork: ce1f38434a70eb1e228344f7632e636c3ceca03b
@@ -1872,12 +1961,12 @@ SPEC CHECKSUMS:
18721961
ReactAppDependencyProvider: 41e9fb63606c32cce924653d2d410cb01ec81286
18731962
ReactCodegen: 9cf993a8cfdffca67d5abe1ba056020fc48fc0d4
18741963
ReactCommon: ede76856e587ac3fd7ce70ca2387e571bc947d14
1875-
ReactNativeHost: 8ef54ff7c6c17c1242e287c286699f8955f22e45
1964+
ReactNativeHost: e48e75303e422f7966cf7dc4b68d4b59d4570217
18761965
ReactTestApp-DevSupport: f23bacc6d21da29a7d8d248bb6ee8cc9ad241a48
18771966
ReactTestApp-Resources: 4f6dff3b157f879757cd750caccd1d34a7eda647
1878-
RNGestureHandler: 00e35ccf0f6ee047d10d726a6b2c1cf85de54946
1879-
RNScreens: 62107db9c6147f19a6d0e8989f355acae46a99c5
1880-
RNVectorIcons: 5c1b761ed018ba598757d876380e584414befada
1967+
RNGestureHandler: 5efafa1473ccab9c4530bb7310032b784ecc84a6
1968+
RNScreens: 749bdbb62d3dc57bd1373c64eaf5342ea0768178
1969+
RNVectorIcons: 3bcc7d69519bcac82308d2464579c4203a451c28
18811970
SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
18821971
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
18831972
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748

packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabViewImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ data class TabInfo(
1616
val badge: String?,
1717
val activeTintColor: Int?,
1818
val hidden: Boolean,
19-
val testID: String?,
19+
val testID: String?
2020
)
2121

2222
class RCTTabViewImpl {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ struct NewTabView: AnyTabView {
1717

1818
if !tabData.hidden || isFocused {
1919
let icon = props.icons[index]
20-
let role = tabData.role?.convert() ?? nil
2120

2221
let platformChild = props.children[safe: index] ?? PlatformView()
2322
let child = RepresentableView(view: platformChild)
@@ -29,7 +28,7 @@ struct NewTabView: AnyTabView {
2928
onSelect: onSelect
3029
)
3130

32-
Tab(value: tabData.key, role: role) {
31+
Tab(value: tabData.key, role: tabData.role?.convert()) {
3332
child
3433
.ignoresSafeArea(.container, edges: .all)
3534
.tabAppear(using: context)

packages/react-native-bottom-tabs/ios/TabViewProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public final class TabInfo: NSObject {
277277
activeTintColor: RCTConvert.uiColor(itemDict["activeTintColor"] as? NSNumber),
278278
hidden: itemDict["hidden"] as? Bool ?? false,
279279
testID: itemDict["testID"] as? String ?? "",
280-
role: itemDict["role"] as? String,
280+
role: itemDict["role"] as? String
281281
)
282282
)
283283
}

0 commit comments

Comments
 (0)