react-native-screens 4.7.0-beta.4 → 4.7.0

package/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt

@@ -7,12 +7,18 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.StateWrapper
+import kotlin.math.abs
 
 abstract class FabricEnabledHeaderSubviewViewGroup(
     context: Context?,
 ) : ViewGroup(context) {
     private var mStateWrapper: StateWrapper? = null
 
+    private var lastWidth = 0f
+    private var lastHeight = 0f
+    private var lastOffsetX = 0f
+    private var lastOffsetY = 0f
+
     fun setStateWrapper(wrapper: StateWrapper?) {
         mStateWrapper = wrapper
     }
@@ -38,6 +44,21 @@ abstract class FabricEnabledHeaderSubviewViewGroup(
         val offsetXDip: Float = PixelUtil.toDIPFromPixel(offsetX.toFloat())
         val offsetYDip: Float = PixelUtil.toDIPFromPixel(offsetY.toFloat())
 
+        // Check incoming state values. If they're already the correct value, return early to prevent
+        // infinite UpdateState/SetState loop.
+        if (abs(lastWidth - realWidth) < DELTA &&
+            abs(lastHeight - realHeight) < DELTA &&
+            abs(lastOffsetX - offsetXDip) < DELTA &&
+            abs(lastOffsetY - offsetYDip) < DELTA
+        ) {
+            return
+        }
+
+        lastWidth = realWidth
+        lastHeight = realHeight
+        lastOffsetX = offsetXDip
+        lastOffsetY = offsetYDip
+
         val map: WritableMap =
             WritableNativeMap().apply {
                 putDouble("frameWidth", realWidth.toDouble())
@@ -48,4 +69,8 @@ abstract class FabricEnabledHeaderSubviewViewGroup(
 
         mStateWrapper?.updateState(map)
     }
+
+    companion object {
+        private const val DELTA = 0.9f
+    }
 }

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h

@@ -35,8 +35,7 @@ class RNSScreenStackHeaderConfigComponentDescriptor final
     auto stateData = state->getData();
 
     if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
-      layoutableShadowNode.setSize(
-          {stateData.frameSize.width, stateData.frameSize.height});
+      layoutableShadowNode.setSize(stateData.frameSize);
 #ifdef ANDROID
       layoutableShadowNode.setPadding({
           stateData.paddingStart,

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h

@@ -8,6 +8,7 @@
 #include <react/renderer/components/rnscreens/utils/RectUtil.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include "RNSScreenStackHeaderSubviewShadowNode.h"
+#include "utils/RectUtil.h"
 
 namespace facebook::react {
 
@@ -32,12 +33,11 @@ class RNSScreenStackHeaderSubviewComponentDescriptor final
 
     auto state = std::static_pointer_cast<
         const RNSScreenStackHeaderSubviewShadowNode::ConcreteState>(
-        shadowNode.getState());
+        shadowNode.getMostRecentState());
     auto stateData = state->getData();
 
-    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
-      layoutableShadowNode.setSize(
-          Size{stateData.frameSize.width, stateData.frameSize.height});
+    if (!isSizeEmpty(stateData.frameSize)) {
+      layoutableShadowNode.setSize(stateData.frameSize);
     }
 
     ConcreteComponentDescriptor::adopt(shadowNode);

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.h

@@ -44,7 +44,7 @@ class JSI_EXPORT RNSScreenStackHeaderSubviewState final {
 
 #endif // ANDROID
 
-  const Size frameSize{};
+  const Size frameSize{-1.f, -1.f};
   Point contentOffset{};
 
 #pragma mark - Getters

package/common/cpp/react/renderer/components/rnscreens/utils/RectUtil.h

@@ -33,4 +33,11 @@ inline constexpr bool checkFrameSizesEqualWithEps(
       equalWithRespectToEps(first.height, second.height, eps);
 }
 
+/**
+ * @return false if any component value is less than 0
+ */
+inline constexpr bool isSizeEmpty(const react::Size &size) {
+  return size.width < 0 || size.height < 0;
+}
+
 } // namespace rnscreens

package/lib/typescript/types.d.ts

@@ -235,7 +235,7 @@ export interface ScreenProps extends ViewProps {
      * while **Android is limited to three**.
      *
      * There is also possibility to specify `fitToContents` literal, which intents to set the sheet height
-     * to the height of its contents.
+     * to the height of its contents. On iOS `fitToContents` currently also includes small padding accounting for bottom inset.
      *
      * Please note that the array **must** be sorted in ascending order. This invariant is verified only in developement mode,
      * where violation results in error.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.7.0-beta.4",
+  "version": "4.7.0",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",

package/src/types.tsx

@@ -303,7 +303,7 @@ export interface ScreenProps extends ViewProps {
    * while **Android is limited to three**.
    *
    * There is also possibility to specify `fitToContents` literal, which intents to set the sheet height
-   * to the height of its contents.
+   * to the height of its contents. On iOS `fitToContents` currently also includes small padding accounting for bottom inset.
    *
    * Please note that the array **must** be sorted in ascending order. This invariant is verified only in developement mode,
    * where violation results in error.