@momo-kits/native-kits 0.113.1-beta.2 → 0.113.1-beta.3

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt

@@ -40,6 +40,8 @@ import vn.momo.kits.utils.ifNotNull
 data class PopupAction(
     val title: String,
     val onPress: (() -> Unit)?,
+    val onPressMiniapp: ((Int) -> Unit)? = null,
+    val typePopupDisplay: String? = null
 )
 
 enum class PopupActionDirection {
@@ -58,6 +60,7 @@ fun PopupNotify(
     secondary: PopupAction? = null,
     buttonDirection: PopupActionDirection = PopupActionDirection.ROW,
     onIconClose: () -> Unit,
+    buttons: List<String>? = emptyList()
 ) {
     var isScroll by remember { mutableStateOf(false) }
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
@@ -95,6 +98,10 @@ fun PopupNotify(
         callback?.invoke()
     }
 
+    fun onCloseMiniapp(callback: ((Int) -> Unit)?) {
+        callback?.invoke(buttons?.indexOf(buttons.first()) ?: -1)
+    }
+
     Box(Modifier.semantics {
         testTag = "popup_notify"
     }, contentAlignment = Alignment.TopEnd) {
@@ -134,7 +141,7 @@ fun PopupNotify(
             ) {
                 BuildAction(primary, secondary, buttonDirection, onAction = { callback ->
                     onClose(callback)
-                })
+                }, onActionMiniapp = {callback -> onCloseMiniapp(callback)})
             }
         }
 
@@ -178,6 +185,7 @@ fun BuildAction(
     secondary: PopupAction?,
     buttonDirection: PopupActionDirection = PopupActionDirection.ROW,
     onAction: (onPress: (() -> Unit)?) -> Unit,
+    onActionMiniapp: (onPress: ((Int) -> Unit)?) -> Unit,
 ) {
     val closeAction = remember { mutableStateOf("button_action") }
     when (buttonDirection) {
@@ -194,7 +202,8 @@ fun BuildAction(
                     secondary = secondary,
                     onAction = onAction,
                     closeAction = closeAction,
-                    primary = primary
+                    primary = primary,
+                    onActionMiniapp = onActionMiniapp
                 )
             }
         }
@@ -203,7 +212,8 @@ fun BuildAction(
             secondary = secondary,
             onAction = onAction,
             closeAction = closeAction,
-            primary = primary
+            primary = primary,
+            onActionMiniapp = onActionMiniapp
         )
 
         else -> renderColumn(
@@ -221,6 +231,7 @@ fun renderRow(
     closeAction: MutableState<String>,
     primary: PopupAction?,
     onAction: (onPress: (() -> Unit)?) -> Unit,
+    onActionMiniapp: ((onPress: ((Int) -> Unit)?) -> Unit)? = null,
 ) {
     Row(horizontalArrangement = Arrangement.Center) {
         secondary?.let {
@@ -245,7 +256,10 @@ fun renderRow(
                 size = Size.MEDIUM,
                 onClick = {
                     closeAction.value = "button_action"
-                    onAction(primary?.onPress)
+                    if(primary?.typePopupDisplay == "miniapp")
+                        onActionMiniapp?.invoke(primary.onPressMiniapp)
+                    else
+                        onAction( primary?.onPress)
                 },
                 title = primary?.title ?: "",
                 modifier = Modifier.semantics {
@@ -262,13 +276,17 @@ fun renderColumn(
     closeAction: MutableState<String>,
     primary: PopupAction?,
     onAction: (onPress: (() -> Unit)?) -> Unit,
+    onActionMiniapp: ((onPress: ((Int) -> Unit)?) -> Unit)? = null,
 ) {
     Column(horizontalAlignment = Alignment.CenterHorizontally) {
         Button(
             size = Size.MEDIUM,
             onClick = {
                 closeAction.value = "button_action"
-                onAction(primary?.onPress)
+                if(primary?.typePopupDisplay == "miniapp")
+                    onActionMiniapp?.invoke(primary.onPressMiniapp)
+                else
+                    onAction( primary?.onPress)
             },
             title = primary?.title ?: "",
             modifier = Modifier.semantics {

package/ios/Popup/PopupDisplay.swift

@@ -20,7 +20,7 @@ public enum PopupButtonType {
 public struct PopupDisplay: View {
     // MARK: Lifecycle
 
-    public init(isPresented: Binding<Bool>, title: String = "", description: String = "", url: String = "", buttonDirection: PopupButtonDirection = .column, buttonType: PopupButtonType = .button, actionButtonTitle: String = "", closeButtonTitle: String = "", onPressAction: @escaping () -> Void = {}, onPressCloseButton: @escaping () -> Void = {}, onClose: @escaping () -> Void = {}) {
+    public init(isPresented: Binding<Bool>, title: String = "", description: String = "", url: String = "", buttonDirection: PopupButtonDirection = .column, buttonType: PopupButtonType = .button, actionButtonTitle: String = "", closeButtonTitle: String = "", onPressAction: @escaping () -> Void = {}, onPressCloseButton: @escaping () -> Void = {}, onClose: @escaping () -> Void = {},onPressMiniapp: @escaping (Int) -> Void = {_ in }, typePopupDisplay: String = "", buttons: [String]? = []) {
         self._isPresented = isPresented
         self.title = title
         self.description = description
@@ -32,6 +32,9 @@ public struct PopupDisplay: View {
         self.onClose = onClose
         self.closeButtonTitle = closeButtonTitle
         self.actionButtonTitle = actionButtonTitle
+        self.onPressMiniapp = onPressMiniapp
+        self.typePopupDisplay = typePopupDisplay
+        self.buttons = buttons
     }
 
     // MARK: Public
@@ -107,6 +110,9 @@ public struct PopupDisplay: View {
     var onClose: () -> Void
     var actionButtonTitle: String
     var closeButtonTitle: String
+    var typePopupDisplay: String
+    var onPressMiniapp: ((_ index: Int)->Void)?
+    var buttons: [String]?
 
     var RowTextButtons: some View {
         HStack {
@@ -145,7 +151,15 @@ public struct PopupDisplay: View {
     var RowButtons: some View {
         HStack {
             Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
-            Button(title: actionButtonTitle, action: onPressAction)
+            Button(
+                title: actionButtonTitle,
+                action: {if(typePopupDisplay == "miniapp") {
+                    onPressMiniapp?(buttons?.startIndex ?? -1)
+                } else {
+                    onPressAction()
+                } }
+            )
+
         }
         .frame(maxWidth: .infinity, alignment: .center)
         .padding(.horizontal, 24)
@@ -154,7 +168,14 @@ public struct PopupDisplay: View {
 
     var ColumnButtons: some View {
         VStack(alignment: .trailing) {
-            Button(title: actionButtonTitle, action: onPressAction)
+            Button(
+                title: actionButtonTitle,
+                action: {if(typePopupDisplay == "miniapp") {
+                    onPressMiniapp?(buttons?.startIndex ?? -1)
+                } else {
+                    onPressAction()
+                } }
+            )
             Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)

package/package.json

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