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

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

@@ -40,8 +40,6 @@ 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 {
@@ -60,7 +58,6 @@ 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) }
@@ -98,10 +95,6 @@ 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) {
@@ -129,7 +122,7 @@ fun PopupNotify(
                         text = error,
                         style = Typography.descriptionXs,
                         color = AppTheme.current.colors.text.hint,
-                        maxLines = 2,
+                        maxLines = 1,
                         modifier = Modifier.padding(top = Spacing.S)
                     )
                 }
@@ -141,7 +134,7 @@ fun PopupNotify(
             ) {
                 BuildAction(primary, secondary, buttonDirection, onAction = { callback ->
                     onClose(callback)
-                }, onActionMiniapp = {callback -> onCloseMiniapp(callback)})
+                })
             }
         }
 
@@ -185,7 +178,6 @@ 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) {
@@ -202,8 +194,7 @@ fun BuildAction(
                     secondary = secondary,
                     onAction = onAction,
                     closeAction = closeAction,
-                    primary = primary,
-                    onActionMiniapp = onActionMiniapp
+                    primary = primary
                 )
             }
         }
@@ -212,8 +203,7 @@ fun BuildAction(
             secondary = secondary,
             onAction = onAction,
             closeAction = closeAction,
-            primary = primary,
-            onActionMiniapp = onActionMiniapp
+            primary = primary
         )
 
         else -> renderColumn(
@@ -231,7 +221,6 @@ fun renderRow(
     closeAction: MutableState<String>,
     primary: PopupAction?,
     onAction: (onPress: (() -> Unit)?) -> Unit,
-    onActionMiniapp: ((onPress: ((Int) -> Unit)?) -> Unit)? = null,
 ) {
     Row(horizontalArrangement = Arrangement.Center) {
         secondary?.let {
@@ -256,10 +245,7 @@ fun renderRow(
                 size = Size.MEDIUM,
                 onClick = {
                     closeAction.value = "button_action"
-                    if(primary?.typePopupDisplay == "miniapp")
-                        onActionMiniapp?.invoke(primary.onPressMiniapp)
-                    else
-                        onAction( primary?.onPress)
+                    onAction(primary?.onPress)
                 },
                 title = primary?.title ?: "",
                 modifier = Modifier.semantics {
@@ -276,17 +262,13 @@ 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"
-                if(primary?.typePopupDisplay == "miniapp")
-                    onActionMiniapp?.invoke(primary.onPressMiniapp)
-                else
-                    onAction( primary?.onPress)
+                onAction(primary?.onPress)
             },
             title = primary?.title ?: "",
             modifier = Modifier.semantics {

package/ios/Application/Components.swift

@@ -218,6 +218,69 @@ public struct Header: View {
     
 }
 
+public struct HeaderContainerView: View {
+    var headerType: HeaderType = .default
+    var titlePosition: TitlePosition
+    var title: String
+    var headerRight: (() -> AnyView)?
+    var goBack: (() -> Void)?
+    var opacity: CGFloat? = nil
+    var animatedHeader: AnimatedHeader? = nil
+    var scrollState: CGFloat = 0
+    var inputSearchProps: InputSearchProps? = nil
+    
+    @State private var colorFraction: CGFloat = 0
+    
+    public init(
+        headerType: HeaderType = .default,
+        titlePosition: TitlePosition,
+        title: String,
+        headerRight: (() -> AnyView)? = nil,
+        goBack: (() -> Void)? = nil,
+        opacity: CGFloat? = nil,
+        animatedHeader: AnimatedHeader? = nil,
+        scrollState: CGFloat = 0,
+        inputSearchProps: InputSearchProps? = nil
+    ) {
+        self.headerType = headerType
+        self.titlePosition = titlePosition
+        self.title = title
+        self.headerRight = headerRight
+        self.goBack = goBack
+        self.opacity = opacity
+        self.animatedHeader = animatedHeader
+        self.scrollState = scrollState
+        self.inputSearchProps = inputSearchProps
+    }
+    
+    @State private var scrollOffset: CGFloat = 0
+    
+    public var body: some View {
+        ZStack {
+            if animatedHeader == nil {
+                HeaderBackground(headerType: headerType, scrollState: scrollOffset)
+            } else {
+                Color.white.opacity(Double(min(scrollOffset / 114, 1)))
+                    .overlay(HeaderBackground(headerType: headerType, scrollState: scrollOffset))
+                
+            }
+            
+            Header(
+                headerType: headerType,
+                titlePosition: titlePosition,
+                title: title,
+                headerRight: headerRight,
+                goBack: goBack,
+                opacity: min(scrollOffset / 114, 1),
+                animatedHeader: animatedHeader,
+                scrollState: scrollOffset,
+                inputSearchProps: inputSearchProps
+            ).padding(.bottom, headerType == .extended ? 0 : -safeAreaTopInset())
+        }.padding(.top, -safeAreaTopInset())
+    }
+}
+
+
 
 
 

package/ios/Application/Screen.swift

@@ -76,6 +76,17 @@ public struct Screen<Content: View>: View {
             let keyboardHeight: CGFloat = 0
             let keyboardSize: CGFloat = useAvoidKeyboard ? max(keyboardHeight, 0) : 0
             
+            var headerHeight: CGFloat {
+                switch headerType {
+                case .default:
+                    return 52
+                case .extended:
+                    return 154
+                case .none:
+                    return 0
+                }
+            }
+            
             ZStack {
                 (backgroundColor ?? Color.white).edgesIgnoringSafeArea(.all)
                 
@@ -113,6 +124,7 @@ public struct Screen<Content: View>: View {
                                 VStack {
                                     content()
                                 }
+//                                .frame(width: geometry.size.width, height: geometry.size.height + 600)
                                 .background(GeometryReader { geo -> Color in
                                     DispatchQueue.main.async {
                                         self.scrollOffset = -geo.frame(in: .global).origin.y
@@ -122,6 +134,7 @@ public struct Screen<Content: View>: View {
                             }
                         } else {
                             content()
+//                                .frame(width: geometry.size.width, height: geometry.size.height + 104)
                         }
                     }
                     .padding(.bottom, keyboardSize)

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 = {},onPressMiniapp: @escaping (Int) -> Void = {_ in }, typePopupDisplay: String = "", buttons: [String]? = []) {
+    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 = {}) {
         self._isPresented = isPresented
         self.title = title
         self.description = description
@@ -32,9 +32,6 @@ public struct PopupDisplay: View {
         self.onClose = onClose
         self.closeButtonTitle = closeButtonTitle
         self.actionButtonTitle = actionButtonTitle
-        self.onPressMiniapp = onPressMiniapp
-        self.typePopupDisplay = typePopupDisplay
-        self.buttons = buttons
     }
 
     // MARK: Public
@@ -110,10 +107,7 @@ 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 {
             SwiftUI.Button(action: onPressCloseButton) {
@@ -151,15 +145,7 @@ public struct PopupDisplay: View {
     var RowButtons: some View {
         HStack {
             Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
-            Button(
-                title: actionButtonTitle,
-                action: {if(typePopupDisplay == "miniapp") {
-                    onPressMiniapp?(buttons?.startIndex ?? -1)
-                } else {
-                    onPressAction()
-                } }
-            )
-
+            Button(title: actionButtonTitle, action: onPressAction)
         }
         .frame(maxWidth: .infinity, alignment: .center)
         .padding(.horizontal, 24)
@@ -170,11 +156,7 @@ public struct PopupDisplay: View {
         VStack(alignment: .trailing) {
             Button(
                 title: actionButtonTitle,
-                action: {if(typePopupDisplay == "miniapp") {
-                    onPressMiniapp?(buttons?.startIndex ?? -1)
-                } else {
-                    onPressAction()
-                } }
+                action: onPressAction
             )
             Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
         }

package/package.json

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