@amazon-devices/react-native-screens 2.0.1758683737 → 3.0.9000000000

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,12 +39,21 @@ 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;
       case "fullScreenSwipeEnabled":
         mViewManager.setFullScreenSwipeEnabled(view, value == null ? false : (boolean) value);
         break;
+      case "fullScreenSwipeShadowEnabled":
+        mViewManager.setFullScreenSwipeShadowEnabled(view, value == null ? true : (boolean) value);
+        break;
       case "homeIndicatorHidden":
         mViewManager.setHomeIndicatorHidden(view, value == null ? false : (boolean) value);
         break;
@@ -81,7 +91,7 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
         mViewManager.setStackAnimation(view, (String) value);
         break;
       case "transitionDuration":
-        mViewManager.setTransitionDuration(view, value == null ? 350 : ((Double) value).intValue());
+        mViewManager.setTransitionDuration(view, value == null ? 500 : ((Double) value).intValue());
         break;
       case "replaceAnimation":
         mViewManager.setReplaceAnimation(view, (String) value);
@@ -98,6 +108,9 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
       case "navigationBarColor":
         mViewManager.setNavigationBarColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
+      case "navigationBarTranslucent":
+        mViewManager.setNavigationBarTranslucent(view, value == null ? false : (boolean) value);
+        break;
       case "navigationBarHidden":
         mViewManager.setNavigationBarHidden(view, value == null ? false : (boolean) value);
         break;

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

@@ -11,16 +11,20 @@ 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);
   void setHomeIndicatorHidden(T view, boolean value);
   void setPreventNativeDismiss(T view, boolean value);
   void setGestureEnabled(T view, boolean value);
@@ -39,6 +43,7 @@ public interface RNSScreenManagerInterface<T extends View> {
   void setHideKeyboardOnSwipe(T view, boolean value);
   void setActivityState(T view, float value);
   void setNavigationBarColor(T view, @Nullable Integer value);
+  void setNavigationBarTranslucent(T view, boolean value);
   void setNavigationBarHidden(T view, boolean value);
   void setNativeBackButtonDismissalEnabled(T view, boolean value);
 }

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

@@ -91,12 +91,18 @@ public class RNSScreenStackHeaderConfigManagerDelegate<T extends View, U extends
       case "disableBackButtonMenu":
         mViewManager.setDisableBackButtonMenu(view, value == null ? false : (boolean) value);
         break;
+      case "backButtonDisplayMode":
+        mViewManager.setBackButtonDisplayMode(view, (String) value);
+        break;
       case "hideBackButton":
         mViewManager.setHideBackButton(view, value == null ? false : (boolean) value);
         break;
       case "backButtonInCustomView":
         mViewManager.setBackButtonInCustomView(view, value == null ? false : (boolean) value);
         break;
+      case "blurEffect":
+        mViewManager.setBlurEffect(view, (String) value);
+        break;
       case "topInsetEnabled":
         mViewManager.setTopInsetEnabled(view, value == null ? false : (boolean) value);
         break;

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

@@ -36,7 +36,9 @@ public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> {
   void setTitleFontWeight(T view, @Nullable String value);
   void setTitleColor(T view, @Nullable Integer value);
   void setDisableBackButtonMenu(T view, boolean value);
+  void setBackButtonDisplayMode(T view, @Nullable String value);
   void setHideBackButton(T view, boolean value);
   void setBackButtonInCustomView(T view, boolean value);
+  void setBlurEffect(T view, @Nullable String value);
   void setTopInsetEnabled(T view, boolean value);
 }

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

@@ -0,0 +1,99 @@
+/**
+* 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.bridge.ColorPropConverter;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNSSearchBarManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSSearchBarManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNSSearchBarManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "hideWhenScrolling":
+        mViewManager.setHideWhenScrolling(view, value == null ? false : (boolean) value);
+        break;
+      case "autoCapitalize":
+        mViewManager.setAutoCapitalize(view, (String) value);
+        break;
+      case "placeholder":
+        mViewManager.setPlaceholder(view, value == null ? null : (String) value);
+        break;
+      case "placement":
+        mViewManager.setPlacement(view, (String) value);
+        break;
+      case "obscureBackground":
+        mViewManager.setObscureBackground(view, value == null ? false : (boolean) value);
+        break;
+      case "hideNavigationBar":
+        mViewManager.setHideNavigationBar(view, value == null ? false : (boolean) value);
+        break;
+      case "cancelButtonText":
+        mViewManager.setCancelButtonText(view, value == null ? null : (String) value);
+        break;
+      case "barTintColor":
+        mViewManager.setBarTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "tintColor":
+        mViewManager.setTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "textColor":
+        mViewManager.setTextColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "disableBackButtonOverride":
+        mViewManager.setDisableBackButtonOverride(view, value == null ? false : (boolean) value);
+        break;
+      case "inputType":
+        mViewManager.setInputType(view, value == null ? null : (String) value);
+        break;
+      case "hintTextColor":
+        mViewManager.setHintTextColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "headerIconColor":
+        mViewManager.setHeaderIconColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "shouldShowHintSearchIcon":
+        mViewManager.setShouldShowHintSearchIcon(view, value == null ? true : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+
+  @Override
+  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
+    switch (commandName) {
+      case "blur":
+        mViewManager.blur(view);
+        break;
+      case "focus":
+        mViewManager.focus(view);
+        break;
+      case "clearText":
+        mViewManager.clearText(view);
+        break;
+      case "toggleCancelButton":
+        mViewManager.toggleCancelButton(view, args.getBoolean(0));
+        break;
+      case "setText":
+        mViewManager.setText(view, args.getString(0));
+        break;
+      case "cancelSearch":
+        mViewManager.cancelSearch(view);
+        break;
+    }
+  }
+}

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

@@ -0,0 +1,37 @@
+/**
+* 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;
+import androidx.annotation.Nullable;
+
+public interface RNSSearchBarManagerInterface<T extends View> {
+  void setHideWhenScrolling(T view, boolean value);
+  void setAutoCapitalize(T view, @Nullable String value);
+  void setPlaceholder(T view, @Nullable String value);
+  void setPlacement(T view, @Nullable String value);
+  void setObscureBackground(T view, boolean value);
+  void setHideNavigationBar(T view, boolean value);
+  void setCancelButtonText(T view, @Nullable String value);
+  void setBarTintColor(T view, @Nullable Integer value);
+  void setTintColor(T view, @Nullable Integer value);
+  void setTextColor(T view, @Nullable Integer value);
+  void setDisableBackButtonOverride(T view, boolean value);
+  void setInputType(T view, @Nullable String value);
+  void setHintTextColor(T view, @Nullable Integer value);
+  void setHeaderIconColor(T view, @Nullable Integer value);
+  void setShouldShowHintSearchIcon(T view, boolean value);
+  void blur(T view);
+  void focus(T view);
+  void clearText(T view);
+  void toggleCancelButton(T view, boolean flag);
+  void setText(T view, String text);
+  void cancelSearch(T view);
+}

package/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt

@@ -0,0 +1,39 @@
+package com.swmansion.rnscreens
+
+import android.content.Context
+import android.view.ViewGroup
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.StateWrapper
+import com.facebook.react.uimanager.UIManagerModule
+import com.swmansion.rnscreens.utils.PaddingBundle
+import kotlin.math.abs
+
+abstract class FabricEnabledHeaderConfigViewGroup(
+    context: Context,
+) : ViewGroup(context) {
+    private var lastPaddingStart = 0
+    private var lastPaddingEnd = 0
+
+    fun setStateWrapper(wrapper: StateWrapper?) = Unit
+
+    fun updatePaddingsFabric(
+        paddingStart: Int,
+        paddingEnd: Int,
+    ) {
+        // Note that on Paper we do not convert these props from px to dip. This is done internally by RN.
+        if (abs(lastPaddingStart - paddingStart) < DELTA && abs(lastPaddingEnd - paddingEnd) < DELTA) {
+            return
+        }
+
+        lastPaddingStart = paddingStart
+        lastPaddingEnd = paddingEnd
+
+        val reactContext = context as? ReactContext
+        val uiManagerModule = reactContext?.getNativeModule(UIManagerModule::class.java)
+        uiManagerModule?.setViewLocalData(this.id, PaddingBundle(paddingStart.toFloat(), paddingEnd.toFloat()))
+    }
+
+    companion object {
+        private const val DELTA = 0.9
+    }
+}

package/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt

@@ -2,9 +2,18 @@ package com.swmansion.rnscreens
 
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.StateWrapper
 
-abstract class FabricEnabledViewGroup constructor(context: ReactContext?) : ViewGroup(context) {
-    protected fun updateScreenSizeFabric(width: Int, height: Int) {
+abstract class FabricEnabledViewGroup(
+    context: ReactContext?,
+) : ViewGroup(context) {
+    fun setStateWrapper(wrapper: StateWrapper?) = Unit
+
+    protected fun updateScreenSizeFabric(
+        width: Int,
+        height: Int,
+        headerHeight: Int,
+    ) {
         // do nothing
     }
 }

package/android/src/paper/java/com/swmansion/rnscreens/NativeProxy.kt

@@ -0,0 +1,19 @@
+package com.swmansion.rnscreens
+
+import com.facebook.react.fabric.FabricUIManager
+
+class NativeProxy {
+    // do nothing on Paper
+    fun nativeAddMutationsListener(fabricUIManager: FabricUIManager) = Unit
+
+    companion object {
+        fun addScreenToMap(
+            tag: Int,
+            view: Screen,
+        ) = Unit
+
+        fun removeScreenFromMap(tag: Int) = Unit
+
+        fun clearMapOnInvalidate() = Unit
+    }
+}

package/android/src/paper/java/com/swmansion/rnscreens/NativeScreensModuleSpec.java

@@ -0,0 +1,36 @@
+
+/**
+ * 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: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.swmansion.rnscreens;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeScreensModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "RNSModule";
+
+  public NativeScreensModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+
+}

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

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <cstdint>
+
+namespace rnscreens {
+
+/**
+ * Flags describing types of corrections to apply to Screen frame
+ * after layout process.
+ */
+class FrameCorrectionModes final {
+ public:
+  enum Mode : std::uint8_t {
+    /**
+     * No correction should be applied to layout metrics of Screen
+     */
+    None = 0,
+
+    /**
+     * Screen's frame height should be corrected
+     */
+    FrameHeightCorrection = 1 << 0,
+
+    /**
+     * Screen's frame origin should be corrected
+     */
+    FrameOriginCorrection = 1 << 1,
+  };
+
+  inline void set(Mode mode) {
+    modes_ = Mode(modes_ | mode);
+  }
+
+  inline void unset(Mode mode) {
+    modes_ = Mode(modes_ & ~mode);
+  }
+
+  // Check whether current set of flags contains all flags set in argument.
+  inline bool check(Mode mode) const {
+    return Mode(modes_ & mode) == mode;
+  }
+
+  inline Mode getAll() const {
+    return modes_;
+  }
+
+ private:
+  Mode modes_{Mode::None};
+};
+
+} // namespace rnscreens

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

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include "RNSModalScreenShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+class RNSModalScreenComponentDescriptor final
+    : public ConcreteComponentDescriptor<RNSModalScreenShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(dynamic_cast<RNSModalScreenShadowNode *>(&shadowNode));
+    auto &screenShadowNode =
+        static_cast<RNSModalScreenShadowNode &>(shadowNode);
+
+    react_native_assert(
+        dynamic_cast<YogaLayoutableShadowNode *>(&screenShadowNode));
+    auto &layoutableShadowNode =
+        dynamic_cast<YogaLayoutableShadowNode &>(screenShadowNode);
+
+    auto state =
+        std::static_pointer_cast<const RNSModalScreenShadowNode::ConcreteState>(
+            shadowNode.getState());
+    auto stateData = state->getData();
+
+    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
+      layoutableShadowNode.setSize(
+          Size{stateData.frameSize.width, stateData.frameSize.height});
+    }
+
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace react
+} // namespace facebook

package/common/cpp/react/renderer/components/rnscreens/RNSModalScreenShadowNode.cpp

@@ -0,0 +1,16 @@
+#include "RNSModalScreenShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+extern const char RNSModalScreenComponentName[] = "RNSModalScreen";
+
+Point RNSModalScreenShadowNode::getContentOriginOffset(
+    bool /*includeTransform*/) const {
+  auto stateData = getStateData();
+  auto contentOffset = stateData.contentOffset;
+  return {contentOffset.x, contentOffset.y};
+}
+
+} // namespace react
+} // namespace facebook

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

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/rnscreens/EventEmitters.h>
+#include <react/renderer/components/rnscreens/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include "RNSScreenState.h"
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT extern const char RNSModalScreenComponentName[];
+
+class JSI_EXPORT RNSModalScreenShadowNode final
+    : public ConcreteViewShadowNode<
+          RNSModalScreenComponentName,
+          RNSScreenProps,
+          RNSScreenEventEmitter,
+          RNSScreenState> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  Point getContentOriginOffset(bool includeTransform) const override;
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::RootNodeKind);
+    return traits;
+  }
+};
+
+} // namespace react
+} // namespace facebook

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

@@ -1,38 +1,81 @@
 #pragma once
 
+#ifdef ANDROID
+#include <fbjni/fbjni.h>
+#endif // ANDROID
 #include <react/debug/react_native_assert.h>
-#include "RNSScreenShadowNode.h"
+#include <react/renderer/components/rnscreens/Props.h>
+#include <react/renderer/components/rnscreens/utils/RectUtil.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include "RNSScreenShadowNode.h"
 
 namespace facebook {
 namespace react {
 
+using namespace rnscreens;
+
 class RNSScreenComponentDescriptor final
     : public ConcreteComponentDescriptor<RNSScreenShadowNode> {
  public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
-  void adopt(ShadowNode::Unshared const &shadowNode) const override {
-    react_native_assert(
-        std::dynamic_pointer_cast<RNSScreenShadowNode>(shadowNode));
-    auto screenShadowNode =
-        std::static_pointer_cast<RNSScreenShadowNode>(shadowNode);
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(dynamic_cast<RNSScreenShadowNode *>(&shadowNode));
+    auto &screenShadowNode = static_cast<RNSScreenShadowNode &>(shadowNode);
 
     react_native_assert(
-        std::dynamic_pointer_cast<YogaLayoutableShadowNode>(screenShadowNode));
-    auto layoutableShadowNode =
-        std::static_pointer_cast<YogaLayoutableShadowNode>(screenShadowNode);
+        dynamic_cast<YogaLayoutableShadowNode *>(&screenShadowNode));
+    auto &layoutableShadowNode =
+        dynamic_cast<YogaLayoutableShadowNode &>(screenShadowNode);
 
     auto state =
         std::static_pointer_cast<const RNSScreenShadowNode::ConcreteState>(
-            shadowNode->getState());
+            shadowNode.getState());
     auto stateData = state->getData();
 
+#ifdef ANDROID
     if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
-      layoutableShadowNode->setSize(
+      // When we receive dimensions from JVM side we can remove padding used for
+      // correction, and we can stop applying height and offset corrections for
+      // the frame.
+      // TODO: In future, when we have dynamic header height we might want to
+      // update Y offset correction here.
+
+#ifdef REACT_NATIVE_DEBUG
+      // We use the fact that height correction is disabled once we receive
+      // state from the native, so when we have incoming state & height
+      // correction is still enabled, we know this is the very first native
+      // state update.
+      if (screenShadowNode.getFrameCorrectionModes().check(
+              FrameCorrectionModes::Mode::FrameHeightCorrection) &&
+          !checkFrameSizesEqualWithEps(
+              screenShadowNode.layoutMetrics_.frame.size,
+              stateData.frameSize)) {
+        LOG(ERROR)
+            << "[RNScreens] The first frame received from state update: "
+            << stateData.frameSize.width << "x" << stateData.frameSize.height
+            << " differs from the one expected: "
+            << screenShadowNode.layoutMetrics_.frame.size.width << "x"
+            << screenShadowNode.layoutMetrics_.frame.size.height
+            << ". This is most likely a react-native-screens library bug. Please report this at https://github.com/software-mansion/react-native-screens/issues";
+      }
+#endif
+
+      screenShadowNode.setPadding({0, 0, 0, 0});
+      screenShadowNode.getFrameCorrectionModes().unset(
+          FrameCorrectionModes::Mode::FrameHeightCorrection);
+      screenShadowNode.getFrameCorrectionModes().unset(
+          FrameCorrectionModes::Mode::FrameOriginCorrection);
+
+      layoutableShadowNode.setSize(
           Size{stateData.frameSize.width, stateData.frameSize.height});
     }
-
+#else
+    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
+      layoutableShadowNode.setSize(
+          Size{stateData.frameSize.width, stateData.frameSize.height});
+    }
+#endif // ANDROID
     ConcreteComponentDescriptor::adopt(shadowNode);
   }
 };