@momo-kits/native-kits 0.163.1-sp.8-debug → 0.163.2-beta.1-debug

package/ios/Application/Localize.swift

@@ -28,69 +28,16 @@ public final class Localize: ObservableObject {
     public static let VI = "vi"
     public static let EN = "en"
 
-    // AI-GENERATED START: follow the host app language and publish dictionary changes
-    /// App-wide instance bound to the host language; the environment default uses it too,
-    /// so every screen agrees on one language.
-    public static let shared = Localize()
-    // AI-GENERATED END: follow the host app language and publish dictionary changes
-
     private var assets: LocalizationObject
     @Published public private(set) var currentLanguage: String = Localize.VI
 
-    // AI-GENERATED START: follow the host app language and publish dictionary changes
-    /// Bumped by `addTranslations` — `assets` is not published, so without this the dictionary
-    /// can change without any consumer re-rendering.
-    @Published public private(set) var revision: Int = 0
-
-    private let languageSource: LanguageSource?
-
-    /// `NavigationContainer` uses this to skip its legacy one-shot `MaxApi` pull.
-    var observesAppLanguage: Bool { languageSource != nil }
-
-    /// Pass `languageSource: nil` to opt out and keep the old "starts at vi" behavior.
-    public init(
-        _ translations: LocalizationObject = LocalizationObject(),
-        languageSource: LanguageSource? = UserDefaultsLanguageSource()
-    ) {
+    public init(_ translations: LocalizationObject = LocalizationObject()) {
         self.assets = Localize.merge(base: Localize.defaultLanguage, override: translations)
-        self.languageSource = languageSource
-        guard let languageSource else { return }
-        // Seed synchronously so the first frame is already correct (no vi -> en flash).
-        currentLanguage = languageSource.currentLanguage
-        languageSource.startObserving { [weak self] language in self?.apply(language) }
-    }
-
-    deinit {
-        languageSource?.stopObserving()
-    }
-
-    /// Host values are sometimes legacy JSON-quoted (`"\"vi\""`); anything that is not `en` is `vi`.
-    public static func normalize(_ raw: String?) -> String {
-        let cleaned = (raw ?? "")
-            .replacingOccurrences(of: "\"", with: "")
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .lowercased()
-        return cleaned == Localize.EN ? Localize.EN : Localize.VI
-    }
-
-    private func apply(_ language: String) {
-        // KVO and didChangeNotification both fire for one write; publish once, on main.
-        onMain {
-            guard self.currentLanguage != language else { return }
-            self.currentLanguage = language
-        }
-    }
-
-    /// Synchronous when already on main — an async hop would defer the switch by a frame.
-    private func onMain(_ work: @escaping () -> Void) {
-        if Thread.isMainThread { work() } else { DispatchQueue.main.async(execute: work) }
     }
 
-    /// A local override: the next host language change supersedes it.
     public func changeLanguage(_ language: String?) {
-        apply(Localize.normalize(language))
+        currentLanguage = (language == Localize.EN) ? Localize.EN : Localize.VI
     }
-    // AI-GENERATED END: follow the host app language and publish dictionary changes
 
     public func translate(_ key: String) -> String {
         let dictionary = currentLanguage == Localize.EN ? assets.en : assets.vi
@@ -111,9 +58,6 @@ public final class Localize: ObservableObject {
     /// Existing keys win (mirrors Compose: `merge(translations, assets)`).
     public func addTranslations(_ translations: LocalizationObject) {
         assets = Localize.merge(base: translations, override: assets)
-        // AI-GENERATED START: publish dictionary changes so consumers re-render
-        onMain { self.revision &+= 1 }
-        // AI-GENERATED END: publish dictionary changes so consumers re-render
     }
 
     private static func merge(base: LocalizationObject, override: LocalizationObject) -> LocalizationObject {
@@ -339,22 +283,14 @@ public final class Localize: ObservableObject {
 private struct LocalizeBox: Equatable {
     let localize: Localize
     let language: String
-    // AI-GENERATED START: invalidate consumers when the dictionary changes, not just the language
-    let revision: Int
-    // AI-GENERATED END: invalidate consumers when the dictionary changes, not just the language
 
     init(_ localize: Localize) {
         self.localize = localize
         self.language = localize.currentLanguage
-        // AI-GENERATED START: invalidate consumers when the dictionary changes, not just the language
-        self.revision = localize.revision
-        // AI-GENERATED END: invalidate consumers when the dictionary changes, not just the language
     }
 
     static func == (lhs: LocalizeBox, rhs: LocalizeBox) -> Bool {
-        // AI-GENERATED START: invalidate consumers when the dictionary changes, not just the language
-        lhs.localize === rhs.localize && lhs.language == rhs.language && lhs.revision == rhs.revision
-        // AI-GENERATED END: invalidate consumers when the dictionary changes, not just the language
+        lhs.localize === rhs.localize && lhs.language == rhs.language
     }
 }
 
@@ -362,12 +298,7 @@ private struct LocalizeKey: EnvironmentKey {
     /// A default-constructed `Localize` already carries the full kit dictionary, so a
     /// consumer that never injects one renders untranslated-but-correct text instead of
     /// trapping the way `@EnvironmentObject` does.
-    // AI-GENERATED START: default to the app-language-observing shared instance
-    /// `defaultValue` is a `static let`, so this box is never rebuilt: without a provider the
-    /// language is right on first render but does not live-update. Wrap the root in
-    /// `.momoLocalize()` (or use `NavigationContainer`) to get updates.
-    static let defaultValue = LocalizeBox(Localize.shared)
-    // AI-GENERATED END: default to the app-language-observing shared instance
+    static let defaultValue = LocalizeBox(Localize())
 }
 
 public extension EnvironmentValues {

package/ios/Application/Navigation/NavigationContainer.swift

@@ -46,9 +46,7 @@ public struct NavigationContainer<Initial: View>: View {
                 maxApi: maxApi
             )
         )
-        // AI-GENERATED START: default to the app-language-observing shared Localize
-        _localize = StateObject(wrappedValue: localize ?? Localize.shared)
-        // AI-GENERATED END: default to the app-language-observing shared Localize
+        _localize = StateObject(wrappedValue: localize ?? Localize())
         self.composeApi = composeApi
         self.maxApi = maxApi
         self.setNavigator = setNavigator
@@ -64,17 +62,15 @@ public struct NavigationContainer<Initial: View>: View {
         .environmentObject(navigator)
         .environmentObject(applicationEnvironment)
         .environment(\.applicationEnvironment, applicationEnvironment)
-        // AI-GENERATED START: route Localize injection through the observing modifier
-        .momoLocalize(localize)
-        // AI-GENERATED END: route Localize injection through the observing modifier
+        .environmentObject(localize)
+        .environment(\.localize, localize)
         .fullScreenCover(item: $navigator.presented) { route in
             screenView(forDialog: route)
                 .environmentObject(navigator)
                 .environmentObject(applicationEnvironment)
                 .environment(\.applicationEnvironment, applicationEnvironment)
-                // AI-GENERATED START: route Localize injection through the observing modifier
-                .momoLocalize(localize)
-                // AI-GENERATED END: route Localize injection through the observing modifier
+                .environmentObject(localize)
+                .environment(\.localize, localize)
         }
         .overlay {
             if let item = navigator.overplay {
@@ -82,9 +78,8 @@ public struct NavigationContainer<Initial: View>: View {
                     .environmentObject(navigator)
                     .environmentObject(applicationEnvironment)
                     .environment(\.applicationEnvironment, applicationEnvironment)
-                    // AI-GENERATED START: route Localize injection through the observing modifier
-                    .momoLocalize(localize)
-                    // AI-GENERATED END: route Localize injection through the observing modifier
+                    .environmentObject(localize)
+                    .environment(\.localize, localize)
             }
         }
         .onAppear {
@@ -92,21 +87,13 @@ public struct NavigationContainer<Initial: View>: View {
                 navigator.composeApi = composeApi
             }
             setNavigator?(navigator)
-            // Register with the host swipe-back bridge (mirrors ComposeAppContainer's
-            // ComposeNavigatorManager.push). Idempotent, so a re-appear won't double-count.
-            NavigatorManager.shared.push(navigator)
-            // AI-GENERATED START: demote the MaxApi language pull to a seed of last resort
-            // Only a seed: a Localize with a language source already tracks the host in both
-            // directions, so asking maxApi would just race it. `changeLanguage` normalizes the
-            // raw response and hops to main itself.
-            guard !localize.observesAppLanguage else { return }
+            // Mirrors Compose's LaunchedEffect(maxApi, resolvedLocalize): host-reported
+            // language wins over the default "vi" only when it resolves to English.
             maxApi?.getLanguage { data in
-                localize.changeLanguage(data?["response"] as? String)
+                if parseLanguage(data) == Localize.EN {
+                    localize.changeLanguage(Localize.EN)
+                }
             }
-            // AI-GENERATED END: demote the MaxApi language pull to a seed of last resort
-        }
-        .onDisappear {
-            NavigatorManager.shared.remove(navigator)
         }
     }
 
@@ -208,3 +195,9 @@ private func safeAreaBottomInset() -> CGFloat {
         .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
         .first ?? 0
 }
+
+private func parseLanguage(_ raw: [String: Any?]?) -> String? {
+    guard let response = (raw?["response"] as? String)?.trimmingCharacters(in: .whitespaces).lowercased(),
+          !response.isEmpty else { return nil }
+    return response.hasPrefix(Localize.EN) ? Localize.EN : Localize.VI
+}

package/ios/Application/Navigation/Navigator.swift

@@ -89,11 +89,7 @@ public struct OverplayItem: Identifiable {
 
 @available(iOS 16.0, *)
 public final class Navigator: ObservableObject {
-    @Published public var path: [DynamicScreenRoute] = [] {
-        // Disposal hangs off the path so every route that leaves the stack — pop,
-        // replace, reset — is released the same way, after its exit transition.
-        didSet { disposeScreens(droppedFrom: oldValue) }
-    }
+    @Published public var path: [DynamicScreenRoute] = []
     @Published public var presented: DynamicDialogRoute?
     @Published public var overplay: OverplayItem?
 
@@ -151,7 +147,8 @@ public final class Navigator: ObservableObject {
 
     public func replace<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
         guard !path.isEmpty else { return }
-        path.removeLast()
+        let removed = path.removeLast()
+        registry.unregister(id: removed.id)
         push(content, options: options)
     }
 
@@ -161,12 +158,14 @@ public final class Navigator: ObservableObject {
         options: NavigationOptions? = nil
     ) {
         guard !path.isEmpty else { return }
-        path.removeLast()
+        let removed = path.removeLast()
+        registry.unregister(id: removed.id)
         push(screenName: screenName, content, options: options)
     }
 
     public func reset<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        let previousRoot = rootRoute.id
+        for route in path { registry.unregister(id: route.id) }
+        registry.unregister(id: rootRoute.id)
         path.removeAll()
         let route = registry.register(
             screenName: options?.screenName ?? "",
@@ -174,7 +173,6 @@ public final class Navigator: ObservableObject {
             options: options
         )
         rootRoute = route
-        disposeScreens([previousRoot])
     }
 
     public func reset<V: View>(
@@ -182,7 +180,8 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        let previousRoot = rootRoute.id
+        for route in path { registry.unregister(id: route.id) }
+        registry.unregister(id: rootRoute.id)
         path.removeAll()
         let route = registry.register(
             screenName: screenName,
@@ -190,50 +189,26 @@ public final class Navigator: ObservableObject {
             options: options
         )
         rootRoute = route
-        disposeScreens([previousRoot])
     }
 
     public func pop(_ count: Int = 1, callback: (() -> Void)? = nil) {
-        popStep(remaining: count, callback: callback)
-    }
-
-    /// One `pop` iteration. Compose runs the loop in a coroutine and suspends over the
-    /// overplay's exit animation before the next step; the same wait is needed here, or
-    /// a `pop(2)` (prevent-back: close the popup, then leave) would spend both steps on
-    /// the overplay that is still animating out and never pop the screen.
-    private func popStep(remaining: Int, callback: (() -> Void)?) {
-        guard remaining > 0 else {
-            callback?()
-            return
-        }
-
-        if overplay?.type == .snackBar {
-            // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
-            // while one is showing pops the screen underneath and clears the
-            // snackbar immediately, without playing its dismiss animation.
-            overplayDismissHandler = nil
-            overplay = nil
-            guard popScreen() else {
-                callback?()
-                return
-            }
-            popStep(remaining: remaining - 1, callback: callback)
-        } else if overplay != nil {
-            hideOverplay()
-            DispatchQueue.main.asyncAfter(deadline: .now() + Self.overplayDismissDelay) { [weak self] in
-                guard let self else { return }
-                // The component reports back through `finishOverplayDismiss` once its exit
-                // animation ends; clear it here if it never did, so the step is not wasted.
-                if self.overplay != nil { self.finishOverplayDismiss() }
-                self.popStep(remaining: remaining - 1, callback: callback)
+        var remaining = count
+        while remaining > 0 {
+            if overplay?.type == .snackBar {
+                // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
+                // while one is showing pops the screen underneath and clears the
+                // snackbar immediately, without playing its dismiss animation.
+                overplayDismissHandler = nil
+                overplay = nil
+                if !popScreen() { break }
+            } else if overplay != nil {
+                hideOverplay()
+            } else if !popScreen() {
+                break
             }
-        } else {
-            guard popScreen() else {
-                callback?()
-                return
-            }
-            popStep(remaining: remaining - 1, callback: callback)
+            remaining -= 1
         }
+        callback?()
     }
 
     /// Pops the topmost presented screen or stack entry. Returns `false` (and requests
@@ -243,10 +218,11 @@ public final class Navigator: ObservableObject {
         if presented != nil {
             let dismissedId = presented?.id
             presented = nil
-            if let id = dismissedId { disposeScreens([id]) }
+            if let id = dismissedId { registry.unregister(id: id) }
             return true
         } else if !path.isEmpty {
-            path.removeLast()
+            let removed = path.removeLast()
+            registry.unregister(id: removed.id)
             return true
         } else {
             composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
@@ -255,18 +231,12 @@ public final class Navigator: ObservableObject {
     }
 
     public func popToRoot() {
+        for route in path { registry.unregister(id: route.id) }
         path.removeAll()
     }
 
-    /// The entry a back action applies to — mirrors Compose's `currentScreen()`
-    /// (`navController.currentBackStackEntry`): a presented screen sits on top of
-    /// the stack, otherwise it is the last pushed screen, otherwise the root.
-    private func currentScreen() -> DynamicScreen? {
-        registry.getScreen(id: presented?.id ?? path.last?.id ?? rootRoute.id)
-    }
-
     public func onBackSafe(callback: (() -> Void)? = nil) {
-        let latest = currentScreen()
+        let latest = registry.latest()
         if let onBack = latest?.options?.onBackHandler {
             onBack()
             return
@@ -412,36 +382,4 @@ public final class Navigator: ObservableObject {
     public func hideSnackBar() {
         if overplay?.type == .snackBar { hideOverplay() }
     }
-
-    // MARK: Screen disposal
-
-    /// Matches the `delay(300)` Compose waits in `dismissScreen` before unregistering,
-    /// with a little headroom for the pop transition.
-    private static let screenDisposeDelay: TimeInterval = 0.35
-
-    /// Longest overplay exit animation (the bottom sheet's), so a queued pop step runs
-    /// after the component has taken itself down.
-    private static let overplayDismissDelay: TimeInterval = 0.3
-
-    private func disposeScreens(droppedFrom previous: [DynamicScreenRoute]) {
-        let live = Set(path.map(\.id))
-        disposeScreens(previous.map(\.id).filter { !live.contains($0) })
-    }
-
-    /// Screens are released only once the pop transition has played out: the outgoing
-    /// view is still on screen while it animates and the registry is what renders it —
-    /// dropping it right away blanks the screen mid-transition. Liveness is re-checked
-    /// when the timer fires, so a route pushed back before then keeps its screen.
-    private func disposeScreens(_ ids: [Int]) {
-        guard !ids.isEmpty else { return }
-        DispatchQueue.main.asyncAfter(deadline: .now() + Self.screenDisposeDelay) { [weak self] in
-            guard let self else { return }
-            var live = Set(self.path.map(\.id))
-            live.insert(self.rootRoute.id)
-            if let presented = self.presented { live.insert(presented.id) }
-            for id in ids where !live.contains(id) {
-                self.registry.unregister(id: id)
-            }
-        }
-    }
 }

package/ios/Application/StackScreen.swift

@@ -5,7 +5,7 @@
 //  SwiftUI mirror of Compose's `StackScreen`. This is a refactor of `Screen`:
 //  the body is decomposed into the same focused pieces Compose uses — header
 //  layer, scrollable content (`StackScreenContent`), floating button
-//  (`FloatingContent`) and footer (`NavigationFooter`) — instead of one
+//  (`FloatingContent`) and footer (`FooterContent`) — instead of one
 //  monolithic, partially-duplicated view. The public init matches `Screen`
 //  so call sites (e.g. NavigationContainer's ScreenHost) can swap over.
 //
@@ -165,13 +165,12 @@ public struct StackScreen<Content: View>: View {
 
                         FloatingContent(
                             fabProps: fabProps,
-                            keyboardSize: keyboardSize,
-                            hasFooter: footer != nil,
+                            keyboardOffset: 0,
                             scrollOffset: scrollOffset
                         )
                     }
 
-                    NavigationFooter(footerComponent: footer, keyboardSize: keyboardSize)
+                    FooterContent(footer: footer, keyboardSize: keyboardSize, bottomInset: bottomInset)
                 }
 
                 // Animated search bar overlay (mirrors Compose's SearchAnimated layer).
@@ -445,29 +444,17 @@ private struct SearchAnimatedHeader: View {
 /// Mirrors Compose's `FloatingContent`: no FAB props means nothing renders.
 private struct FloatingContent: View {
     let fabProps: FabProps?
-    let keyboardSize: CGFloat
-    /// With a footer the FAB is anchored to the footer's *layout* top, which does not move
-    /// when the band offsets itself over the keyboard — so it rides the same offset.
-    let hasFooter: Bool
+    let keyboardOffset: CGFloat
     let scrollOffset: CGFloat
 
-    /// Compose keeps the FAB `Spacing.M + AppNavigationBar` above the bottom of the screen
-    /// and lifts it with `imePadding()`; here it sits `Spacing.M` above the safe area and
-    /// nothing lifts it, so the difference is applied as an offset (see NavigationFooter).
-    private var verticalOffset: CGFloat {
-        if hasFooter { return NavigationFooter.verticalOffset(keyboardSize: keyboardSize) }
-        return NavigationFooter.safeAreaBottom - NavigationFooter.navigationBarInset - keyboardSize
-    }
-
     var body: some View {
         if let fabProps = fabProps {
             FloatingButton(
                 props: fabProps,
-                keyboardOffset: 0,
+                keyboardOffset: keyboardOffset,
                 scrollOffset: scrollOffset
             )
             .padding(.horizontal, Spacing.M)
-            .offset(y: verticalOffset)
             .ignoresSafeArea(.keyboard, edges: .bottom)
         }
     }
@@ -496,3 +483,19 @@ private struct HideKeyboardOnTap: ViewModifier {
         }
     }
 }
+
+// MARK: - Footer content
+
+/// Mirrors Compose's `FooterContent`: renders the footer chrome only when a
+/// footer component is supplied. Reuses the existing `Footer` view from Screen.swift.
+private struct FooterContent: View {
+    let footer: (() -> AnyView)?
+    let keyboardSize: CGFloat
+    let bottomInset: CGFloat
+
+    var body: some View {
+        if let footerView = footer?() {
+            Footer(footerView: footerView, keyboardSize: keyboardSize, bottomInset: bottomInset)
+        }
+    }
+}

package/ios/Badge/BadgeRibbon.swift

@@ -174,7 +174,6 @@ public struct BadgeRibbon: View {
         )
         .frame(width: RibbonConstants.headTailWidth, height: RibbonConstants.headTailHeight)
         .rotationEffect(.degrees(180))
-        .offset(x: 1)
         .clipped()
     }
     
@@ -184,7 +183,6 @@ public struct BadgeRibbon: View {
             placeholder: AnyView(Color.clear)
         )
         .frame(width: RibbonConstants.headTailWidth, height: RibbonConstants.headTailHeight)
-        .offset(x: 1)
         .clipped()
     }
     
@@ -194,7 +192,6 @@ public struct BadgeRibbon: View {
             placeholder: AnyView(Color.clear)
         )
         .frame(width: RibbonConstants.skewTailWidth, height: RibbonConstants.skewTailHeight)
-        .offset(x: -2)
         .clipped()
     }
 }
@@ -284,7 +281,7 @@ private struct RibbonConstants {
     static let ribbonHeight: CGFloat = 20
     static let roundHeight: CGFloat = 16
     static let skewBodyHeight: CGFloat = 16
-    static let roundRightRadius: CGFloat = 8
+    static let roundRightRadius: CGFloat = 12
     static let roundPaddingEnd: CGFloat = 6
     static let skewTailWidth: CGFloat = 8
     static let skewTailHeight: CGFloat = 16

package/ios/Button/Button.swift

@@ -133,19 +133,19 @@ public struct Button: View {
     var action: () -> Void
     var type: ButtonType
     var size: ButtonSize
-    var iconLeft: String
-    var iconRight: String
+    var iconLeft: AnyView?
+    var iconRight: AnyView?
     var isFull: Bool
     var loading: Bool
     var useTintColor: Bool
 
     public init(
-        title: String = "Button",
+        title: String = "",
         action: @escaping () -> Void,
         type: ButtonType = .primary,
         size: ButtonSize = .large,
-        iconLeft: String = "",
-        iconRight: String = "",
+        iconLeft: AnyView? = nil,
+        iconRight: AnyView? = nil,
         isFull: Bool = true,
         loading: Bool = false,
         useTintColor: Bool = true
@@ -161,9 +161,38 @@ public struct Button: View {
         self.useTintColor = useTintColor
     }
 
-    private func shouldLoadingOnLeft(_ left: String, _ right: String) -> Bool {
-        let hasLeft = !left.isEmpty
-        let hasRight = !right.isEmpty
+    /// Mirrors Kotlin's `Button(iconLeft: String, iconRight: String, ...)`, which resolves
+    /// icons by design-system source name through the shared `Icon` component rather than
+    /// a caller-supplied view. `iconLeft` is required here (unlike Kotlin's `= ""` default)
+    /// solely to keep this initializer unambiguous alongside the `AnyView`-based one above —
+    /// pass `""` explicitly for an icon-right-only button.
+    public init(
+        title: String = "Button",
+        action: @escaping () -> Void,
+        type: ButtonType = .primary,
+        size: ButtonSize = .large,
+        iconLeft: String,
+        iconRight: String = "",
+        isFull: Bool = true,
+        loading: Bool = false,
+        useTintColor: Bool = true
+    ) {
+        self.init(
+            title: title,
+            action: action,
+            type: type,
+            size: size,
+            iconLeft: iconLeft.isEmpty ? nil : AnyView(Icon(source: iconLeft)),
+            iconRight: iconRight.isEmpty ? nil : AnyView(Icon(source: iconRight)),
+            isFull: isFull,
+            loading: loading,
+            useTintColor: useTintColor
+        )
+    }
+
+    private func shouldLoadingOnLeft(_ left: AnyView?, _ right: AnyView?) -> Bool {
+        let hasLeft = left != nil
+        let hasRight = right != nil
 
         switch (hasLeft, hasRight) {
         case (false, false): return true
@@ -188,13 +217,27 @@ public struct Button: View {
             }
         }) {
             HStack(spacing: size.iconSpacing) {
-                renderIcon(icon: iconLeft, forceLoading: loading && loadingOnLeft, textColor: fg)
+                if loading && loadingOnLeft {
+                    LottieView(name: "lottie_circle_loader", loopMode: .loop)
+                        .frame(width: size.iconSize, height: size.iconSize)
+                        .colorMultiply(fg)
+
+                } else if let iconLeft = iconLeft {
+                    tintedIcon(iconLeft, color: fg)
+                }
 
                 MomoText(title, typography: size.typographyStyle, color: fg)
                     .lineLimit(1)
                     .truncationMode(.tail)
 
-                renderIcon(icon: iconRight, forceLoading: loading && !loadingOnLeft, textColor: fg)
+                if loading && !loadingOnLeft {
+                    LottieView(name: "lottie_circle_loader", loopMode: .loop)
+                        .frame(width: size.iconSize, height: size.iconSize)
+                        .colorMultiply(fg)
+
+                } else if let iconRight = iconRight {
+                    tintedIcon(iconRight, color: fg)
+                }
             }
             .frame(maxWidth: isFull ? .infinity : nil)
             .padding(.horizontal, size.padding)
@@ -206,24 +249,20 @@ public struct Button: View {
             border: border,
             borderWidth: borderWidth,
             radius: size.radius,
-            height: size.height,
-            isFull: isFull
+            height: size.height
         ))
         .disabled(!isEnabled)
     }
 
-    /// Mirrors Kotlin `RenderIcon`: the loader replaces the icon slot entirely, and
-    /// `useTintColor == false` leaves the icon at its own colors.
     @ViewBuilder
-    private func renderIcon(icon: String, forceLoading: Bool, textColor: Color) -> some View {
-        let color: Color? = useTintColor ? textColor : nil
-
-        if forceLoading {
-            LottieView(name: "lottie_circle_loader", loopMode: .loop)
+    private func tintedIcon(_ icon: AnyView, color: Color) -> some View {
+        if useTintColor {
+            icon
+                .frame(width: size.iconSize, height: size.iconSize)
+                .colorMultiply(color)
+        } else {
+            icon
                 .frame(width: size.iconSize, height: size.iconSize)
-                .colorMultiply(color ?? Colors.black01)
-        } else if !icon.isEmpty {
-            Icon(source: icon, size: size.iconSize, color: color)
         }
     }
 }
@@ -238,13 +277,11 @@ private struct ButtonPressFeedbackStyle: ButtonStyle {
     let borderWidth: CGFloat
     let radius: CGFloat
     let height: CGFloat
-    let isFull: Bool
 
     func makeBody(configuration: Configuration) -> some View {
         let pressed = configuration.isPressed && isEnabled
 
         configuration.label
-            .modifier(HugContentOnLegacyOS(isFull: isFull))
             .opacity(pressed ? 0.5 : 1)
             .background(
                 RoundedRectangle(cornerRadius: radius)
@@ -260,20 +297,3 @@ private struct ButtonPressFeedbackStyle: ButtonStyle {
             .animation(.easeInOut(duration: 0.1), value: pressed)
     }
 }
-
-/// `ButtonStyleConfiguration.Label` is greedy on iOS 16 and earlier — it accepts
-/// the full proposed width, so the background drawn in `makeBody` stretches past
-/// the content even when `isFull == false`. iOS 17 fixed the label to hug its
-/// content, so only legacy OSes need the `fixedSize` clamp (kept off on 17+ to
-/// preserve tail truncation of long titles).
-private struct HugContentOnLegacyOS: ViewModifier {
-    let isFull: Bool
-
-    func body(content: Content) -> some View {
-        if #available(iOS 17.0, *) {
-            content
-        } else {
-            content.fixedSize(horizontal: !isFull, vertical: false)
-        }
-    }
-}