@momo-kits/native-kits 0.162.2-sp.7 → 0.162.2-sp.8-debug

package/ios/Application/Navigation/BottomTab/BottomTab.swift

@@ -56,6 +56,7 @@ public struct BottomTab: View {
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .ignoresSafeArea(edges: .bottom)
+        .preference(key: IsBottomTabRootKey.self, value: true)
     }
 
     @ViewBuilder

package/ios/Application/Navigation/NavigationContainer.swift

@@ -14,9 +14,11 @@ import SwiftUI
 public struct NavigationContainer<Initial: View>: View {
     @StateObject private var navigator: Navigator
     @StateObject private var applicationEnvironment: ApplicationEnvironment
+    @StateObject private var localize: Localize
 
     private let setNavigator: ((Navigator) -> Void)?
     private let composeApi: KitComposeApi?
+    private let maxApi: MaxApi?
 
     public init(
         initialScreenName: String = "",
@@ -25,6 +27,8 @@ public struct NavigationContainer<Initial: View>: View {
         applicationContext: MiniAppContext? = nil,
         composeApi: KitComposeApi? = nil,
         config: KitConfig? = nil,
+        maxApi: MaxApi? = nil,
+        localize: Localize? = nil,
         setNavigator: ((Navigator) -> Void)? = nil
     ) {
         let nav = Navigator(
@@ -38,10 +42,13 @@ public struct NavigationContainer<Initial: View>: View {
             wrappedValue: ApplicationEnvironment(
                 applicationContext: applicationContext,
                 composeApi: composeApi,
-                config: config
+                config: config,
+                maxApi: maxApi
             )
         )
+        _localize = StateObject(wrappedValue: localize ?? Localize())
         self.composeApi = composeApi
+        self.maxApi = maxApi
         self.setNavigator = setNavigator
     }
 
@@ -55,11 +62,13 @@ public struct NavigationContainer<Initial: View>: View {
         .environmentObject(navigator)
         .environmentObject(applicationEnvironment)
         .environment(\.applicationEnvironment, applicationEnvironment)
+        .environmentObject(localize)
         .fullScreenCover(item: $navigator.presented) { route in
             screenView(forDialog: route)
                 .environmentObject(navigator)
                 .environmentObject(applicationEnvironment)
                 .environment(\.applicationEnvironment, applicationEnvironment)
+                .environmentObject(localize)
         }
         .overlay {
             if let item = navigator.overplay {
@@ -67,6 +76,7 @@ public struct NavigationContainer<Initial: View>: View {
                     .environmentObject(navigator)
                     .environmentObject(applicationEnvironment)
                     .environment(\.applicationEnvironment, applicationEnvironment)
+                    .environmentObject(localize)
             }
         }
         .onAppear {
@@ -74,12 +84,19 @@ public struct NavigationContainer<Initial: View>: View {
                 navigator.composeApi = composeApi
             }
             setNavigator?(navigator)
+            // Mirrors Compose's LaunchedEffect(maxApi, resolvedLocalize): host-reported
+            // language wins over the default "vi" only when it resolves to English.
+            maxApi?.getLanguage { data in
+                if parseLanguage(data) == Localize.EN {
+                    localize.changeLanguage(Localize.EN)
+                }
+            }
         }
     }
 
     @ViewBuilder
     private func screenView(for route: DynamicScreenRoute) -> some View {
-        if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
+        if let screen = navigator.registry.getScreen(id: route.id) {
             ScreenHost(screen: screen, navigator: navigator)
                 .navigationBarBackButtonHidden(true)
         } else {
@@ -89,7 +106,7 @@ public struct NavigationContainer<Initial: View>: View {
 
     @ViewBuilder
     private func screenView(forDialog route: DynamicDialogRoute) -> some View {
-        if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
+        if let screen = navigator.registry.getScreen(id: route.id) {
             ScreenHost(screen: screen, navigator: navigator)
         } else {
             EmptyView()
@@ -128,6 +145,7 @@ private struct ScreenHost: View {
             layoutOffset: options.layoutOffset,
             inputSearchProps: options.inputSearchProps,
             fabProps: options.fabProps,
+            screenName: screen.name,
             content: { screen.content() }
         )
     }
@@ -174,3 +192,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

@@ -30,12 +30,10 @@ public struct DynamicScreen {
 }
 
 public final class DynamicScreenRegistry {
-    public static let shared = DynamicScreenRegistry()
-
     private var screens: [Int: DynamicScreen] = [:]
     private var idCounter: Int = 1
 
-    private init() {}
+    public init() {}
 
     @discardableResult
     public func register(
@@ -95,6 +93,11 @@ public final class Navigator: ObservableObject {
     @Published public var presented: DynamicDialogRoute?
     @Published public var overplay: OverplayItem?
 
+    /// Owned per-Navigator (mirrors Compose's `remember { DynamicScreenRegistry() }` +
+    /// disposal): screens registered by this navigator are released via ARC when the
+    /// navigator itself deallocates, instead of accumulating in a process-wide singleton.
+    public let registry = DynamicScreenRegistry()
+
     /// Animated-close handler registered by the active overplay component
     /// (mirrors Compose's `OverplayComponentRegistry.bindClose`). When set, a
     /// dismiss request runs the component's exit animation before the item is
@@ -111,7 +114,7 @@ public final class Navigator: ObservableObject {
         composeApi: KitComposeApi? = nil
     ) {
         self.composeApi = composeApi
-        self.rootRoute = DynamicScreenRegistry.shared.register(
+        self.rootRoute = registry.register(
             screenName: initialScreenName,
             content: initialContent,
             options: options
@@ -121,7 +124,7 @@ public final class Navigator: ObservableObject {
     // MARK: Stack
 
     public func push<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: options?.screenName ?? "",
             content: { AnyView(content()) },
             options: options
@@ -134,7 +137,7 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: screenName,
             content: { AnyView(content()) },
             options: options
@@ -145,7 +148,7 @@ public final class Navigator: ObservableObject {
     public func replace<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
         guard !path.isEmpty else { return }
         let removed = path.removeLast()
-        DynamicScreenRegistry.shared.unregister(id: removed.id)
+        registry.unregister(id: removed.id)
         push(content, options: options)
     }
 
@@ -156,15 +159,15 @@ public final class Navigator: ObservableObject {
     ) {
         guard !path.isEmpty else { return }
         let removed = path.removeLast()
-        DynamicScreenRegistry.shared.unregister(id: removed.id)
+        registry.unregister(id: removed.id)
         push(screenName: screenName, content, options: options)
     }
 
     public func reset<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
-        DynamicScreenRegistry.shared.unregister(id: rootRoute.id)
+        for route in path { registry.unregister(id: route.id) }
+        registry.unregister(id: rootRoute.id)
         path.removeAll()
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: options?.screenName ?? "",
             content: { AnyView(content()) },
             options: options
@@ -177,10 +180,10 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
-        DynamicScreenRegistry.shared.unregister(id: rootRoute.id)
+        for route in path { registry.unregister(id: route.id) }
+        registry.unregister(id: rootRoute.id)
         path.removeAll()
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: screenName,
             content: { AnyView(content()) },
             options: options
@@ -191,17 +194,16 @@ public final class Navigator: ObservableObject {
     public func pop(_ count: Int = 1, callback: (() -> Void)? = nil) {
         var remaining = count
         while remaining > 0 {
-            if overplay != nil {
+            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 presented != nil {
-                let dismissedId = presented?.id
-                presented = nil
-                if let id = dismissedId { DynamicScreenRegistry.shared.unregister(id: id) }
-            } else if !path.isEmpty {
-                let removed = path.removeLast()
-                DynamicScreenRegistry.shared.unregister(id: removed.id)
-            } else {
-                composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+            } else if !popScreen() {
                 break
             }
             remaining -= 1
@@ -209,13 +211,32 @@ public final class Navigator: ObservableObject {
         callback?()
     }
 
+    /// Pops the topmost presented screen or stack entry. Returns `false` (and requests
+    /// a host dismiss) when there is nothing left to pop.
+    @discardableResult
+    private func popScreen() -> Bool {
+        if presented != nil {
+            let dismissedId = presented?.id
+            presented = nil
+            if let id = dismissedId { registry.unregister(id: id) }
+            return true
+        } else if !path.isEmpty {
+            let removed = path.removeLast()
+            registry.unregister(id: removed.id)
+            return true
+        } else {
+            composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+            return false
+        }
+    }
+
     public func popToRoot() {
-        for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
+        for route in path { registry.unregister(id: route.id) }
         path.removeAll()
     }
 
     public func onBackSafe(callback: (() -> Void)? = nil) {
-        let latest = DynamicScreenRegistry.shared.latest()
+        let latest = registry.latest()
         if let onBack = latest?.options?.onBackHandler {
             onBack()
             return
@@ -256,7 +277,7 @@ public final class Navigator: ObservableObject {
     // MARK: Modal-style screen (vertical slide)
 
     public func present<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: options?.screenName ?? "",
             content: { AnyView(content()) },
             options: options
@@ -269,7 +290,7 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: screenName,
             content: { AnyView(content()) },
             options: options
@@ -279,7 +300,7 @@ public final class Navigator: ObservableObject {
 
     public func dismiss() {
         if let id = presented?.id {
-            DynamicScreenRegistry.shared.unregister(id: id)
+            registry.unregister(id: id)
         }
         presented = nil
     }

package/ios/Application/Navigation/Overplay/BottomSheet.swift

@@ -43,42 +43,84 @@ struct BottomSheetView<Content: View>: View {
     let content: () -> Content
 
     @EnvironmentObject private var navigator: Navigator
+    @Environment(\.appTheme) private var theme
+    @Environment(\.applicationEnvironment) private var appEnv
 
     /// Vertical translation of the sheet; starts off-screen and animates to 0.
     @State private var sheetOffset: CGFloat = UIScreen.main.bounds.height
-    @State private var scrimAlpha: CGFloat = 0
+    /// Mirrors Compose's `backgroundAlpha`: only touched by open()/close(), never by drag.
+    @State private var backgroundAlpha: CGFloat = 0
     @State private var sheetHeight: CGFloat = 0
     @State private var didAppear = false
+    @State private var keyboardHeight: CGFloat = 0
+    /// Live drag offset, isolated from `sheetOffset` so a touch-move only invalidates
+    /// this gesture-scoped value instead of forcing the whole body (including
+    /// `content()`) to reconstruct every frame — mirrors the pattern already used in
+    /// `ios/PopupView/PopupView.swift` for smooth drag-to-dismiss.
+    @GestureState private var dragTranslation: CGFloat = 0
 
     /// Mirrors Compose's `sheetCloseOffset` (100dp drag threshold to dismiss).
     private let closeThreshold: CGFloat = 100
 
+    /// Mirrors Compose's per-term peak (0.3f). Combined with `backgroundAlpha` the
+    /// steady-state (fully open) scrim peaks at 0.6, matching ModalScreen's peak.
+    private let maxDynamicAlpha: CGFloat = 0.3
+
     private var screenHeight: CGFloat { UIScreen.main.bounds.height }
     private var bottomInset: CGFloat { safeAreaBottomInset() }
+    /// While the keyboard is up, it already covers the home-indicator area, so it
+    /// replaces (rather than adds to) the usual bottom-inset filler.
+    private var effectiveBottomInset: CGFloat { keyboardHeight > 0 ? keyboardHeight : bottomInset }
 
     private var backgroundColor: Color {
-        // Compose uses background.surface (white) for `isSurface`, otherwise
-        // background.default. Both resolve to white in the current iOS palette.
-        isSurface ? Colors.black01 : Colors.black01
+        isSurface ? theme.colors.background.surface : theme.colors.background.default
+    }
+
+    private var effectiveOffset: CGFloat { sheetOffset + dragTranslation }
+
+    /// Mirrors Compose's `dynamicAlpha`: a plain derived value (not itself animated)
+    /// that tracks the current offset live, shrinking toward 0 as the sheet is
+    /// dragged down.
+    private var dynamicAlpha: CGFloat {
+        let denom = sheetHeight > 0 ? sheetHeight : screenHeight
+        guard denom > 0 else { return maxDynamicAlpha }
+        let progress = min(max(1 - effectiveOffset / denom, 0), 1)
+        return progress * maxDynamicAlpha
     }
 
+    /// Mirrors Compose's `alpha = backgroundAlpha + dynamicAlpha`: additive, so the
+    /// scrim peaks at 0.6 at rest and only fades to a 0.3 floor while dragging
+    /// (backgroundAlpha holds steady until an explicit close()).
+    private var totalScrimAlpha: CGFloat { backgroundAlpha + dynamicAlpha }
+
     var body: some View {
         ZStack(alignment: .bottom) {
-            // Dimmed scrim (max 0.3 alpha, mirrors Compose).
-            Color.black.opacity(scrimAlpha)
-                .ignoresSafeArea()
+            // Dimmed scrim — additive backgroundAlpha + dynamicAlpha (see above).
+            Color.black.opacity(totalScrimAlpha)
                 .contentShape(Rectangle())
                 .onTapGesture {
                     if barrierDismissible { close() }
                 }
 
             sheet
-                .offset(y: sheetOffset)
+                .offset(y: effectiveOffset)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .ignoresSafeArea()
+        .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillChangeFrameNotification)) { notification in
+            guard let endFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect else { return }
+            withAnimation(.easeOut(duration: 0.25)) {
+                keyboardHeight = UIScreen.main.bounds.height - endFrame.origin.y
+            }
+        }
         .onAppear {
             guard !didAppear else { return }
             didAppear = true
+            ScreenTracker.trackPopupDisplayed(
+                maxApi: appEnv.maxApi,
+                context: appEnv.applicationContext,
+                parentScreenName: ScreenTracker.getLastScreenName()
+            )
             navigator.registerOverplayDismiss { close() }
             open()
         }
@@ -103,16 +145,16 @@ struct BottomSheetView<Content: View>: View {
             .gesture(dragGesture)
 
             Rectangle()
-                .fill(Colors.black04)
+                .fill(theme.colors.border.default)
                 .frame(height: 1)
 
             content()
 
             backgroundColor
-                .frame(height: bottomInset)
+                .frame(height: effectiveBottomInset)
         }
         .frame(maxWidth: .infinity)
-        .frame(maxHeight: screenHeight - safeAreaTopInset() - 90, alignment: .bottom)
+        .frame(alignment: .bottom)
         .background(
             GeometryReader { geo in
                 Color.clear.onAppear { sheetHeight = geo.size.height }
@@ -143,13 +185,33 @@ struct BottomSheetView<Content: View>: View {
     // MARK: - Drag handling (mirrors Compose's detectDragGestures)
 
     private var dragGesture: some Gesture {
-        DragGesture()
-            .onChanged { value in
-                let newOffset = max(value.translation.height, 0)
-                sheetOffset = newOffset
+        // `.global` (not the default `.local`) so the gesture tracks against the
+        // window rather than the handle's own view, which is itself repositioned
+        // every frame by this same gesture's output (`sheet.offset(y: effectiveOffset)`
+        // in `body`) — the local coordinate space chasing its own moving reference
+        // frame is a plausible source of a continuous drag-time jitter.
+        DragGesture(coordinateSpace: .global)
+            .onChanged { _ in
+                // Touching the handle should immediately settle `sheetOffset` to its
+                // resting value (0) with no animation, so a drag that starts while the
+                // open animation — or the keyboard-driven resize, which shifts this
+                // same bottom-anchored top edge — is still in flight doesn't fight a
+                // moving target. Without this, the live drag value chases an animated
+                // one, producing a couple of corrective jumps before it settles.
+                if sheetOffset != 0 {
+                    sheetOffset = 0
+                }
+            }
+            .updating($dragTranslation) { value, state, _ in
+                state = max(value.translation.height, 0)
             }
-            .onEnded { _ in
-                if sheetOffset > closeThreshold {
+            .onEnded { value in
+                let finalOffset = max(value.translation.height, 0)
+                // Capture into persisted state BEFORE @GestureState resets to 0,
+                // avoiding a one-frame snap back to rest before close()'s own
+                // slide-out animation starts (mirrors PopupView's `lastDragPosition`).
+                sheetOffset = finalOffset
+                if finalOffset > closeThreshold {
                     close()
                 } else {
                     withAnimation(.spring(response: 0.3, dampingFraction: 0.9)) {
@@ -163,17 +225,23 @@ struct BottomSheetView<Content: View>: View {
 
     private func open() {
         DispatchQueue.main.async {
-            withAnimation(.easeOut(duration: 0.1)) { scrimAlpha = 0.3 }
+            withAnimation(.timingCurve(0.05, 0.7, 0.1, 1, duration: 0.1)) { backgroundAlpha = maxDynamicAlpha }
             withAnimation(.timingCurve(0.05, 0.7, 0.1, 1, duration: 0.35)) { sheetOffset = 0 }
         }
     }
 
+    /// Mirrors Compose's `closeEvent`: slide out over 200ms, then fade the scrim
+    /// out over 100ms only after the slide finishes, then dismiss.
     private func close() {
         withAnimation(.timingCurve(0.3, 0, 0.8, 0.15, duration: 0.2)) {
             sheetOffset = max(sheetHeight, screenHeight)
-            scrimAlpha = 0
         }
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+            withAnimation(.timingCurve(0.3, 0, 0.8, 0.15, duration: 0.1)) {
+                backgroundAlpha = 0
+            }
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             navigator.finishOverplayDismiss()
         }
     }

package/ios/Application/Navigation/Overplay/ModalScreen.swift

@@ -15,6 +15,7 @@ struct ModalScreen<Content: View>: View {
     let content: () -> Content
 
     @EnvironmentObject private var navigator: Navigator
+    @Environment(\.applicationEnvironment) private var appEnv
 
     @State private var scrimOpacity: CGFloat = 0
     @State private var contentScale: CGFloat = 0.8
@@ -38,6 +39,11 @@ struct ModalScreen<Content: View>: View {
         .onAppear {
             guard !didAppear else { return }
             didAppear = true
+            ScreenTracker.trackPopupDisplayed(
+                maxApi: appEnv.maxApi,
+                context: appEnv.applicationContext,
+                parentScreenName: ScreenTracker.getLastScreenName()
+            )
             navigator.registerOverplayDismiss { close() }
             open()
         }

package/ios/Application/Navigation/Tracking/ScreenTracker.swift

@@ -0,0 +1,117 @@
+//
+//  ScreenTracker.swift
+//  MoMoUIKits
+//
+//  SwiftUI mirror of Compose's `navigation/tracking/ScreenTracker.kt`. Pure
+//  logic, no platform dependency beyond the `MaxApi` bridge.
+//
+
+import Foundation
+
+public final class ScreenTrackingState {
+    public var time: Double = Date().timeIntervalSince1970 * 1000
+    public var releaseNavigated: Bool = false
+    public var releaseLoad: Bool = false
+    public var releaseInteraction: Bool = false
+    public var previousScreenName: String?
+    public var action: String = "push"
+
+    public init() {}
+}
+
+public enum ScreenTracker {
+    private static var lastScreenName: String?
+
+    public static func trackScreenNavigated(
+        maxApi: MaxApi?,
+        context: MiniAppContext?,
+        screenName: String,
+        action: String,
+        state: ScreenTrackingState
+    ) {
+        guard !state.releaseNavigated else { return }
+
+        let previousScreen = lastScreenName
+        lastScreenName = screenName
+
+        var params = buildBaseParams(context: context, screenName: screenName)
+        params["pre_screen_name"] = previousScreen
+        params["state"] = "navigated"
+        params["action"] = action
+        maxApi?.track(eventName: "auto_screen_navigated", params: params)
+
+        state.releaseNavigated = true
+        state.previousScreenName = previousScreen
+    }
+
+    public static func trackScreenDisplayed(
+        maxApi: MaxApi?,
+        context: MiniAppContext?,
+        screenName: String,
+        duration: Double,
+        state: ScreenTrackingState
+    ) {
+        guard !state.releaseLoad else { return }
+
+        var params = buildBaseParams(context: context, screenName: screenName)
+        params["state"] = "load"
+        params["duration"] = duration
+        maxApi?.track(eventName: "auto_screen_displayed", params: params)
+
+        state.releaseLoad = true
+    }
+
+    public static func trackScreenInteracted(
+        maxApi: MaxApi?,
+        context: MiniAppContext?,
+        screenName: String,
+        duration: Double,
+        totalDuration: Double,
+        state: ScreenTrackingState
+    ) {
+        guard !state.releaseInteraction else { return }
+
+        var params = buildBaseParams(context: context, screenName: screenName)
+        params["state"] = "interaction"
+        params["duration"] = duration
+        params["total_duration"] = totalDuration
+        maxApi?.track(eventName: "auto_screen_interacted", params: params)
+
+        state.releaseInteraction = true
+    }
+
+    public static func trackPopupDisplayed(
+        maxApi: MaxApi?,
+        context: MiniAppContext?,
+        parentScreenName: String?
+    ) {
+        maxApi?.track(eventName: "auto_popup_displayed", params: [
+            "screen_name": parentScreenName,
+            "tracking_source": 1,
+            "app_id": context?.appId,
+            "feature_code": context?.appCode,
+            "kits_version": nil,
+            "component_name": "Modal"
+        ])
+    }
+
+    private static func buildBaseParams(
+        context: MiniAppContext?,
+        screenName: String,
+        componentName: String = "Screen"
+    ) -> [String: Any?] {
+        [
+            "app_id": context?.appId,
+            "feature_code": context?.appCode,
+            "screen_name": screenName,
+            "component_name": componentName,
+            "tracking_source": 1
+        ]
+    }
+
+    public static func getLastScreenName() -> String? { lastScreenName }
+
+    public static func reset() {
+        lastScreenName = nil
+    }
+}

package/ios/Application/Screen.swift

@@ -237,7 +237,7 @@ struct Footer: View {
         }
         .padding(.vertical, Spacing.S)
         .padding(.horizontal, Spacing.M)
-        .padding(.bottom, keyboardSize + bottomInset)
+        .padding(.bottom, keyboardSize - bottomInset)
         .background(Colors.black01)
         .overlay(
             Rectangle()