react-native-screens 5.0.0-alpha.1 → 5.0.0-alpha.3

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/FormSheetPresentationManager.kt

@@ -1,207 +0,0 @@
-package com.swmansion.rnscreens.modals.formsheet
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.view.View
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.swmansion.rnscreens.common.event.ViewAppearanceEventEmitter
-import com.swmansion.rnscreens.modals.dimmingview.DimmingViewManager
-
-internal class FormSheetPresentationManager(
-    private val dialog: FormSheetDialog,
-    private val bottomSheetView: View?,
-    private val dimmingManager: DimmingViewManager,
-    private val onNativeDismiss: () -> Unit,
-) {
-    internal var appearanceEventEmitter: ViewAppearanceEventEmitter? = null
-
-    private var state = FormSheetPresentationState.DISMISSED
-    private var targetIsOpen = false
-
-    private val animatorFactory = FormSheetAnimatorFactory(dimmingManager)
-    private var currentSheetAnimator: Animator? = null
-
-    private val nativeDismissCoordinator =
-        FormSheetNativeDismissCoordinator(
-            dialog = dialog,
-            dimmingManager = dimmingManager,
-            onNativeDismiss = { handleNativeDismiss() },
-        )
-
-    internal fun setup() {
-        bottomSheetView?.let { view ->
-            dimmingManager.attachToBehavior(BottomSheetBehavior.from(view))
-        }
-        nativeDismissCoordinator.setup()
-    }
-
-    internal fun updatePresentationState(isOpen: Boolean) {
-        targetIsOpen = isOpen
-        resolvePresentationState()
-    }
-
-    private fun resolvePresentationState() {
-        if (targetIsOpen) {
-            presentIfNeeded()
-        } else {
-            dismissIfNeeded()
-        }
-    }
-
-    private fun presentIfNeeded() {
-        if (state != FormSheetPresentationState.DISMISSED) {
-            return
-        }
-
-        state = FormSheetPresentationState.PRESENTING
-        appearanceEventEmitter?.emitOnWillAppear()
-        dialog.setOnShowListener {
-            dialog.setOnShowListener(null)
-            dimmingManager.onDialogShow()
-            startEnterAnimation()
-        }
-        dialog.show()
-    }
-
-    private fun dismissIfNeeded() {
-        if (state != FormSheetPresentationState.PRESENTED) {
-            return
-        }
-
-        state = FormSheetPresentationState.DISMISSING
-        appearanceEventEmitter?.emitOnWillDisappear()
-
-        val isSheetHidden =
-            bottomSheetView?.let {
-                BottomSheetBehavior.from(it).state == BottomSheetBehavior.STATE_HIDDEN
-            } ?: true
-
-        if (isSheetHidden) {
-            performDismiss()
-            return
-        }
-
-        startExitAnimation()
-    }
-
-    private fun startEnterAnimation() {
-        if (bottomSheetView == null) {
-            onPresentationComplete()
-            return
-        }
-
-        val isInterrupting = currentSheetAnimator?.isRunning == true
-        currentSheetAnimator?.removeAllListeners()
-        currentSheetAnimator?.cancel()
-
-        dimmingManager.isTransitionAnimationRunning = true
-
-        currentSheetAnimator =
-            animatorFactory.createEnterAnimator(bottomSheetView, isInterrupting).apply {
-                addListener(
-                    object : AnimatorListenerAdapter() {
-                        override fun onAnimationEnd(animation: Animator) {
-                            dimmingManager.isTransitionAnimationRunning = false
-
-                            if (currentSheetAnimator == this@apply) currentSheetAnimator = null
-                            onPresentationComplete()
-                        }
-                    },
-                )
-                start()
-            }
-    }
-
-    private fun startExitAnimation() {
-        if (bottomSheetView == null) {
-            performDismiss()
-            return
-        }
-
-        val isInterrupting = currentSheetAnimator?.isRunning == true
-        currentSheetAnimator?.removeAllListeners()
-        currentSheetAnimator?.cancel()
-
-        dimmingManager.isTransitionAnimationRunning = true
-
-        currentSheetAnimator =
-            animatorFactory.createExitAnimator(bottomSheetView, isInterrupting).apply {
-                addListener(
-                    object : AnimatorListenerAdapter() {
-                        override fun onAnimationEnd(animation: Animator) {
-                            dimmingManager.isTransitionAnimationRunning = false
-
-                            if (currentSheetAnimator == this@apply) currentSheetAnimator = null
-                            syncBehaviorStateAfterExitAnimationComplete(bottomSheetView)
-                            performDismiss()
-                        }
-                    },
-                )
-                start()
-            }
-    }
-
-    private fun performDismiss() {
-        dialog.dismiss()
-        onDismissComplete()
-    }
-
-    private fun onPresentationComplete() {
-        if (state == FormSheetPresentationState.PRESENTING) {
-            state = FormSheetPresentationState.PRESENTED
-            appearanceEventEmitter?.emitOnDidAppear()
-            // ensure state hasn't updated during presentation
-            resolvePresentationState()
-        }
-    }
-
-    private fun onDismissComplete() {
-        if (state == FormSheetPresentationState.DISMISSING) {
-            state = FormSheetPresentationState.DISMISSED
-            appearanceEventEmitter?.emitOnDidDisappear()
-            // ensure state hasn't updated during dismissal
-            resolvePresentationState()
-        }
-    }
-
-    private fun handleNativeDismiss() {
-        if (state == FormSheetPresentationState.DISMISSING || state == FormSheetPresentationState.DISMISSED) {
-            return
-        }
-
-        onNativeDismiss()
-        updatePresentationState(isOpen = false)
-    }
-
-    /**
-     * Synchronizes the BottomSheetBehavior state with our custom exit animation.
-     *
-     * Since our custom ExitAnimator uses `translationY` for visual movement, the physical
-     * `top` of the view remains at the top of the screen. If we just call `state = STATE_HIDDEN`,
-     * Material will attempt to align the layout and enter `STATE_SETTLING`, leaving the state
-     * machine corrupted for the next open.
-     *
-     * To fix this, we manually push the physical `top` to the bottom of the screen.
-     * This makes the behavior skip the animation and synchronously switch to `STATE_HIDDEN`,
-     * properly cleaning up its internal state on dismissal.
-     */
-    private fun syncBehaviorStateAfterExitAnimationComplete(view: View) {
-        val behavior = BottomSheetBehavior.from(view)
-        val parent = view.parent as? View
-        val targetTop = parent?.height ?: view.height
-
-        view.offsetTopAndBottom(targetTop - view.top)
-        behavior.state = BottomSheetBehavior.STATE_HIDDEN
-    }
-
-    internal fun destroy() {
-        currentSheetAnimator?.cancel()
-        currentSheetAnimator = null
-
-        dialog.setOnShowListener(null)
-
-        state = FormSheetPresentationState.DISMISSED
-
-        nativeDismissCoordinator.destroy()
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/stack/header/StackHeaderAppBarLayout.kt

@@ -1,113 +0,0 @@
-package com.swmansion.rnscreens.stack.header
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
-import androidx.appcompat.widget.AppCompatTextView
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.google.android.material.R
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.CollapsingToolbarLayout
-import com.google.android.material.appbar.MaterialToolbar
-import com.swmansion.rnscreens.stack.header.config.StackHeaderType
-import com.swmansion.rnscreens.utils.resolveDimensionAttr
-
-internal sealed class StackHeaderAppBarLayout(
-    context: Context,
-) : AppBarLayout(context) {
-    abstract val toolbar: MaterialToolbar
-
-    init {
-        layoutParams =
-            CoordinatorLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT).apply {
-                behavior = StackHeaderAppBarLayoutBehavior()
-            }
-
-        // TODO: this should be exposed in the future via prop. Also, it might not work correctly
-        //       until we set liftOnScrollView manually. Also, we should disable it in transparent
-        //       mode or set elevation higher.
-        isLiftOnScroll = true
-
-        // TODO: this won't work with nested header but there were some problems with lift on scroll
-        //       without it when I was researching this.
-        fitsSystemWindows = true
-    }
-
-    internal class Small(
-        context: Context,
-    ) : StackHeaderAppBarLayout(context) {
-        override val toolbar =
-            MaterialToolbar(context).apply {
-                elevation = 0f
-                layoutParams = LayoutParams(MATCH_PARENT, WRAP_CONTENT)
-            }
-
-        // We need to manually manage the title to handle leading subview's positioning.
-        internal var managedTitleView: AppCompatTextView? = null
-
-        init {
-            addView(toolbar)
-        }
-    }
-
-    @SuppressLint("ViewConstructor")
-    internal class Collapsing(
-        context: Context,
-        val type: StackHeaderType,
-    ) : StackHeaderAppBarLayout(context) {
-        override val toolbar =
-            MaterialToolbar(context).apply {
-                elevation = 0f
-                layoutParams =
-                    CollapsingToolbarLayout
-                        .LayoutParams(
-                            MATCH_PARENT,
-                            resolveDimensionAttr(context, android.R.attr.actionBarSize),
-                        ).apply {
-                            collapseMode = CollapsingToolbarLayout.LayoutParams.COLLAPSE_MODE_PIN
-                        }
-            }
-
-        internal val collapsingToolbarLayout: CollapsingToolbarLayout =
-            run {
-                val (styleAttr, sizeAttr) =
-                    when (type) {
-                        StackHeaderType.MEDIUM ->
-                            Pair(R.attr.collapsingToolbarLayoutMediumStyle, R.attr.collapsingToolbarLayoutMediumSize)
-                        StackHeaderType.LARGE ->
-                            Pair(R.attr.collapsingToolbarLayoutLargeStyle, R.attr.collapsingToolbarLayoutLargeSize)
-                        else -> error("[RNScreens] Invalid header mode.")
-                    }
-                CollapsingToolbarLayout(context, null, styleAttr).apply {
-                    layoutParams =
-                        LayoutParams(
-                            MATCH_PARENT,
-                            resolveDimensionAttr(context, sizeAttr),
-                        )
-                    addView(toolbar)
-                }
-            }
-
-        init {
-            require(
-                type == StackHeaderType.MEDIUM ||
-                    type == StackHeaderType.LARGE,
-            ) {
-                "[RNScreens] Collapsing StackHeaderAppBarLayout must be MEDIUM or LARGE type."
-            }
-            addView(collapsingToolbarLayout)
-        }
-    }
-
-    companion object {
-        fun create(
-            context: Context,
-            type: StackHeaderType,
-        ): StackHeaderAppBarLayout =
-            when (type) {
-                StackHeaderType.SMALL -> Small(context)
-                StackHeaderType.MEDIUM, StackHeaderType.LARGE -> Collapsing(context, type)
-            }
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/StackHeaderToolbarMenuConfig.kt

@@ -1,60 +0,0 @@
-package com.swmansion.rnscreens.stack.header.toolbar
-
-import android.graphics.drawable.Drawable
-
-// Immutable tree of data classes. Updates walk the tree recursively and use
-// reference comparison (!==) to detect actual changes — only the path from
-// the changed leaf to the root is copied; unchanged subtrees keep their
-// original instances.
-internal data class StackHeaderToolbarMenuConfig(
-    val groups: List<StackHeaderToolbarMenuGroupConfig>,
-    val children: List<StackHeaderToolbarMenuElementConfig>,
-) {
-    internal fun updateItemIcon(
-        id: String,
-        icon: Drawable?,
-    ): StackHeaderToolbarMenuConfig {
-        val updated = updateChildrenIcon(children, id, icon)
-        return if (updated !== children) copy(children = updated) else this
-    }
-
-    private fun updateChildrenIcon(
-        children: List<StackHeaderToolbarMenuElementConfig>,
-        id: String,
-        icon: Drawable?,
-    ): List<StackHeaderToolbarMenuElementConfig> {
-        for ((index, element) in children.withIndex()) {
-            val updated = updateElementIcon(element, id, icon)
-            if (updated !== element) {
-                return children.toMutableList().apply { set(index, updated) }
-            }
-        }
-        return children
-    }
-
-    private fun updateElementIcon(
-        element: StackHeaderToolbarMenuElementConfig,
-        id: String,
-        icon: Drawable?,
-    ): StackHeaderToolbarMenuElementConfig {
-        if (element.item.id == id) {
-            if (icon !== element.item.icon) {
-                val newItem = element.item.copy(icon = icon)
-                return when (element) {
-                    is StackHeaderToolbarMenuElementConfig.MenuItem -> element.copy(item = newItem)
-                    is StackHeaderToolbarMenuElementConfig.Submenu -> element.copy(item = newItem)
-                }
-            }
-            return element
-        }
-
-        if (element is StackHeaderToolbarMenuElementConfig.Submenu) {
-            val updatedChildren = updateChildrenIcon(element.menu.children, id, icon)
-            if (updatedChildren !== element.menu.children) {
-                return element.copy(menu = element.menu.copy(children = updatedChildren))
-            }
-        }
-
-        return element
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/StackHeaderToolbarMenuElementOptions.kt

@@ -1,32 +0,0 @@
-package com.swmansion.rnscreens.stack.header.toolbar
-
-import android.graphics.drawable.Drawable
-
-/**
- * Partial update for a toolbar menu element.
- *
- * A `null` field means "leave the current value unchanged".
- */
-internal data class StackHeaderToolbarMenuElementOptions(
-    val title: StackHeaderToolbarFieldUpdate<String>? = null,
-    val titleCondensed: StackHeaderToolbarFieldUpdate<String>? = null,
-    val tooltipText: StackHeaderToolbarFieldUpdate<String>? = null,
-    val accessibilityLabel: StackHeaderToolbarFieldUpdate<String>? = null,
-    val hidden: Boolean? = null,
-    val disabled: Boolean? = null,
-    val showAsAction: StackHeaderToolbarMenuItemShowAsAction? = null,
-    val icon: StackHeaderToolbarFieldUpdate<Drawable>?,
-    val iconTintColorNormal: StackHeaderToolbarFieldUpdate<Int>?,
-    val iconTintColorPressed: StackHeaderToolbarFieldUpdate<Int>?,
-    val iconTintColorFocused: StackHeaderToolbarFieldUpdate<Int>?,
-    val iconTintColorDisabled: StackHeaderToolbarFieldUpdate<Int>?,
-    val checked: Boolean? = null,
-    val menuTitle: StackHeaderToolbarFieldUpdate<String>? = null,
-) {
-    val requiresIconTintColorUpdate: Boolean
-        get() =
-            iconTintColorNormal != null ||
-                iconTintColorPressed != null ||
-                iconTintColorFocused != null ||
-                iconTintColorDisabled != null
-}

package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/StackHeaderToolbarMenuGroupMetadata.kt

@@ -1,16 +0,0 @@
-package com.swmansion.rnscreens.stack.header.toolbar
-
-internal data class StackHeaderToolbarMenuGroupMetadata(
-    val itemGroupMap: Map<String, String>,
-    val groupSingleSelection: Map<String, Boolean>,
-    val groupMemberItems: Map<String, List<String>>,
-) {
-    companion object {
-        val EMPTY =
-            StackHeaderToolbarMenuGroupMetadata(
-                emptyMap(),
-                emptyMap(),
-                emptyMap(),
-            )
-    }
-}

package/ios/ReactMountingTransactionObserving.swift

@@ -1,7 +0,0 @@
-import Foundation
-
-@objc
-public protocol ReactMountingTransactionObserving {
-  func reactMountingTransactionWillMount()
-  func reactMountingTransactionDidMount()
-}

package/ios/bridging/Swift-Bridging.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#if __has_include(<RNScreens/RNScreens-Swift.h>)
-#import <RNScreens/RNScreens-Swift.h>
-#else
-#import "RNScreens-Swift.h"
-#endif

package/ios/conversion/RNSConversions-Stack.h

@@ -1,32 +0,0 @@
-#pragma once
-
-#if defined(__cplusplus)
-
-#import <react/renderer/components/rnscreens/Props.h>
-#import "RNSHeaderItemPlacement.h"
-#import "RNSHeaderItemSpacerPlacement.h"
-#import "RNSStackScreenComponentView.h"
-#import "always_false.h"
-
-namespace rnscreens::conversion {
-
-template <typename TargetType, typename InputType>
-TargetType convert(InputType) {
-  static_assert(
-      rnscreens::always_false<TargetType>::value,
-      "[RNScreens] Missing template specialisation for demanded types!");
-}
-
-template <>
-RNSStackScreenActivityMode convert(react::RNSStackScreenActivityMode mode);
-
-template <>
-RNSHeaderItemPlacement convert(react::RNSStackHeaderItemIOSPlacement placement);
-
-template <>
-RNSHeaderItemSpacerPlacement convert(
-    react::RNSStackHeaderItemSpacerIOSPlacement placement);
-
-}; // namespace rnscreens::conversion
-
-#endif // defined(__cplusplus)

package/ios/conversion/RNSConversions-Stack.mm

@@ -1,41 +0,0 @@
-#import "RNSConversions-Stack.h"
-
-namespace rnscreens::conversion {
-
-namespace react = facebook::react;
-
-template <>
-RNSStackScreenActivityMode convert(react::RNSStackScreenActivityMode mode)
-{
-  return static_cast<RNSStackScreenActivityMode>(mode);
-};
-
-template <>
-RNSHeaderItemPlacement convert(react::RNSStackHeaderItemIOSPlacement placement)
-{
-  switch (placement) {
-    case react::RNSStackHeaderItemIOSPlacement::Leading:
-      return RNSHeaderItemPlacementLeading;
-    case react::RNSStackHeaderItemIOSPlacement::Trailing:
-      return RNSHeaderItemPlacementTrailing;
-    case react::RNSStackHeaderItemIOSPlacement::Title:
-      return RNSHeaderItemPlacementTitle;
-    case react::RNSStackHeaderItemIOSPlacement::Subtitle:
-      return RNSHeaderItemPlacementSubtitle;
-    case react::RNSStackHeaderItemIOSPlacement::LargeSubtitle:
-      return RNSHeaderItemPlacementLargeSubtitle;
-  }
-};
-
-template <>
-RNSHeaderItemSpacerPlacement convert(react::RNSStackHeaderItemSpacerIOSPlacement placement)
-{
-  switch (placement) {
-    case react::RNSStackHeaderItemSpacerIOSPlacement::Leading:
-      return RNSHeaderItemSpacerPlacementLeading;
-    case react::RNSStackHeaderItemSpacerIOSPlacement::Trailing:
-      return RNSHeaderItemSpacerPlacementTrailing;
-  }
-};
-
-}; // namespace rnscreens::conversion

package/ios/conversion/always_false.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#if defined(__cplusplus)
-
-namespace rnscreens {
-
-namespace do_not_use {
-
-/// This is a marker type, that should never be instantiated.
-/// It is here to assert that there is a valid template specialization for
-/// `always_false` that can return `true`. Check out this article:
-/// https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p2593r0.html#valid-workaround
-struct DoNotUseThis {
-  DoNotUseThis() = delete;
-  DoNotUseThis(const DoNotUseThis &other) = delete;
-  DoNotUseThis(const DoNotUseThis &&other) = delete;
-};
-
-}; // namespace do_not_use
-
-/// Workaround for  `static_assert(false)`. See:
-/// https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p2593r0.html#valid-workaround
-/// https://stackoverflow.com/questions/14637356/static-assert-fails-compilation-even-though-template-function-is-called-nowhere/14637534#14637534
-template <typename T>
-struct always_false : std::false_type {};
-template <>
-struct always_false<do_not_use::DoNotUseThis> : std::true_type {};
-
-}; // namespace rnscreens
-
-#endif // defined(__cplusplus)

package/ios/orientation/RNSOrientationProviding.swift

@@ -1,6 +0,0 @@
-// TODO: investigate objc - swift interop and deduplicate this code
-// This class needs to follow the RNSOrientationProviding from objc.
-@objc
-public protocol RNSOrientationProvidingSwift {
-  func evaluateOrientation() -> RNSOrientationSwift
-}

package/ios/orientation/RNSOrientationSwift.swift

@@ -1,14 +0,0 @@
-// TODO: investigate objc - swift interop and deduplicate this code
-// This enum needs to follow the RNSOrientation from objc.
-@objc
-public enum RNSOrientationSwift: Int {
-  case inherit
-  case all
-  case allButUpsideDown
-  case portrait
-  case portraitUp
-  case portraitDown
-  case landscape
-  case landscapeLeft
-  case landscapeRight
-}