react-native-screens 3.17.0 → 3.18.1

package/lib/typescript/native-stack/types.d.ts

@@ -70,6 +70,11 @@ export declare type NativeStackNavigationOptions = {
      * @platform ios
      */
     disableBackButtonMenu?: boolean;
+    /**
+     * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
+     * Defaults to `true` when `enableFreeze()` is run at the top of the application.
+     */
+    freezeOnBlur?: boolean;
     /**
      * Boolean indicating whether the swipe gesture should work on whole screen. Swiping with this option results in the same transition animation as `simple_push` by default.
      * It can be changed to other custom animations with `customAnimationOnSwipe` prop, but default iOS swipe animation is not achievable due to usage of custom recognizer.
@@ -355,11 +360,6 @@ export declare type NativeStackNavigationOptions = {
      * @platform ios
      */
     transitionDuration?: number;
-    /**
-     * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
-     * Defaults to `true` when `enableFreeze()` is run at the top of the application.
-     */
-    freezeOnBlur?: boolean;
 };
 export declare type NativeStackNavigatorProps = DefaultNavigatorOptions<NativeStackNavigationOptions> & StackRouterOptions & NativeStackNavigationConfig;
 export declare type NativeStackDescriptor = Descriptor<ParamListBase, string, StackNavigationState<ParamListBase>, NativeStackNavigationOptions>;

package/lib/typescript/reanimated/ReanimatedNativeStackScreen.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ScreenProps } from 'react-native-screens';
 import Animated from 'react-native-reanimated';
-declare const ReanimatedNativeStackScreen: React.ForwardRefExoticComponent<Pick<ScreenProps, "children" | "active" | "activityState" | "customAnimationOnSwipe" | "enabled" | "isNativeStack" | "fullScreenSwipeEnabled" | "gestureEnabled" | "gestureResponseDistance" | "homeIndicatorHidden" | "hideKeyboardOnSwipe" | "nativeBackButtonDismissalEnabled" | "navigationBarColor" | "navigationBarHidden" | "onAppear" | "onComponentRef" | "onDisappear" | "onDismissed" | "onHeaderBackButtonClicked" | "onTransitionProgress" | "onWillAppear" | "onWillDisappear" | "replaceAnimation" | "screenOrientation" | "stackAnimation" | "stackPresentation" | "statusBarAnimation" | "statusBarColor" | "statusBarHidden" | "statusBarStyle" | "statusBarTranslucent" | "swipeDirection" | "transitionDuration" | "freezeOnBlur" | "hitSlop" | "onLayout" | "pointerEvents" | "removeClippedSubviews" | "style" | "testID" | "nativeID" | "collapsable" | "needsOffscreenAlphaCompositing" | "renderToHardwareTextureAndroid" | "focusable" | "shouldRasterizeIOS" | "isTVSelectable" | "hasTVPreferredFocus" | "tvParallaxProperties" | "tvParallaxShiftDistanceX" | "tvParallaxShiftDistanceY" | "tvParallaxTiltAngle" | "tvParallaxMagnification" | "onStartShouldSetResponder" | "onMoveShouldSetResponder" | "onResponderEnd" | "onResponderGrant" | "onResponderReject" | "onResponderMove" | "onResponderRelease" | "onResponderStart" | "onResponderTerminationRequest" | "onResponderTerminate" | "onStartShouldSetResponderCapture" | "onMoveShouldSetResponderCapture" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "onTouchCancel" | "onTouchEndCapture" | "accessible" | "accessibilityActions" | "accessibilityLabel" | "accessibilityRole" | "accessibilityState" | "accessibilityHint" | "accessibilityValue" | "onAccessibilityAction" | "accessibilityComponentType" | "accessibilityLiveRegion" | "importantForAccessibility" | "accessibilityElementsHidden" | "accessibilityTraits" | "accessibilityViewIsModal" | "onAccessibilityEscape" | "onAccessibilityTap" | "onMagicTap" | "accessibilityIgnoresInvertColors"> & React.RefAttributes<React.ComponentClass<Animated.AnimateProps<{}>, any>>>;
+declare const ReanimatedNativeStackScreen: React.ForwardRefExoticComponent<Pick<ScreenProps, "children" | "active" | "activityState" | "customAnimationOnSwipe" | "enabled" | "isNativeStack" | "freezeOnBlur" | "fullScreenSwipeEnabled" | "gestureEnabled" | "gestureResponseDistance" | "homeIndicatorHidden" | "hideKeyboardOnSwipe" | "nativeBackButtonDismissalEnabled" | "navigationBarColor" | "navigationBarHidden" | "onAppear" | "onComponentRef" | "onDisappear" | "onDismissed" | "onHeaderBackButtonClicked" | "onNativeDismissCancelled" | "onTransitionProgress" | "onWillAppear" | "onWillDisappear" | "preventNativeDismiss" | "replaceAnimation" | "screenOrientation" | "stackAnimation" | "stackPresentation" | "statusBarAnimation" | "statusBarColor" | "statusBarHidden" | "statusBarStyle" | "statusBarTranslucent" | "swipeDirection" | "transitionDuration" | "hitSlop" | "onLayout" | "pointerEvents" | "removeClippedSubviews" | "style" | "testID" | "nativeID" | "collapsable" | "needsOffscreenAlphaCompositing" | "renderToHardwareTextureAndroid" | "focusable" | "shouldRasterizeIOS" | "isTVSelectable" | "hasTVPreferredFocus" | "tvParallaxProperties" | "tvParallaxShiftDistanceX" | "tvParallaxShiftDistanceY" | "tvParallaxTiltAngle" | "tvParallaxMagnification" | "onStartShouldSetResponder" | "onMoveShouldSetResponder" | "onResponderEnd" | "onResponderGrant" | "onResponderReject" | "onResponderMove" | "onResponderRelease" | "onResponderStart" | "onResponderTerminationRequest" | "onResponderTerminate" | "onStartShouldSetResponderCapture" | "onMoveShouldSetResponderCapture" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "onTouchCancel" | "onTouchEndCapture" | "accessible" | "accessibilityActions" | "accessibilityLabel" | "accessibilityRole" | "accessibilityState" | "accessibilityHint" | "accessibilityValue" | "onAccessibilityAction" | "accessibilityComponentType" | "accessibilityLiveRegion" | "importantForAccessibility" | "accessibilityElementsHidden" | "accessibilityTraits" | "accessibilityViewIsModal" | "onAccessibilityEscape" | "onAccessibilityTap" | "onMagicTap" | "accessibilityIgnoresInvertColors"> & React.RefAttributes<React.ComponentClass<Animated.AnimateProps<{}>, any>>>;
 export default ReanimatedNativeStackScreen;

package/lib/typescript/reanimated/ReanimatedScreen.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ScreenProps } from 'react-native-screens';
 import Animated from 'react-native-reanimated';
-declare const ReanimatedScreen: React.ForwardRefExoticComponent<Pick<ScreenProps, "children" | "active" | "activityState" | "customAnimationOnSwipe" | "enabled" | "isNativeStack" | "fullScreenSwipeEnabled" | "gestureEnabled" | "gestureResponseDistance" | "homeIndicatorHidden" | "hideKeyboardOnSwipe" | "nativeBackButtonDismissalEnabled" | "navigationBarColor" | "navigationBarHidden" | "onAppear" | "onComponentRef" | "onDisappear" | "onDismissed" | "onHeaderBackButtonClicked" | "onTransitionProgress" | "onWillAppear" | "onWillDisappear" | "replaceAnimation" | "screenOrientation" | "stackAnimation" | "stackPresentation" | "statusBarAnimation" | "statusBarColor" | "statusBarHidden" | "statusBarStyle" | "statusBarTranslucent" | "swipeDirection" | "transitionDuration" | "freezeOnBlur" | "hitSlop" | "onLayout" | "pointerEvents" | "removeClippedSubviews" | "style" | "testID" | "nativeID" | "collapsable" | "needsOffscreenAlphaCompositing" | "renderToHardwareTextureAndroid" | "focusable" | "shouldRasterizeIOS" | "isTVSelectable" | "hasTVPreferredFocus" | "tvParallaxProperties" | "tvParallaxShiftDistanceX" | "tvParallaxShiftDistanceY" | "tvParallaxTiltAngle" | "tvParallaxMagnification" | "onStartShouldSetResponder" | "onMoveShouldSetResponder" | "onResponderEnd" | "onResponderGrant" | "onResponderReject" | "onResponderMove" | "onResponderRelease" | "onResponderStart" | "onResponderTerminationRequest" | "onResponderTerminate" | "onStartShouldSetResponderCapture" | "onMoveShouldSetResponderCapture" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "onTouchCancel" | "onTouchEndCapture" | "accessible" | "accessibilityActions" | "accessibilityLabel" | "accessibilityRole" | "accessibilityState" | "accessibilityHint" | "accessibilityValue" | "onAccessibilityAction" | "accessibilityComponentType" | "accessibilityLiveRegion" | "importantForAccessibility" | "accessibilityElementsHidden" | "accessibilityTraits" | "accessibilityViewIsModal" | "onAccessibilityEscape" | "onAccessibilityTap" | "onMagicTap" | "accessibilityIgnoresInvertColors"> & React.RefAttributes<React.ComponentClass<Animated.AnimateProps<{}>, any>>>;
+declare const ReanimatedScreen: React.ForwardRefExoticComponent<Pick<ScreenProps, "children" | "active" | "activityState" | "customAnimationOnSwipe" | "enabled" | "isNativeStack" | "freezeOnBlur" | "fullScreenSwipeEnabled" | "gestureEnabled" | "gestureResponseDistance" | "homeIndicatorHidden" | "hideKeyboardOnSwipe" | "nativeBackButtonDismissalEnabled" | "navigationBarColor" | "navigationBarHidden" | "onAppear" | "onComponentRef" | "onDisappear" | "onDismissed" | "onHeaderBackButtonClicked" | "onNativeDismissCancelled" | "onTransitionProgress" | "onWillAppear" | "onWillDisappear" | "preventNativeDismiss" | "replaceAnimation" | "screenOrientation" | "stackAnimation" | "stackPresentation" | "statusBarAnimation" | "statusBarColor" | "statusBarHidden" | "statusBarStyle" | "statusBarTranslucent" | "swipeDirection" | "transitionDuration" | "hitSlop" | "onLayout" | "pointerEvents" | "removeClippedSubviews" | "style" | "testID" | "nativeID" | "collapsable" | "needsOffscreenAlphaCompositing" | "renderToHardwareTextureAndroid" | "focusable" | "shouldRasterizeIOS" | "isTVSelectable" | "hasTVPreferredFocus" | "tvParallaxProperties" | "tvParallaxShiftDistanceX" | "tvParallaxShiftDistanceY" | "tvParallaxTiltAngle" | "tvParallaxMagnification" | "onStartShouldSetResponder" | "onMoveShouldSetResponder" | "onResponderEnd" | "onResponderGrant" | "onResponderReject" | "onResponderMove" | "onResponderRelease" | "onResponderStart" | "onResponderTerminationRequest" | "onResponderTerminate" | "onStartShouldSetResponderCapture" | "onMoveShouldSetResponderCapture" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "onTouchCancel" | "onTouchEndCapture" | "accessible" | "accessibilityActions" | "accessibilityLabel" | "accessibilityRole" | "accessibilityState" | "accessibilityHint" | "accessibilityValue" | "onAccessibilityAction" | "accessibilityComponentType" | "accessibilityLiveRegion" | "importantForAccessibility" | "accessibilityElementsHidden" | "accessibilityTraits" | "accessibilityViewIsModal" | "onAccessibilityEscape" | "onAccessibilityTap" | "onMagicTap" | "accessibilityIgnoresInvertColors"> & React.RefAttributes<React.ComponentClass<Animated.AnimateProps<{}>, any>>>;
 export default ReanimatedScreen;

package/lib/typescript/types.d.ts

@@ -35,6 +35,11 @@ export interface ScreenProps extends ViewProps {
      * Internal boolean used to not attach events used only by native-stack. It prevents non native-stack navigators from sending transition progress from their Screen components.
      */
     isNativeStack?: boolean;
+    /**
+     * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
+     * When `enableFreeze()` is run at the top of the application defaults to `true`.
+     */
+    freezeOnBlur?: boolean;
     /**
      * Boolean indicating whether the swipe gesture should work on whole screen. Swiping with this option results in the same transition animation as `simple_push` by default.
      * It can be changed to other custom animations with `customAnimationOnSwipe` prop, but default iOS swipe animation is not achievable due to usage of custom recognizer.
@@ -109,6 +114,14 @@ export interface ScreenProps extends ViewProps {
      * @platform android
      */
     onHeaderBackButtonClicked?: () => void;
+    /**
+     * An internal callback called when screen is dismissed by gesture or by native header back button and `preventNativeDismiss` is set to `true`.
+     *
+     * @platform ios
+     */
+    onNativeDismissCancelled?: (e: NativeSyntheticEvent<{
+        dismissCount: number;
+    }>) => void;
     /**
      * An internal callback called every frame during the transition of screens of `native-stack`, used to feed transition context.
      */
@@ -121,6 +134,13 @@ export interface ScreenProps extends ViewProps {
      * A callback that gets called when the current screen will disappear. This is called as soon as the transition begins.
      */
     onWillDisappear?: (e: NativeSyntheticEvent<TargetedEvent>) => void;
+    /**
+     * Boolean indicating whether to prevent current screen from being dismissed.
+     * Defaults to `false`.
+     *
+     * @platform ios
+     */
+    preventNativeDismiss?: boolean;
     ref?: React.Ref<View>;
     /**
      * How should the screen replacing another screen animate. Defaults to `pop`.
@@ -209,11 +229,6 @@ export interface ScreenProps extends ViewProps {
      * @platform ios
      */
     transitionDuration?: number;
-    /**
-     * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
-     * When `enableFreeze()` is run at the top of the application defaults to `true`.
-     */
-    freezeOnBlur?: boolean;
 }
 export interface ScreenContainerProps extends ViewProps {
     children?: React.ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "3.17.0",
+  "version": "3.18.1",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "check-types": "tsc --noEmit",
@@ -38,6 +38,7 @@
     "ios/",
     "windows/",
     "RNScreens.podspec",
+    "react-native.config.js",
     "README.md",
     "!**/__tests__",
     "!android/src/main/java/com/swmansion/rnscreens/LifecycleHelper.kt"
@@ -132,12 +133,11 @@
     "lib/"
   ],
   "codegenConfig": {
-    "libraries": [
-      {
-        "name": "rnscreens",
-        "type": "components",
-        "jsSrcsDir": "./src/fabric"
-      }
-    ]
+    "name": "rnscreens",
+    "type": "components",
+    "jsSrcsDir": "./src/fabric",
+    "android": {
+      "javaPackageName": "com.swmansion.rnscreens"
+    }
   }
 }

package/react-native.config.js

@@ -0,0 +1,19 @@
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        componentDescriptors: [
+          "RNSFullWindowOverlayComponentDescriptor",
+          "RNSScreenContainerComponentDescriptor",
+          "RNSScreenNavigationContainerComponentDescriptor",
+          "RNSScreenStackHeaderConfigComponentDescriptor",
+          "RNSScreenStackHeaderSubviewComponentDescriptor",
+          "RNSScreenStackComponentDescriptor",
+          "RNSSearchBarComponentDescriptor",
+          'RNSScreenComponentDescriptor'
+        ],
+        cmakeListsPath: "../android/src/main/jni/CMakeLists.txt"
+      },
+    },
+  },
+}

package/src/native-stack/types.tsx

@@ -96,6 +96,11 @@ export type NativeStackNavigationOptions = {
    * @platform ios
    */
   disableBackButtonMenu?: boolean;
+  /**
+   * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
+   * Defaults to `true` when `enableFreeze()` is run at the top of the application.
+   */
+  freezeOnBlur?: boolean;
   /**
    * Boolean indicating whether the swipe gesture should work on whole screen. Swiping with this option results in the same transition animation as `simple_push` by default.
    * It can be changed to other custom animations with `customAnimationOnSwipe` prop, but default iOS swipe animation is not achievable due to usage of custom recognizer.
@@ -375,11 +380,6 @@ export type NativeStackNavigationOptions = {
    * @platform ios
    */
   transitionDuration?: number;
-  /**
-   * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
-   * Defaults to `true` when `enableFreeze()` is run at the top of the application.
-   */
-  freezeOnBlur?: boolean;
 };
 
 export type NativeStackNavigatorProps = DefaultNavigatorOptions<

package/src/native-stack/utils/getDefaultHeaderHeight.tsx

@@ -22,7 +22,7 @@ export default function getDefaultHeaderHeight(
       statusBarHeight = 0;
     }
 
-    if (Platform.isPad || Platform.isTVOS) {
+    if (Platform.isPad || Platform.isTV) {
       headerHeight = isFromSheetModal ? formSheetModalHeight : 50;
     } else {
       if (isLandscape) {

package/src/types.tsx

@@ -95,6 +95,11 @@ export interface ScreenProps extends ViewProps {
    * Internal boolean used to not attach events used only by native-stack. It prevents non native-stack navigators from sending transition progress from their Screen components.
    */
   isNativeStack?: boolean;
+  /**
+   * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
+   * When `enableFreeze()` is run at the top of the application defaults to `true`.
+   */
+  freezeOnBlur?: boolean;
   /**
    * Boolean indicating whether the swipe gesture should work on whole screen. Swiping with this option results in the same transition animation as `simple_push` by default.
    * It can be changed to other custom animations with `customAnimationOnSwipe` prop, but default iOS swipe animation is not achievable due to usage of custom recognizer.
@@ -167,6 +172,14 @@ export interface ScreenProps extends ViewProps {
    * @platform android
    */
   onHeaderBackButtonClicked?: () => void;
+  /**
+   * An internal callback called when screen is dismissed by gesture or by native header back button and `preventNativeDismiss` is set to `true`.
+   *
+   * @platform ios
+   */
+  onNativeDismissCancelled?: (
+    e: NativeSyntheticEvent<{ dismissCount: number }>
+  ) => void;
   /**
    * An internal callback called every frame during the transition of screens of `native-stack`, used to feed transition context.
    */
@@ -181,6 +194,13 @@ export interface ScreenProps extends ViewProps {
    * A callback that gets called when the current screen will disappear. This is called as soon as the transition begins.
    */
   onWillDisappear?: (e: NativeSyntheticEvent<TargetedEvent>) => void;
+  /**
+   * Boolean indicating whether to prevent current screen from being dismissed.
+   * Defaults to `false`.
+   *
+   * @platform ios
+   */
+  preventNativeDismiss?: boolean;
   ref?: React.Ref<View>;
   /**
    * How should the screen replacing another screen animate. Defaults to `pop`.
@@ -269,11 +289,6 @@ export interface ScreenProps extends ViewProps {
    * @platform ios
    */
   transitionDuration?: number;
-  /**
-   * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
-   * When `enableFreeze()` is run at the top of the application defaults to `true`.
-   */
-  freezeOnBlur?: boolean;
 }
 
 export interface ScreenContainerProps extends ViewProps {

package/android/src/fabric/java/com/swmansion/rnscreens/RNScreensComponentsRegistry.java

@@ -1,28 +0,0 @@
-package com.swmansion.rnscreens;
-
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.soloader.SoLoader;
-
-@DoNotStrip
-public class RNScreensComponentsRegistry {
-  static {
-    SoLoader.loadLibrary("rnscreens_modules");
-  }
-
-  @DoNotStrip private final HybridData mHybridData;
-
-  @DoNotStrip
-  private native HybridData initHybrid(ComponentFactory componentFactory);
-
-  @DoNotStrip
-  private RNScreensComponentsRegistry(ComponentFactory componentFactory) {
-    mHybridData = initHybrid(componentFactory);
-  }
-
-  @DoNotStrip
-  public static RNScreensComponentsRegistry register(ComponentFactory componentFactory) {
-    return new RNScreensComponentsRegistry(componentFactory);
-  }
-}

package/android/src/main/jni/Android.mk

@@ -1,44 +0,0 @@
-SCREENS_MAIN_THIS_DIR := $(call my-dir)
-
-include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
-
-include $(SCREENS_MAIN_THIS_DIR)/../../../build/generated/source/codegen/jni/Android.mk
-include $(SCREENS_MAIN_THIS_DIR)/../../../../common/cpp/Android.mk
-
-include $(CLEAR_VARS)
-
-LOCAL_PATH := $(SCREENS_MAIN_THIS_DIR)
-LOCAL_MODULE := rnscreens_modules
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-
-# Please note as one of the library listed is libreact_codegen_samplelibrary
-# This name will be generated as libreact_codegen_<library-name>
-# where <library-name> is the one you specified in the Gradle configuration
-LOCAL_SHARED_LIBRARIES := libjsi \
-    libfbjni \
-    libglog \
-    libfolly_runtime \
-    libyoga \
-    libreact_nativemodule_core \
-    libturbomodulejsijni \
-    librrc_view \
-    libreact_render_core \
-    libreact_render_graphics \
-    libfabricjni \
-    libreact_debug \
-    libreact_render_componentregistry \
-    libreact_render_debug \
-    libruntimeexecutor \
-    libreact_render_mapbuffer \
-    libreact_codegen_rncore \
-    libreact_codegen_rnscreens \
-    librnscreens_common
-
-LOCAL_CFLAGS := \
-    -DLOG_TAG=\"ReactNative\"
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
-
-include $(BUILD_SHARED_LIBRARY)

package/android/src/main/jni/OnLoad.cpp

@@ -1,9 +0,0 @@
-#include <fbjni/fbjni.h>
-
-#include "RNScreensComponentsRegistry.h"
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
-  return facebook::jni::initialize(vm, [] {
-    facebook::react::RNScreensComponentsRegistry::registerNatives();
-  });
-}

package/android/src/main/jni/RNScreensComponentsRegistry.cpp

@@ -1,66 +0,0 @@
-#include "RNScreensComponentsRegistry.h"
-
-#include <CoreComponentsRegistry.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/rnscreens/ComponentDescriptors.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
-#include <rnscreens/RNSScreenComponentDescriptor.h>
-
-namespace facebook {
-namespace react {
-
-RNScreensComponentsRegistry::RNScreensComponentsRegistry(
-    ComponentFactory *delegate)
-    : delegate_(delegate) {}
-
-std::shared_ptr<ComponentDescriptorProviderRegistry const>
-RNScreensComponentsRegistry::sharedProviderRegistry() {
-  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
-
-  // Screens
-  providerRegistry->add(concreteComponentDescriptorProvider<RNSScreenComponentDescriptor>());
-  providerRegistry->add(concreteComponentDescriptorProvider<RNSScreenStackComponentDescriptor>());
-  providerRegistry->add(concreteComponentDescriptorProvider<RNSScreenStackHeaderConfigComponentDescriptor>());
-  providerRegistry->add(concreteComponentDescriptorProvider<RNSScreenStackHeaderSubviewComponentDescriptor>());
-
-  return providerRegistry;
-}
-
-jni::local_ref<RNScreensComponentsRegistry::jhybriddata>
-RNScreensComponentsRegistry::initHybrid(
-    jni::alias_ref<jclass>,
-    ComponentFactory *delegate) {
-  auto instance = makeCxxInstance(delegate);
-
-  auto buildRegistryFunction =
-      [](EventDispatcher::Weak const &eventDispatcher,
-         ContextContainer::Shared const &contextContainer)
-      -> ComponentDescriptorRegistry::Shared {
-    auto registry = RNScreensComponentsRegistry::sharedProviderRegistry()
-                        ->createComponentDescriptorRegistry(
-                            {eventDispatcher, contextContainer});
-
-    return registry;
-  };
-
-  delegate->buildRegistryFunction = buildRegistryFunction;
-  return instance;
-}
-
-void RNScreensComponentsRegistry::registerNatives() {
-  registerHybrid({
-      makeNativeMethod("initHybrid", RNScreensComponentsRegistry::initHybrid),
-  });
-  // This is a temporary solution that allows components exported by the screens
-  // library to be added to the main component registry. This code is triggered
-  // when c++ screens library is initialized and is needed because RN's autolinking
-  // does not currently support Fabric components. As a consequence, users would need
-  // to manually put library initialization calls in their ReactNativeHost implementation
-  // which is undesirable.
-  sharedProviderRegistry();
-}
-
-} // namespace react
-} // namespace facebook

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

@@ -1,34 +0,0 @@
-#pragma once
-
-#include <ComponentFactory.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-
-namespace facebook {
-namespace react {
-
-class RNScreensComponentsRegistry
-    : public facebook::jni::HybridClass<RNScreensComponentsRegistry> {
- public:
-  constexpr static auto kJavaDescriptor =
-      "Lcom/swmansion/rnscreens/RNScreensComponentsRegistry;";
-
-  static void registerNatives();
-
-  RNScreensComponentsRegistry(ComponentFactory *delegate);
-
- private:
-  friend HybridBase;
-
-  static std::shared_ptr<ComponentDescriptorProviderRegistry const> sharedProviderRegistry();
-
-  const ComponentFactory *delegate_;
-
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jclass>,
-      ComponentFactory *delegate);
-};
-
-} // namespace react
-} // namespace facebook

package/common/cpp/Android.mk

@@ -1,37 +0,0 @@
-SCREENS_COMMON_THIS_DIR := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PATH := $(SCREENS_COMMON_THIS_DIR)
-LOCAL_MODULE := rnscreens_common
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*.cpp) 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-
-# Please note as one of the library listed is libreact_codegen_samplelibrary
-# This name will be generated as libreact_codegen_<library-name>
-# where <library-name> is the one you specified in the Gradle configuration
-LOCAL_SHARED_LIBRARIES := libjsi \
-    libfbjni \
-    libglog \
-    libfolly_runtime \
-    libyoga \
-    libreact_nativemodule_core \
-    libturbomodulejsijni \
-    librrc_view \
-    libreact_render_core \
-    libreact_render_graphics \
-    libfabricjni \
-    libreact_debug \
-    libreact_render_componentregistry \
-    libreact_render_debug \
-    libruntimeexecutor \
-    libreact_codegen_rncore \
-    libreact_codegen_rnscreens
-
-LOCAL_CFLAGS := \
-    -DLOG_TAG=\"ReactNative\"
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
-
-include $(BUILD_SHARED_LIBRARY)