@apexnative/navigation 1.0.0-alpha.5 → 1.0.0-alpha.7

package/src/interfaces/options/topBar.ts

@@ -50,7 +50,7 @@ export interface OptionsTopBarTitleDocument {
 export interface OptionsTopBarTitle {
   /**
    * The text of the title. Setting it removes a React title. On iOS it is the title of the screen's navigation item,
-   * the label the system shows on the next screen's back button before iOS 26, and what Rename edits. On Android it
+   * the label the system shows on the next screen's back button without the glass design, and what Rename edits. On Android it
    * is one line cut with an ellipsis, and also the text of the large title; a title component set together with the
    * text drops the text and the subtitle (with a warning in development).
    */
@@ -94,9 +94,9 @@ export interface OptionsTopBarTitle {
    */
   document?: OptionsTopBarTitleDocument;
   /**
-   * (iOS 26+) Puts the title on a Liquid Glass capsule like the buttons: `'regular'` or `'clear'`; `'none'` and any
+   * (iOS 26+, glass design) Puts the title on a Liquid Glass capsule like the buttons: `'regular'` or `'clear'`; `'none'` and any
    * other value mean no capsule. A text title and the subtitle are two lines on the capsule; a component title sits on
-   * it as it is, the capsule taking its size. Before iOS 26 and on Android it does nothing.
+   * it as it is, the capsule taking its size. Without the glass design (see `UIDesignRequiresCompatibility`) and on Android it does nothing.
    */
   glass?: 'regular' | 'clear' | 'none';
   /** (Android) The height of the row of title and buttons, in dp. By default 64, regardless of `topBar.height`. */
@@ -118,15 +118,15 @@ export interface OptionsTopBarTitle {
 /** The subtitle: a second line under the title. */
 export interface OptionsTopBarSubtitle {
   /**
-   * The text of the second line. An empty text removes it. On iOS 26 it is the system subtitle, under the title, the
-   * large title and the collapsed bar, and on the capsule when the title has `glass`; a React title hides it. Before
-   * iOS 26 it makes a two-line title view, only without a large title or a React title. On Android it is the line under
+   * The text of the second line. An empty text removes it. With the glass design (iOS 26+, see `UIDesignRequiresCompatibility`) it is the system subtitle, under the title, the
+   * large title and the collapsed bar, and on the capsule when the title has `glass`; a React title hides it. Without
+   * it, it makes a two-line title view, only without a large title or a React title. On Android it is the line under
    * the title, hidden when empty and dropped when the title is a component.
    */
   text?: string;
   /**
-   * The size of the font. On iOS 26 only what is set goes to the system subtitle, and any font option sets the whole
-   * font; before iOS 26 the size is 12. On Android it is in sp, 14 by default.
+   * The size of the font. With the glass design only what is set goes to the system subtitle, and any font option sets the whole
+   * font; without it the size is 12. On Android it is in sp, 14 by default.
    */
   fontSize?: number;
   /** The color of the subtitle. On Android the theme's on-surface-variant color by default. */
@@ -177,14 +177,14 @@ export interface OptionsTopBarBackButton {
    */
   visible?: boolean;
   /**
-   * (iOS) The text of the back button. On iOS 26 the system button without it is an arrow alone, since the title of
-   * the screen below is never shown; before iOS 26 it is that title while it fits. It is set on the screen below, as
+   * (iOS) The text of the back button. With the glass design (iOS 26+, see `UIDesignRequiresCompatibility`) the system button without it is an arrow alone,
+   * since the title of the screen below is never shown; without it, it is that title while it fits. It is set on the screen below, as
    * its back button title.
    */
   title?: string;
   /**
    * (iOS) `true` shows the title of the screen below (or `title`), `false` shows an arrow alone (the minimal mode).
-   * Without it the system decides; on iOS 26 that is the arrow.
+   * Without it the system decides; with the glass design that is the arrow.
    */
   showTitle?: boolean;
   /**
@@ -207,7 +207,7 @@ export interface OptionsTopBarBackButton {
   /**
    * A shape behind the icon, as for a button. It takes effect with a `color` of the shape. On iOS the icon (the
    * chevron by default) is drawn on it and the back button becomes an own button that keeps the history menu unless
-   * `enableMenu` is `false`; without a capsule on iOS 26 by default. On Android the arrow sits on the shape.
+   * `enableMenu` is `false`; without a capsule with the glass design by default. On Android the arrow sits on the shape.
    */
   iconBackground?: IconBackgroundOptions;
   /**
@@ -228,7 +228,7 @@ export interface OptionsTopBarBackButton {
    */
   displayMode?: 'default' | 'generic' | 'minimal';
   /**
-   * (iOS 26+) Whether the Liquid Glass capsule under the back button is hidden. It works only for an own button with
+   * (iOS 26+, glass design) Whether the Liquid Glass capsule under the back button is hidden. It works only for an own button with
    * an `iconBackground`, where the shape is already drawn into the icon; the system button ignores it.
    * @default true
    */
@@ -245,9 +245,9 @@ export interface OptionsTopBarBackButton {
 /** The background of the bar: a color, a component, translucency and blur. */
 export interface OptionsTopBarBackground {
   /**
-   * The color of the bar. On iOS it fills both the standard look and the one at the scroll edge; on iOS 26 the bar is
-   * then solid in this color instead of glass. A transparent color makes a transparent bar. It beats `blur` and
-   * `translucent`. With a large title on iOS 26 the color is drawn into the list under the title, and the collapsed bar
+   * The color of the bar. On iOS it fills both the standard look and the one at the scroll edge; with the glass design the bar is
+   * then solid in this color instead of glass; without it (`UIDesignRequiresCompatibility`) it is the opaque bar of before iOS 26. A transparent color makes a transparent bar. It beats `blur` and
+   * `translucent`. With a large title and the glass design the color is drawn into the list under the title, and the collapsed bar
    * paints itself. On Android it is the background of the bar with the status bar strip, by default the theme's
    * surface color, changing at once on push and pop. Together with `component` the color lies under the component.
    */
@@ -266,8 +266,8 @@ export interface OptionsTopBarBackground {
    */
   component?: OptionsTopBarBackgroundComponent;
   /**
-   * (iOS) Whether content shows through the bar. By default `true` on iOS 26 (glass) and `false` before. With `true`
-   * the bar is glass on iOS 26 and the system translucent bar before; with `false` it is solid in the system color.
+   * (iOS) Whether content shows through the bar. By default `true` with the glass design (iOS 26+, see `UIDesignRequiresCompatibility`) and `false` without it. With `true`
+   * the bar is glass with the glass design and the system translucent bar without it; with `false` it is solid in the system color.
    * `color` and `blur` beat it. Only an explicit `true` puts the screen under the bar.
    */
   translucent?: boolean;
@@ -301,7 +301,7 @@ export interface OptionsTopBarBackgroundComponent {
 export interface OptionsTopBarScrollEdgeAppearanceTitle {
   /** The size of the font, handled like `topBar.title.fontSize`. */
   fontSize?: number;
-  /** The color of the title at the edge. On iOS 26 it is fixed during a push, like the usual title color. */
+  /** The color of the title at the edge. With the glass design it is fixed during a push, like the usual title color. */
   color?: Color;
   /** The font family, handled like `topBar.title.fontFamily`. */
   fontFamily?: FontFamily;
@@ -327,7 +327,7 @@ export interface OptionsTopBarScrollEdgeAppearanceBackground {
 
 /**
  * (iOS) How the bar looks while the list is at its top edge. Without `active` the edge looks as the usual bar, except
- * for the transparency under a large title on iOS 26; the title and the border at the edge still come from the fields
+ * for the transparency under a large title with the glass design; the title and the border at the edge still come from the fields
  * here or from the usual ones. Android doesn't read it.
  */
 export interface OptionsTopBarScrollEdgeAppearance {
@@ -337,7 +337,7 @@ export interface OptionsTopBarScrollEdgeAppearance {
   background?: OptionsTopBarScrollEdgeAppearanceBackground;
   /**
    * Whether the bar has a background of its own at the edge (`background`). With it the edge isn't made transparent
-   * under a large title, and on iOS 26 an opaque color covers the large title. A change by `mergeOptions` applies at
+   * under a large title, and with the glass design an opaque color covers the large title. A change by `mergeOptions` applies at
    * once.
    * @default false
    */
@@ -373,7 +373,7 @@ export interface OptionsTopBarLargeTitle {
    * Whether the large title collapses into the bar as the list scrolls. With `false` on iOS the bar follows an empty
    * scroll view instead of the list, so the title stays as at the top of the list; under the row it then needs a
    * background (`background.color`, else a system blur), and `searchBar.hideOnScroll` doesn't work. On Android `false`
-   * leaves the bar as it is and stops listening to the list. On iOS 26 in a right-to-left layout nothing collapses.
+   * leaves the bar as it is and stops listening to the list. With the glass design in a right-to-left layout nothing collapses.
    * @default true
    */
   collapseOnScroll?: boolean;
@@ -637,7 +637,7 @@ export interface OptionsTopBar {
   /**
    * The shape color behind the icons of the left buttons that have an `icon` image and no `iconBackground.color`; the
    * size and corners come from the button's `iconBackground`, or the icon's size without corners. On iOS only image
-   * buttons, not SF Symbols, and without a capsule on iOS 26. A color sent by `mergeOptions` repaints all the side's
+   * buttons, not SF Symbols, and without a capsule with the glass design. A color sent by `mergeOptions` repaints all the side's
    * image buttons, those with their own shape color too.
    */
   leftButtonBackgroundColor?: Color;
@@ -654,6 +654,20 @@ export interface OptionsTopBar {
   centerButtonColor?: Color;
   /** (iOS 16+) The color of the disabled center buttons that have no `disabledColor` of their own. */
   centerButtonDisabledColor?: Color;
+  /**
+   * (Android) The background of the bar's menus: "⋮" and the menus of the buttons, their submenus too. Without it the
+   * bar's color (`background.color`, else the theme's surface), unless the bar lets something through; then the
+   * theme's surface container color. It follows light and dark mode; an open menu closes as the mode switches. iOS
+   * draws its system menus in the system's colors.
+   */
+  menuBackgroundColor?: Color;
+  /**
+   * (Android) The color of the text and the icons of the items of the bar's menus, and of the titles of their
+   * submenus. Without it the title's color (`title.color`) when the menu takes the bar's color, else the theme's
+   * colors. A destructive item stays red, and a button moved into "⋮" keeps its own color or the side's
+   * (`rightButtonColor`). A disabled item is dimmed. An open menu closes when either menu color is merged.
+   */
+  menuTextColor?: Color;
   /**
    * Whether the content of the screen goes under the bar, starting at the top of the screen. The screen goes under the
    * bar by itself in some cases (a large title that may show, `hideOnScroll`, a hidden bar, an explicit translucent
@@ -815,12 +829,15 @@ export interface OptionsScrollEdge {
 
 /**
  * (iOS 26+) The scroll edge effect of the scroll views of a screen: how the content fades or blurs where it scrolls
- * under a bar. The scroll views draw it, and only where content goes under a bar. It applies to every scroll view in
- * the view of the screen when the screen appears; after React mounts it applies to the main list of the screen only; on
- * `mergeOptions` all is reset and applied again. Other scroll views mounted later get it at the next appearance or
- * `mergeOptions`. When the screen leaves, its scroll views get the system effect back. Under a bar with
- * `background.color` or `background.component` there is no effect at the top unless the screen sets one for the top or
- * for all edges. Before iOS 26 and on Android it does nothing.
+ * under a bar. The scroll views draw it, and only where content goes under a bar. When the screen appears, it applies
+ * to the vertical lists and text views (a multi-line `TextInput`) in the view of the screen, except in hidden views
+ * (`display: none`). A list inside another vertical list gets none (UIKit draws no edge effect there); a scroll view
+ * that doesn't scroll vertically, like a pager, is searched for its lists. A list nested very deep in the screen's
+ * views may not get it. After React mounts, the main list of the screen gets it; a list mounted later gets it at the
+ * next appearance, or at a `mergeOptions` of `scrollEdgeEffect` or of the bar's background. The lists get the system
+ * effect back when the screen leaves or is destroyed, and a list React removes from the screen gets it back too. Under
+ * a bar with `background.color` or `background.component` there is no effect at the top unless the screen sets one for
+ * the top or for all edges. Before iOS 26 and on Android it does nothing.
  */
 export interface OptionsScrollEdgeEffect {
   /** Whether the effect is hidden on all four edges. The value of an edge beats it. */

package/android/src/main/java/dev/apexnative/navigation/react/ArrangementStates.kt

@@ -1,42 +0,0 @@
-package dev.apexnative.navigation.react
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import dev.apexnative.navigation.react.events.EventContract
-import dev.apexnative.navigation.react.events.EventEmitter
-import java.util.concurrent.ConcurrentHashMap
-
-/**
- * The state of each screen of a pair (`useArrangement`): which screen of the pair it is, how the pair lies, whether it
- * lies over the other one and whether it is out of the window. Set on the main thread as the pair lays out; JavaScript
- * reads it from its own thread for a screen's first render, and gets every change as `ANN.ArrangementChanged`. A
- * screen outside a pair has none.
- */
-internal object ArrangementStates {
-    data class State(val placement: String, val layout: String, val front: Boolean, val hidden: Boolean)
-
-    private val states = ConcurrentHashMap<String, State>()
-
-    /**
-     * Keeps the screen's state, and tells JavaScript when it changed and [notify] holds, through [emitter], the one of
-     * the JavaScript the screen was made for: silent once it went. Main thread only.
-     */
-    fun set(screenId: String, state: State, notify: Boolean, emitter: EventEmitter) {
-        if (states.put(screenId, state) == state || !notify) return
-        emitter.emitArrangementChanged(screenId, toMap(state))
-    }
-
-    /** `{ placement, layout, front, hidden }`, empty for a screen outside a pair. Any thread. */
-    fun get(screenId: String): WritableMap = states[screenId]?.let(::toMap) ?: Arguments.createMap()
-
-    fun remove(screenId: String) {
-        states.remove(screenId)
-    }
-
-    private fun toMap(state: State): WritableMap = Arguments.createMap().apply {
-        putString(EventContract.ArrangementChanged.PLACEMENT, state.placement)
-        putString(EventContract.ArrangementChanged.LAYOUT, state.layout)
-        putBoolean(EventContract.ArrangementChanged.FRONT, state.front)
-        putBoolean(EventContract.ArrangementChanged.HIDDEN, state.hidden)
-    }
-}

package/android/src/main/java/dev/apexnative/navigation/react/ScreenInsets.kt

@@ -1,70 +0,0 @@
-package dev.apexnative.navigation.react
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import dev.apexnative.navigation.react.events.EventContract
-import dev.apexnative.navigation.react.events.EventEmitter
-import java.util.concurrent.ConcurrentHashMap
-
-/**
- * The safe area of each screen, in dp: how much of its content the bars and the system cover on each side. The padding
- * is the part of it the screen's safe area view keeps its content out of: the insets on the edges the screen's options
- * give. JavaScript gets the rest, what still covers the content (0 on a padded edge): it reads it from its own thread
- * for a screen's first render, and gets every change as `ANN.ScreenInsetsChanged`.
- */
-object ScreenInsets {
-    data class Insets(val top: Double, val right: Double, val bottom: Double, val left: Double)
-
-    private val insets = ConcurrentHashMap<String, Insets>()
-    // Main thread only.
-    private val padding = HashMap<String, Insets>()
-    private val paddingListeners = HashMap<String, MutableSet<() -> Unit>>()
-
-    /** The padding of the screen's safe area view; none before the screen was laid out. */
-    fun padding(screenId: String): Insets? = padding[screenId]
-
-    /** Calls `listener` when the padding of the screen changes; returns the function that stops it. */
-    fun listenToPadding(screenId: String, listener: () -> Unit): () -> Unit {
-        paddingListeners.getOrPut(screenId) { LinkedHashSet() }.add(listener)
-        return {
-            paddingListeners[screenId]?.let {
-                it.remove(listener)
-                if (it.isEmpty()) paddingListeners.remove(screenId)
-            }
-        }
-    }
-
-    /**
-     * Keeps the screen's insets and padding, and tells when they changed through [emitter], the one of the JavaScript
-     * the screen was made for: silent once it went.
-     */
-    fun update(screenId: String, value: Insets, paddingValue: Insets, emitter: EventEmitter) {
-        if (padding.put(screenId, paddingValue) != paddingValue) {
-            paddingListeners[screenId]?.toList()?.forEach { it() }
-        }
-        // JavaScript gets what still covers the content: the edges the safe area view keeps it off are 0.
-        val uncovered = Insets(
-            top = (value.top - paddingValue.top).coerceAtLeast(0.0),
-            right = (value.right - paddingValue.right).coerceAtLeast(0.0),
-            bottom = (value.bottom - paddingValue.bottom).coerceAtLeast(0.0),
-            left = (value.left - paddingValue.left).coerceAtLeast(0.0),
-        )
-        if (insets.put(screenId, uncovered) == uncovered) return
-        emitter.emitScreenInsetsChanged(screenId, toMap(uncovered))
-    }
-
-    /** `{ top, right, bottom, left }`, empty before the screen was laid out. Any thread. */
-    fun get(screenId: String): WritableMap = insets[screenId]?.let(::toMap) ?: Arguments.createMap()
-
-    fun remove(screenId: String) {
-        insets.remove(screenId)
-        padding.remove(screenId)
-    }
-
-    private fun toMap(value: Insets): WritableMap = Arguments.createMap().apply {
-        putDouble(EventContract.ScreenInsetsChanged.TOP, value.top)
-        putDouble(EventContract.ScreenInsetsChanged.RIGHT, value.right)
-        putDouble(EventContract.ScreenInsetsChanged.BOTTOM, value.bottom)
-        putDouble(EventContract.ScreenInsetsChanged.LEFT, value.left)
-    }
-}

package/android/src/main/java/dev/apexnative/navigation/viewcontrollers/bottomtabs/CustomTabRowPlacer.kt

@@ -1,223 +0,0 @@
-package dev.apexnative.navigation.viewcontrollers.bottomtabs
-
-import android.app.Activity
-import android.app.Application
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewTreeObserver
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import dev.apexnative.navigation.NavigationActivity
-import dev.apexnative.navigation.utils.UiUtils
-import dev.apexnative.navigation.viewcontrollers.modal.ModalContainer
-import dev.apexnative.navigation.views.bottomtabs.BottomTabsLayout
-import dev.apexnative.navigation.views.bottomtabs.CustomTabRow
-import java.util.WeakHashMap
-
-/**
- * Puts the custom rows of the tabs in their place, as it works now: an observer of every activity of the process that
- * touches only the navigation's activities; on each layout pass of such a window it finds the tabs with a row through
- * the view tree, and puts each row in the window's content right above the layer holding its tabs (after the rows
- * already there) — tabs in a modal: in the modal's own view, right above its root's view (or its sheet), so the row
- * moves with the modal and newer modals cover it —, over the bar as [CustomTabRowGeometry] says — applied only when it
- * changed, so UI tests reach idle. A row whose tabs left the window leaves it too, and comes back to its place as they
- * do. Before each frame the row takes its tabs' alpha (a root that waits under the old one is transparent) and the
- * motion of the bar's container, and stays out of accessibility and touches while they wait. Main thread only.
- */
-internal object CustomTabRowPlacer : Application.ActivityLifecycleCallbacks {
-    private var registered = false
-    // The listeners of each observed activity's window.
-    private val observed = WeakHashMap<Activity, Listeners>()
-    // The rows placed at the last layout pass of each activity, with their tabs.
-    private val rows = WeakHashMap<CustomTabRow, BottomTabsLayout>()
-
-    private class Listeners(
-        val observer: ViewTreeObserver,
-        val layout: ViewTreeObserver.OnGlobalLayoutListener,
-        val draw: ViewTreeObserver.OnPreDrawListener,
-    )
-
-    /** [activity] has tabs with a row: its window is observed from now on, and the process's later activities. */
-    fun track(activity: Activity) {
-        if (!registered) {
-            registered = true
-            activity.application?.registerActivityLifecycleCallbacks(this)
-        }
-        observe(activity)
-    }
-
-    /** The tabs of [row] go: the row leaves the window. */
-    fun forget(row: CustomTabRow) {
-        rows.remove(row)
-        (row.parent as? ViewGroup)?.removeView(row)
-    }
-
-    override fun onActivityResumed(activity: Activity) = observe(activity)
-
-    override fun onActivityDestroyed(activity: Activity) {
-        val listeners = observed.remove(activity) ?: return
-        if (!listeners.observer.isAlive) return
-        listeners.observer.removeOnGlobalLayoutListener(listeners.layout)
-        listeners.observer.removeOnPreDrawListener(listeners.draw)
-    }
-
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit
-
-    override fun onActivityStarted(activity: Activity) = Unit
-
-    override fun onActivityPaused(activity: Activity) = Unit
-
-    override fun onActivityStopped(activity: Activity) = Unit
-
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
-
-    // Only the navigation's activities: another activity's views are never looked for.
-    private fun observe(activity: Activity) {
-        if (activity !is NavigationActivity || observed.containsKey(activity)) return
-        val decor = activity.window?.decorView ?: return
-        val observer = decor.viewTreeObserver
-        val layout = ViewTreeObserver.OnGlobalLayoutListener { place(activity) }
-        val draw = ViewTreeObserver.OnPreDrawListener {
-            follow(activity)
-            true
-        }
-        observer.addOnGlobalLayoutListener(layout)
-        observer.addOnPreDrawListener(draw)
-        observed[activity] = Listeners(observer, layout, draw)
-    }
-
-    private fun contentOf(activity: Activity): ViewGroup? =
-        activity.window?.decorView?.findViewById(android.R.id.content)
-
-    // Each layout pass: the tabs with a row in the content, and the rows in their places.
-    private fun place(activity: NavigationActivity) {
-        val content = contentOf(activity) ?: return
-        val found = ArrayList<BottomTabsLayout>()
-        collect(content, found)
-        val placed = found.mapNotNull { tabs -> tabs.row?.also { place(activity, content, tabs, it) } }.toSet()
-        // A row whose tabs left the window leaves it too.
-        rows.entries.filter { (row, tabs) -> row !in placed && tabs.context === activity }.forEach { (row, _) ->
-            (row.parent as? ViewGroup)?.removeView(row)
-        }
-    }
-
-    private fun collect(view: View, found: MutableList<BottomTabsLayout>) {
-        if (view is CustomTabRow) return
-        if (view is BottomTabsLayout && view.row != null) found += view
-        if (view is ViewGroup) for (index in 0 until view.childCount) collect(view.getChildAt(index), found)
-    }
-
-    private fun place(activity: NavigationActivity, content: ViewGroup, tabs: BottomTabsLayout, row: CustomTabRow) {
-        rows[row] = tabs
-        val (host, layer) = placeIn(content, tabs) ?: return
-        if (row.parent !== host) {
-            (row.parent as? ViewGroup)?.removeView(row)
-            // Margins of the host's own kind: the host converts them (a frame or a coordinator layout).
-            host.addView(row, indexAbove(host, layer, row), ViewGroup.MarginLayoutParams(0, 0))
-            row.place = null
-        } else if (host.indexOfChild(row) != indexAbove(host, layer, row)) {
-            val params = row.layoutParams
-            host.removeView(row)
-            host.addView(row, indexAbove(host, layer, row), params)
-        }
-        row.showWith(tabs.bar)
-        if (tabs.bar.visibility == View.GONE || tabs.bar.width == 0) return
-        val place = placeOf(activity, host, tabs, row)
-        if (!CustomTabRowGeometry.needsPlacing(row.place, place)) return
-        row.place = place
-        val params = row.layoutParams as? ViewGroup.MarginLayoutParams ?: return
-        params.width = place.right - place.left
-        params.height = place.bottom - place.top
-        params.leftMargin = place.left
-        params.topMargin = place.top
-        row.layoutParams = params
-    }
-
-    // Over the bar: its edges less the margins, its bottom, the height of the content and the margin below it, in the
-    // coordinates of the row's [host].
-    private fun placeOf(
-        activity: Activity,
-        host: ViewGroup,
-        tabs: BottomTabsLayout,
-        row: CustomTabRow,
-    ): CustomTabRowGeometry.Place {
-        val bar = IntArray(2).also(tabs.bar::getLocationInWindow)
-        val origin = IntArray(2).also(host::getLocationInWindow)
-        val options = row.options
-        val margin = UiUtils.dpToPixels(
-            activity,
-            options.horizontalMargin.get(CustomTabRowGeometry.HORIZONTAL_MARGIN_DP.toDouble()),
-        )
-        val height = options.height.get(null)?.let { UiUtils.dpToPixels(activity, it) }
-        val extra = UiUtils.dpToPixels(activity, CustomTabRowGeometry.EXTRA_HEIGHT_DP.toDouble())
-        // Where the bar rests: its container's motion (a ride, a slide, the hide on scroll) the row takes before each
-        // frame as its own translation.
-        val left = bar[0] - origin[0] - tabs.container.translationX.toInt()
-        val top = bar[1] - origin[1] - tabs.container.translationY.toInt()
-        // Never over the navigation bar's buttons: the bar is above them, and so is the row.
-        val navigationBar = if ((activity as? NavigationActivity)?.isEdgeToEdge == true) navigationBarOf(host) else 0
-        return CustomTabRowGeometry.place(
-            barLeft = left,
-            barRight = left + tabs.bar.width,
-            barBottom = minOf(top + tabs.bar.height, host.height - navigationBar),
-            margin = margin,
-            content = CustomTabRowGeometry.content(tabs.bar.height, height, extra),
-            bottomMargin = UiUtils.dpToPixels(activity, options.bottomMargin.get(0.0)),
-        )
-    }
-
-    // The navigation bar at the bottom of the window, through the compat insets on every version.
-    private fun navigationBarOf(view: View): Int =
-        ViewCompat.getRootWindowInsets(view)?.getInsets(WindowInsetsCompat.Type.navigationBars())?.bottom ?: 0
-
-    // Where the row of [tabs] goes, and the child there it goes right above: tabs in a modal, the modal's own view and
-    // the view in it that holds them (its root's, or its sheet's container); else the content and the layer of the
-    // root or of the overlays. A sheet's drag moves it without a layout: the row doesn't follow a drag.
-    private fun placeIn(content: ViewGroup, tabs: View): Pair<ViewGroup, View>? {
-        var current: View = tabs
-        while (true) {
-            val parent = current.parent as? ViewGroup ?: return null
-            if (parent is ModalContainer || parent === content) return parent to current
-            current = parent
-        }
-    }
-
-    // Right above [layer], after the rows already there.
-    private fun indexAbove(host: ViewGroup, layer: View, row: CustomTabRow): Int {
-        var index = host.indexOfChild(layer) + 1
-        while (index < host.childCount) {
-            val child = host.getChildAt(index)
-            if (child !is CustomTabRow || child === row) break
-            index++
-        }
-        return index
-    }
-
-    // Before each frame: the row takes the alpha of its tabs up to the view it is in and the container's translation,
-    // and leaves accessibility while they wait to show.
-    private fun follow(activity: Activity) {
-        val content = contentOf(activity) ?: return
-        for ((row, tabs) in rows) {
-            val host = row.parent as? View ?: continue
-            if (host !== content && host !is ModalContainer) continue
-            var alpha = tabs.container.alpha
-            var current: View? = tabs
-            while (current != null && current !== host) {
-                alpha *= current.alpha
-                current = current.parent as? View
-            }
-            if (row.alpha != alpha) row.alpha = alpha
-            // The row goes with the bar's container: a ride, a slide, the hide on scroll.
-            val container = tabs.container
-            if (row.translationX != container.translationX) row.translationX = container.translationX
-            if (row.translationY != container.translationY) row.translationY = container.translationY
-            val mode = if (row.hiddenFromAccessibility()) {
-                View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
-            } else {
-                View.IMPORTANT_FOR_ACCESSIBILITY_AUTO
-            }
-            if (row.importantForAccessibility != mode) row.importantForAccessibility = mode
-        }
-    }
-}

package/android/src/main/java/dev/apexnative/navigation/views/element/ElementStub.kt

@@ -1,31 +0,0 @@
-package dev.apexnative.navigation.views.element
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Canvas
-import android.view.MotionEvent
-import android.view.View
-
-/**
- * The empty view that stands in an element's place in its parent while the element is in the transition layer: the same
- * id at the same index with the same layout, so Fabric finds the parent's children as it left them; React removing it
- * removes the element for good. It has no `nativeID`, so no search finds it as the element. It draws nothing and takes
- * no touches. Main thread only.
- */
-@SuppressLint("ViewConstructor")
-internal class ElementStub(context: Context, element: View) : View(context) {
-    init {
-        id = element.id
-        importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
-        isClickable = false
-        isFocusable = false
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) =
-        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec))
-
-    override fun draw(canvas: Canvas) = Unit
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(event: MotionEvent?): Boolean = false
-}