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

package/ios/Popup/PopupPromotion.swift

@@ -2,12 +2,13 @@ import SwiftUI
 import SDWebImageSwiftUI
 
 public struct PopupPromotion: View {
-    @Environment(\.appTheme) private var theme
+    @Environment(\.screenLayout) private var layout
 
     var imageUrl: String
     var onIconClose: (() -> Void)?
     var onAction: (() -> Void)?
 
+    @State private var imageFailed = false
 
     public init(
         imageUrl: String,
@@ -19,56 +20,39 @@ public struct PopupPromotion: View {
         self.onAction = onAction
     }
 
-    public var body: some View {
-        VStack(spacing: 8) {
-            if(imageUrl.isEmpty) {
-                Icon(source: "media_fail", size: UIScreen.main.bounds.width - Spacing.XL * 2)
-            }
-            else {
-                WebImage(url: URL(string: imageUrl)!)
-                    .resizable()
-                    .placeholder {
-                        Color.gray
-                            .aspectRatio(0.72, contentMode: .fit)
-                            .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
-                            .clipped()
-                    }
-                    .aspectRatio(0.72, contentMode: .fit)
-                    .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2, alignment: .center)
-                    .clipped()
-                    .onTapGesture {
-                        onAction?()
-                    }
-            }
-            buildCloseIcon()
-                .accessibility(identifier: "ic_popup_close")
-        }
-        .accessibilityElement(children: .ignore)
-        .accessibility(identifier: "popup_promotion")
-    }
+    private static let aspectRatio: CGFloat = 0.72
+    private static let closeTapSize: CGFloat = 40
+    // close button row under the image: top padding + 40pt tap target
+    private static let closeRowHeight: CGFloat = Spacing.S + closeTapSize
 
-    @ViewBuilder
-    private func buildCloseIcon() -> some View {
-        HStack(alignment: .center, spacing: 0) {
-            SwiftUI.Button(action: {
-                onIconClose?()
-            }) {
-                ZStack {
-                    Circle()
-                        .strokeBorder(theme.colors.background.surface, lineWidth: 2)
-                        .background(Circle().fill(theme.colors.text.default))
-                        .frame(width: 22, height: 22)
+    // fit the portrait image by height when iPhone Duo leaves too little room
+    private var imageWidth: CGFloat {
+        let width = min(layout.width - Spacing.M * 2, layout.popupMaxWidth)
+        guard let maxHeight = layout.popupMaxHeight else { return width }
+        return min(width, (maxHeight - Self.closeRowHeight) * Self.aspectRatio)
+    }
 
-                    Icon(source: "navigation_close", size: 16, color: theme.colors.background.surface)
+    public var body: some View {
+        VStack(spacing: 0) {
+            // stretched like Compose's ContentScale.FillBounds; an empty url shows the error state, as in Compose
+            WebImage(url: URL(string: imageUrl))
+                .onSuccess { _, _, _ in imageFailed = false }
+                .onFailure { _ in imageFailed = true }
+                .resizable()
+                .placeholder { PopupImagePlaceholder(failed: imageFailed || URL(string: imageUrl) == nil) }
+                .aspectRatio(Self.aspectRatio, contentMode: .fit)
+                .frame(maxWidth: imageWidth)
+                .contentShape(Rectangle())
+                .onTapGesture {
+                    onAction?()
                 }
-                .frame(width: 40, height: 40)
-                .padding(8)
-                .zIndex(1)
+
+            PopupCloseButton(tapSize: Self.closeTapSize) {
+                onIconClose?()
             }
+            .padding(.top, Spacing.S)
         }
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifier("popup_promotion")
     }
-
 }
-
-
-

package/ios/PopupView/FullscreenPopup.swift

@@ -51,12 +51,9 @@ public struct FullscreenPopup<Item: Equatable, PopupContent: View>: ViewModifier
     @State private var opacity = 0.0
 
     // MARK: - Autohide
-    /// Class reference for capturing a weak reference later in dispatch work holder.
-    private var isPresentedRef: ClassReference<Binding<Bool>>?
-    private var itemRef: ClassReference<Binding<Item?>>?
-
-    /// holder for autohiding dispatch work (to be able to cancel it when needed)
-    private var dispatchWorkHolder = DispatchWorkHolder()
+    /// holder for autohiding dispatch work (to be able to cancel it when needed);
+    /// state so it outlives re-renders, which would otherwise orphan the pending work
+    @State private var dispatchWorkHolder = DispatchWorkHolder()
 
     // MARK: - Internal
     /// Set dismiss souce to pass to dismiss callback
@@ -85,9 +82,6 @@ public struct FullscreenPopup<Item: Equatable, PopupContent: View>: ViewModifier
         self.backgroundColor = backgroundColor
         self.dismissCallback = dismissCallback
         self.view = view
-
-        self.isPresentedRef = ClassReference(self.$isPresented)
-        self.itemRef = ClassReference(self.$item)
     }
 
     init(item: Binding<Item?>,
@@ -113,9 +107,6 @@ public struct FullscreenPopup<Item: Equatable, PopupContent: View>: ViewModifier
         self.backgroundColor = backgroundColor
         self.dismissCallback = dismissCallback
         self.view = view
-
-        self.isPresentedRef = ClassReference(self.$isPresented)
-        self.itemRef = ClassReference(self.$item)
     }
 
     public func body(content: Content) -> some View {
@@ -214,7 +205,8 @@ public struct FullscreenPopup<Item: Equatable, PopupContent: View>: ViewModifier
     }
 
     func onAnimationCompleted() -> () {
-        if shouldShowContent { // return if this was called on showing animation, only proceed if called on hiding
+        // only proceed on hiding, once: both the offset animation and the fallback timer land here
+        if shouldShowContent || !showContent {
             return
         }
         showContent = false // unload popup body after hiding animation is done
@@ -229,12 +221,14 @@ public struct FullscreenPopup<Item: Equatable, PopupContent: View>: ViewModifier
         if let autohideIn = autohideIn {
             dispatchWorkHolder.work?.cancel()
 
-            // Weak reference to avoid the work item capturing the struct,
-            // which would create a retain cycle with the work holder itself.
-            dispatchWorkHolder.work = DispatchWorkItem(block: { [weak isPresentedRef, weak itemRef] in
-                isPresentedRef?.value.wrappedValue = false
-                itemRef?.value.wrappedValue = nil
-                dismissSource = .autohide
+            // bindings only: capturing the struct would retain the work holder in a cycle
+            let isPresented = $isPresented
+            let item = $item
+            let dismissSource = $dismissSource
+            dispatchWorkHolder.work = DispatchWorkItem(block: {
+                dismissSource.wrappedValue = .autohide
+                isPresented.wrappedValue = false
+                item.wrappedValue = nil
             })
             if sheetPresented, let work = dispatchWorkHolder.work {
                 DispatchQueue.main.asyncAfter(deadline: .now() + autohideIn, execute: work)

package/ios/PopupView/PopupView.swift

@@ -239,7 +239,7 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
                 .onAnimationCompleted(for: currentOffset) {
                     animationCompletedCallback()
                 }
-                .animation(animation)
+                .animation(animation, value: currentOffset)
         }
 
         #if !os(tvOS)

package/ios/PopupView/Utils++.swift

@@ -5,14 +5,6 @@ final class DispatchWorkHolder {
     var work: DispatchWorkItem?
 }
 
-final class ClassReference<T> {
-    var value: T
-
-    init(_ value: T) {
-        self.value = value
-    }
-}
-
 public extension View {
     
     @ViewBuilder

package/ios/ProgressInfo/ProgressInfo.swift

@@ -112,7 +112,9 @@ private struct ProgressInfoHorizontal: View {
 
     var body: some View {
         HStack(alignment: .top, spacing: 0) {
-            ForEach(Array(steps.enumerated()), id: \.element.id) { index, item in
+            // Keyed by position: `ProgressInfoItem.id` is a fresh UUID per init, so it churns
+            // identity whenever the caller rebuilds `steps`.
+            ForEach(Array(steps.enumerated()), id: \.offset) { index, item in
                 let isFirst = index == 0
                 let isLast = index == steps.count - 1
 
@@ -207,7 +209,7 @@ private struct ProgressInfoVertical: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
-            ForEach(Array(steps.enumerated()), id: \.element.id) { index, item in
+            ForEach(Array(steps.enumerated()), id: \.offset) { index, item in
                 let isLast = index == steps.count - 1
 
                 HStack(alignment: .top, spacing: 0) {

package/ios/Radio/Radio.swift

@@ -36,8 +36,9 @@ public struct Radio: View {
     public var body: some View {
         SwiftUI.Button(action: onTap) {
             HStack(spacing: 0) {
+                // strokeBorder keeps the ring inside 20pt, like Compose `border`.
                 RoundedRectangle(cornerRadius: Radius.M)
-                    .stroke(borderColor, lineWidth: borderWidth)
+                    .strokeBorder(borderColor, lineWidth: borderWidth)
                     .frame(width: 20, height: 20)
                     .padding(.trailing, label.isEmpty ? 0 : Spacing.XS)
 

package/ios/Rating/Rating.swift

@@ -35,7 +35,7 @@ public struct Rating: View {
 
     public var body: some View {
         HStack(spacing: 2) {
-            ForEach(0..<numOfStars, id: \.self) { index in
+            ForEach(0..<max(numOfStars, 0), id: \.self) { index in
                 star(at: index)
             }
         }
@@ -59,7 +59,14 @@ public struct Rating: View {
         }
     }
 
+    // Kotlin's toInt() maps NaN to 0 and saturates; Swift's Int(_:) traps on both.
+    private var safeRating: Float {
+        guard rating.isFinite else { return 0 }
+        return min(max(rating, -Float(Int32.max)), Float(Int32.max))
+    }
+
     private func starIcon(at index: Int) -> String {
+        let rating = safeRating
         let intRating = Int(rating)
         if index < intRating {
             return "reaction_star_full"
@@ -71,6 +78,7 @@ public struct Rating: View {
     }
 
     private func starColor(at index: Int) -> Color {
+        let rating = safeRating
         let intRating = Int(rating)
         if index < intRating {
             return Colors.yellow03