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

package/src/fabric/stack/StackHostNativeComponent.ts

@@ -1,9 +1,18 @@
 'use client';
 
-import type { HostComponent, ViewProps } from 'react-native';
+import type {
+  HostComponent,
+  ViewProps,
+  CodegenTypes as CT,
+} from 'react-native';
 import { codegenNativeComponent } from 'react-native';
 
-export interface NativeProps extends ViewProps {}
+type StackHostColorScheme = 'inherit' | 'light' | 'dark';
+
+export interface NativeProps extends ViewProps {
+  // General
+  colorScheme?: CT.WithDefault<StackHostColorScheme, 'inherit'>;
+}
 
 export default codegenNativeComponent<NativeProps>(
   'RNSStackHost',

package/src/fabric/tabs/TabsHostIOSNativeComponent.ts

@@ -85,6 +85,7 @@ export interface NativeProps extends ViewProps {
   layoutDirection?: CT.WithDefault<LayoutDirection, 'inherit'>;
 
   // iOS-specific props
+  tabBarHiddenAnimationEnabled?: CT.WithDefault<boolean, true>;
   tabBarTintColor?: ColorValue | undefined;
   tabBarMinimizeBehavior?: CT.WithDefault<TabBarMinimizeBehavior, 'automatic'>;
   tabBarControllerMode?: CT.WithDefault<TabBarControllerMode, 'automatic'>;

package/android/src/main/java/com/swmansion/rnscreens/modals/dimmingview/DimmingView.kt

@@ -1,83 +0,0 @@
-package com.swmansion.rnscreens.modals.dimmingview
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Color
-import android.view.MotionEvent
-import android.view.ViewGroup
-import com.facebook.react.uimanager.ReactCompoundViewGroup
-import com.facebook.react.uimanager.ReactPointerEventsView
-import com.swmansion.rnscreens.ext.equalWithRespectToEps
-
-/**
- * Serves as dimming view that can be used as background for some view that does not fully fill
- * the viewport.
- *
- * This dimming view has one more additional feature: it blocks gestures if its alpha > 0.
- */
-@SuppressLint("ViewConstructor") // Only we instantiate this view
-internal class DimmingView(
-    context: Context,
-    initialAlpha: Float,
-    private val pointerEventsProxy: DimmingViewPointerEventsProxy,
-) : ViewGroup(context),
-    ReactCompoundViewGroup,
-    ReactPointerEventsView by pointerEventsProxy {
-    constructor(context: Context, initialAlpha: Float) : this(
-        context,
-        initialAlpha,
-        DimmingViewPointerEventsProxy(null),
-    )
-
-    init {
-        pointerEventsProxy.pointerEventsImpl = DimmingViewPointerEventsImpl(this)
-        setFocusable(false)
-    }
-
-    internal val blockGestures
-        get() = !alpha.equalWithRespectToEps(0F)
-
-    init {
-        setBackgroundColor(Color.BLACK)
-        alpha = initialAlpha
-    }
-
-    // This view group is not supposed to have any children, however we need it to be a view group
-    override fun onLayout(
-        changed: Boolean,
-        l: Int,
-        t: Int,
-        r: Int,
-        b: Int,
-    ) = Unit
-
-    // We do not want to have any action defined here. We just want listeners notified that the click happened.
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(event: MotionEvent?): Boolean {
-        if (blockGestures && event?.actionMasked == MotionEvent.ACTION_UP) {
-            callOnClick()
-        }
-        return blockGestures
-    }
-
-    override fun reactTagForTouch(
-        x: Float,
-        y: Float,
-    ): Int = throw IllegalStateException("[RNScreens] $TAG should never be asked for the view tag!")
-
-    override fun interceptsTouchEvent(
-        x: Float,
-        y: Float,
-    ) = blockGestures
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-
-        // Break reference cycle, since the pointerEventsImpl strongly retains this.
-        pointerEventsProxy.pointerEventsImpl = null
-    }
-
-    companion object {
-        const val TAG = "DimmingView"
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/modals/dimmingview/DimmingViewManager.kt

@@ -1,89 +0,0 @@
-package com.swmansion.rnscreens.modals.dimmingview
-
-import android.content.Context
-import android.util.Log
-import android.view.View
-import android.view.ViewGroup
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-
-class DimmingViewManager(
-    context: Context,
-    private val dialog: BottomSheetDialog,
-) {
-    // TODO: @t0maboro - consider exposing as a prop
-    internal val maxAlpha: Float = MAX_ALPHA
-
-    internal var isTransitionAnimationRunning: Boolean = false
-
-    internal var dimmingViewAlpha: Float
-        get() = dimmingView.alpha
-        set(value) {
-            dimmingView.alpha = value
-        }
-
-    private val dimmingView =
-        DimmingView(context, initialAlpha = 0f).apply {
-            layoutParams =
-                CoordinatorLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                )
-        }
-
-    internal fun setOnBackdropClickListener(listener: View.OnClickListener?) {
-        dimmingView.setOnClickListener(listener)
-    }
-
-    internal fun onDialogShow() {
-        attachDimmingViewOverNativeTouchOutside()
-    }
-
-    internal fun attachToBehavior(behavior: BottomSheetBehavior<*>) {
-        behavior.addBottomSheetCallback(
-            object : BottomSheetBehavior.BottomSheetCallback() {
-                override fun onStateChanged(
-                    bottomSheet: View,
-                    newState: Int,
-                ) = Unit
-
-                override fun onSlide(
-                    bottomSheet: View,
-                    slideOffset: Float,
-                ) {
-                    // Prevent system updates from overriding alpha while running custom enter/exit animation.
-                    // When initialDetentIndex is snapping to a high detent, BottomSheetBehavior fires onSlide
-                    // events that conflict with our manual alpha animator, causing the backdrop to flash.
-                    if (isTransitionAnimationRunning) {
-                        return
-                    }
-
-                    val fraction = if (slideOffset >= 0) 1f else 1f + slideOffset
-                    dimmingView.alpha = fraction * maxAlpha
-                }
-            },
-        )
-    }
-
-    private fun attachDimmingViewOverNativeTouchOutside() {
-        val coordinator = dialog.findViewById<CoordinatorLayout>(com.google.android.material.R.id.coordinator)
-        val bottomSheetView = dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
-
-        if (coordinator != null && dimmingView.parent == null && bottomSheetView != null) {
-            val sheetIndex = coordinator.indexOfChild(bottomSheetView)
-            if (sheetIndex >= 0) {
-                coordinator.addView(dimmingView, sheetIndex)
-            } else {
-                Log.e(TAG, "[RNScreens] BottomSheetView not found! Falling back to bottom index.")
-                coordinator.addView(dimmingView, 0)
-            }
-        }
-    }
-
-    companion object {
-        const val TAG = "DimmingViewManager"
-
-        private const val MAX_ALPHA = 0.3f
-    }
-}

package/android/src/main/java/com/swmansion/rnscreens/modals/dimmingview/DimmingViewPointerEvents.kt

@@ -1,18 +0,0 @@
-package com.swmansion.rnscreens.modals.dimmingview
-
-import com.facebook.react.uimanager.PointerEvents
-import com.facebook.react.uimanager.ReactPointerEventsView
-
-internal class DimmingViewPointerEventsImpl(
-    val dimmingView: DimmingView,
-) : ReactPointerEventsView {
-    override val pointerEvents: PointerEvents
-        get() = if (dimmingView.blockGestures) PointerEvents.AUTO else PointerEvents.NONE
-}
-
-internal class DimmingViewPointerEventsProxy(
-    var pointerEventsImpl: DimmingViewPointerEventsImpl?,
-) : ReactPointerEventsView {
-    override val pointerEvents: PointerEvents
-        get() = pointerEventsImpl?.pointerEvents ?: PointerEvents.NONE
-}

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

@@ -1,83 +0,0 @@
-package com.swmansion.rnscreens.stack.header.toolbar
-
-import android.util.Log
-import com.google.android.material.appbar.MaterialToolbar
-import com.swmansion.rnscreens.stack.header.toolbar.model.StackHeaderToolbarMenuGroupMetadata
-
-/**
- * Owns toolbar-menu selection state (id map + group metadata) and applies
- * group-item checked-state changes.
- */
-internal class StackHeaderToolbarMenuSelectionController {
-    internal var forwardIdMap: Map<String, Int> = emptyMap()
-        private set
-
-    private var groupMetadata: StackHeaderToolbarMenuGroupMetadata = StackHeaderToolbarMenuGroupMetadata.EMPTY
-
-    internal fun setMenuMaps(
-        forwardIdMap: Map<String, Int>,
-        groupMetadata: StackHeaderToolbarMenuGroupMetadata,
-    ) {
-        this.forwardIdMap = forwardIdMap
-        this.groupMetadata = groupMetadata
-    }
-
-    internal fun clear() {
-        forwardIdMap = emptyMap()
-        groupMetadata = StackHeaderToolbarMenuGroupMetadata.EMPTY
-    }
-
-    /**
-     * Mutates the checked state of [itemId] within its group and returns the id of the group
-     * whose selection changed, or `null` when nothing changed (the item is not in a group, an
-     * invalid attempt to uncheck a single-selection item, or the item was already in the
-     * target state). Does not emit — callers decide when to emit so that batched updates can
-     * coalesce into one event per group.
-     */
-    internal fun applyGroupItemStateChange(
-        toolbar: MaterialToolbar,
-        itemId: String,
-        explicitCheckedValue: Boolean? = null,
-    ): String? {
-        val groupId = groupMetadata.itemGroupMap[itemId] ?: return null
-        val singleSelection = groupMetadata.groupSingleSelection[groupId] ?: return null
-        val intId = forwardIdMap[itemId] ?: return null
-        val menuItem = toolbar.menu.findItem(intId) ?: return null
-
-        if (singleSelection && explicitCheckedValue == false) {
-            Log.w(
-                TAG,
-                "[RNScreens] Cannot uncheck item '$itemId' in single-selection group '$groupId'. " +
-                    "Check a different item instead.",
-            )
-            return null
-        }
-
-        val newChecked =
-            if (singleSelection) {
-                true
-            } else {
-                explicitCheckedValue ?: !menuItem.isChecked
-            }
-        if (menuItem.isChecked == newChecked) return null
-        menuItem.isChecked = newChecked
-
-        return groupId
-    }
-
-    internal fun collectSelectedIds(
-        toolbar: MaterialToolbar,
-        groupId: String,
-    ): List<String> =
-        groupMetadata
-            .groupMemberItems[groupId]
-            .orEmpty()
-            .filter { memberId ->
-                val intId = forwardIdMap[memberId] ?: return@filter false
-                toolbar.menu.findItem(intId)?.isChecked == true
-            }
-
-    companion object {
-        private const val TAG = "StackHeaderToolbarMenuSelectionController"
-    }
-}

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)