react-native-screens 3.17.0 → 3.18.1

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt

@@ -1,6 +1,5 @@
 package com.swmansion.rnscreens
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.PorterDuff
 import android.os.Build
@@ -101,23 +100,9 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     }
 
     private val screen: Screen?
-        get() {
-            val screen = parent
-            return if (screen is Screen) {
-                screen
-            } else null
-        }
+        get() = parent as? Screen
     private val screenStack: ScreenStack?
-        get() {
-            val screen = screen
-            if (screen != null) {
-                val container = screen.container
-                if (container is ScreenStack) {
-                    return container
-                }
-            }
-            return null
-        }
+        get() = screen?.container as? ScreenStack
     val screenFragment: ScreenStackFragment?
         get() {
             val screen = parent
@@ -133,9 +118,11 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
     fun onUpdate() {
         val stack = screenStack
         val isTop = stack == null || stack.topScreen == parent
+
         if (!mIsAttachedToWindow || !isTop || mDestroyed) {
             return
         }
+
         val activity = screenFragment?.activity as AppCompatActivity? ?: return
         if (mDirection != null) {
             if (mDirection == "rtl") {
@@ -158,15 +145,18 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             }
             ScreenWindowTraits.trySetWindowTraits(it, activity, reactContext)
         }
+
         if (mIsHidden) {
             if (toolbar.parent != null) {
                 screenFragment?.removeToolbar()
             }
             return
         }
+
         if (toolbar.parent == null) {
             screenFragment?.setToolbar(toolbar)
         }
+
         if (mIsTopInsetEnabled) {
             headerTopInset.let {
                 toolbar.setPadding(0, it ?: 0, 0, 0)
@@ -176,6 +166,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
                 toolbar.setPadding(0, 0, 0, 0)
             }
         }
+
         activity.setSupportActionBar(toolbar)
         // non-null toolbar is set in the line above and it is used here
         val actionBar = requireNotNull(activity.supportActionBar)
@@ -212,10 +203,12 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
             // which would impact the position of custom header views rendered at the center.
             toolbar.contentInsetStartWithNavigation = 0
         }
+
         val titleTextView = titleTextView
         if (mTitleColor != 0) {
             toolbar.setTitleTextColor(mTitleColor)
         }
+
         if (titleTextView != null) {
             if (mTitleFontFamily != null || mTitleFontWeight > 0) {
                 val titleTypeface = ReactTypefaceUtils.applyStyles(
@@ -233,8 +226,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
 
         // color
         if (mTintColor != 0) {
-            val navigationIcon = toolbar.navigationIcon
-            navigationIcon?.setColorFilter(mTintColor, PorterDuff.Mode.SRC_ATOP)
+            toolbar.navigationIcon?.setColorFilter(mTintColor, PorterDuff.Mode.SRC_ATOP)
         }
 
         // subviews
@@ -243,6 +235,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
                 toolbar.removeViewAt(i)
             }
         }
+
         var i = 0
         val size = mConfigSubviews.size
         while (i < size) {
@@ -290,9 +283,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         }
     }
 
-    fun getConfigSubview(index: Int): ScreenStackHeaderSubview {
-        return mConfigSubviews[index]
-    }
+    fun getConfigSubview(index: Int): ScreenStackHeaderSubview = mConfigSubviews[index]
 
     val configSubviewsCount: Int
         get() = mConfigSubviews.size
@@ -314,16 +305,13 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
 
     private val titleTextView: TextView?
         get() {
-            var i = 0
-            val size = toolbar.childCount
-            while (i < size) {
+            for (i in 0 until toolbar.childCount) {
                 val view = toolbar.getChildAt(i)
                 if (view is TextView) {
                     if (view.text == toolbar.title) {
                         return view
                     }
                 }
-                i++
             }
             return null
         }

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfigViewManager.kt

@@ -21,13 +21,9 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
         mDelegate = RNSScreenStackHeaderConfigManagerDelegate<ScreenStackHeaderConfig, ScreenStackHeaderConfigViewManager>(this)
     }
 
-    override fun getName(): String {
-        return REACT_CLASS
-    }
+    override fun getName(): String = REACT_CLASS
 
-    override fun createViewInstance(reactContext: ThemedReactContext): ScreenStackHeaderConfig {
-        return ScreenStackHeaderConfig(reactContext)
-    }
+    override fun createViewInstance(reactContext: ThemedReactContext) = ScreenStackHeaderConfig(reactContext)
 
     override fun addView(parent: ScreenStackHeaderConfig, child: View, index: Int) {
         if (child !is ScreenStackHeaderSubview) {
@@ -50,17 +46,11 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
         parent.removeConfigSubview(index)
     }
 
-    override fun getChildCount(parent: ScreenStackHeaderConfig): Int {
-        return parent.configSubviewsCount
-    }
+    override fun getChildCount(parent: ScreenStackHeaderConfig): Int = parent.configSubviewsCount
 
-    override fun getChildAt(parent: ScreenStackHeaderConfig, index: Int): View {
-        return parent.getConfigSubview(index)
-    }
+    override fun getChildAt(parent: ScreenStackHeaderConfig, index: Int): View = parent.getConfigSubview(index)
 
-    override fun needsCustomLayoutForChildren(): Boolean {
-        return true
-    }
+    override fun needsCustomLayoutForChildren() = true
 
     override fun onAfterUpdateTransaction(parent: ScreenStackHeaderConfig) {
         super.onAfterUpdateTransaction(parent)
@@ -149,9 +139,7 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
             .build()
     }
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderConfig> {
-        return mDelegate
-    }
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderConfig> = mDelegate
 
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderConfig"

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubview.kt

@@ -12,9 +12,7 @@ class ScreenStackHeaderSubview(context: ReactContext?) : ReactViewGroup(context)
     var type = Type.RIGHT
 
     val config: ScreenStackHeaderConfig?
-        get() {
-            return (parent as? CustomToolbar)?.config
-        }
+        get() = (parent as? CustomToolbar)?.config
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         if (MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY &&
@@ -32,9 +30,7 @@ class ScreenStackHeaderSubview(context: ReactContext?) : ReactViewGroup(context)
         setMeasuredDimension(mReactWidth, mReactHeight)
     }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        // no-op
-    }
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) = Unit
 
     enum class Type {
         LEFT, CENTER, RIGHT, BACK, SEARCH_BAR

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubviewManager.kt

@@ -17,13 +17,9 @@ class ScreenStackHeaderSubviewManager : ViewGroupManager<ScreenStackHeaderSubvie
         mDelegate = RNSScreenStackHeaderSubviewManagerDelegate<ScreenStackHeaderSubview, ScreenStackHeaderSubviewManager>(this)
     }
 
-    override fun getName(): String {
-        return REACT_CLASS
-    }
+    override fun getName() = REACT_CLASS
 
-    override fun createViewInstance(context: ThemedReactContext): ScreenStackHeaderSubview {
-        return ScreenStackHeaderSubview(context)
-    }
+    override fun createViewInstance(context: ThemedReactContext) = ScreenStackHeaderSubview(context)
 
     @ReactProp(name = "type")
     override fun setType(view: ScreenStackHeaderSubview, type: String?) {
@@ -37,9 +33,7 @@ class ScreenStackHeaderSubviewManager : ViewGroupManager<ScreenStackHeaderSubvie
         }
     }
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderSubview> {
-        return mDelegate
-    }
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderSubview> = mDelegate
 
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderSubview"

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackViewManager.kt

@@ -3,7 +3,6 @@ package com.swmansion.rnscreens
 import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
@@ -21,13 +20,9 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackMa
         mDelegate = RNSScreenStackManagerDelegate<ScreenStack, ScreenStackViewManager>(this)
     }
 
-    override fun getName(): String {
-        return REACT_CLASS
-    }
+    override fun getName() = REACT_CLASS
 
-    override fun createViewInstance(reactContext: ThemedReactContext): ScreenStack {
-        return ScreenStack(reactContext)
-    }
+    override fun createViewInstance(reactContext: ThemedReactContext) = ScreenStack(reactContext)
 
     override fun addView(parent: ScreenStack, child: View, index: Int) {
         require(child is Screen) { "Attempt attach child that is not of type RNScreen" }
@@ -44,10 +39,8 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackMa
     }
 
     private fun startTransitionRecursive(parent: ViewGroup?) {
-        var i = 0
         parent?.let {
-            val size = it.childCount
-            while (i < size) {
+            for (i in 0 until it.childCount) {
                 val child = it.getChildAt(i)
                 child?.let { view -> it.startViewTransition(view) }
                 if (child is ScreenStackHeaderConfig) {
@@ -58,37 +51,23 @@ class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackMa
                 if (child is ViewGroup) {
                     startTransitionRecursive(child)
                 }
-                i++
             }
         }
     }
 
-    override fun getChildCount(parent: ScreenStack): Int {
-        return parent.screenCount
-    }
+    override fun getChildCount(parent: ScreenStack) = parent.screenCount
 
-    override fun getChildAt(parent: ScreenStack, index: Int): View {
-        return parent.getScreenAt(index)
-    }
+    override fun getChildAt(parent: ScreenStack, index: Int): View = parent.getScreenAt(index)
 
-    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode {
-        return ScreensShadowNode(context)
-    }
+    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
 
-    override fun needsCustomLayoutForChildren(): Boolean {
-        return true
-    }
+    override fun needsCustomLayoutForChildren() = true
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> {
-        return mDelegate
-    }
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> = mDelegate
 
-    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
-        return MapBuilder.of(
-            StackFinishTransitioningEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onFinishTransitioning"),
-        )
-    }
+    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> = mutableMapOf(
+        StackFinishTransitioningEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFinishTransitioning")
+    )
 
     companion object {
         const val REACT_CLASS = "RNSScreenStack"

package/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt

@@ -17,7 +17,6 @@ import com.swmansion.rnscreens.events.ScreenDismissedEvent
 import com.swmansion.rnscreens.events.ScreenTransitionProgressEvent
 import com.swmansion.rnscreens.events.ScreenWillAppearEvent
 import com.swmansion.rnscreens.events.ScreenWillDisappearEvent
-import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 
 @ReactModule(name = ScreenViewManager.REACT_CLASS)
 class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<Screen> {
@@ -27,13 +26,9 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
         mDelegate = RNSScreenManagerDelegate<Screen, ScreenViewManager>(this)
     }
 
-    override fun getName(): String {
-        return REACT_CLASS
-    }
+    override fun getName() = REACT_CLASS
 
-    override fun createViewInstance(reactContext: ThemedReactContext): Screen {
-        return Screen(reactContext)
-    }
+    override fun createViewInstance(reactContext: ThemedReactContext) = Screen(reactContext)
 
     override fun setActivityState(view: Screen, activityState: Float) {
         setActivityState(view, activityState.toInt())
@@ -180,9 +175,7 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
         )
     }
 
-    protected override fun getDelegate(): ViewManagerDelegate<Screen> {
-        return mDelegate
-    }
+    protected override fun getDelegate(): ViewManagerDelegate<Screen> = mDelegate
 
     companion object {
         const val REACT_CLASS = "RNSScreen"

package/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt

@@ -25,6 +25,7 @@ object ScreenWindowTraits {
     private var mDidSetStatusBarAppearance = false
     private var mDidSetNavigationBarAppearance = false
     private var mDefaultStatusBarColor: Int? = null
+
     internal fun applyDidSetOrientation() {
         mDidSetOrientation = true
     }

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+set(LIB_LITERAL rnscreens)
+set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
+
+set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
+set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
+set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
+
+add_compile_options(
+  -fexceptions
+  -frtti
+  -std=c++17
+  -Wall
+  -Wpedantic
+  -Wno-gnu-zero-variadic-macro-arguments
+)
+
+file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
+file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
+
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED 
+  ${LIB_CUSTOM_SRCS}
+  ${LIB_CODEGEN_SRCS}
+)
+
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC 
+  . 
+  ${LIB_COMMON_DIR}
+  ${LIB_ANDROID_GENERATED_JNI_DIR}
+  ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
+)
+
+target_link_libraries(
+  ${LIB_TARGET_NAME}
+  fbjni
+  folly_runtime
+  glog
+  jsi
+  react_codegen_rncore
+  react_debug
+  react_nativemodule_core
+  react_render_core
+  react_render_debug
+  react_render_graphics
+  react_render_mapbuffer
+  rrc_view
+  turbomodulejsijni
+  yoga
+)
+
+target_compile_options(
+  ${LIB_TARGET_NAME}
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++17
+  -Wall
+)
+
+target_include_directories(
+ ${CMAKE_PROJECT_NAME}
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)

package/android/src/main/jni/rnscreens.cpp

@@ -0,0 +1,16 @@
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ * @generated by codegen project: GenerateModuleJniCpp.js
+ */
+#include "rnscreens.h"
+
+namespace facebook {
+namespace react {
+
+
+std::shared_ptr<TurboModule> rnscreens_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+  return nullptr;
+}
+
+} // namespace react
+} // namespace facebook

package/android/src/main/jni/rnscreens.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+/**
+ * Note this import and that it is not present in autogenerated header file
+ * under android/build/generated/source/codegen/jni/rnscreens.h
+ * 
+ * It is added here to make our custom symbols visible in autogenerated file with 
+ * code responsible for registering component descriptor providers. See that rncli.cpp, 
+ * located under <App>/android/app/build/generated/rncli/src/main/jni/rncli.cpp,
+ * includes autogenerated rnscreens.h header by default. We change this behaviour
+ * by appropriate include path configuration so that this header file gets included.
+ * 
+ * See: https://github.com/software-mansion/react-native-screens/pull/1585
+ */
+#include <react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> rnscreens_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+
+} // namespace react
+} // namespace facebook

package/common/cpp/{rnscreens → react/renderer/components/rnscreens}/RNSScreenShadowNode.h

@@ -4,13 +4,14 @@
 #include <react/renderer/components/rnscreens/EventEmitters.h>
 #include <react/renderer/components/rnscreens/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
 
-extern const char RNSScreenComponentName[];
+JSI_EXPORT extern const char RNSScreenComponentName[];
 
-class RNSScreenShadowNode final : public ConcreteViewShadowNode<
+class JSI_EXPORT RNSScreenShadowNode final : public ConcreteViewShadowNode<
                                           RNSScreenComponentName,
                                           RNSScreenProps,
                                           RNSScreenEventEmitter,

package/common/cpp/{rnscreens → react/renderer/components/rnscreens}/RNSScreenState.h

@@ -13,7 +13,7 @@
 namespace facebook {
 namespace react {
 
-class RNSScreenState final {
+class JSI_EXPORT RNSScreenState final {
  public:
   using Shared = std::shared_ptr<const RNSScreenState>;
 

package/ios/RNSFullWindowOverlay.mm

@@ -4,11 +4,11 @@
 
 #ifdef RN_FABRIC_ENABLED
 #import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <React/RCTFabricComponentsPlugins.h>
 #else
 #import <React/RCTTouchHandler.h>
 #endif // RN_FABRIC_ENABLED

package/ios/RNSScreen.mm

@@ -6,13 +6,13 @@
 
 #ifdef RN_FABRIC_ENABLED
 #import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTRootComponentView.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import <rnscreens/RNSScreenComponentDescriptor.h>
-#import <React/RCTFabricComponentsPlugins.h>
 #import "RNSConvert.h"
 #import "RNSScreenViewEvent.h"
 #else

package/ios/RNSScreenContainer.mm

@@ -3,9 +3,9 @@
 
 #ifdef RN_FABRIC_ENABLED
 #import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
-#import <React/RCTFabricComponentsPlugins.h>
 #endif
 
 @implementation RNScreensViewController

package/ios/RNSScreenNavigationContainer.mm

@@ -3,9 +3,9 @@
 #import "RNSScreenContainer.h"
 
 #ifdef RN_FABRIC_ENABLED
+#import <React/RCTFabricComponentsPlugins.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
-#import <React/RCTFabricComponentsPlugins.h>
 #endif
 
 @implementation RNScreensContainerNavigationController

package/ios/RNSScreenStackHeaderConfig.mm

@@ -1,11 +1,11 @@
 #ifdef RN_FABRIC_ENABLED
 #import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
 #import <React/UIView+React.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <React/RCTFabricComponentsPlugins.h>
 #else
 #import <React/RCTBridge.h>
 #import <React/RCTImageLoader.h>
@@ -459,7 +459,6 @@
     return;
   }
 
-  navitem.title = config.title;
 #if !TARGET_OS_TV
   if (config.backTitle != nil || config.backTitleFontFamily || config.backTitleFontSize ||
       config.disableBackButtonMenu) {
@@ -587,6 +586,10 @@
     }
   }
 
+  // This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
+  // See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
+  navitem.title = config.title;
+
   if (animated && vc.transitionCoordinator != nil &&
       vc.transitionCoordinator.presentationStyle == UIModalPresentationNone && !wasHidden) {
     // when there is an ongoing transition we may need to update navbar setting in animation block

package/ios/RNSSearchBar.mm

@@ -8,11 +8,11 @@
 
 #ifdef RN_FABRIC_ENABLED
 #import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <React/RCTFabricComponentsPlugins.h>
 #import "RNSConvert.h"
 #endif
 

package/lib/commonjs/native-stack/utils/getDefaultHeaderHeight.js

@@ -23,7 +23,7 @@ function getDefaultHeaderHeight(layout, topInset, stackPresentation) {
       statusBarHeight = 0;
     }
 
-    if (_reactNative.Platform.isPad || _reactNative.Platform.isTVOS) {
+    if (_reactNative.Platform.isPad || _reactNative.Platform.isTV) {
       headerHeight = isFromSheetModal ? formSheetModalHeight : 50;
     } else {
       if (isLandscape) {

package/lib/commonjs/native-stack/utils/getDefaultHeaderHeight.js.map

@@ -1 +1 @@
-{"version":3,"sources":["getDefaultHeaderHeight.tsx"],"names":["formSheetModalHeight","getDefaultHeaderHeight","layout","topInset","stackPresentation","headerHeight","Platform","OS","statusBarHeight","isLandscape","width","height","isFromSheetModal","isPad","isTVOS"],"mappings":";;;;;;;AAAA;;AAIA,MAAMA,oBAAoB,GAAG,EAA7B;;AAEe,SAASC,sBAAT,CACbC,MADa,EAEbC,QAFa,EAGbC,iBAHa,EAIL;AACR;AACA,MAAIC,YAAY,GAAGC,sBAASC,EAAT,KAAgB,SAAhB,GAA4B,EAA5B,GAAiC,EAApD;AACA,MAAIC,eAAe,GAAGL,QAAtB;;AAEA,MAAIG,sBAASC,EAAT,KAAgB,KAApB,EAA2B;AACzB,UAAME,WAAW,GAAGP,MAAM,CAACQ,KAAP,GAAeR,MAAM,CAACS,MAA1C;AACA,UAAMC,gBAAgB,GACpBR,iBAAiB,KAAK,OAAtB,IAAiCA,iBAAiB,KAAK,WADzD;;AAEA,QAAIQ,gBAAgB,IAAI,CAACH,WAAzB,EAAsC;AACpC;AACAD,MAAAA,eAAe,GAAG,CAAlB;AACD;;AAED,QAAIF,sBAASO,KAAT,IAAkBP,sBAASQ,MAA/B,EAAuC;AACrCT,MAAAA,YAAY,GAAGO,gBAAgB,GAAGZ,oBAAH,GAA0B,EAAzD;AACD,KAFD,MAEO;AACL,UAAIS,WAAJ,EAAiB;AACfJ,QAAAA,YAAY,GAAG,EAAf;AACD,OAFD,MAEO;AACLA,QAAAA,YAAY,GAAGO,gBAAgB,GAAGZ,oBAAH,GAA0B,EAAzD;AACD;AACF;AACF;;AAED,SAAOK,YAAY,GAAGG,eAAtB;AACD","sourcesContent":["import { Platform } from 'react-native';\nimport { StackPresentationTypes } from 'react-native-screens';\ntype Layout = { width: number; height: number };\n\nconst formSheetModalHeight = 56;\n\nexport default function getDefaultHeaderHeight(\n  layout: Layout,\n  topInset: number,\n  stackPresentation: StackPresentationTypes\n): number {\n  // default header heights\n  let headerHeight = Platform.OS === 'android' ? 56 : 64;\n  let statusBarHeight = topInset;\n\n  if (Platform.OS === 'ios') {\n    const isLandscape = layout.width > layout.height;\n    const isFromSheetModal =\n      stackPresentation === 'modal' || stackPresentation === 'formSheet';\n    if (isFromSheetModal && !isLandscape) {\n      // `modal` and `formSheet` presentations do not take whole screen, so should not take the inset.\n      statusBarHeight = 0;\n    }\n\n    if (Platform.isPad || Platform.isTVOS) {\n      headerHeight = isFromSheetModal ? formSheetModalHeight : 50;\n    } else {\n      if (isLandscape) {\n        headerHeight = 32;\n      } else {\n        headerHeight = isFromSheetModal ? formSheetModalHeight : 44;\n      }\n    }\n  }\n\n  return headerHeight + statusBarHeight;\n}\n"]}
+{"version":3,"sources":["getDefaultHeaderHeight.tsx"],"names":["formSheetModalHeight","getDefaultHeaderHeight","layout","topInset","stackPresentation","headerHeight","Platform","OS","statusBarHeight","isLandscape","width","height","isFromSheetModal","isPad","isTV"],"mappings":";;;;;;;AAAA;;AAIA,MAAMA,oBAAoB,GAAG,EAA7B;;AAEe,SAASC,sBAAT,CACbC,MADa,EAEbC,QAFa,EAGbC,iBAHa,EAIL;AACR;AACA,MAAIC,YAAY,GAAGC,sBAASC,EAAT,KAAgB,SAAhB,GAA4B,EAA5B,GAAiC,EAApD;AACA,MAAIC,eAAe,GAAGL,QAAtB;;AAEA,MAAIG,sBAASC,EAAT,KAAgB,KAApB,EAA2B;AACzB,UAAME,WAAW,GAAGP,MAAM,CAACQ,KAAP,GAAeR,MAAM,CAACS,MAA1C;AACA,UAAMC,gBAAgB,GACpBR,iBAAiB,KAAK,OAAtB,IAAiCA,iBAAiB,KAAK,WADzD;;AAEA,QAAIQ,gBAAgB,IAAI,CAACH,WAAzB,EAAsC;AACpC;AACAD,MAAAA,eAAe,GAAG,CAAlB;AACD;;AAED,QAAIF,sBAASO,KAAT,IAAkBP,sBAASQ,IAA/B,EAAqC;AACnCT,MAAAA,YAAY,GAAGO,gBAAgB,GAAGZ,oBAAH,GAA0B,EAAzD;AACD,KAFD,MAEO;AACL,UAAIS,WAAJ,EAAiB;AACfJ,QAAAA,YAAY,GAAG,EAAf;AACD,OAFD,MAEO;AACLA,QAAAA,YAAY,GAAGO,gBAAgB,GAAGZ,oBAAH,GAA0B,EAAzD;AACD;AACF;AACF;;AAED,SAAOK,YAAY,GAAGG,eAAtB;AACD","sourcesContent":["import { Platform } from 'react-native';\nimport { StackPresentationTypes } from 'react-native-screens';\ntype Layout = { width: number; height: number };\n\nconst formSheetModalHeight = 56;\n\nexport default function getDefaultHeaderHeight(\n  layout: Layout,\n  topInset: number,\n  stackPresentation: StackPresentationTypes\n): number {\n  // default header heights\n  let headerHeight = Platform.OS === 'android' ? 56 : 64;\n  let statusBarHeight = topInset;\n\n  if (Platform.OS === 'ios') {\n    const isLandscape = layout.width > layout.height;\n    const isFromSheetModal =\n      stackPresentation === 'modal' || stackPresentation === 'formSheet';\n    if (isFromSheetModal && !isLandscape) {\n      // `modal` and `formSheet` presentations do not take whole screen, so should not take the inset.\n      statusBarHeight = 0;\n    }\n\n    if (Platform.isPad || Platform.isTV) {\n      headerHeight = isFromSheetModal ? formSheetModalHeight : 50;\n    } else {\n      if (isLandscape) {\n        headerHeight = 32;\n      } else {\n        headerHeight = isFromSheetModal ? formSheetModalHeight : 44;\n      }\n    }\n  }\n\n  return headerHeight + statusBarHeight;\n}\n"]}

package/lib/module/native-stack/utils/getDefaultHeaderHeight.js

@@ -14,7 +14,7 @@ export default function getDefaultHeaderHeight(layout, topInset, stackPresentati
       statusBarHeight = 0;
     }
 
-    if (Platform.isPad || Platform.isTVOS) {
+    if (Platform.isPad || Platform.isTV) {
       headerHeight = isFromSheetModal ? formSheetModalHeight : 50;
     } else {
       if (isLandscape) {

package/lib/module/native-stack/utils/getDefaultHeaderHeight.js.map

@@ -1 +1 @@
-{"version":3,"sources":["getDefaultHeaderHeight.tsx"],"names":["Platform","formSheetModalHeight","getDefaultHeaderHeight","layout","topInset","stackPresentation","headerHeight","OS","statusBarHeight","isLandscape","width","height","isFromSheetModal","isPad","isTVOS"],"mappings":"AAAA,SAASA,QAAT,QAAyB,cAAzB;AAIA,MAAMC,oBAAoB,GAAG,EAA7B;AAEA,eAAe,SAASC,sBAAT,CACbC,MADa,EAEbC,QAFa,EAGbC,iBAHa,EAIL;AACR;AACA,MAAIC,YAAY,GAAGN,QAAQ,CAACO,EAAT,KAAgB,SAAhB,GAA4B,EAA5B,GAAiC,EAApD;AACA,MAAIC,eAAe,GAAGJ,QAAtB;;AAEA,MAAIJ,QAAQ,CAACO,EAAT,KAAgB,KAApB,EAA2B;AACzB,UAAME,WAAW,GAAGN,MAAM,CAACO,KAAP,GAAeP,MAAM,CAACQ,MAA1C;AACA,UAAMC,gBAAgB,GACpBP,iBAAiB,KAAK,OAAtB,IAAiCA,iBAAiB,KAAK,WADzD;;AAEA,QAAIO,gBAAgB,IAAI,CAACH,WAAzB,EAAsC;AACpC;AACAD,MAAAA,eAAe,GAAG,CAAlB;AACD;;AAED,QAAIR,QAAQ,CAACa,KAAT,IAAkBb,QAAQ,CAACc,MAA/B,EAAuC;AACrCR,MAAAA,YAAY,GAAGM,gBAAgB,GAAGX,oBAAH,GAA0B,EAAzD;AACD,KAFD,MAEO;AACL,UAAIQ,WAAJ,EAAiB;AACfH,QAAAA,YAAY,GAAG,EAAf;AACD,OAFD,MAEO;AACLA,QAAAA,YAAY,GAAGM,gBAAgB,GAAGX,oBAAH,GAA0B,EAAzD;AACD;AACF;AACF;;AAED,SAAOK,YAAY,GAAGE,eAAtB;AACD","sourcesContent":["import { Platform } from 'react-native';\nimport { StackPresentationTypes } from 'react-native-screens';\ntype Layout = { width: number; height: number };\n\nconst formSheetModalHeight = 56;\n\nexport default function getDefaultHeaderHeight(\n  layout: Layout,\n  topInset: number,\n  stackPresentation: StackPresentationTypes\n): number {\n  // default header heights\n  let headerHeight = Platform.OS === 'android' ? 56 : 64;\n  let statusBarHeight = topInset;\n\n  if (Platform.OS === 'ios') {\n    const isLandscape = layout.width > layout.height;\n    const isFromSheetModal =\n      stackPresentation === 'modal' || stackPresentation === 'formSheet';\n    if (isFromSheetModal && !isLandscape) {\n      // `modal` and `formSheet` presentations do not take whole screen, so should not take the inset.\n      statusBarHeight = 0;\n    }\n\n    if (Platform.isPad || Platform.isTVOS) {\n      headerHeight = isFromSheetModal ? formSheetModalHeight : 50;\n    } else {\n      if (isLandscape) {\n        headerHeight = 32;\n      } else {\n        headerHeight = isFromSheetModal ? formSheetModalHeight : 44;\n      }\n    }\n  }\n\n  return headerHeight + statusBarHeight;\n}\n"]}
+{"version":3,"sources":["getDefaultHeaderHeight.tsx"],"names":["Platform","formSheetModalHeight","getDefaultHeaderHeight","layout","topInset","stackPresentation","headerHeight","OS","statusBarHeight","isLandscape","width","height","isFromSheetModal","isPad","isTV"],"mappings":"AAAA,SAASA,QAAT,QAAyB,cAAzB;AAIA,MAAMC,oBAAoB,GAAG,EAA7B;AAEA,eAAe,SAASC,sBAAT,CACbC,MADa,EAEbC,QAFa,EAGbC,iBAHa,EAIL;AACR;AACA,MAAIC,YAAY,GAAGN,QAAQ,CAACO,EAAT,KAAgB,SAAhB,GAA4B,EAA5B,GAAiC,EAApD;AACA,MAAIC,eAAe,GAAGJ,QAAtB;;AAEA,MAAIJ,QAAQ,CAACO,EAAT,KAAgB,KAApB,EAA2B;AACzB,UAAME,WAAW,GAAGN,MAAM,CAACO,KAAP,GAAeP,MAAM,CAACQ,MAA1C;AACA,UAAMC,gBAAgB,GACpBP,iBAAiB,KAAK,OAAtB,IAAiCA,iBAAiB,KAAK,WADzD;;AAEA,QAAIO,gBAAgB,IAAI,CAACH,WAAzB,EAAsC;AACpC;AACAD,MAAAA,eAAe,GAAG,CAAlB;AACD;;AAED,QAAIR,QAAQ,CAACa,KAAT,IAAkBb,QAAQ,CAACc,IAA/B,EAAqC;AACnCR,MAAAA,YAAY,GAAGM,gBAAgB,GAAGX,oBAAH,GAA0B,EAAzD;AACD,KAFD,MAEO;AACL,UAAIQ,WAAJ,EAAiB;AACfH,QAAAA,YAAY,GAAG,EAAf;AACD,OAFD,MAEO;AACLA,QAAAA,YAAY,GAAGM,gBAAgB,GAAGX,oBAAH,GAA0B,EAAzD;AACD;AACF;AACF;;AAED,SAAOK,YAAY,GAAGE,eAAtB;AACD","sourcesContent":["import { Platform } from 'react-native';\nimport { StackPresentationTypes } from 'react-native-screens';\ntype Layout = { width: number; height: number };\n\nconst formSheetModalHeight = 56;\n\nexport default function getDefaultHeaderHeight(\n  layout: Layout,\n  topInset: number,\n  stackPresentation: StackPresentationTypes\n): number {\n  // default header heights\n  let headerHeight = Platform.OS === 'android' ? 56 : 64;\n  let statusBarHeight = topInset;\n\n  if (Platform.OS === 'ios') {\n    const isLandscape = layout.width > layout.height;\n    const isFromSheetModal =\n      stackPresentation === 'modal' || stackPresentation === 'formSheet';\n    if (isFromSheetModal && !isLandscape) {\n      // `modal` and `formSheet` presentations do not take whole screen, so should not take the inset.\n      statusBarHeight = 0;\n    }\n\n    if (Platform.isPad || Platform.isTV) {\n      headerHeight = isFromSheetModal ? formSheetModalHeight : 50;\n    } else {\n      if (isLandscape) {\n        headerHeight = 32;\n      } else {\n        headerHeight = isFromSheetModal ? formSheetModalHeight : 44;\n      }\n    }\n  }\n\n  return headerHeight + statusBarHeight;\n}\n"]}