react-native-screens 5.0.0-alpha.2 → 5.0.0-alpha.4

package/Package.swift

@@ -0,0 +1,87 @@
+// swift-tools-version: 6.0
+import PackageDescription
+
+// Header search paths for quoted cross-directory imports (SPM has no CocoaPods header maps).
+// Keep in sync when adding new ios/ subdirectories that contain headers.
+let headerSearchPaths: [String] = [
+    "ios",
+    "ios/bridging",
+    "ios/conversion",
+    "ios/helpers/container",
+    "ios/helpers/image",
+    "ios/helpers/scroll-view",
+    "ios/legacy",
+    "ios/legacy/events",
+    "ios/legacy/integrations",
+    "ios/legacy/utils",
+    "ios/modals/form-sheet",
+    "ios/modals/utils",
+    "ios/safe-area",
+    "ios/scroll-to-top-guard",
+    "ios/scroll-view-marker",
+    "ios/scroll-view-marker/conversion",
+    "ios/split",
+    "ios/split/conversion",
+    "ios/stack",
+    "ios/stack/conversion",
+    "ios/stack/header",
+    "ios/stack/host",
+    "ios/stack/screen",
+    "ios/tabs",
+    "ios/tabs/bottom-accessory",
+    "ios/tabs/conversion",
+    "ios/tabs/extensions",
+    "ios/tabs/host",
+    "ios/tabs/screen",
+    "ios/utils",
+    "ios/utils/extensions",
+    "common/cpp",
+    "cpp/legacy",
+]
+
+let cSettings: [CSetting] = headerSearchPaths.map { .headerSearchPath($0) }
+
+let cxxSettings: [CXXSetting] = [
+    .define("DEBUG", .when(configuration: .debug)),
+    .define("NDEBUG", .when(configuration: .release)),
+] + headerSearchPaths.map { .headerSearchPath($0) }
+
+let package = Package(
+    name: "RNScreens",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(name: "RNScreens", targets: ["RNScreens"]),
+    ],
+    dependencies: [
+        // Resolved from the autolinker symlink `<app>/ios/build/generated/autolinking/libs/RNScreens`,
+        // not from node_modules: `../../../../xcframeworks` -> `<app>/ios/build/xcframeworks`,
+        // `../../../ios` -> `<app>/ios/build/generated/ios`. Same layout `npx react-native spm scaffold` emits.
+        // Making this self-contained (remote RN package URL + shipping our own codegen output) is blocked
+        // on RN publishing a remote SPM package and would require `codegenConfig.includesGeneratedCode`, see:
+        // https://github.com/react/react-native/blob/v0.87.1/packages/react-native/scripts/spm/__docs__/spm-header-paths-contract.md#hand-authored-community-library-contract
+        .package(name: "ReactNative", path: "../../../../xcframeworks"),
+        .package(name: "React-GeneratedCode", path: "../../../ios"),
+    ],
+    targets: [
+        .target(
+            name: "RNScreens",
+            dependencies: [
+                .product(name: "ReactHeaders", package: "ReactNative"),
+                .product(name: "ReactNativeHeaders", package: "ReactNative"),
+                .product(name: "ReactNativeDependenciesHeaders", package: "ReactNative"),
+                .product(name: "ReactAppHeaders", package: "React-GeneratedCode"),
+            ],
+            path: ".",
+            exclude: ["ios/RNScreens.xcodeproj"],
+            sources: ["ios", "common/cpp", "cpp"],
+            publicHeadersPath: "ios",
+            cSettings: cSettings,
+            cxxSettings: cxxSettings,
+            linkerSettings: [
+                .linkedFramework("UIKit"),
+                .linkedFramework("Foundation"),
+            ]
+        ),
+    ],
+    cxxLanguageStandard: .cxx20
+)

package/README.md

@@ -6,10 +6,6 @@
 
 This project aims to expose native navigation container components to React Native. It is not designed to be used as a standalone library but rather as a dependency of a [full-featured navigation library](https://github.com/react-navigation/react-navigation).
 
-## Fabric
-
-To learn about how to use `react-native-screens` with Fabric architecture, head over to [Fabric README](README-Fabric.md). Instructions on how to run Fabric Example within this repo can be found in the [FabricExample README](FabricExample/README.md).
-
 ## Supported platforms
 
 - [x] iOS
@@ -254,13 +250,6 @@ There are many ways to contribute to this project. See [CONTRIBUTING](https://gi
 
 React native screens library is licensed under [The MIT License](LICENSE).
 
-## Credits
-
-This project has been built and is maintained thanks to the support from [Expo.io](https://expo.io) and [Software Mansion](https://swmansion.com).
-
-[![expo](https://avatars2.githubusercontent.com/u/12504344?v=3&s=100 'Expo.io')](https://expo.io)
-[![swm](https://logo.swmansion.com/logo?color=white&variant=desktop&width=150&tag=react-native-reanimated-github 'Software Mansion')](https://swmansion.com)
-
 ## React Native Screens is created by Software Mansion
 
 Since 2012 [Software Mansion](https://swmansion.com) is a software agency with experience in building web and mobile apps. We are Core React Native Contributors and experts in dealing with all kinds of React Native issues. We can help you build your next dream product – [Hire us](https://swmansion.com/contact/projects?utm_source=screens&utm_medium=readme).

package/android/build.gradle

@@ -141,6 +141,7 @@ android {
         versionCode 1
         versionName "1.0"
         buildConfigField "boolean", "RNS_DEBUG_LOGGING", areDebugLogsEnabled().toString()
+        consumerProguardFiles "consumer-rules.pro"
         ndk {
             abiFilters (*reactNativeArchitectures())
         }

package/android/consumer-rules.pro

@@ -0,0 +1,3 @@
+# RNScreensFragmentFactory recognises library fragments by their package-name prefix when
+# restoring saved state. Keep their names so R8 can't rename or repackage them.
+-keepnames class com.swmansion.rnscreens.** extends androidx.fragment.app.Fragment

package/android/src/fabric/java/com/swmansion/rnscreens/legacy/FabricEnabledHeaderConfigViewGroup.kt

@@ -71,6 +71,8 @@ abstract class FabricEnabledHeaderConfigViewGroup(
         mStateWrapper?.updateState(map)
     }
 
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     companion object {
         private const val DELTA = 0.9f
     }

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

@@ -72,6 +72,8 @@ abstract class FabricEnabledHeaderSubviewViewGroup(
         mStateWrapper?.updateState(map)
     }
 
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     companion object {
         private const val DELTA = 0.9f
     }

package/android/src/fabric/java/com/swmansion/rnscreens/legacy/FabricEnabledViewGroup.kt

@@ -18,6 +18,14 @@ abstract class FabricEnabledViewGroup(
     private var lastHeight = 0f
     private var lastHeaderHeight = 0f
 
+    protected var isStateInvalidated = false
+        private set
+
+    // A detached screen can miss native layout changes while the commit hook resets its shadow state.
+    protected fun invalidateState() {
+        isStateInvalidated = true
+    }
+
     fun setStateWrapper(wrapper: StateWrapper?) {
         mStateWrapper = wrapper
     }
@@ -36,15 +44,20 @@ abstract class FabricEnabledViewGroup(
         val realHeaderHeight: Float = pxToDp(headerHeight.toFloat())
 
         // Check incoming state values. If they're already the correct value, return early to prevent
-        // infinite UpdateState/SetState loop.
+        // an infinite UpdateState/SetState loop. The state-invalidated flag forces the update when the
+        // commit hook has reset the state while the screen was detached from the native hierarchy
+        // - the screen may have missed some layout changes in the meantime (see #4336 and #4760).
         val delta = 0.9f
-        if (abs(lastWidth - realWidth) < delta &&
+        if (!isStateInvalidated &&
+            abs(lastWidth - realWidth) < delta &&
             abs(lastHeight - realHeight) < delta &&
             abs(lastHeaderHeight - realHeaderHeight) < delta
         ) {
             return
         }
 
+        val stateWrapper = mStateWrapper ?: return
+        isStateInvalidated = false
         lastWidth = realWidth
         lastHeight = realHeight
         lastHeaderHeight = realHeaderHeight
@@ -55,6 +68,8 @@ abstract class FabricEnabledViewGroup(
                 putDouble("contentOffsetX", 0.0)
                 putDouble("contentOffsetY", realHeaderHeight.toDouble())
             }
-        mStateWrapper?.updateState(map)
+        stateWrapper.updateState(map)
     }
+
+    override fun shouldDelayChildPressedState(): Boolean = false
 }

package/android/src/main/cpp/NativeProxy.cpp

@@ -2,6 +2,7 @@
 #include <react/fabric/Binding.h>
 #include <react/renderer/scheduler/Scheduler.h>
 
+#include <memory>
 #include <string>
 
 #include "NativeProxy.h"
@@ -11,6 +12,19 @@ using namespace react;
 
 namespace rnscreens {
 
+namespace {
+// Keep this listener process-lifetime to avoid races during initialization,
+// when nativeAddMutationsListener() can be called concurrently from different
+// threads. A function-local static initializes thread-safely, and an immortal
+// instance suits core's delegate list, which is append-only. For more details:
+// https://github.com/software-mansion/react-native-screens/pull/4413
+const std::shared_ptr<RNSScreenRemovalListener> &removalListener() {
+  static const std::shared_ptr<RNSScreenRemovalListener> instance =
+      std::make_shared<RNSScreenRemovalListener>();
+  return instance;
+}
+} // namespace
+
 NativeProxy::NativeProxy(jni::alias_ref<NativeProxy::javaobject> jThis)
     : javaPart_(jni::make_global(jThis)) {}
 
@@ -32,13 +46,18 @@ void NativeProxy::nativeAddMutationsListener(
   auto uiManager =
       fabricUIManager->getBinding()->getScheduler()->getUIManager();
 
-  if (!screenRemovalListener_) {
-    screenRemovalListener_ =
-        std::make_shared<RNSScreenRemovalListener>([this](int tag) {
+  {
+    // Capture a copy of the global ref, never `this`: the listener outlives
+    // this NativeProxy, and the old live read of javaPart_ at call time raced
+    // invalidateNative(). installMutex_ keeps the copy from racing the
+    // invalidation write and keeps the stored token matching the last install.
+    std::lock_guard<std::mutex> lock(installMutex_);
+    removalListenerToken_ =
+        removalListener()->setListener([javaPart = javaPart_](int tag) {
           static const auto method =
-              javaPart_->getClass()->getMethod<void(jint)>(
+              javaPart->getClass()->getMethod<void(jint)>(
                   "notifyScreenRemoved");
-          method(javaPart_, tag);
+          method(javaPart, tag);
         });
   }
 
@@ -79,7 +98,7 @@ void NativeProxy::addMountingCoordinatorIfNeeded(
       });
 
   if (!wasRegistered) {
-    coordinator->setMountingOverrideDelegate(screenRemovalListener_);
+    coordinator->setMountingOverrideDelegate(removalListener());
     coordinatorsWithMountingOverrides_.push_back(coordinator);
   }
 }
@@ -90,6 +109,11 @@ jni::local_ref<NativeProxy::jhybriddata> NativeProxy::initHybrid(
 }
 
 void NativeProxy::invalidateNative() {
+  // Disarm before the hybrid is collected; also releases the captured global
+  // ref so the Java NativeProxy stays collectable. Serialized with the install
+  // path so the token is never stale and javaPart_ is not nulled mid-capture.
+  std::lock_guard<std::mutex> lock(installMutex_);
+  removalListener()->clearListener(removalListenerToken_);
   javaPart_ = nullptr;
 }
 

package/android/src/main/cpp/NativeProxy.h

@@ -4,6 +4,7 @@
 #include <react/fabric/JFabricUIManager.h>
 #include "RNSScreenRemovalListener.h"
 
+#include <cstdint>
 #include <mutex>
 #include <string>
 
@@ -13,7 +14,6 @@ using namespace facebook::jni;
 
 class NativeProxy : public jni::HybridClass<NativeProxy> {
  public:
-  std::shared_ptr<RNSScreenRemovalListener> screenRemovalListener_;
   std::vector<std::weak_ptr<const facebook::react::MountingCoordinator>>
       coordinatorsWithMountingOverrides_;
   static auto constexpr kJavaDescriptor =
@@ -28,6 +28,12 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
 
   std::mutex coordinatorsMutex_;
 
+  // Serializes callback install (nativeAddMutationsListener) with
+  // invalidateNative: the install-time copy of javaPart_ must not race the
+  // invalidation write, and the stored token must match the last install.
+  std::mutex installMutex_;
+  uint64_t removalListenerToken_{0};
+
   explicit NativeProxy(jni::alias_ref<NativeProxy::javaobject> jThis);
 
   void nativeAddMutationsListener(

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

@@ -18,8 +18,8 @@ import com.swmansion.rnscreens.legacy.ScreenStackViewManager
 import com.swmansion.rnscreens.legacy.ScreenViewManager
 import com.swmansion.rnscreens.legacy.SearchBarManager
 import com.swmansion.rnscreens.legacy.utils.ScreenDummyLayoutHelper
-import com.swmansion.rnscreens.modals.formsheet.react.contentwrapper.FormSheetContentWrapperViewManager
-import com.swmansion.rnscreens.modals.formsheet.react.host.FormSheetHostViewManager
+import com.swmansion.rnscreens.react.modals.formsheet.contentwrapper.FormSheetContentWrapperViewManager
+import com.swmansion.rnscreens.react.modals.formsheet.host.FormSheetHostViewManager
 import com.swmansion.rnscreens.safearea.SafeAreaViewManager
 import com.swmansion.rnscreens.scrollviewmarker.ScrollViewMarkerViewManager
 import com.swmansion.rnscreens.stack.header.config.StackHeaderConfigViewManager

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

@@ -57,10 +57,14 @@ class ScreensModule(
     }
 
     private fun setupFabric() {
-        val fabricUIManager =
-            UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) as FabricUIManager
+        // Null when the host has no live ReactInstance. In bridgeless mode this happens only while
+        // the instance owning this module is being torn down (reload / destroy): ReactHostImpl
+        // drops its instance reference before it stops the JS thread, so JS can still create this
+        // module. There is nothing to set up then, the module gets invalidated right after.
+        // See https://github.com/software-mansion/react-native-screens/issues/4699
+        val uiManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) ?: return
         proxy?.apply {
-            nativeAddMutationsListener(fabricUIManager)
+            nativeAddMutationsListener(uiManager as FabricUIManager)
         }
     }
 

package/android/src/main/java/com/swmansion/rnscreens/common/colorscheme/ColorSchemeCoordinator.kt

@@ -3,6 +3,7 @@ package com.swmansion.rnscreens.common.colorscheme
 import android.content.res.Configuration
 import android.view.View
 import android.view.ViewParent
+import java.lang.ref.WeakReference
 import kotlin.properties.Delegates
 
 internal typealias OnUiNightModeResolvedCallback = (nightMode: Int) -> Unit
@@ -16,6 +17,15 @@ internal class ColorSchemeCoordinator :
         }
     }
     private var parentProvider: ColorSchemeProviding? = null
+
+    /**
+     * Parent provider known from ownership, taking precedence over the view-tree walk
+     * in [setup]. Set it when the owner knows its provider statically (e.g. a fragment's
+     * root view always resolves through the container that created the fragment) - the
+     * walk is unreliable there: transitions reparent an exiting fragment's view into the
+     * container's ViewGroupOverlay, whose parent chain ends in null. Survives [teardown].
+     */
+    internal var explicitParentProvider: WeakReference<ColorSchemeProviding>? = null
     private var systemUiNightMode: Int = Configuration.UI_MODE_NIGHT_NO
     private var lastAppliedUiNightMode: Int? = null
     private val childListeners = mutableListOf<ColorSchemeListener>()
@@ -60,7 +70,7 @@ internal class ColorSchemeCoordinator :
 
         systemUiNightMode =
             hostView.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-        parentProvider = findParentColorSchemeProvider(hostView)
+        parentProvider = explicitParentProvider?.get() ?: findParentColorSchemeProvider(hostView)
         parentProvider?.addColorSchemeListener(this)
         onUiNightModeResolved = onUiNightModeResolvedCallback
         isSetUp = true

package/android/src/main/java/com/swmansion/rnscreens/common/container/Container.kt

@@ -9,4 +9,21 @@ interface Container {
      * (if any).
      */
     fun resolveCurrentContentScrollView(): ViewGroup?
+
+    /**
+     * Asked when this container's whole subtree is about to be natively dismissed,
+     * e.g. the screen hosting this container is popped. Returns the item that
+     * vetoes the dismissal via `preventNativeDismiss`, or null when nothing
+     * in the subtree does.
+     */
+    fun wantsToPreventStackNativeDismiss(): ContainerItem?
+
+    /**
+     * Asks the container to pop its own stack to the root, if it can. If it has nothing
+     * to pop (or can't pop), the request is forwarded to the nested container of its
+     * active item.
+     *
+     * @return `true` if a pop was performed or requested (here or in a nested container), `false` otherwise.
+     */
+    fun requestPopToRoot(): Boolean
 }

package/android/src/main/java/com/swmansion/rnscreens/common/container/ContainerItem.kt

@@ -2,7 +2,7 @@ package com.swmansion.rnscreens.common.container
 
 import android.view.ViewGroup
 
-internal interface ContainerItem {
+interface ContainerItem {
     // region Nested Container handling
 
     /**
@@ -27,4 +27,16 @@ internal interface ContainerItem {
     fun findContentScrollView(): ViewGroup?
 
     // endregion
+
+    // region Native dismissal
+
+    /**
+     * Asked when this item (screen) is about to be natively dismissed together
+     * with its subtree. The nested container (if any) is consulted first; its
+     * non-null answer wins, otherwise the item answers for itself, returning
+     * itself when it vetoes the dismissal or null otherwise.
+     */
+    fun wantsToPreventStackNativeDismiss(): ContainerItem?
+
+    // endregion
 }

package/android/src/main/java/com/swmansion/rnscreens/common/text/ReactTextAppearance.kt

@@ -0,0 +1,62 @@
+package com.swmansion.rnscreens.common.text
+
+import android.content.res.AssetManager
+import android.graphics.Typeface
+import android.os.Build
+import com.facebook.react.common.ReactConstants
+import com.facebook.react.common.assets.ReactFontManager.TypefaceStyle
+import com.facebook.react.views.text.ReactTypefaceUtils
+import kotlin.properties.Delegates
+import kotlin.properties.ReadWriteProperty
+
+/**
+ * [TextAppearance] driven by React props. Font family, weight and style are kept as the raw
+ * React values and turned into a [Typeface]. [onChanged] is invoked whenever a property
+ * actually changes value.
+ */
+internal class ReactTextAppearance(
+    private val assets: AssetManager,
+    onChanged: () -> Unit,
+) : TextAppearance {
+    override var color: Int? by changeNotifying(onChanged)
+    override var fontSize: Float? by changeNotifying(onChanged)
+    internal var fontFamily: String? by changeNotifying(onChanged)
+    internal var fontWeight: String? by changeNotifying(onChanged)
+    internal var fontStyle: String? by changeNotifying(onChanged)
+
+    override fun resolveTypeface(base: Typeface): Typeface {
+        val weight = ReactTypefaceUtils.parseFontWeight(fontWeight)
+        val style = ReactTypefaceUtils.parseFontStyle(fontStyle)
+
+        if (fontFamily == null && weight == ReactConstants.UNSET && style == ReactConstants.UNSET) {
+            return base
+        }
+
+        // ReactFontManager.TypefaceStyle turns an unset weight into 400 and an unset style into
+        // "not italic" rather than deriving them from the base. This would drop default styling
+        // from base typeface. Resolve both up front so it never receives UNSET style or weight.
+        return ReactTypefaceUtils.applyStyles(
+            base,
+            if (style != ReactConstants.UNSET) style else base.resolveStyle(),
+            if (weight != ReactConstants.UNSET) weight else base.resolveWeight(),
+            fontFamily,
+            assets,
+        )
+    }
+}
+
+private fun <T> changeNotifying(onChanged: () -> Unit): ReadWriteProperty<Any?, T?> =
+    Delegates.observable(null) { _, old, new -> if (old != new) onChanged() }
+
+/**
+ * Numeric weight of this typeface. [Typeface.getWeight] requires API 28; below it only bold
+ * can be told apart from regular.
+ */
+private fun Typeface.resolveWeight(): Int =
+    when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.P -> weight
+        isBold -> TypefaceStyle.BOLD
+        else -> TypefaceStyle.NORMAL
+    }
+
+private fun Typeface.resolveStyle(): Int = if (isItalic) Typeface.ITALIC else Typeface.NORMAL

package/android/src/main/java/com/swmansion/rnscreens/common/text/TextAppearance.kt

@@ -0,0 +1,20 @@
+package com.swmansion.rnscreens.common.text
+
+import android.graphics.Typeface
+
+/**
+ * Provides text styling for some given part of the interface. Interface is React-agnostic. A `null`
+ * value means "keep the default".
+ */
+internal interface TextAppearance {
+    val color: Int?
+
+    /** Font size in SP. */
+    val fontSize: Float?
+
+    /**
+     * Returns the modified typeface based on [base] typeface. Properties that are not overridden
+     * are inherited from [base], which is returned unchanged when there are no overrides at all.
+     */
+    fun resolveTypeface(base: Typeface): Typeface
+}

package/android/src/main/java/com/swmansion/rnscreens/common/text/TextAppearanceDefaults.kt

@@ -0,0 +1,65 @@
+package com.swmansion.rnscreens.common.text
+
+import android.content.Context
+import android.graphics.Typeface
+import androidx.annotation.AttrRes
+import com.swmansion.rnscreens.utils.resolveColorAttr
+import com.swmansion.rnscreens.utils.resolveStyleResAttr
+
+/**
+ * Default text styling of a single title/subtitle slot, resolved from the M3 type-scale
+ * style behind [textAppearanceAttr] and the color behind [textColorAttr].
+ *
+ * Resolved from the style rather than read back from the widget: Material resolves a slot's
+ * default typeface asynchronously, so until that lands the widget reports [Typeface.DEFAULT].
+ */
+internal class TextAppearanceDefaults(
+    val color: Int,
+    val textSizePx: Float,
+    val typeface: Typeface,
+) {
+    companion object {
+        fun resolve(
+            context: Context,
+            @AttrRes textAppearanceAttr: Int,
+            @AttrRes textColorAttr: Int,
+        ): TextAppearanceDefaults {
+            val appearanceRes = resolveStyleResAttr(context, textAppearanceAttr)
+            val attrs = context.obtainStyledAttributes(appearanceRes, APPEARANCE_ATTRS)
+            try {
+                val textSizePx = attrs.getDimension(IDX_TEXT_SIZE, 0f)
+                require(textSizePx > 0f) { "[RNScreens] Text appearance defines no text size." }
+
+                // android:fontFamily is either a font resource (@font/…, resolvable only
+                // asynchronously) or a family name. The M3 type scale always declares a family
+                // name (@string/m3_ref_typeface_* — "sans-serif" / "sans-serif-medium"),
+                // so we can unconditionally take the synchronous path (Material's own fallback and
+                // AppCompatTextHelper do the same).
+                val textStyle = attrs.getInt(IDX_TEXT_STYLE, Typeface.NORMAL)
+                val typeface =
+                    attrs.getString(IDX_FONT_FAMILY)?.let { Typeface.create(it, textStyle) }
+                        ?: Typeface.defaultFromStyle(textStyle)
+
+                return TextAppearanceDefaults(
+                    resolveColorAttr(context, textColorAttr),
+                    textSizePx,
+                    typeface,
+                )
+            } finally {
+                attrs.recycle()
+            }
+        }
+
+        // Framework attr ids are compile-time constants; the array must stay sorted
+        // ascending (obtainStyledAttributes requirement).
+        private val APPEARANCE_ATTRS =
+            intArrayOf(
+                android.R.attr.textSize,
+                android.R.attr.textStyle,
+                android.R.attr.fontFamily,
+            )
+        private const val IDX_TEXT_SIZE = 0
+        private const val IDX_TEXT_STYLE = 1
+        private const val IDX_FONT_FAMILY = 2
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/coordinator/FormSheetAppearanceCoordinator.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.coordinator
+package com.swmansion.rnscreens.core.modals.formsheet.coordinator
 
 import android.os.Build
 import android.widget.FrameLayout
@@ -6,7 +6,7 @@ import androidx.core.view.doOnNextLayout
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetConfig
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetConfig
 import com.swmansion.rnscreens.utils.dpToPx
 
 internal class FormSheetAppearanceCoordinator(