@momo-kits/native-kits 0.162.49-debug → 0.162.50-debug

package/ios/Navigation/Component/SnackBar.swift

@@ -57,6 +57,7 @@ struct SnackBarView: View {
     let bottomInset: CGFloat
 
     @EnvironmentObject private var navigator: Navigator
+    @Environment(\.screenLayout) private var layout
 
     @State private var contentHeight: CGFloat = 0
     @State private var offsetY: CGFloat = 0
@@ -75,6 +76,9 @@ struct SnackBarView: View {
                 )
                 .offset(y: offsetY)
                 .padding(.bottom, bottomInset)
+                // iPhone Duo: clear of the side toolbar strip, like the screen content (0 elsewhere)
+                .padding(.leading, layout.insetLeft)
+                .padding(.trailing, layout.insetRight)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .ignoresSafeArea()

package/ios/Navigation/ModalScreen.swift

@@ -34,11 +34,15 @@ struct ModalScreen<Content: View>: View {
                 }
 
             content()
+                // iPhone Duo: capped so it stays a dialog on the inner display; nil leaves the size alone
+                .frame(
+                    maxWidth: layout.isDuoDevice ? layout.duoModalMaxWidth : nil,
+                    maxHeight: layout.isDuoDevice ? layout.duoModalMaxHeight : nil
+                )
                 .scaleEffect(contentScale)
                 .opacity(contentOpacity)
-                // iPhone Duo: center below the side status bar and above the home indicator
-                .padding(.top, layout.isDuoDevice ? layout.duoTopInset : 0)
-                .padding(.bottom, layout.isDuoDevice ? layout.insets.bottom : 0)
+                // iPhone Duo: center in the safe area, clear of the side toolbar strip and the home indicator
+                .padding(layout.isDuoDevice ? layout.insets : EdgeInsets())
         }
         // Full screen like RN's Modal, so asymmetric landscape insets don't shift the content sideways.
         .frame(maxWidth: .infinity, maxHeight: .infinity)

package/ios/Popup/PopupDisplay.swift

@@ -107,7 +107,7 @@ public struct PopupDisplay: View {
             }
             .fixedSize(horizontal: false, vertical: true)
             .background(theme.colors.background.surface)
-            .clipShape(RoundedRectangle(cornerRadius: Radius.L))
+            .clipShape(RoundedRectangle(cornerRadius: layout.popupRadius()))
 
             if isShowCloseIcon {
                 PopupCloseButton(action: onClose)
@@ -115,7 +115,7 @@ public struct PopupDisplay: View {
             }
         }
         .frame(maxWidth: layout.popupMaxWidth)
-        .padding(.horizontal, 12)
+        .padding(.horizontal, layout.popupHorizontalPadding(12))
         .accessibilityElement(children: .contain)
         .accessibilityIdentifier("popup_notify")
     }

package/ios/Popup/PopupInput.swift

@@ -59,11 +59,11 @@ public struct PopupInput: View {
                     .offset(x: 11, y: -11)
             }
         }
-        .background(theme.colors.background.surface.cornerRadius(8))
+        .background(theme.colors.background.surface.cornerRadius(layout.popupRadius(8)))
         .shadow(color: .black.opacity(0.08), radius: 2, x: 0, y: 0)
         .shadow(color: .black.opacity(0.16), radius: 24, x: 0, y: 0)
         .frame(maxWidth: layout.popupMaxWidth)
-        .padding(.horizontal, 40)
+        .padding(.horizontal, layout.popupHorizontalPadding(40))
     }
 
     // MARK: Internal

package/ios/Popup/PopupLayout.swift

@@ -1,19 +1,26 @@
 import SDWebImageSwiftUI
 import SwiftUI
 
-// Width of a system alert on the iPhone Duo inner display, in both orientations (RN Popup/utils.ts).
-private let duoPopupMaxWidth: CGFloat = 440
-
 extension ScreenLayout {
-    /// Card width cap (Compose `popupMaxWidth`); unbounded off iPhone Duo, where the popup's own padding sets the width.
+    /// Card width cap on iPhone Duo (the modal bounds, Compose `popupMaxWidth`); unbounded elsewhere,
+    /// where the popup's own padding sets the width.
     var popupMaxWidth: CGFloat {
-        isDuoDevice ? duoPopupMaxWidth : .infinity
+        isDuoDevice ? duoModalMaxWidth : .infinity
+    }
+
+    /// The modal bounds already keep iPhone Duo popups off the edges, so their own side padding goes.
+    func popupHorizontalPadding(_ padding: CGFloat) -> CGFloat {
+        isDuoDevice ? 0 : padding
     }
 
-    /// Room left for a popup on iPhone Duo, where landscape is too short for it; nil elsewhere.
+    /// Tallest a popup gets on iPhone Duo, landscape and the inner display included; nil elsewhere.
     var popupMaxHeight: CGFloat? {
-        guard isDuoDevice else { return nil }
-        return height - duoTopInset - insets.bottom - Spacing.XL * 2
+        isDuoDevice ? duoModalMaxHeight : nil
+    }
+
+    /// Rounder on iPhone Duo, closer to its system alerts.
+    func popupRadius(_ regular: CGFloat = Radius.L) -> CGFloat {
+        isDuoDevice ? Radius.XL : regular
     }
 }
 

package/ios/Popup/PopupNotify.swift

@@ -105,7 +105,7 @@ public struct PopupNotify: View {
                     .popupReadHeight($actionsHeight)
             }
             .background(theme.colors.background.surface)
-            .clipShape(RoundedRectangle(cornerRadius: Radius.L))
+            .clipShape(RoundedRectangle(cornerRadius: layout.popupRadius()))
 
             if props.isShowCloseIcon {
                 PopupCloseButton(action: props.onIconClose)
@@ -113,7 +113,7 @@ public struct PopupNotify: View {
             }
         }
         .frame(maxWidth: layout.popupMaxWidth)
-        .padding(.horizontal, Spacing.M)
+        .padding(.horizontal, layout.popupHorizontalPadding(Spacing.M))
         .accessibilityElement(children: .contain)
         .accessibilityIdentifier("popup_notify")
     }

package/ios/Typography/FontScale.swift

@@ -19,11 +19,19 @@ public struct FontScale: Equatable {
     public let useOSScaleRate: Bool
     /// OS Dynamic Type factor at the time the snapshot was taken.
     public let osFontScale: CGFloat
+    // AI-GENERATED START: device scale from the app window, not UIScreen.main (fixed to one display on iPhone Duo)
+    public let windowShortSide: CGFloat
 
-    public init(userScaleRate: CGFloat = 1, useOSScaleRate: Bool = true, osFontScale: CGFloat = 1) {
+    public init(
+        userScaleRate: CGFloat = 1,
+        useOSScaleRate: Bool = true,
+        osFontScale: CGFloat = 1,
+        windowShortSide: CGFloat? = nil
+    ) {
         self.userScaleRate = userScaleRate
         self.useOSScaleRate = useOSScaleRate
         self.osFontScale = osFontScale
+        self.windowShortSide = windowShortSide ?? DesignSystemKits.currentWindowShortSide()
     }
 
     /// `callAsFunction` so call sites keep reading like Compose's `scaleSize(16)`.
@@ -31,8 +39,8 @@ public struct FontScale: Equatable {
         guard useOSScaleRate else { return size * userScaleRate }
 
         // Short side, not width: landscape must not inflate every font (and so every popup's height).
-        let bounds = UIScreen.main.bounds.size
-        let deviceScale = min(bounds.width, bounds.height) / Self.defaultScreenSize
+        let deviceScale = windowShortSide / Self.defaultScreenSize
+    // AI-GENERATED END: device scale from the app window, not UIScreen.main (fixed to one display on iPhone Duo)
 
         var deviceScaled = size
         var osScaled = size
@@ -58,7 +66,10 @@ public struct FontScale: Equatable {
         return FontScale(
             userScaleRate: userScaleRate ?? self.userScaleRate,
             useOSScaleRate: useOSScaleRate ?? self.useOSScaleRate,
-            osFontScale: osFontScale
+            osFontScale: osFontScale,
+            // AI-GENERATED START: keep the window size through context overrides
+            windowShortSide: windowShortSide
+            // AI-GENERATED END: keep the window size through context overrides
         )
     }
 }

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-beta.22'
+  s.version          = '0.168.1-beta.8'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.167.1-beta.22'
+  s.version          = '0.168.1-beta.8'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.49-debug",
+  "version": "0.162.50-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},