react-native-screens 3.28.0 → 3.30.0

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

@@ -5,14 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
 class SearchBarSearchButtonPressEvent(surfaceId: Int, viewId: Int, private val text: String?) : Event<ScreenAppearEvent>(surfaceId, viewId) {
-    override fun getEventName(): String {
-        return EVENT_NAME
-    }
+    override fun getEventName(): String = EVENT_NAME
 
-    override fun getCoalescingKey(): Short {
-        // All events for a given view can be coalesced.
-        return 0
-    }
+    // All events for a given view can be coalesced.
+    override fun getCoalescingKey(): Short = 0
 
     override fun getEventData(): WritableMap? = Arguments.createMap().apply {
         putString("text", text)

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

@@ -17,6 +17,7 @@
  * See: https://github.com/software-mansion/react-native-screens/pull/1585
  */
 #include <react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h>
+#include <react/renderer/components/rnscreens/RNSModalScreenComponentDescriptor.h>
 
 namespace facebook {
 namespace react {

package/android/src/main/res/v33/anim-v33/rns_default_enter_in.xml

@@ -19,7 +19,6 @@
         android:fillEnabled="true"
         android:fillBefore="true"
         android:fillAfter="true"
-        android:startOffset="0"
         android:interpolator="@android:interpolator/fast_out_extra_slow_in"
         android:duration="450" />
 

package/android/src/main/res/v33/anim-v33/rns_default_enter_out.xml

@@ -5,13 +5,13 @@
 
     <alpha
         android:fromAlpha="1.0"
-        android:toAlpha="0.0"
+        android:toAlpha="1.0"
         android:fillEnabled="true"
         android:fillBefore="true"
         android:fillAfter="true"
         android:interpolator="@anim/rns_standard_accelerate_interpolator"
         android:startOffset="0"
-        android:duration="83" />
+        android:duration="450" />
 
     <translate
         android:fromXDelta="0"

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

@@ -8,7 +8,7 @@ abstract class FabricEnabledViewGroup constructor(context: ReactContext?) : View
 
     val fabricViewStateManager get() = null as FabricViewStateManager?
 
-    protected fun updateScreenSizeFabric(width: Int, height: Int) {
+    protected fun updateScreenSizeFabric(width: Int, height: Int, headerHeight: Double) {
         // do nothing
     }
 }

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

@@ -0,0 +1,32 @@
+
+/**
+ * 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.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+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/RNSModalScreenComponentDescriptor.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <react/debug/react_native_assert.h>
+#include "RNSModalScreenShadowNode.h"
+#include <react/renderer/core/ConcreteComponentDescriptor.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,15 @@
+#include "RNSModalScreenShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+extern const char RNSModalScreenComponentName[] = "RNSModalScreen";
+
+Point RNSModalScreenShadowNode::getContentOriginOffset() 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,31 @@
+#pragma once
+
+#include "RNSScreenState.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>
+
+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() 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/RNSScreenShadowNode.cpp

@@ -5,5 +5,11 @@ namespace react {
 
 extern const char RNSScreenComponentName[] = "RNSScreen";
 
+Point RNSScreenShadowNode::getContentOriginOffset() const {
+  auto stateData = getStateData();
+  auto contentOffset = stateData.contentOffset;
+  return {contentOffset.x, contentOffset.y};
+}
+
 } // namespace react
 } // namespace facebook

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

@@ -19,11 +19,7 @@ class JSI_EXPORT RNSScreenShadowNode final : public ConcreteViewShadowNode<
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
-  static ShadowNodeTraits BaseTraits() {
-    auto traits = ConcreteViewShadowNode::BaseTraits();
-    traits.set(ShadowNodeTraits::Trait::RootNodeKind);
-    return traits;
-  }
+  Point getContentOriginOffset() const override;
 };
 
 } // namespace react

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

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

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

@@ -17,7 +17,7 @@ class JSI_EXPORT RNSScreenState final {
   using Shared = std::shared_ptr<const RNSScreenState>;
 
   RNSScreenState(){};
-  RNSScreenState(Size frameSize_) : frameSize(frameSize_){};
+  RNSScreenState(Size frameSize_, Point contentOffset_) : frameSize(frameSize_), contentOffset(contentOffset_){};
 
 #ifdef ANDROID
   RNSScreenState(
@@ -25,10 +25,15 @@ class JSI_EXPORT RNSScreenState final {
       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()})
+    {};
 #endif
 
-  const Size frameSize{};
+    const Size frameSize{};
+    Point contentOffset;
 
 #ifdef ANDROID
   folly::dynamic getDynamic() const;

package/cpp/RNScreensTurboModule.cpp

@@ -0,0 +1,107 @@
+#include "RNScreensTurboModule.h"
+
+using namespace facebook;
+
+namespace RNScreens {
+
+const char RNScreensTurboModule::MODULE_NAME[] = "RNScreensTurboModule";
+
+std::function<std::array<int, 2>(int)> RNScreensTurboModule::startTransition_;
+std::function<void(int, double)> RNScreensTurboModule::updateTransition_;
+std::function<void(int, bool)> RNScreensTurboModule::finishTransition_;
+std::function<void(int)> RNScreensTurboModule::disableSwipeBackForTopScreen_;
+
+RNScreensTurboModule::RNScreensTurboModule(
+  std::function<std::array<int, 2>(int)> startTransition,
+  std::function<void(int, double)> updateTransition,
+  std::function<void(int, bool)> finishTransition,
+  std::function<void(int)> disableSwipeBackForTopScreen
+) {
+  startTransition_ = startTransition;
+  updateTransition_ = updateTransition;
+  finishTransition_ = finishTransition;
+  disableSwipeBackForTopScreen_ = disableSwipeBackForTopScreen;
+}
+
+RNScreensTurboModule::~RNScreensTurboModule() {};
+
+jsi::Value RNScreensTurboModule::get(jsi::Runtime& rt, const jsi::PropNameID& name) {   
+  if (name.utf8(rt) == "startTransition") {
+    return jsi::Function::createFromHostFunction(rt, name, 1, startTransition);
+  }
+  else if (name.utf8(rt) == "updateTransition") {
+    return jsi::Function::createFromHostFunction(rt, name, 2, updateTransition);
+  }
+  else if (name.utf8(rt) == "finishTransition") {
+    return jsi::Function::createFromHostFunction(rt, name, 2, finishTransition);
+  }
+  else if (name.utf8(rt) == "disableSwipeBackForTopScreen") {
+    return jsi::Function::createFromHostFunction(rt, name, 1, disableSwipeBackForTopScreen);
+  }
+  return jsi::Value::undefined();
+}
+
+void RNScreensTurboModule::set(jsi::Runtime&, const jsi::PropNameID&, const jsi::Value&) {};
+
+std::vector<jsi::PropNameID> RNScreensTurboModule::getPropertyNames(jsi::Runtime& rt) {
+  std::vector<jsi::PropNameID> properties;
+  properties.push_back(jsi::PropNameID::forUtf8(rt, "startTransition"));
+  properties.push_back(jsi::PropNameID::forUtf8(rt, "updateTransition"));
+  properties.push_back(jsi::PropNameID::forUtf8(rt, "finishTransition"));
+  properties.push_back(jsi::PropNameID::forUtf8(rt, "disableSwipeBackForTopScreen"));
+  return properties;
+}
+
+JSI_HOST_FUNCTION(RNScreensTurboModule::startTransition) {
+  if (count < 1) {
+    throw jsi::JSError(rt, "[RNScreens] `startTransition` method requires 1 argument.");
+  }
+  int stackTag = arguments[0].asNumber();
+  auto screenTags = startTransition_(stackTag);
+  jsi::Object screenTagsObject(rt);
+  jsi::Value topScreenTag, belowTopScreenTag, canStartTransition;
+  if (screenTags[0] > -1) {
+    topScreenTag = jsi::Value(screenTags[0]);
+    belowTopScreenTag = jsi::Value(screenTags[1]);
+    canStartTransition = jsi::Value(true);
+  } else {
+    topScreenTag = jsi::Value(-1);
+    belowTopScreenTag = jsi::Value(-1);
+    canStartTransition = jsi::Value(false);
+  }
+  screenTagsObject.setProperty(rt, "topScreenTag", topScreenTag);
+  screenTagsObject.setProperty(rt, "belowTopScreenTag", belowTopScreenTag);
+  screenTagsObject.setProperty(rt, "canStartTransition", canStartTransition);
+  return screenTagsObject;
+}
+
+JSI_HOST_FUNCTION(RNScreensTurboModule::updateTransition) {
+  if (count < 2) {
+    throw jsi::JSError(rt, "[RNScreens] `updateTransition` requires 2 arguments.");
+  }
+  int stackTag = arguments[0].asNumber();
+  double progress = arguments[1].asNumber();
+  updateTransition_(stackTag, progress);
+  return jsi::Value::undefined();
+}
+
+JSI_HOST_FUNCTION(RNScreensTurboModule::finishTransition) {
+  if (count < 2) {
+    throw jsi::JSError(rt, "[RNScreens] `finishTransition` requires 2 arguments.");
+  }
+  int stackTag = arguments[0].asNumber();
+  bool canceled = arguments[1].getBool();
+  finishTransition_(stackTag, canceled);
+  return jsi::Value::undefined();
+}
+
+JSI_HOST_FUNCTION(RNScreensTurboModule::disableSwipeBackForTopScreen) {
+if (count < 1) {
+    throw jsi::JSError(rt, "[RNScreens] `startTransition` method requires 1 argument.");
+  }
+  int stackTag = arguments[0].asNumber();
+  disableSwipeBackForTopScreen_(stackTag);
+  return jsi::Value::undefined();
+}
+
+}

package/cpp/RNScreensTurboModule.h

@@ -0,0 +1,43 @@
+#include <array>
+#include <jsi/jsi.h>
+
+#define JSI_HOST_FUNCTION(NAME)   \
+  jsi::Value NAME(                \
+    jsi::Runtime &rt,             \
+    const jsi::Value &thisValue,  \
+    const jsi::Value *arguments,  \
+    size_t count                  \
+  )
+
+using namespace facebook;
+
+namespace RNScreens {
+
+class RNScreensTurboModule : public jsi::HostObject {
+
+  static std::function<std::array<int, 2>(int)> startTransition_;
+  static std::function<void(int, double)> updateTransition_;
+  static std::function<void(int, bool)> finishTransition_;
+  static std::function<void(int)> disableSwipeBackForTopScreen_;
+
+public:
+  static const char MODULE_NAME[];
+
+  RNScreensTurboModule(
+    std::function<std::array<int, 2>(int)> startTransition,
+    std::function<void(int, double)> updateTransition,
+    std::function<void(int, bool)> finishTransition,
+    std::function<void(int)> disableSwipeBackForTopScreen
+  );
+  ~RNScreensTurboModule() override;
+  jsi::Value get(jsi::Runtime& rt, const jsi::PropNameID& name) override;
+  void set(jsi::Runtime&, const jsi::PropNameID&, const jsi::Value&) override;
+  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& rt) override;
+  static JSI_HOST_FUNCTION(startTransition);
+  static JSI_HOST_FUNCTION(updateTransition);
+  static JSI_HOST_FUNCTION(finishTransition);
+  static JSI_HOST_FUNCTION(disableSwipeBackForTopScreen);
+
+};
+
+}

package/gesture-handler/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../lib/commonjs/gesture-handler/index",
+  "module": "../lib/module/gesture-handler/index",
+  "react-native": "../src/gesture-handler/index",
+  "types": "../lib/typescript/gesture-handler/index"
+}

package/ios/RNSConvert.h

@@ -26,8 +26,10 @@ namespace react = facebook::react;
 + (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
     (const react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance;
 
+#if !TARGET_OS_VISION
 + (UITextAutocapitalizationType)UITextAutocapitalizationTypeFromCppEquivalent:
     (react::RNSSearchBarAutoCapitalize)autoCapitalize;
+#endif
 
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement;
 

package/ios/RNSConvert.mm

@@ -27,12 +27,13 @@
 + (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:(react::RNSScreenStackAnimation)stackAnimation
 {
   switch (stackAnimation) {
-    // these four are intentionally grouped
+    // these three are intentionally grouped
     case react::RNSScreenStackAnimation::Slide_from_right:
-    case react::RNSScreenStackAnimation::Slide_from_left:
     case react::RNSScreenStackAnimation::Ios:
     case react::RNSScreenStackAnimation::Default:
       return RNSScreenStackAnimationDefault;
+    case react::RNSScreenStackAnimation::Slide_from_left:
+      return RNSScreenStackAnimationSlideFromLeft;
     case react::RNSScreenStackAnimation::Flip:
       return RNSScreenStackAnimationFlip;
     case react::RNSScreenStackAnimation::Simple_push:
@@ -123,6 +124,7 @@
   };
 }
 
+#if !TARGET_OS_VISION
 + (UITextAutocapitalizationType)UITextAutocapitalizationTypeFromCppEquivalent:
     (react::RNSSearchBarAutoCapitalize)autoCapitalize
 {
@@ -137,6 +139,7 @@
       return UITextAutocapitalizationTypeNone;
   }
 }
+#endif
 
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement
 {

package/ios/RNSEnums.h

@@ -16,6 +16,7 @@ typedef NS_ENUM(NSInteger, RNSScreenStackAnimation) {
   RNSScreenStackAnimationFlip,
   RNSScreenStackAnimationSlideFromBottom,
   RNSScreenStackAnimationSimplePush,
+  RNSScreenStackAnimationSlideFromLeft,
 };
 
 typedef NS_ENUM(NSInteger, RNSScreenReplaceAnimation) {

package/ios/RNSModalScreen.h

@@ -0,0 +1,8 @@
+#import "RNSScreen.h"
+
+@interface RNSModalScreen : RNSScreenView
+@end
+
+@interface RNSModalScreenManager : RNSScreenManager
+
+@end

package/ios/RNSModalScreen.mm

@@ -0,0 +1,36 @@
+#import "RNSModalScreen.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTFabricComponentsPlugins.h>
+#import <rnscreens/RNSModalScreenComponentDescriptor.h>
+#endif
+
+@implementation RNSModalScreen
+
+#ifdef RCT_NEW_ARCH_ENABLED
++ (react::ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return react::concreteComponentDescriptorProvider<react::RNSModalScreenComponentDescriptor>();
+}
+#endif
+@end
+
+#ifdef RCT_NEW_ARCH_ENABLED
+Class<RCTComponentViewProtocol> RNSModalScreenCls(void)
+{
+  return RNSModalScreen.class;
+}
+#endif
+
+@implementation RNSModalScreenManager
+
+RCT_EXPORT_MODULE()
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#else
+- (UIView *)view
+{
+  return [[RNSModalScreen alloc] initWithBridge:self.bridge];
+}
+#endif // RCT_NEW_ARCH_ENABLED
+@end

package/ios/RNSModule.h

@@ -0,0 +1,19 @@
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <rnscreens/rnscreens.h>
+#else
+#import <React/RCTBridge.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNSModule : NSObject
+#ifdef RCT_NEW_ARCH_ENABLED
+                       <NativeScreensModuleSpec>
+#else
+                       <RCTBridgeModule>
+#endif
+
+@end
+
+NS_ASSUME_NONNULL_END