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

package/android/src/main/java/com/swmansion/rnscreens/tabs/container/TabsContainer.kt

@@ -26,13 +26,11 @@ import com.swmansion.rnscreens.common.colorscheme.ColorSchemeProviding
 import com.swmansion.rnscreens.common.container.Container
 import com.swmansion.rnscreens.common.container.ContainerItem
 import com.swmansion.rnscreens.common.container.ParentContainerItemRegistry
-import com.swmansion.rnscreens.helpers.FragmentManagerHelper
-import com.swmansion.rnscreens.helpers.ViewFinder
+import com.swmansion.rnscreens.ext.createTransactionWithReordering
 import com.swmansion.rnscreens.helpers.ViewIdGenerator
-import com.swmansion.rnscreens.helpers.createTransactionWithReordering
 import com.swmansion.rnscreens.safearea.EdgeInsets
+import com.swmansion.rnscreens.safearea.OnInterfaceInsetsChangeListener
 import com.swmansion.rnscreens.safearea.SafeAreaProvider
-import com.swmansion.rnscreens.safearea.SafeAreaView
 import com.swmansion.rnscreens.tabs.appearance.TabsAppearanceCoordinator
 import com.swmansion.rnscreens.tabs.host.TabsHost
 import com.swmansion.rnscreens.tabs.host.TabsHostA11yCoordinator
@@ -40,6 +38,7 @@ import com.swmansion.rnscreens.tabs.screen.TabsScreen
 import com.swmansion.rnscreens.tabs.screen.TabsScreenDelegate
 import com.swmansion.rnscreens.tabs.screen.TabsScreenFragment
 import com.swmansion.rnscreens.utils.RNSLog
+import java.lang.ref.WeakReference
 import kotlin.properties.Delegates
 
 /**
@@ -53,6 +52,7 @@ import kotlin.properties.Delegates
 @SuppressLint("ViewConstructor") // Created only by us. Should never be restored.
 class TabsContainer internal constructor(
     private val context: Context,
+    private val delegate: WeakReference<TabsContainerDelegate>,
 ) : FrameLayout(context),
     Container,
     ColorSchemeProviding,
@@ -68,9 +68,7 @@ class TabsContainer internal constructor(
             val selectedTabScreen = this@TabsContainer.selectedTab.tabsScreen
 
             if (selectedTabScreen.shouldUseRepeatedTabSelectionPopToRootSpecialEffect) {
-                val screenStack =
-                    ViewFinder.findScreenStackInFirstDescendantChain(selectedTabScreen)
-                if (screenStack != null && screenStack.popToRoot()) {
+                if (selectedTabScreen.resolveNestedContainer()?.requestPopToRoot() == true) {
                     return true
                 }
             }
@@ -162,7 +160,7 @@ class TabsContainer internal constructor(
 
     private val a11yCoordinator = TabsHostA11yCoordinator(bottomNavigationView, tabsModel)
 
-    private var interfaceInsetsChangeListener: SafeAreaView? = null
+    private var interfaceInsetsChangeListener: OnInterfaceInsetsChangeListener? = null
 
     internal var tabBarHidden: Boolean by Delegates.observable(false) { _, oldValue, newValue ->
         if (newValue != oldValue) {
@@ -257,9 +255,9 @@ class TabsContainer internal constructor(
 
     internal fun setupFragmentManager() {
         fragmentManager =
-            checkNotNull(FragmentManagerHelper.findFragmentManagerForView(this)) {
-                "[RNScreens] Nullish fragment manager - can't run container operations"
-            }
+            checkNotNull(delegate.get()) {
+                "[RNScreens] TabsContainer has no delegate to resolve the fragment manager from"
+            }.resolveFragmentManager()
     }
 
     internal fun teardownFragmentManager() {
@@ -374,14 +372,14 @@ class TabsContainer internal constructor(
         }
     }
 
-    override fun setOnInterfaceInsetsChangeListener(listener: SafeAreaView) {
+    override fun setOnInterfaceInsetsChangeListener(listener: OnInterfaceInsetsChangeListener) {
         if (interfaceInsetsChangeListener == null) {
             bottomNavigationView.addOnLayoutChangeListener(this)
         }
         interfaceInsetsChangeListener = listener
     }
 
-    override fun removeOnInterfaceInsetsChangeListener(listener: SafeAreaView) {
+    override fun removeOnInterfaceInsetsChangeListener(listener: OnInterfaceInsetsChangeListener) {
         if (interfaceInsetsChangeListener == listener) {
             interfaceInsetsChangeListener = null
             bottomNavigationView.removeOnLayoutChangeListener(this)
@@ -417,11 +415,23 @@ class TabsContainer internal constructor(
                 menuItem,
                 tabsScreen,
                 appearance,
+                appearanceCoordinator.resolveIconBoxDp(),
             )
             a11yCoordinator.setA11yPropertiesToTabItem(menuItem, tabsScreen)
         }
     }
 
+    override fun onItemSizeChange(tabsScreen: TabsScreen) {
+        // Icon box is bar-wide, so this must run even when the changed tab is not selected.
+        // Skip when detached; reattachment reapplies the full appearance anyway.
+        if (isAttachedToWindow) {
+            invalidationFlags.isNavigationMenuAppearanceInvalidated = true
+            post {
+                this.flushPendingUpdates()
+            }
+        }
+    }
+
     override fun getFragmentForTabsScreen(tabsScreen: TabsScreen): TabsScreenFragment? =
         tabsModel.find {
             it.tabsScreen ===
@@ -552,6 +562,7 @@ class TabsContainer internal constructor(
         tabsModel.forEach { fragment ->
             menu.getOrCreateMenuItemForFragment(fragment)
         }
+        appearanceCoordinator.invalidateRebuiltMenuItems()
     }
 
     private fun updateBottomNavigationViewAppearance() {
@@ -801,6 +812,10 @@ class TabsContainer internal constructor(
             null
         }
 
+    // Tabs have no stack of their own - the request goes to the selected tab's nested container.
+    override fun requestPopToRoot(): Boolean =
+        navState.isNotEmpty() && selectedTab.tabsScreen.resolveNestedContainer()?.requestPopToRoot() == true
+
     // endregion
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/tabs/container/TabsContainerDelegate.kt

@@ -0,0 +1,11 @@
+package com.swmansion.rnscreens.tabs.container
+
+import androidx.fragment.app.FragmentManager
+
+internal interface TabsContainerDelegate {
+    /**
+     * Resolves the fragment manager the container should run its operations on. Called every time the container
+     * is attached to a window, as the result may differ between attachments.
+     */
+    fun resolveFragmentManager(): FragmentManager
+}

package/android/src/main/java/com/swmansion/rnscreens/tabs/host/TabsHost.kt

@@ -4,21 +4,25 @@ import android.annotation.SuppressLint
 import android.view.ViewTreeObserver
 import android.widget.FrameLayout
 import androidx.core.graphics.drawable.toDrawable
+import androidx.fragment.app.FragmentManager
 import com.facebook.react.bridge.UIManager
 import com.facebook.react.bridge.UIManagerListener
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.swmansion.rnscreens.common.colorscheme.ColorScheme
+import com.swmansion.rnscreens.helpers.FragmentManagerHelper
 import com.swmansion.rnscreens.helpers.getFabricUIManagerNotNull
 import com.swmansion.rnscreens.tabs.container.TabsActionOrigin
 import com.swmansion.rnscreens.tabs.container.TabsContainer
+import com.swmansion.rnscreens.tabs.container.TabsContainerDelegate
 import com.swmansion.rnscreens.tabs.container.TabsNavigationState
 import com.swmansion.rnscreens.tabs.container.TabsNavigationStateObserver
 import com.swmansion.rnscreens.tabs.container.TabsNavigationStateRejectionReason
 import com.swmansion.rnscreens.tabs.container.TabsNavigationStateUpdateRequest
 import com.swmansion.rnscreens.tabs.screen.TabsScreen
 import com.swmansion.rnscreens.utils.RNSLog
+import java.lang.ref.WeakReference
 import kotlin.properties.Delegates
 
 @SuppressLint("ViewConstructor") // Only created by us. Should never be restored
@@ -28,7 +32,8 @@ class TabsHost(
 ) : FrameLayout(reactContext),
     TabsNavigationStateObserver,
     ViewTreeObserver.OnPreDrawListener,
-    UIManagerListener {
+    UIManagerListener,
+    TabsContainerDelegate {
     private val renderedScreens: ArrayList<TabsScreen> = arrayListOf()
     private var jsNavStateRequest: TabsNavigationStateUpdateRequest? = null
     private val layoutCoordinator: TabsHostLayoutCoordinator =
@@ -37,7 +42,7 @@ class TabsHost(
     private var hasFirstLayoutWithInsets: Boolean = false
 
     private val container: TabsContainer =
-        TabsContainer(reactContext).apply {
+        TabsContainer(reactContext, WeakReference(this)).apply {
             layoutParams =
                 LayoutParams(
                     LayoutParams.MATCH_PARENT,
@@ -82,6 +87,11 @@ class TabsHost(
         super.onDetachedFromWindow()
     }
 
+    override fun resolveFragmentManager(): FragmentManager =
+        checkNotNull(FragmentManagerHelper.findFragmentManagerForView(this)) {
+            "[RNScreens] Nullish fragment manager - can't run container operations"
+        }
+
     internal fun mountReactSubviewAt(
         tabsScreen: TabsScreen,
         index: Int,

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreen.kt

@@ -1,7 +1,6 @@
 package com.swmansion.rnscreens.tabs.screen
 
 import android.content.res.Configuration
-import android.graphics.drawable.Drawable
 import android.os.Parcelable
 import android.util.SparseArray
 import android.view.ViewGroup
@@ -11,7 +10,6 @@ import com.swmansion.rnscreens.common.FragmentProviding
 import com.swmansion.rnscreens.common.container.Container
 import com.swmansion.rnscreens.common.container.ContainerItem
 import com.swmansion.rnscreens.common.container.ContainerItemSupport
-import com.swmansion.rnscreens.helpers.getSystemDrawableResource
 import com.swmansion.rnscreens.scrollviewmarker.ScrollViewMarker
 import com.swmansion.rnscreens.scrollviewmarker.ScrollViewSeeking
 import com.swmansion.rnscreens.tabs.appearance.TabsAppearance
@@ -54,7 +52,11 @@ class TabsScreen(
 
     internal var appearance: TabsAppearance? by Delegates.observable(null) { _, oldValue, newValue ->
         if (oldValue != newValue) {
-            tabsScreenDelegate.get()?.onAppearanceChanged(this)
+            if (invalidateMenuItemSizesIfNeeded(oldValue, newValue)) {
+                tabsScreenDelegate.get()?.onItemSizeChange(this)
+            } else {
+                tabsScreenDelegate.get()?.onAppearanceChanged(this)
+            }
         }
     }
 
@@ -80,24 +82,39 @@ class TabsScreen(
     // endregion
 
     // region Icon
-    var drawableIconResourceName: String? by Delegates.observable(null) { _, oldValue, newValue ->
-        if (newValue != oldValue) {
-            icon = getSystemDrawableResource(reactContext, newValue)
-        }
-    }
 
-    var selectedDrawableIconResourceName: String? by Delegates.observable(null) { _, oldValue, newValue ->
-        if (newValue != oldValue) {
-            selectedIcon = getSystemDrawableResource(reactContext, newValue)
-        }
-    }
+    internal val icon = TabsScreenIcon(reactContext, ::onIconChange)
+    internal val selectedIcon = TabsScreenIcon(reactContext, ::onIconChange)
 
-    var icon: Drawable? by Delegates.observable(null) { _, oldValue, newValue ->
-        updateMenuItemAttributesIfNeeded(oldValue, newValue)
+    internal var isMenuItemIconInvalidated = true
+
+    internal var isMenuItemActiveIndicatorInvalidated = true
+
+    internal var appliedActiveIndicatorWidthPx: Int? = null
+
+    internal var appliedActiveIndicatorHeightPx: Int? = null
+
+    internal fun resolveIconsIfNeeded() {
+        icon.resolveIfNeeded()
+        selectedIcon.resolveIfNeeded()
     }
 
-    var selectedIcon: Drawable? by Delegates.observable(null) { _, oldValue, newValue ->
-        updateMenuItemAttributesIfNeeded(oldValue, newValue)
+    private fun invalidateMenuItemSizesIfNeeded(
+        oldValue: TabsAppearance?,
+        newValue: TabsAppearance?,
+    ): Boolean {
+        val isIconSizeChanged = oldValue?.tabBarItemIconSize != newValue?.tabBarItemIconSize
+        val isActiveIndicatorSizeChanged =
+            oldValue?.tabBarItemActiveIndicatorWidth != newValue?.tabBarItemActiveIndicatorWidth ||
+                oldValue?.tabBarItemActiveIndicatorHeight != newValue?.tabBarItemActiveIndicatorHeight
+        if (isIconSizeChanged) {
+            isMenuItemIconInvalidated = true
+        }
+        if (isIconSizeChanged || isActiveIndicatorSizeChanged) {
+            isMenuItemActiveIndicatorInvalidated = true
+            return true
+        }
+        return false
     }
 
     // endregion
@@ -121,6 +138,8 @@ class TabsScreen(
         super.onAttachedToWindow()
     }
 
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     override fun onLayout(
         changed: Boolean,
         l: Int,
@@ -150,6 +169,11 @@ class TabsScreen(
         tabsScreenDelegate.get()?.onMenuItemAttributesChange(this)
     }
 
+    private fun onIconChange() {
+        isMenuItemIconInvalidated = true
+        onMenuItemAttributesChange()
+    }
+
     internal fun onViewManagerAddEventEmitters() {
         // When this is called from View Manager the view tag is already set
         check(id != NO_ID) { "[RNScreens] TabsScreen must have its tag set when registering event emitters" }

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreenDelegate.kt

@@ -8,6 +8,12 @@ internal interface TabsScreenDelegate {
 
     fun onMenuItemAttributesChange(tabsScreen: TabsScreen)
 
+    /**
+     * The icon box is bar-wide, so an icon size change requires a whole-bar appearance
+     * update regardless of tab selection.
+     */
+    fun onItemSizeChange(tabsScreen: TabsScreen)
+
     /**
      * **If a fragment is associated with the tab screen**, notify the delegate that the fragment
      * got configuration update.

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreenIcon.kt

@@ -0,0 +1,82 @@
+package com.swmansion.rnscreens.tabs.screen
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import com.swmansion.rnscreens.helpers.IconResolution
+import com.swmansion.rnscreens.helpers.NoTintDrawable
+import com.swmansion.rnscreens.helpers.PropIconResolver
+import com.swmansion.rnscreens.helpers.resolveImage
+import kotlin.properties.Delegates
+
+/**
+ * Single icon slot (normal or selected) of a tab bar item. Props stage here and may arrive
+ * in any order within a single update batch; resolution runs once per transaction via
+ * [resolveIfNeeded]. [onChanged] fires only when the resolved [drawable] actually changes.
+ */
+internal class TabsScreenIcon(
+    context: Context,
+    private val onChanged: () -> Unit,
+) {
+    var drawableResourceName: String? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (newValue != oldValue) isInvalidated = true
+    }
+
+    var tinting: TabsScreenIconTinting by Delegates.observable(
+        TabsScreenIconTinting.DEFAULT,
+    ) { _, oldValue, newValue ->
+        if (newValue != oldValue) isInvalidated = true
+    }
+
+    var imageUri: String? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (newValue != oldValue) isInvalidated = true
+    }
+
+    // Resolved output; read by the appearance applicator.
+    var drawable: Drawable? = null
+        private set
+
+    private var isInvalidated = false
+
+    // Handles source precedence (drawable name wins over uri), dedup, and stale async image drops.
+    private val resolver = createPropIconResolver(context)
+
+    // Kept unwrapped so a tint-only change re-wraps without reloading.
+    private var rawDrawable: Drawable? = null
+    private var appliedTinting = TabsScreenIconTinting.DEFAULT
+
+    fun resolveIfNeeded() {
+        if (!isInvalidated) {
+            return
+        }
+        isInvalidated = false
+        resolver.resolve(drawableResourceName, imageUri) { result ->
+            when (result) {
+                IconResolution.Unchanged -> if (tinting != appliedTinting) emit()
+                is IconResolution.Resolved -> {
+                    rawDrawable = result.drawable
+                    emit()
+                }
+            }
+        }
+    }
+
+    // Tint is read at emit time, so a toggle during an in-flight image load still applies.
+    private fun emit() {
+        appliedTinting = tinting
+        val next =
+            rawDrawable?.let {
+                if (tinting == TabsScreenIconTinting.ORIGINAL) NoTintDrawable(it) else it
+            }
+        if (next !== drawable) {
+            drawable = next
+            onChanged()
+        }
+    }
+
+    private companion object {
+        fun createPropIconResolver(context: Context) =
+            PropIconResolver { name, uri, onComplete ->
+                resolveImage(context, name, uri, onComplete)
+            }
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreenIconTinting.kt

@@ -0,0 +1,17 @@
+package com.swmansion.rnscreens.tabs.screen
+
+internal enum class TabsScreenIconTinting {
+    DEFAULT,
+    TINTED,
+    ORIGINAL,
+    ;
+
+    companion object {
+        fun fromString(value: String?): TabsScreenIconTinting =
+            when (value) {
+                "tinted" -> TINTED
+                "original" -> ORIGINAL
+                else -> DEFAULT
+            }
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreenViewManager.kt

@@ -8,7 +8,6 @@ import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.RNSTabsScreenAndroidManagerDelegate
 import com.facebook.react.viewmanagers.RNSTabsScreenAndroidManagerInterface
-import com.swmansion.rnscreens.helpers.loadImage
 import com.swmansion.rnscreens.helpers.makeEventRegistrationInfo
 import com.swmansion.rnscreens.helpers.readOptionalBoolean
 import com.swmansion.rnscreens.helpers.readOptionalColor
@@ -55,6 +54,11 @@ class TabsScreenViewManager :
         view.onViewManagerAddEventEmitters()
     }
 
+    override fun onAfterUpdateTransaction(view: TabsScreen) {
+        super.onAfterUpdateTransaction(view)
+        view.resolveIconsIfNeeded()
+    }
+
     override fun setScreenKey(
         view: TabsScreen,
         value: String?,
@@ -125,42 +129,42 @@ class TabsScreenViewManager :
         view: TabsScreen,
         value: String?,
     ) {
-        view.drawableIconResourceName = value
+        view.icon.drawableResourceName = value
     }
 
     override fun setSelectedDrawableIconResourceName(
         view: TabsScreen,
         value: String?,
     ) {
-        view.selectedDrawableIconResourceName = value
+        view.selectedIcon.drawableResourceName = value
+    }
+
+    override fun setIconTinting(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.icon.tinting = TabsScreenIconTinting.fromString(value)
+    }
+
+    override fun setSelectedIconTinting(
+        view: TabsScreen,
+        value: String?,
+    ) {
+        view.selectedIcon.tinting = TabsScreenIconTinting.fromString(value)
     }
 
     override fun setImageIconResource(
         view: TabsScreen,
         value: ReadableMap?,
     ) {
-        val uri = value?.getString("uri")
-        if (uri != null) {
-            loadImage(view.context, uri) { drawable ->
-                if (drawable != null) {
-                    view.icon = drawable
-                }
-            }
-        }
+        view.icon.imageUri = value?.getString("uri")
     }
 
     override fun setSelectedImageIconResource(
         view: TabsScreen,
         value: ReadableMap?,
     ) {
-        val uri = value?.getString("uri")
-        if (uri != null) {
-            loadImage(view.context, uri) { drawable ->
-                if (drawable != null) {
-                    view.selectedIcon = drawable
-                }
-            }
-        }
+        view.selectedIcon.imageUri = value?.getString("uri")
     }
 
     override fun setStandardAppearance(
@@ -187,8 +191,11 @@ class TabsScreenViewManager :
             selected = if (appearance.hasKey("selected")) parseItemStateAppearance(context, appearance.getMap("selected")) else null,
             focused = if (appearance.hasKey("focused")) parseItemStateAppearance(context, appearance.getMap("focused")) else null,
             disabled = if (appearance.hasKey("disabled")) parseItemStateAppearance(context, appearance.getMap("disabled")) else null,
+            tabBarItemIconSize = appearance.readOptionalFloat("tabBarItemIconSize"),
             tabBarItemActiveIndicatorColor = appearance.readOptionalColor(context, "tabBarItemActiveIndicatorColor"),
             tabBarItemActiveIndicatorEnabled = appearance.readOptionalBoolean("tabBarItemActiveIndicatorEnabled"),
+            tabBarItemActiveIndicatorWidth = appearance.readOptionalFloat("tabBarItemActiveIndicatorWidth"),
+            tabBarItemActiveIndicatorHeight = appearance.readOptionalFloat("tabBarItemActiveIndicatorHeight"),
             tabBarItemTitleFontFamily = appearance.readOptionalString("tabBarItemTitleFontFamily"),
             tabBarItemTitleSmallLabelFontSize = appearance.readOptionalFloat("tabBarItemTitleSmallLabelFontSize"),
             tabBarItemTitleLargeLabelFontSize = appearance.readOptionalFloat("tabBarItemTitleLargeLabelFontSize"),

package/android/src/main/java/com/swmansion/rnscreens/utils/DimensionUtils.kt

@@ -1,13 +1,20 @@
 package com.swmansion.rnscreens.utils
 
 import android.content.Context
+import android.content.res.Resources
 import android.util.TypedValue
 import android.view.View
-import com.facebook.react.uimanager.PixelUtil
+
+/**
+ * Density of the device's main display - the value React Native's `PixelUtil` converts with
+ * (`DisplayMetricsHolder` screen metrics), read without depending on React Native.
+ */
+private val mainDisplayDensity: Float
+    get() = Resources.getSystem().displayMetrics.density
 
 /**
  * Converts a pixel value to dp using the given display [density] — not the process-global
- * density that [PixelUtil] reads from the device's main display. Fabric mounts views with
+ * density of the device's main display. Fabric mounts views with
  * the per-display density, so state pushed back to the Shadow Tree must be converted with
  * that same density; the global one mis-scales the frame on any display whose density
  * differs from the main one (Samsung DeX, freeform multi-window, external monitors). On
@@ -18,12 +25,12 @@ import com.facebook.react.uimanager.PixelUtil
  * [android.util.DisplayMetrics] that was never populated — which should not happen for a
  * live view. The `density > 0f` guard exists solely so a degenerate `0` cannot turn the
  * division into Infinity/NaN and corrupt the pushed state; in that case we fall back to the
- * global conversion, which is at least well-defined.
+ * main display's density ([mainDisplayDensity]), which is at least well-defined.
  */
 internal fun pxToDp(
     px: Float,
     density: Float,
-): Float = if (density > 0f) px / density else PixelUtil.toDIPFromPixel(px)
+): Float = if (density > 0f) px / density else px / mainDisplayDensity
 
 /**
  * Converts a pixel value to dp using the density of the display this [View] is attached to.
@@ -34,13 +41,13 @@ internal fun View.pxToDp(px: Float): Float = pxToDp(px, resources.displayMetrics
 
 /**
  * Converts a dp value to pixels using the given display [density] — not the process-global
- * density that [PixelUtil] reads from the device's main display.
+ * density of the device's main display.
  * See [pxToDp] for more context.
  */
 internal fun dpToPx(
     dp: Float,
     density: Float,
-): Float = if (density > 0f) dp * density else PixelUtil.toPixelFromDIP(dp)
+): Float = if (density > 0f) dp * density else dp * mainDisplayDensity
 
 /**
  * Converts a dp value to pixels using the density of the display this [View] is attached to.
@@ -52,7 +59,7 @@ internal fun View.dpToPx(dp: Float): Float = dpToPx(dp, resources.displayMetrics
 /**
  * Converts an SP value to pixels using the density of the display this [View] is
  * attached to (including the current font scale). Uses the view's own resources
- * rather than the process-global density read by [PixelUtil]. See [pxToDp].
+ * rather than the process-global density of the main display. See [pxToDp].
  */
 internal fun View.spToPx(sp: Float): Float = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, resources.displayMetrics)
 

package/android/src/main/java/com/swmansion/rnscreens/utils/RNSLog.kt

@@ -3,6 +3,10 @@ package com.swmansion.rnscreens.utils
 import android.util.Log
 import com.swmansion.rnscreens.BuildConfig
 
+/**
+ * `d`, `i` and `v` are emitted only when `RNS_DEBUG_LOGGING` is enabled;
+ * `w`, `e` and `wtf` are always emitted.
+ */
 object RNSLog {
     private inline fun logIfEnabled(
         tag: String,
@@ -39,13 +43,17 @@ object RNSLog {
     fun e(
         tag: String,
         msg: String,
-    ) = logIfEnabled(tag, msg, Log::e)
+    ) {
+        Log.e(tag, msg)
+    }
 
     fun e(
         tag: String,
         msg: String,
         tr: Throwable,
-    ) = logIfEnabled(tag, msg, tr, Log::e)
+    ) {
+        Log.e(tag, msg, tr)
+    }
 
     fun i(
         tag: String,
@@ -72,22 +80,30 @@ object RNSLog {
     fun w(
         tag: String,
         msg: String,
-    ) = logIfEnabled(tag, msg, Log::w)
+    ) {
+        Log.w(tag, msg)
+    }
 
     fun w(
         tag: String,
         msg: String,
         tr: Throwable,
-    ) = logIfEnabled(tag, msg, tr, Log::w)
+    ) {
+        Log.w(tag, msg, tr)
+    }
 
     fun wtf(
         tag: String,
         msg: String,
-    ) = logIfEnabled(tag, msg, Log::wtf)
+    ) {
+        Log.wtf(tag, msg)
+    }
 
     fun wtf(
         tag: String,
         msg: String,
         tr: Throwable,
-    ) = logIfEnabled(tag, msg, tr, Log::wtf)
+    ) {
+        Log.wtf(tag, msg, tr)
+    }
 }

package/ios/RNSEnums.h

@@ -51,11 +51,22 @@ typedef NS_ENUM(NSInteger, RNSBlurEffectStyle) {
 
 typedef NS_ENUM(NSInteger, RNSTabsIconType) {
   RNSTabsIconTypeImage,
-  RNSTabsIconTypeTemplate,
   RNSTabsIconTypeSfSymbol,
   RNSTabsIconTypeXcasset,
 };
 
+typedef NS_ENUM(NSInteger, RNSTabsIconImageRenderingMode) {
+  RNSTabsIconImageRenderingModeDefault,
+  RNSTabsIconImageRenderingModeTemplate,
+  RNSTabsIconImageRenderingModeOriginal,
+};
+
+typedef NS_ENUM(NSInteger, RNSTabsIconSymbolRenderingMode) {
+  RNSTabsIconSymbolRenderingModeDefault,
+  RNSTabsIconSymbolRenderingModeMonochrome,
+  RNSTabsIconSymbolRenderingModeOriginal,
+};
+
 typedef NS_ENUM(NSInteger, RNSOrientation) {
   RNSOrientationInherit,
   RNSOrientationAll,
@@ -84,6 +95,8 @@ typedef NS_ENUM(NSInteger, RNSTabsScreenSystemItem) {
   RNSTabsScreenSystemItemTopRated
 };
 
+typedef NS_ENUM(NSInteger, RNSTabsScreenTabRole) { RNSTabsScreenTabRoleNone, RNSTabsScreenTabRoleSearch };
+
 typedef NS_ENUM(NSInteger, RNSTabsBottomAccessoryEnvironment) {
   RNSTabsBottomAccessoryEnvironmentRegular,
   RNSTabsBottomAccessoryEnvironmentInline

package/ios/helpers/image/RNSImageLoadingHelper.h

@@ -27,6 +27,13 @@
                  asTemplate:(BOOL)isTemplate
             completionBlock:(void (^_Nonnull)(UIImage *_Nullable image))imageLoadingCompletionBlock;
 
+/**
+ * Loads a symbol image by name: a built-in SF Symbol if one matches, otherwise a custom
+ * symbol from the app's asset catalog (custom symbols are semantically SF Symbols, but
+ * UIKit only resolves them via `imageNamed:`).
+ */
++ (nullable UIImage *)symbolImageNamed:(nonnull NSString *)name;
+
 @end
 
 #endif // defined(__cplusplus)