@momo-kits/native-kits 0.300.3-debug → 0.300.4-debug

package/ios/Layout/ScreenLayout.swift

@@ -0,0 +1,415 @@
+//
+//  ScreenLayout.swift
+//  MoMoUIKits
+//
+//  Port of momo-kits RN `useScreenLayout` (Layout/utils.ts) and `Application/device.ts`:
+//  window size, safe-area insets, content width, header geometry and the iPhone Duo side bar.
+//
+
+import SwiftUI
+import UIKit
+
+public enum SideBarEdge: Equatable {
+    case left, right
+}
+
+public struct SideBarLayout: Equatable {
+    public let edge: SideBarEdge
+    public let width: CGFloat
+    /// Preferred window y of the first control; StackScreen still keeps the column above the bottom bars.
+    public let top: CGFloat
+    /// Room kept free above the window bottom, clear of a camera at the bottom end of the strip.
+    public let bottom: CGFloat
+}
+
+/// Room the header row keeps from each side for the status bar clock and battery clusters.
+public struct StatusBarClearance: Equatable {
+    public let left: CGFloat
+    public let right: CGFloat
+}
+
+public struct ScreenLayout: Equatable {
+    public let width: CGFloat
+    public let height: CGFloat
+    public let isIPhoneDuo: Bool
+    /// The device has a hinge, folded or not, whatever the window size; drives popups, modal and bottom sheet.
+    public let isDuoDevice: Bool
+    public let insets: EdgeInsets
+    public let insetLeft: CGFloat
+    public let insetRight: CGFloat
+    public let contentWidth: CGFloat
+    public let headerHeight: CGFloat
+    /// 0 when the status bar is off the top edge, so the bar row fills the header and keeps the title centered.
+    public let headerStatusBarHeight: CGFloat
+    /// iPhone Duo moves back and toolkit into a column in the side safe area; nil while they stay in the bar.
+    public let sideBar: SideBarLayout?
+    /// iPhone Duo inner display in portrait: the header row shares the status bar band, between its clusters.
+    public let statusBarClearance: StatusBarClearance?
+
+    public var headerBarHeight: CGFloat { headerHeight - headerStatusBarHeight }
+}
+
+// Measured by momo-kits RN (Layout/utils.ts) on the iOS 27.1 iPhone Duo simulator; keep both in sync.
+enum DuoMetrics {
+    // Inner display is ~1.42, outer ~1.45; every slab iPhone is 1.77 or taller.
+    static let maxAspectRatio: CGFloat = 1.6
+    // Outer display is 466pt tall in landscape, inner 669pt.
+    static let innerMinHeight: CGFloat = 600
+    static let controlSize: CGFloat = 48
+    static let itemPitch: CGFloat = 50
+    static let firstItemTop: CGFloat = 170
+    static let firstItemTopLandscape: CGFloat = 120
+    // Outer display in portrait: the header is 4pt taller than the iPhone floor and its title
+    // lines up with the camera punchout (y 24–66 at the top of the strip).
+    static let outerHeaderHeight: CGFloat = 76
+    static let outerCameraCenterY: CGFloat = 45
+    // Outer display in landscape has no status bar in the strip: controls keep this far from
+    // both ends unless a reserved region (the camera at either end) asks for more.
+    static let edgeInset: CGFloat = 24
+    // Inner display in portrait: the clock and connectivity cluster sits at the top right corner
+    // (x 550–643 of 669, clock digits centered on y 47); its reserved region is taller than the glyphs.
+    static let innerStatusBarCenterY: CGFloat = 47
+    static let innerStatusBarWidth: CGFloat = 120
+    // Host app's iOS 26 tab bar on the inner display in portrait: a 62pt glass pill sized to its tabs,
+    // QR as a 62pt platter beside it, ≥ 20pt from the sides, 13pt into the home indicator inset.
+    static let floatingTabBarHeight: CGFloat = 62
+    static let floatingTabBarMargin: CGFloat = 20
+    static let floatingTabBarInsetOverlap: CGFloat = 13
+}
+
+enum HeaderMetrics {
+    static let barHeight: CGFloat = HEADER_HEIGHT
+    static let iPhoneMinHeight: CGFloat = 72
+    // A smaller top inset means the status bar is not on the top edge.
+    static let statusBarMinInset: CGFloat = 20
+}
+
+private var isPhoneIdiom: Bool { UIDevice.current.userInterfaceIdiom == .phone }
+
+private var keyWindow: UIWindow? {
+    UIApplication.shared.connectedScenes
+        .compactMap { ($0 as? UIWindowScene)?.keyWindow }
+        .first
+}
+
+extension ScreenLayout {
+    /// Snapshot of the key window; not reactive, so views read `\.screenLayout` instead.
+    public static var current: ScreenLayout {
+        guard let window = keyWindow else {
+            return make(size: UIScreen.main.bounds.size, insets: EdgeInsets())
+        }
+        let inset = window.safeAreaInsets
+        return make(
+            size: window.bounds.size,
+            insets: EdgeInsets(top: inset.top, leading: inset.left, bottom: inset.bottom, trailing: inset.right)
+        )
+    }
+
+    static func make(
+        size: CGSize,
+        insets: EdgeInsets,
+        reservedRegions: [CGRect] = ReservedRegions.current,
+        isPhone: Bool = isPhoneIdiom,
+        isFoldable: Bool = FoldableDevice.isFoldable(measuredIn: keyWindow)
+    ) -> ScreenLayout {
+        let width = size.width
+        let height = size.height
+        let isDuoDevice = isPhone && isFoldable
+        var (headerHeight, headerStatusBarHeight) = headerGeometry(topInset: insets.top, isPhone: isPhone)
+        let isDuo = isPhone && isIPhoneDuoWindow(width: width, height: height, insets: insets)
+        guard isDuo else {
+            return ScreenLayout(
+                width: width, height: height, isIPhoneDuo: false, isDuoDevice: isDuoDevice, insets: insets,
+                insetLeft: 0, insetRight: 0, contentWidth: width,
+                headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: nil,
+                statusBarClearance: nil
+            )
+        }
+
+        var statusBarClearance: StatusBarClearance?
+        let isInnerPortrait = height > width && width >= DuoMetrics.innerMinHeight
+        if isInnerPortrait && insets.top >= HeaderMetrics.statusBarMinInset {
+            statusBarClearance = statusBarClusters(reservedRegions, windowWidth: width, topInset: insets.top)
+                ?? StatusBarClearance(left: 0, right: DuoMetrics.innerStatusBarWidth + Spacing.S)
+            // centered on the clock digits; the cluster's region center sits above them
+            headerHeight = DuoMetrics.innerStatusBarCenterY * 2
+            headerStatusBarHeight = 0
+        }
+
+        var sideBar: SideBarLayout?
+        let sideInset = max(insets.leading, insets.trailing)
+        // narrower strips cannot host a control 12pt from the inner edge
+        if sideInset >= DuoMetrics.controlSize + Spacing.M {
+            let edge: SideBarEdge = insets.trailing >= insets.leading ? .right : .left
+            let stripLeft = edge == .right ? width - sideInset : 0
+            // clear of the camera and of the status bar cluster, which grows for calls and Live
+            // Activities; region frames already include the system's margin
+            let occlusion = stripOcclusion(reservedRegions, stripLeft: stripLeft, stripRight: stripLeft + sideInset, windowHeight: height)
+
+            var top = statusBarClearance != nil
+                ? headerHeight + Spacing.M
+                : insets.top + HeaderMetrics.barHeight + Spacing.M
+            if insets.top < HeaderMetrics.statusBarMinInset {
+                // status bar lives in the strip: start under its cluster, as the native bar does
+                if width <= height {
+                    top = DuoMetrics.firstItemTop
+                } else if height >= DuoMetrics.innerMinHeight {
+                    top = DuoMetrics.firstItemTopLandscape
+                } else {
+                    // outer display in landscape: no status bar in the strip, the title row centers
+                    // on the camera when it sits at the top end, otherwise on the back button
+                    top = DuoMetrics.edgeInset
+                    let titleCenterY = occlusion.top > top ? occlusion.topCenter : top + DuoMetrics.controlSize / 2
+                    (headerHeight, headerStatusBarHeight) = centeredHeaderGeometry(centerY: titleCenterY)
+                }
+
+                if height > width && width < DuoMetrics.innerMinHeight {
+                    // outer display: the row starts below the top so the title centers on the camera
+                    headerHeight = DuoMetrics.outerHeaderHeight
+                    headerStatusBarHeight = DuoMetrics.outerCameraCenterY * 2 - DuoMetrics.outerHeaderHeight
+                }
+            }
+
+            sideBar = SideBarLayout(
+                edge: edge,
+                width: sideInset,
+                top: max(top, occlusion.top),
+                bottom: max(DuoMetrics.edgeInset, occlusion.bottom)
+            )
+        }
+
+        return ScreenLayout(
+            width: width, height: height, isIPhoneDuo: true, isDuoDevice: isDuoDevice, insets: insets,
+            insetLeft: insets.leading, insetRight: insets.trailing,
+            contentWidth: width - insets.leading - insets.trailing,
+            headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: sideBar,
+            statusBarClearance: statusBarClearance
+        )
+    }
+
+    private static func headerGeometry(topInset: CGFloat, isPhone: Bool) -> (CGFloat, CGFloat) {
+        let height = topInset + HeaderMetrics.barHeight
+        guard isPhone else { return (height, topInset) }
+        return (
+            max(height, HeaderMetrics.iPhoneMinHeight),
+            topInset < HeaderMetrics.statusBarMinInset ? 0 : topInset
+        )
+    }
+
+    /// Bar row centered on a window y, at least iPhoneMinHeight tall and reaching 8pt below
+    /// a side bar control centered there.
+    private static func centeredHeaderGeometry(centerY: CGFloat) -> (CGFloat, CGFloat) {
+        let height = max(HeaderMetrics.iPhoneMinHeight, centerY + DuoMetrics.controlSize / 2 + Spacing.S)
+        return (height, max(0, centerY * 2 - height))
+    }
+
+    /// How far system regions reach into a side strip from its top and from its bottom end
+    /// (e.g. the camera, which sits at either end depending on the rotation), and the center y
+    /// of the region reaching furthest from the top.
+    private static func stripOcclusion(
+        _ regions: [CGRect],
+        stripLeft: CGFloat,
+        stripRight: CGFloat,
+        windowHeight: CGFloat
+    ) -> (top: CGFloat, topCenter: CGFloat, bottom: CGFloat) {
+        regions.reduce(into: (top: CGFloat(0), topCenter: CGFloat(0), bottom: CGFloat(0))) { occlusion, region in
+            guard region.minX < stripRight && region.maxX > stripLeft else { return }
+            if region.midY < windowHeight / 2 {
+                if region.maxY > occlusion.top {
+                    occlusion.top = region.maxY
+                    occlusion.topCenter = region.midY
+                }
+            } else {
+                occlusion.bottom = max(occlusion.bottom, windowHeight - region.minY)
+            }
+        }
+    }
+
+    /// How far the clock and battery clusters of a status bar on the top edge reach in from each
+    /// side; nil without reserved regions there.
+    private static func statusBarClusters(_ regions: [CGRect], windowWidth: CGFloat, topInset: CGFloat) -> StatusBarClearance? {
+        let midX = windowWidth / 2
+        let clusters = regions.filter {
+            $0.minY < topInset && $0.maxY <= topInset && ($0.maxX <= midX || $0.minX >= midX)
+        }
+        guard !clusters.isEmpty else { return nil }
+        var left: CGFloat = 0
+        var right: CGFloat = 0
+        for region in clusters {
+            if region.minX < midX {
+                left = max(left, region.maxX)
+            } else {
+                right = max(right, windowWidth - region.minX)
+            }
+        }
+        return StatusBarClearance(left: left, right: right)
+    }
+
+    // Slab iPhones report equal side insets in landscape; iPhone Duo moves the status bar to one side.
+    private static func isIPhoneDuoWindow(width: CGFloat, height: CGFloat, insets: EdgeInsets) -> Bool {
+        let shortSide = min(width, height)
+        let isSquare = shortSide > 0 && max(width, height) / shortSide < DuoMetrics.maxAspectRatio
+        return isSquare || insets.leading != insets.trailing
+    }
+
+    /// Below the side status bar: in portrait it is about twice as tall as its inset is wide.
+    public var duoTopInset: CGFloat {
+        max(insets.top, height > width ? max(insets.leading, insets.trailing) * 2 : 0)
+    }
+}
+
+/// Snapshot for call sites without `\.screenLayout`; not reactive. `windowSize` is ignored,
+/// kept for host call sites.
+public func isIPhoneDuoDevice(windowSize: CGSize? = nil) -> Bool {
+    isPhoneIdiom && FoldableDevice.isFoldable(measuredIn: keyWindow)
+}
+
+/// Apple's foldable check (as the host's `SideTabRailView.isFoldableDevice`): only a device with a
+/// hinge reports a `.division` region, inactive while flat but still there. Screen size cannot tell
+/// it apart from a large iPhone in landscape or a narrowed window.
+enum FoldableDevice {
+    // a hinge never goes away, so a positive answer is kept
+    private static var isKnownFoldable = false
+
+    static func isFoldable(measuredIn view: UIView?) -> Bool {
+        if isKnownFoldable { return true }
+        // compiled out on SDKs older than iOS 27.1 (UIKit 9127.0.85.28)
+        #if canImport(UIKit, _version: 9127.0.85.28)
+        guard #available(iOS 27.1, *), let view, view.window != nil || view is UIWindow else { return false }
+        isKnownFoldable = !view.reservedRegions(kind: .division, options: .includeInactive).isEmpty
+        #endif
+        return isKnownFoldable
+    }
+
+    /// Catches the hinge when the regions were read too early (before the window had them).
+    static func observe(in view: UIView) {
+        #if canImport(UIKit, _version: 9127.0.85.28)
+        guard #available(iOS 27.1, *) else { return }
+        view.addInteraction(UIHingeInteraction { _, update in
+            guard update.hinge != nil, !isKnownFoldable else { return }
+            isKnownFoldable = true
+            NotificationCenter.default.post(name: ReservedRegions.didChange, object: nil)
+        })
+        #endif
+    }
+}
+
+// MARK: - Reserved regions
+
+/// System occlusion regions (iOS 27.1+) in window coordinates: the iPhone Duo camera, and the
+/// status bar cluster as it grows for a call or a Live Activity. Empty before iOS 27.1.
+enum ReservedRegions {
+    // last report of a probe, so `ScreenLayout.current` includes it
+    private(set) static var current: [CGRect] = []
+    static let didChange = Notification.Name("MoMoUIKitsReservedRegionsDidChange")
+
+    fileprivate static func publish(_ regions: [CGRect]) {
+        guard regions != current else { return }
+        current = regions
+        NotificationCenter.default.post(name: didChange, object: nil)
+    }
+}
+
+/// Invisible probe: reading the regions in layoutSubviews makes UIKit run it again when they
+/// change, so nothing polls. Port of RN `@momo-kits/reserved-regions`.
+private final class ReservedRegionsProbe: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        isUserInteractionEnabled = false
+        FoldableDevice.observe(in: self)
+    }
+
+    required init?(coder: NSCoder) { nil }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        // read even when not publishing, so UIKit keeps re-running this when they change
+        let regions = occlusionRegions()
+        // every screen has a probe but the regions are window-wide: one sliding in on a push or
+        // a present, or off the window, would overwrite them with a partial read
+        guard spansWindow else { return }
+        // layout pass: publish on the next turn instead of mutating SwiftUI state mid-update
+        DispatchQueue.main.async { ReservedRegions.publish(regions) }
+    }
+
+    private var spansWindow: Bool {
+        guard let window else { return false }
+        let frame = convert(bounds, to: nil)
+        return abs(frame.minX) < 1 && abs(frame.maxX - window.bounds.width) < 1 && abs(frame.minY) < 1
+    }
+
+    override func didMoveToWindow() {
+        super.didMoveToWindow()
+        setNeedsLayout()
+    }
+
+    // The API is newer than the SDKs hosts may build with, so it is reached through the runtime.
+    private func occlusionRegions() -> [CGRect] {
+        let regionsOfKind = NSSelectorFromString("reservedRegionsOfKind:")
+        guard window != nil, responds(to: regionsOfKind),
+              let kindType = NSClassFromString("UIViewReservedRegionKind") as? NSObject.Type,
+              let kind = (kindType as AnyObject).perform(NSSelectorFromString("occlusionRegionKind"))?.takeUnretainedValue(),
+              let regions = perform(regionsOfKind, with: kind)?.takeUnretainedValue() as? [NSObject]
+        else { return [] }
+        return regions.compactMap { ($0.value(forKey: "frame") as? NSValue)?.cgRectValue }
+            .map { convert($0, to: nil) }
+    }
+}
+
+private struct ReservedRegionsProbeView: UIViewRepresentable {
+    func makeUIView(context: Context) -> ReservedRegionsProbe { ReservedRegionsProbe() }
+
+    func updateUIView(_ probe: ReservedRegionsProbe, context: Context) {}
+}
+
+// MARK: - Environment
+
+private struct ScreenLayoutKey: EnvironmentKey {
+    // Computed so an un-injected subtree (bare UIHostingController) still reads the live window.
+    static var defaultValue: ScreenLayout { .current }
+}
+
+public extension EnvironmentValues {
+    var screenLayout: ScreenLayout {
+        get { self[ScreenLayoutKey.self] }
+        set { self[ScreenLayoutKey.self] = newValue }
+    }
+}
+
+/// Re-reads the window whenever this view's size changes (rotation, fold/unfold, Split View).
+private struct ScreenLayoutReader: ViewModifier {
+    @State private var layout: ScreenLayout = .current
+
+    func body(content: Content) -> some View {
+        content
+            .environment(\.screenLayout, layout)
+            .background(
+                GeometryReader { proxy in
+                    Color.clear
+                        .onAppear { refresh() }
+                        .onChange(of: proxy.size) { _ in refresh() }
+                        .onChange(of: proxy.safeAreaInsets) { _ in refresh() }
+                }
+            )
+            .background(ReservedRegionsProbeView().ignoresSafeArea())
+            // any screen's probe may report, so every reader follows the shared value
+            .onReceive(NotificationCenter.default.publisher(for: ReservedRegions.didChange)) { _ in
+                refresh()
+            }
+            .onReceive(NotificationCenter.default.publisher(for: UIDevice.orientationDidChangeNotification)) { _ in
+                refresh()
+            }
+    }
+
+    private func refresh() {
+        let next = ScreenLayout.current
+        if next != layout { layout = next }
+    }
+}
+
+public extension View {
+    /// Provides `\.screenLayout`; NavigationContainer applies it, a bare UIHostingController root should too.
+    func momoScreenLayout() -> some View {
+        modifier(ScreenLayoutReader())
+    }
+}

package/ios/Layout/Section.swift

@@ -1,8 +1,8 @@
 import SwiftUI
 
-/// 12-column section container: horizontal margin, optional background image, and a
-/// wrapping row of children that read their span size from `\.gridContext`.
-/// Mirrors `vn.momo.kits.layout.Section`.
+/// Grid section container (12 columns, 24 when the content is wider than 600pt): horizontal
+/// margin, optional background image, and a wrapping row of children that read their span
+/// size from `\.gridContext`. Mirrors `vn.momo.kits.layout.Section`.
 public struct SectionView<Content: View>: View {
     // MARK: Lifecycle
 
@@ -19,116 +19,20 @@ public struct SectionView<Content: View>: View {
     // MARK: Public
 
     public var body: some View {
-        flow
-            .environment(\.gridContext, grid)
-            .frame(maxWidth: .infinity, alignment: .topLeading)
-            .background(widthReader)
+        GridFlow(gutter: Spacing.M, content: content)
             .background(background)
             .padding(.horizontal, useMargin ? Spacing.M : 0)
     }
 
     // MARK: Private
 
-    private static var columns: Int { 12 }
-    private static var gutter: CGFloat { Spacing.M }
-
     private let useMargin: Bool
     private let backgroundImage: String?
     private let content: () -> Content
 
-    /// Width available *inside* the horizontal margin — the Compose `BoxWithConstraints` equivalent.
-    @State private var availableWidth: CGFloat = 0
-
-    private var grid: GridContext {
-        let columns = CGFloat(Self.columns)
-        // The trailing `- 1 / columns` mirrors Compose: it absorbs rounding so 12 spans
-        // plus their gutters never overflow the row by a sub-point.
-        let sizePerSpan = (availableWidth - Self.gutter * (columns - 1)) / columns - 1 / columns
-        return GridContext(numberOfColumns: Self.columns, gutter: Self.gutter, sizePerSpan: max(0, sizePerSpan))
-    }
-
-    @ViewBuilder private var flow: some View {
-        if #available(iOS 16.0, *) {
-            FlowRowLayout(gutter: Self.gutter) { content() }
-        } else {
-            // No `Layout` protocol before iOS 16: children stack instead of wrapping.
-            // Full-width (span 12) items — the common case — look identical.
-            VStack(alignment: .leading, spacing: Self.gutter) { content() }
-        }
-    }
-
     @ViewBuilder private var background: some View {
         if let backgroundImage {
             ImageView(backgroundImage, contentMode: .fill).clipped()
         }
     }
-
-    private var widthReader: some View {
-        GeometryReader { proxy in
-            Color.clear.preference(key: SectionWidthKey.self, value: proxy.size.width)
-        }
-        .onPreferenceChange(SectionWidthKey.self) { availableWidth = $0 }
-    }
-}
-
-private struct SectionWidthKey: PreferenceKey {
-    static var defaultValue: CGFloat = 0
-
-    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
-    }
-}
-
-/// Wrapping row with equal horizontal/vertical spacing — the Compose `FlowRow` equivalent.
-@available(iOS 16.0, *)
-private struct FlowRowLayout: Layout {
-    struct Row {
-        var items: [(index: Int, size: CGSize)] = []
-        var width: CGFloat = 0
-        var height: CGFloat = 0
-    }
-
-    let gutter: CGFloat
-
-    func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) -> CGSize {
-        let maxWidth = proposal.width ?? .infinity
-        let rows = rows(for: subviews, maxWidth: maxWidth)
-        let height = rows.reduce(0) { $0 + $1.height } + gutter * CGFloat(max(0, rows.count - 1))
-        return CGSize(width: proposal.width ?? rows.map(\.width).max() ?? 0, height: height)
-    }
-
-    func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) {
-        var y = bounds.minY
-        for row in rows(for: subviews, maxWidth: bounds.width) {
-            var x = bounds.minX
-            for item in row.items {
-                subviews[item.index].place(
-                    at: CGPoint(x: x, y: y),
-                    anchor: .topLeading,
-                    proposal: ProposedViewSize(item.size)
-                )
-                x += item.size.width + gutter
-            }
-            y += row.height + gutter
-        }
-    }
-
-    private func rows(for subviews: Subviews, maxWidth: CGFloat) -> [Row] {
-        var rows: [Row] = []
-        var current = Row()
-        for index in subviews.indices {
-            let size = subviews[index].sizeThatFits(ProposedViewSize(width: maxWidth, height: nil))
-            let widthIfAppended = current.items.isEmpty ? size.width : current.width + gutter + size.width
-            // Sub-point tolerance: spans are computed to land exactly on `maxWidth`.
-            if !current.items.isEmpty, widthIfAppended > maxWidth + 0.5 {
-                rows.append(current)
-                current = Row()
-            }
-            current.width = current.items.isEmpty ? size.width : current.width + gutter + size.width
-            current.height = max(current.height, size.height)
-            current.items.append((index, size))
-        }
-        if !current.items.isEmpty { rows.append(current) }
-        return rows
-    }
 }

package/ios/Loader/Loader.swift

@@ -12,8 +12,7 @@ public enum LoaderType {
 /// Mirrors Compose `Loader(type:, tintColor:, modifier:)` which delegates to
 /// `DotLoader` / `SpinnerLoader`. Both variants render Lottie animations
 /// (`files/dot_loading` and `files/lottie_circle_loader`) and optionally tint
-/// the fill/stroke. The tint is reproduced here by masking a solid color rect
-/// with the (monochrome) Lottie animation.
+/// the fill/stroke through a Lottie color value provider.
 public struct Loader: View {
     private let type: LoaderType
     private let tintColor: Color?
@@ -97,17 +96,14 @@ public struct ProgressBar: View {
     }
 }
 
-/// Renders a looping Lottie animation, optionally recolored via a mask.
+// Tinted inside Lottie, as Compose does: SwiftUI masks/color effects over a UIKit-backed view aren't reliable.
 private struct TintedLottie: View {
     let name: String
     let tintColor: Color?
 
     var body: some View {
-        if let tintColor = tintColor {
-            tintColor
-                .mask(LottieView(name: name, loopMode: .loop))
-        } else {
-            LottieView(name: name, loopMode: .loop)
-        }
+        LottieView(name: name, loopMode: .loop, tintColor: tintColor.map { UIColor($0) })
+            // The tint is applied once in makeUIView; a new tint needs a new view.
+            .id(tintColor)
     }
 }

package/ios/Lottie/LottieView.swift

@@ -15,6 +15,8 @@ struct LottieView: UIViewRepresentable {
   var loopMode: LottieLoopMode = .playOnce
   var contentMode : UIView.ContentMode  = .scaleAspectFit
   var onDone: (() -> Void)?
+  // Recolors every fill and stroke, as Compose's iOS LottieAnimation does; nil keeps the file's colors.
+  var tintColor: UIColor?
 
   // Add static cache for animations
   private static var animationCache = NSCache<NSString, LottieAnimation>()
@@ -36,7 +38,8 @@ struct LottieView: UIViewRepresentable {
         animationView.animation = cachedAnimation
         setupAnimationView(animationView, view)
       } else {
-        LottieAnimation.loadedFrom(url: URL(string: url)!, closure: { animation in
+        guard let animationURL = URL(string: url) else { return view }
+        LottieAnimation.loadedFrom(url: animationURL, closure: { animation in
           if let animation = animation {
             Self.animationCache.setObject(animation, forKey: url as NSString)
             animationView.animation = animation
@@ -49,7 +52,8 @@ struct LottieView: UIViewRepresentable {
       if let cachedAnimation = Self.animationCache.object(forKey: name as NSString) {
         animationView.animation = cachedAnimation
         setupAnimationView(animationView, view)
-      } else if let animation = LottieAnimation.named(name) {
+      } else if let animation = LottieAnimation.named(name, bundle: MoMoUIKitsResources.bundle)
+                  ?? LottieAnimation.named(name) {
         Self.animationCache.setObject(animation, forKey: name as NSString)
         animationView.animation = animation
         setupAnimationView(animationView, view)
@@ -62,6 +66,12 @@ struct LottieView: UIViewRepresentable {
   private func setupAnimationView(_ animationView: LottieAnimationView, _ containerView: UIView) {
     animationView.contentMode = contentMode
     animationView.loopMode = loopMode
+    if let tintColor {
+      animationView.setValueProvider(
+        ColorValueProvider(tintColor.lottieColorValue),
+        keypath: AnimationKeypath(keypath: "**.Color")
+      )
+    }
     animationView.backgroundBehavior = loopMode == .loop ? .pauseAndRestore : .pause
 
     // Optimize rendering
@@ -71,6 +81,8 @@ struct LottieView: UIViewRepresentable {
     containerView.addSubview(animationView)
 
     NSLayoutConstraint.activate([
+      animationView.centerXAnchor.constraint(equalTo: containerView.centerXAnchor),
+      animationView.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
       animationView.widthAnchor.constraint(equalTo: containerView.widthAnchor),
       animationView.heightAnchor.constraint(equalTo: containerView.heightAnchor)
     ])