react-native-screens 3.35.0-rc.0 → 4.0.0-beta.0

package/android/src/main/java/com/swmansion/rnscreens/events/SheetDetentChangedEvent.kt

@@ -0,0 +1,27 @@
+package com.swmansion.rnscreens.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+class SheetDetentChangedEvent(
+    surfaceId: Int,
+    viewId: Int,
+    val index: Int,
+    val isStable: Boolean,
+) : Event<SheetDetentChangedEvent>(surfaceId, viewId) {
+    override fun getEventName() = EVENT_NAME
+
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
+
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putInt("index", index)
+            putBoolean("isStable", isStable)
+        }
+
+    companion object {
+        const val EVENT_NAME = "topSheetDetentChanged"
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/ext/NumericExt.kt

@@ -0,0 +1,12 @@
+package com.swmansion.rnscreens.ext
+
+import kotlin.math.abs
+
+/**
+ * 1e-4 should be a reasonable default value for graphic-related use cases.
+ * You should always make sure that it is feasible in your particular use case.
+ */
+internal fun Float.equalWithRespectToEps(
+    other: Float,
+    eps: Float = 1e-4F,
+) = abs(this - other) <= eps

package/android/src/main/java/com/swmansion/rnscreens/ext/ViewExt.kt

@@ -0,0 +1,32 @@
+package com.swmansion.rnscreens.ext
+
+import android.graphics.drawable.ColorDrawable
+import android.view.View
+import android.view.ViewGroup
+
+internal fun View.parentAsView() = this.parent as? View
+
+internal fun View.parentAsViewGroup() = this.parent as? ViewGroup
+
+internal fun View.recycle(): View {
+    // screen fragments reuse view instances instead of creating new ones. In order to reuse a given
+    // view it needs to be detached from the view hierarchy to allow the fragment to attach it back.
+    this.parentAsViewGroup()?.let { parent ->
+        parent.endViewTransition(this)
+        parent.removeView(this)
+    }
+
+    // view detached from fragment manager get their visibility changed to GONE after their state is
+    // dumped. Since we don't restore the state but want to reuse the view we need to change
+    // visibility back to VISIBLE in order for the fragment manager to animate in the view.
+    this.visibility = View.VISIBLE
+    return this
+}
+
+internal fun View.maybeBgColor(): Int? {
+    val bgDrawable = this.background
+    if (bgDrawable is ColorDrawable) {
+        return bgDrawable.color
+    }
+    return null
+}

package/android/src/main/java/com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper.kt

@@ -1,10 +1,12 @@
 package com.swmansion.rnscreens.utils
 
 import android.app.Activity
+import android.content.Context
 import android.util.Log
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.facebook.jni.annotations.DoNotStrip
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.PixelUtil
@@ -18,6 +20,7 @@ import java.lang.ref.WeakReference
  * See https://github.com/software-mansion/react-native-screens/pull/2169
  * for more detailed description of the issue this code solves.
  */
+@DoNotStrip
 internal class ScreenDummyLayoutHelper(
     reactContext: ReactApplicationContext,
 ) : LifecycleEventListener {
@@ -46,7 +49,7 @@ internal class ScreenDummyLayoutHelper(
         try {
             System.loadLibrary(LIBRARY_NAME)
         } catch (e: UnsatisfiedLinkError) {
-            Log.w(TAG, "Failed to load $LIBRARY_NAME")
+            Log.w(TAG, "[RNScreens] Failed to load $LIBRARY_NAME library.")
         }
 
         weakInstance = WeakReference(this)
@@ -57,9 +60,13 @@ internal class ScreenDummyLayoutHelper(
     }
 
     /**
-     * Initializes dummy view hierarchy with CoordinatorLayout, AppBarLayout and dummy View.
+     * Tries to initialize dummy view hierarchy with CoordinatorLayout, AppBarLayout and dummy View.
      * We utilize this to compute header height (app bar layout height) from C++ layer when its needed.
      *
+     * This method might fail in case there is activity attached to the react context.
+     *
+     * This method is called from various threads!
+     *
      * @return boolean whether the layout was initialised or not
      */
     private fun maybeInitDummyLayoutWithHeader(reactContext: ReactApplicationContext): Boolean {
@@ -67,6 +74,7 @@ internal class ScreenDummyLayoutHelper(
             return true
         }
 
+        // Possible data race here - activity is injected into context on UI thread.
         if (!reactContext.hasCurrentActivity()) {
             return false
         }
@@ -74,8 +82,25 @@ internal class ScreenDummyLayoutHelper(
         // We need to use activity here, as react context does not have theme attributes required by
         // AppBarLayout attached leading to crash.
         val contextWithTheme =
-            requireNotNull(reactContext.currentActivity) { "[RNScreens] Attempt to use context detached from activity" }
+            requireNotNull(reactContext.currentActivity) { "[RNScreens] Attempt to use context detached from activity. This could happen only due to race-condition." }
+
+        synchronized(this) {
+            // The layout could have been initialised when this thread waited for access to critical section.
+            if (isLayoutInitialized) {
+                return true
+            }
+            initDummyLayoutWithHeader(contextWithTheme)
+        }
+        return true
+    }
 
+    /**
+     * Initialises the dummy layout. This method is **not** thread-safe.
+     *
+     * @param contextWithTheme this function expects the context to have theme attributes required
+     * to initialize the AppBarLayout.
+     */
+    private fun initDummyLayoutWithHeader(contextWithTheme: Context) {
         coordinatorLayout = CoordinatorLayout(contextWithTheme)
 
         appBarLayout =
@@ -119,7 +144,6 @@ internal class ScreenDummyLayoutHelper(
         }
 
         isLayoutInitialized = true
-        return true
     }
 
     /**
@@ -129,6 +153,7 @@ internal class ScreenDummyLayoutHelper(
      * @param fontSize font size value as passed from JS
      * @return header height in dp as consumed by Yoga
      */
+    @DoNotStrip
     private fun computeDummyLayout(
         fontSize: Int,
         isTitleEmpty: Boolean,
@@ -141,7 +166,7 @@ internal class ScreenDummyLayoutHelper(
                 // is still null at this execution point. We don't wanna crash in such case, thus returning zeroed height.
                 Log.e(
                     TAG,
-                    "[RNScreens] Failed to late-init layout while computing header height. This is a race-condition-bug in react-native-screens, please file an issue at https://github.com/software-mansion/react-native-screens/issues"
+                    "[RNScreens] Failed to late-init layout while computing header height. This is most likely a race-condition-bug in react-native-screens, please file an issue at https://github.com/software-mansion/react-native-screens/issues"
                 )
                 return 0.0f
             }
@@ -210,22 +235,34 @@ internal class ScreenDummyLayoutHelper(
         // dummy view hierarchy.
         private var weakInstance = WeakReference<ScreenDummyLayoutHelper>(null)
 
+        @DoNotStrip
         @JvmStatic
         fun getInstance(): ScreenDummyLayoutHelper? = weakInstance.get()
     }
 
+    // This value is fetched / stored from UI and background thread. Volatile here ensures
+    // that updates are visible to the other thread.
+    @Volatile
     private var isLayoutInitialized = false
 
     override fun onHostResume() {
         // This is the earliest we have guarantee that the context has a reference to an activity.
         val reactContext = requireReactContext { "[RNScreens] ReactContext missing in onHostResume! This should not happen." }
-        check(maybeInitDummyLayoutWithHeader(reactContext)) { "[RNScreens] Failed to initialise dummy layout in onHostResume. This is not expected."}
-        reactContext.removeLifecycleEventListener(this)
+
+        // There are some exotic edge cases where activity might not be present in context
+        // at this point, e.g. when reloading RN in development after an error was reported with redbox.
+        if (maybeInitDummyLayoutWithHeader(reactContext)) {
+            reactContext.removeLifecycleEventListener(this)
+        } else {
+            Log.w(TAG, "[RNScreens] Failed to initialise dummy layout in onHostResume.")
+        }
     }
 
     override fun onHostPause() = Unit
 
-    override fun onHostDestroy() = Unit
+    override fun onHostDestroy() {
+        reactContextRef.get()?.removeLifecycleEventListener(this)
+    }
 }
 
 private data class CacheKey(

package/android/src/main/res/base/drawable/rns_rounder_top_corners_shape.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"/>
+    <solid android:color="#ffffff"/>
+</shape>

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContentWrapperManagerDelegate.java

@@ -0,0 +1,25 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNSScreenContentWrapperManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenContentWrapperManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNSScreenContentWrapperManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    super.setProperty(view, propName, value);
+  }
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContentWrapperManagerInterface.java

@@ -0,0 +1,16 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+
+public interface RNSScreenContentWrapperManagerInterface<T extends View> {
+  // No props
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenFooterManagerDelegate.java

@@ -0,0 +1,25 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNSScreenFooterManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenFooterManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNSScreenFooterManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    super.setProperty(view, propName, value);
+  }
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenFooterManagerInterface.java

@@ -0,0 +1,16 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+
+public interface RNSScreenFooterManagerInterface<T extends View> {
+  // No props
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerDelegate.java

@@ -12,6 +12,7 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
@@ -24,10 +25,10 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
       case "sheetAllowedDetents":
-        mViewManager.setSheetAllowedDetents(view, (String) value);
+        mViewManager.setSheetAllowedDetents(view, (ReadableArray) value);
         break;
       case "sheetLargestUndimmedDetent":
-        mViewManager.setSheetLargestUndimmedDetent(view, (String) value);
+        mViewManager.setSheetLargestUndimmedDetent(view, value == null ? -1 : ((Double) value).intValue());
         break;
       case "sheetGrabberVisible":
         mViewManager.setSheetGrabberVisible(view, value == null ? false : (boolean) value);
@@ -38,6 +39,12 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
       case "sheetExpandsWhenScrolledToEdge":
         mViewManager.setSheetExpandsWhenScrolledToEdge(view, value == null ? false : (boolean) value);
         break;
+      case "sheetInitialDetent":
+        mViewManager.setSheetInitialDetent(view, value == null ? 0 : ((Double) value).intValue());
+        break;
+      case "sheetElevation":
+        mViewManager.setSheetElevation(view, value == null ? 24 : ((Double) value).intValue());
+        break;
       case "customAnimationOnSwipe":
         mViewManager.setCustomAnimationOnSwipe(view, value == null ? false : (boolean) value);
         break;

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerInterface.java

@@ -11,14 +11,17 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 
 public interface RNSScreenManagerInterface<T extends View> {
-  void setSheetAllowedDetents(T view, @Nullable String value);
-  void setSheetLargestUndimmedDetent(T view, @Nullable String value);
+  void setSheetAllowedDetents(T view, @Nullable ReadableArray value);
+  void setSheetLargestUndimmedDetent(T view, int value);
   void setSheetGrabberVisible(T view, boolean value);
   void setSheetCornerRadius(T view, float value);
   void setSheetExpandsWhenScrolledToEdge(T view, boolean value);
+  void setSheetInitialDetent(T view, int value);
+  void setSheetElevation(T view, int value);
   void setCustomAnimationOnSwipe(T view, boolean value);
   void setFullScreenSwipeEnabled(T view, boolean value);
   void setFullScreenSwipeShadowEnabled(T view, boolean value);

package/ios/RNSConvert.h

@@ -26,9 +26,7 @@ namespace react = facebook::react;
 
 + (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:(react::RNSScreenSwipeDirection)swipeDirection;
 
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:(react::RNSScreenSheetAllowedDetents)allowedDetents;
-
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:(react::RNSScreenSheetLargestUndimmedDetent)detent;
++ (NSArray<NSNumber *> *)detentFractionsArrayFromVector:(const std::vector<react::Float> &)detents;
 
 + (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
     (const react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance;
@@ -40,6 +38,10 @@ namespace react = facebook::react;
 
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement;
 
++ (NSMutableArray<NSNumber *> *)NSNumberMutableArrayFromFloatVector:(const std::vector<CGFloat> &)vector;
+
++ (NSMutableArray<NSNumber *> *)arrayFromVector:(const std::vector<CGFloat> &)vector;
+
 + (UIBlurEffectStyle)UIBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect;
 
 @end

package/ios/RNSConvert.mm

@@ -113,28 +113,13 @@
   }
 }
 
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:(react::RNSScreenSheetAllowedDetents)allowedDetents
++ (NSArray<NSNumber *> *)detentFractionsArrayFromVector:(const std::vector<react::Float> &)detents
 {
-  switch (allowedDetents) {
-    case react::RNSScreenSheetAllowedDetents::All:
-      return RNSScreenDetentTypeAll;
-    case react::RNSScreenSheetAllowedDetents::Large:
-      return RNSScreenDetentTypeLarge;
-    case react::RNSScreenSheetAllowedDetents::Medium:
-      return RNSScreenDetentTypeMedium;
-  }
-}
-
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:(react::RNSScreenSheetLargestUndimmedDetent)detent
-{
-  switch (detent) {
-    case react::RNSScreenSheetLargestUndimmedDetent::All:
-      return RNSScreenDetentTypeAll;
-    case react::RNSScreenSheetLargestUndimmedDetent::Large:
-      return RNSScreenDetentTypeLarge;
-    case react::RNSScreenSheetLargestUndimmedDetent::Medium:
-      return RNSScreenDetentTypeMedium;
+  auto array = [NSMutableArray<NSNumber *> arrayWithCapacity:detents.size()];
+  for (const react::Float value : detents) {
+    [array addObject:[NSNumber numberWithFloat:value]];
   }
+  return array;
 }
 
 + (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
@@ -177,6 +162,15 @@
   }
 }
 
++ (NSMutableArray<NSNumber *> *)arrayFromVector:(const std::vector<CGFloat> &)vector
+{
+  NSMutableArray *array = [NSMutableArray arrayWithCapacity:vector.size()];
+  for (CGFloat val : vector) {
+    [array addObject:[NSNumber numberWithFloat:val]];
+  }
+  return array;
+}
+
 + (UIBlurEffectStyle)UIBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect
 {
 #if !TARGET_OS_TV && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \

package/ios/RNSScreen.h

@@ -86,8 +86,8 @@ namespace react = facebook::react;
 @property (nonatomic) BOOL homeIndicatorHidden;
 
 // Props controlling UISheetPresentationController
-@property (nonatomic) RNSScreenDetentType sheetAllowedDetents;
-@property (nonatomic) RNSScreenDetentType sheetLargestUndimmedDetent;
+@property (nonatomic) NSArray<NSNumber *> *sheetAllowedDetents;
+@property (nonatomic) NSNumber *sheetLargestUndimmedDetent;
 @property (nonatomic) BOOL sheetGrabberVisible;
 @property (nonatomic) CGFloat sheetCornerRadius;
 @property (nonatomic) BOOL sheetExpandsWhenScrolledToEdge;
@@ -109,6 +109,7 @@ namespace react = facebook::react;
 @property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
 @property (nonatomic, copy) RCTDirectEventBlock onTransitionProgress;
 @property (nonatomic, copy) RCTDirectEventBlock onGestureCancel;
+@property (nonatomic, copy) RCTDirectEventBlock onSheetDetentChanged;
 #endif // RCT_NEW_ARCH_ENABLED
 
 - (void)notifyFinishTransitioning;