react-native-screens 3.31.0 → 3.32.0

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

@@ -1,12 +1,15 @@
 package com.swmansion.rnscreens
 
+import android.util.Log
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
-import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNSSearchBarManagerDelegate
+import com.facebook.react.viewmanagers.RNSSearchBarManagerInterface
 import com.swmansion.rnscreens.events.SearchBarBlurEvent
 import com.swmansion.rnscreens.events.SearchBarChangeTextEvent
 import com.swmansion.rnscreens.events.SearchBarCloseEvent
@@ -15,7 +18,17 @@ import com.swmansion.rnscreens.events.SearchBarOpenEvent
 import com.swmansion.rnscreens.events.SearchBarSearchButtonPressEvent
 
 @ReactModule(name = SearchBarManager.REACT_CLASS)
-class SearchBarManager : ViewGroupManager<SearchBarView>() {
+class SearchBarManager : ViewGroupManager<SearchBarView>(), RNSSearchBarManagerInterface<SearchBarView> {
+    private val delegate: ViewManagerDelegate<SearchBarView>
+
+    init {
+        delegate = RNSSearchBarManagerDelegate<SearchBarView, SearchBarManager>(this)
+    }
+
+    protected override fun getDelegate(): ViewManagerDelegate<SearchBarView> {
+        return delegate
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -30,7 +43,7 @@ class SearchBarManager : ViewGroupManager<SearchBarView>() {
     }
 
     @ReactProp(name = "autoCapitalize")
-    fun setAutoCapitalize(view: SearchBarView, autoCapitalize: String?) {
+    override fun setAutoCapitalize(view: SearchBarView, autoCapitalize: String?) {
         view.autoCapitalize = when (autoCapitalize) {
             null, "none" -> SearchBarView.SearchBarAutoCapitalize.NONE
             "words" -> SearchBarView.SearchBarAutoCapitalize.WORDS
@@ -48,17 +61,17 @@ class SearchBarManager : ViewGroupManager<SearchBarView>() {
     }
 
     @ReactProp(name = "barTintColor", customType = "Color")
-    fun setTintColor(view: SearchBarView, color: Int?) {
+    override fun setBarTintColor(view: SearchBarView, color: Int?) {
         view.tintColor = color
     }
 
     @ReactProp(name = "disableBackButtonOverride")
-    fun setDisableBackButtonOverride(view: SearchBarView, disableBackButtonOverride: Boolean?) {
+    override fun setDisableBackButtonOverride(view: SearchBarView, disableBackButtonOverride: Boolean) {
         view.shouldOverrideBackButton = disableBackButtonOverride != true
     }
 
     @ReactProp(name = "inputType")
-    fun setInputType(view: SearchBarView, inputType: String?) {
+    override fun setInputType(view: SearchBarView, inputType: String?) {
         view.inputType = when (inputType) {
             null, "text" -> SearchBarView.SearchBarInputTypes.TEXT
             "phone" -> SearchBarView.SearchBarInputTypes.PHONE
@@ -71,56 +84,42 @@ class SearchBarManager : ViewGroupManager<SearchBarView>() {
     }
 
     @ReactProp(name = "placeholder")
-    fun setPlaceholder(view: SearchBarView, placeholder: String?) {
+    override fun setPlaceholder(view: SearchBarView, placeholder: String?) {
         if (placeholder != null) {
             view.placeholder = placeholder
         }
     }
 
     @ReactProp(name = "textColor", customType = "Color")
-    fun setTextColor(view: SearchBarView, color: Int?) {
+    override fun setTextColor(view: SearchBarView, color: Int?) {
         view.textColor = color
     }
 
     @ReactProp(name = "headerIconColor", customType = "Color")
-    fun setHeaderIconColor(view: SearchBarView, color: Int?) {
+    override fun setHeaderIconColor(view: SearchBarView, color: Int?) {
         view.headerIconColor = color
     }
 
     @ReactProp(name = "hintTextColor", customType = "Color")
-    fun setHintTextColor(view: SearchBarView, color: Int?) {
+    override fun setHintTextColor(view: SearchBarView, color: Int?) {
         view.hintTextColor = color
     }
 
     @ReactProp(name = "shouldShowHintSearchIcon")
-    fun setShouldShowHintSearchIcon(view: SearchBarView, shouldShowHintSearchIcon: Boolean?) {
+    override fun setShouldShowHintSearchIcon(view: SearchBarView, shouldShowHintSearchIcon: Boolean) {
         view.shouldShowHintSearchIcon = shouldShowHintSearchIcon ?: true
     }
 
-    fun setPlacement(view: SearchBarView, placeholder: String?) = Unit
-
-    override fun receiveCommand(root: SearchBarView, commandId: String?, args: ReadableArray?) {
-        when (commandId) {
-            "focus" -> root.handleFocusJsRequest()
-            "blur" -> root.handleBlurJsRequest()
-            "clearText" -> root.handleClearTextJsRequest()
-            "toggleCancelButton" -> root.handleToggleCancelButtonJsRequest(false) // just a dummy argument
-            "setText" -> root.handleSetTextJsRequest(args?.getString(0))
-            "cancelSearch" -> root.handleCancelSearchJsRequest()
-            else -> throw JSApplicationIllegalArgumentException("Unsupported native command received: $commandId")
-        }
-    }
-
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
         return MapBuilder.of(
             SearchBarBlurEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onBlur"),
+            MapBuilder.of("registrationName", "onSearchBlur"),
             SearchBarChangeTextEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onChangeText"),
             SearchBarCloseEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onClose"),
             SearchBarFocusEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onFocus"),
+            MapBuilder.of("registrationName", "onSearchFocus"),
             SearchBarOpenEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onOpen"),
             SearchBarSearchButtonPressEvent.EVENT_NAME,
@@ -131,4 +130,60 @@ class SearchBarManager : ViewGroupManager<SearchBarView>() {
     companion object {
         const val REACT_CLASS = "RNSSearchBar"
     }
+
+    private fun logNotAvailable(propName: String) {
+        Log.w("RN SCREENS", "$propName prop is not available on Android")
+    }
+
+    // NativeCommands
+
+    override fun blur(view: SearchBarView?) {
+        view?.handleBlurJsRequest()
+    }
+
+    override fun focus(view: SearchBarView?) {
+        view?.handleFocusJsRequest()
+    }
+
+    override fun clearText(view: SearchBarView?) {
+        view?.handleClearTextJsRequest()
+    }
+
+    override fun toggleCancelButton(view: SearchBarView?, flag: Boolean) {
+        view?.handleToggleCancelButtonJsRequest(flag)
+    }
+
+    override fun setText(view: SearchBarView?, text: String?) {
+        view?.handleSetTextJsRequest(text)
+    }
+
+    override fun cancelSearch(view: SearchBarView?) {
+        view?.handleFocusJsRequest()
+    }
+
+    // iOS only
+
+    override fun setPlacement(view: SearchBarView, placeholder: String?) {
+        logNotAvailable("setPlacement")
+    }
+
+    override fun setHideWhenScrolling(view: SearchBarView?, value: Boolean) {
+        logNotAvailable("hideWhenScrolling")
+    }
+
+    override fun setObscureBackground(view: SearchBarView?, value: Boolean) {
+        logNotAvailable("hideNavigationBar")
+    }
+
+    override fun setHideNavigationBar(view: SearchBarView?, value: Boolean) {
+        logNotAvailable("hideNavigationBar")
+    }
+
+    override fun setCancelButtonText(view: SearchBarView?, value: String?) {
+        logNotAvailable("cancelButtonText")
+    }
+
+    override fun setTintColor(view: SearchBarView?, value: Int?) {
+        logNotAvailable("tintColor")
+    }
 }

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

@@ -3,7 +3,6 @@ package com.swmansion.rnscreens.events
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
 class HeaderHeightChangeEvent(
     surfaceId: Int,

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

@@ -13,6 +13,6 @@ class SearchBarBlurEvent(surfaceId: Int, viewId: Int) : Event<SearchBarBlurEvent
     override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
-        const val EVENT_NAME = "topBlur"
+        const val EVENT_NAME = "topSearchBlur"
     }
 }

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

@@ -13,6 +13,6 @@ class SearchBarFocusEvent(surfaceId: Int, viewId: Int) : Event<SearchBarFocusEve
     override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
-        const val EVENT_NAME = "topFocus"
+        const val EVENT_NAME = "topSearchFocus"
     }
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContainerManagerDelegate.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 RNSScreenContainerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNSScreenContainerManagerDelegate(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/RNSScreenContainerManagerInterface.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 RNSScreenContainerManagerInterface<T extends View> {
+  // No props
+}

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

@@ -98,6 +98,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

@@ -39,6 +39,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,6 +91,9 @@ 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;

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

@@ -36,6 +36,7 @@ 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 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, 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/common/cpp/react/renderer/components/rnscreens/RNSModalScreenComponentDescriptor.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <react/debug/react_native_assert.h>
-#include "RNSModalScreenShadowNode.h"
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include "RNSModalScreenShadowNode.h"
 
 namespace facebook {
 namespace react {
@@ -12,16 +12,15 @@ class RNSModalScreenComponentDescriptor final
  public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
-  void adopt(ShadowNode& shadowNode) const override {
-    react_native_assert(
-        dynamic_cast<RNSModalScreenShadowNode*>(&shadowNode));
-    auto& screenShadowNode =
-        static_cast<RNSModalScreenShadowNode&>(shadowNode);
+  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);
+        dynamic_cast<YogaLayoutableShadowNode *>(&screenShadowNode));
+    auto &layoutableShadowNode =
+        dynamic_cast<YogaLayoutableShadowNode &>(screenShadowNode);
 
     auto state =
         std::static_pointer_cast<const RNSModalScreenShadowNode::ConcreteState>(

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

@@ -1,21 +1,22 @@
 #pragma once
 
-#include "RNSScreenState.h"
+#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 <jsi/jsi.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> {
+class JSI_EXPORT RNSModalScreenShadowNode final
+    : public ConcreteViewShadowNode<
+          RNSModalScreenComponentName,
+          RNSScreenProps,
+          RNSScreenEventEmitter,
+          RNSScreenState> {
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 

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

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <react/debug/react_native_assert.h>
-#include "RNSScreenShadowNode.h"
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include "RNSScreenShadowNode.h"
 
 namespace facebook {
 namespace react {
@@ -12,16 +12,14 @@ class RNSScreenComponentDescriptor final
  public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
-  void adopt(ShadowNode& shadowNode) const override {
-    react_native_assert(
-        dynamic_cast<RNSScreenShadowNode*>(&shadowNode));
-    auto& screenShadowNode =
-        static_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(
-        dynamic_cast<YogaLayoutableShadowNode*>(&screenShadowNode));
-    auto& layoutableShadowNode =
-        dynamic_cast<YogaLayoutableShadowNode&>(screenShadowNode);
+        dynamic_cast<YogaLayoutableShadowNode *>(&screenShadowNode));
+    auto &layoutableShadowNode =
+        dynamic_cast<YogaLayoutableShadowNode &>(screenShadowNode);
 
     auto state =
         std::static_pointer_cast<const RNSScreenShadowNode::ConcreteState>(

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

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "RNSScreenState.h"
+#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 <jsi/jsi.h>
+#include "RNSScreenState.h"
 
 namespace facebook {
 namespace react {
@@ -12,10 +12,10 @@ namespace react {
 JSI_EXPORT extern const char RNSScreenComponentName[];
 
 class JSI_EXPORT RNSScreenShadowNode final : public ConcreteViewShadowNode<
-                                          RNSScreenComponentName,
-                                          RNSScreenProps,
-                                          RNSScreenEventEmitter,
-                                          RNSScreenState> {
+                                                 RNSScreenComponentName,
+                                                 RNSScreenProps,
+                                                 RNSScreenEventEmitter,
+                                                 RNSScreenState> {
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 

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

@@ -6,7 +6,8 @@ namespace react {
 #ifdef ANDROID
 folly::dynamic RNSScreenState::getDynamic() const {
   return folly::dynamic::object("frameWidth", frameSize.width)(
-      "frameHeight", frameSize.height)("contentOffsetX", contentOffset.x)("contentOffsetY", contentOffset.y);
+      "frameHeight", frameSize.height)("contentOffsetX", contentOffset.x)(
+      "contentOffsetY", contentOffset.y);
 }
 #endif
 

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

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <react/renderer/graphics/Float.h>
 #include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/graphics/Float.h>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
@@ -17,23 +17,21 @@ class JSI_EXPORT RNSScreenState final {
   using Shared = std::shared_ptr<const RNSScreenState>;
 
   RNSScreenState(){};
-  RNSScreenState(Size frameSize_, Point contentOffset_) : frameSize(frameSize_), contentOffset(contentOffset_){};
+  RNSScreenState(Size frameSize_, Point contentOffset_)
+      : frameSize(frameSize_), contentOffset(contentOffset_){};
 
 #ifdef ANDROID
-  RNSScreenState(
-      RNSScreenState const &previousState,
-      folly::dynamic data)
+  RNSScreenState(RNSScreenState const &previousState, folly::dynamic data)
       : frameSize(Size{
             (Float)data["frameWidth"].getDouble(),
-          (Float)data["frameHeight"].getDouble()}),
+            (Float)data["frameHeight"].getDouble()}),
         contentOffset(Point{
             (Float)data["contentOffsetX"].getDouble(),
-          (Float)data["contentOffsetY"].getDouble()})
-    {};
+            (Float)data["contentOffsetY"].getDouble()}){};
 #endif
 
-    const Size frameSize{};
-    Point contentOffset;
+  const Size frameSize{};
+  Point contentOffset;
 
 #ifdef ANDROID
   folly::dynamic getDynamic() const;