@momo-kits/native-kits 0.117.1-beta.1 → 0.117.1-beta.2

package/ios/Popup/PopupDisplay.swift

@@ -34,17 +34,13 @@ public struct PopupDisplay: View {
         self.actionButtonTitle = actionButtonTitle
         self.errorCode = errorCode
     }
-    
-    var placeholder: AnyView?
-
-    @State var error: Bool = false
 
     // MARK: Public
 
     public var body: some View {
         VStack(spacing: 12) {
             ZStack(alignment: .topTrailing) {
-                SwiftUI.Button(action: onPressClose) {
+                SwiftUI.Button(action: onClose) {
                     Image(systemName: "xmark.circle.fill")
                         .resizable()
                         .frame(width: 22, height: 22)
@@ -56,20 +52,20 @@ public struct PopupDisplay: View {
                     .zIndex(1)
                     .accessibility(identifier: "ic_popup_close")
 
-            VStack {
-                if(!url.isEmpty) {
-                    WebImage(url: URL(string: url), isAnimating: .constant(true))
-                        .resizable()
-                        .placeholder {
-                            Rectangle()
-                                .fill(Color.gray.opacity(0.3))
-                                .frame(maxWidth: .infinity, maxHeight: 184)
-                        }
-                        .scaledToFill()
-                        .frame(maxWidth: .infinity)
-                        .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
-                        .aspectRatio(2, contentMode: .fit)
-                }
+                VStack {
+                    if(!url.isEmpty) {
+                        WebImage(url: URL(string: url), isAnimating: .constant(true))
+                            .resizable()
+                            .placeholder {
+                                Rectangle()
+                                    .fill(Color.gray.opacity(0.3))
+                                    .frame(maxWidth: .infinity, maxHeight: 184)
+                            }
+                            .scaledToFill()
+                            .frame(maxWidth: .infinity)
+                            .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
+                            .aspectRatio(2, contentMode: .fit)
+                    }
                     VStack(alignment: .leading) {
                         Text(title)
                             .foregroundColor(.black)
@@ -85,7 +81,7 @@ public struct PopupDisplay: View {
                             .opacity(0.6)
                             .multilineTextAlignment(.leading)
                             .padding(.bottom, 8)
-                        
+
                         if(!errorCode.isEmpty) {
                             Text(errorCode)
                                 .foregroundColor(Colors.black12)
@@ -134,7 +130,7 @@ public struct PopupDisplay: View {
     var actionButtonTitle: String
     var closeButtonTitle: String
     var errorCode: String
-    
+
     var RowTextButtons: some View {
         HStack {
             SwiftUI.Button(action: onPressCloseButton) {
@@ -195,9 +191,4 @@ public struct PopupDisplay: View {
         .padding(.bottom, 24)
     }
 
-
-    func onPressClose(){
-        isPresented = false
-        onClose()
-    }
 }

package/ios/Popup/PopupPromotion.swift

@@ -4,20 +4,19 @@ import SDWebImageSwiftUI
 public struct PopupPromotion: View {
     var imageUrl: String
     var onIconClose: (() -> Void)?
-    var onRequestClose: (((() -> Void)?) -> Void)? = nil
+    var onAction: (() -> Void)?
+
 
-    
     public init(
         imageUrl: String,
         onIconClose: (() -> Void)? = nil,
-        onRequestClose: (((() -> Void)?) -> Void)? = nil
-
+        onAction: (() -> Void)? = nil
     ) {
         self.imageUrl = imageUrl
         self.onIconClose = onIconClose
-        self.onRequestClose = onRequestClose
+        self.onAction = onAction
     }
-    
+
     public var body: some View {
         VStack(spacing: 8) {
             WebImage(url: URL(string: imageUrl)!)
@@ -31,25 +30,28 @@ public struct PopupPromotion: View {
                 .aspectRatio(0.72, contentMode: .fit)
                 .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
                 .clipped()
-                
+                .onTapGesture {
+                    onAction?()
+                }
+
             buildCloseIcon()
         }
         .accessibility(identifier: "popup_promotion")
     }
-    
+
     @ViewBuilder
     private func buildCloseIcon() -> some View {
         HStack {
             Spacer()
             SwiftUI.Button(action: {
-                onAction(callback: onIconClose)
+                onIconClose?()
             }) {
                 ZStack {
                     Circle()
                         .strokeBorder(Colors.black01, lineWidth: 2)
                         .background(Circle().fill(Colors.black17))
                         .frame(width: 20, height: 20)
-                    
+
                     Icon(source: "navigation_close", size: 14, color: Colors.black01)
                 }
             }
@@ -57,14 +59,7 @@ public struct PopupPromotion: View {
             Spacer()
         }
     }
-    
-    private func onAction(callback: (() -> Void)?) {
-        if let onRequestClose = onRequestClose {
-            onRequestClose(callback)
-        } else {
-            callback?()
-        }
-    }
+
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.117.1-beta.1",
+  "version": "0.117.1-beta.2",
   "private": false,
   "dependencies": {},
   "devDependencies": {},