@momo-kits/native-kits 0.113.3-webview.2 → 0.114.2-beta.1

package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt

@@ -57,8 +57,8 @@ data class MiniAppContext(
 
 val PlatformApi = staticCompositionLocalOf<Any?> { null }
 
-val AppNavigator = staticCompositionLocalOf<Navigator> {
-    error("no navigator provided!")
+val AppNavigator = staticCompositionLocalOf<Navigator?> {
+    null
 }
 
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt

@@ -161,7 +161,7 @@ fun Screen(
                         }
 
                         if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
-                            Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.M)))
+                            Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.S)))
                         }
                         content()
                     }

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

@@ -21,6 +21,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -36,6 +37,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -154,7 +156,7 @@ fun ErrorView(errorMessage: String, errorSpacing: Boolean, hintText: String) {
 
 @Composable
 fun Input(
-    text: MutableState<String> = remember { mutableStateOf("") },
+    text: String = "",
     floatingValue: String = "",
     floatingValueColor: Color = AppTheme.current.colors.text.hint,
     floatingIcon: String = "",
@@ -181,6 +183,11 @@ fun Input(
     keyboardType: KeyboardType = KeyboardType.Text,
     modifier: Modifier = Modifier,
 ) {
+    // Handling state based on the `BasicTextField` concept
+    var textFieldValueState by remember { mutableStateOf(TextFieldValue(text = text)) }
+    val textFieldValue = textFieldValueState.copy(text = text)
+    var lastTextValue by remember(text) { mutableStateOf(text) }
+
     var isFocused by remember { mutableStateOf(false) }
     var passHidden by remember { mutableStateOf(false) }
     var isBlurred = false
@@ -209,10 +216,10 @@ fun Input(
     setAutomationId(testId)
     ) {
         BasicTextField(
+            value = text,
             enabled = !disabled,
             readOnly = readOnly,
             singleLine = true,
-            value = text.value,
             textStyle = TextStyle(
                 color = textColor,
                 fontSize = 16.sp,
@@ -229,7 +236,15 @@ fun Input(
                 if (!it.isFocused && isBlurred) onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            onValueChange = onChangeText,
+            onValueChange = { newValue ->
+                textFieldValueState.copy(text = newValue)
+                val stringChangedSinceLastInvocation = lastTextValue != newValue
+                lastTextValue = newValue
+
+                if (stringChangedSinceLastInvocation) {
+                    onChangeText(newValue)
+                }
+            },
             decorationBox = { innerTextField ->
                 // Floating Icon
                 if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
@@ -291,7 +306,7 @@ fun Input(
                             )
                         }
                         Box(Modifier.weight(1f)) {
-                            if (text.value.isEmpty()) {
+                            if (textFieldValue.text.isEmpty()) {
                                 Text(
                                     text = placeholder,
                                     style = TextStyle(
@@ -304,7 +319,7 @@ fun Input(
                             }
                             innerTextField()
                         }
-                        if (isFocused && text.value.isNotEmpty()) {
+                        if (isFocused && textFieldValue.text.isNotEmpty()) {
                             Row {
                                 Spacer(Modifier.width(Spacing.XS))
                                 Icon(
@@ -312,7 +327,10 @@ fun Input(
                                     size = 16.dp,
                                     color = AppTheme.current.colors.text.hint,
                                     modifier = Modifier.clickable(
-                                        onClick = { text.value = "" },
+                                        onClick = {
+                                            onChangeText("")
+                                            textFieldValueState = TextFieldValue(text = "")
+                                        },
                                         interactionSource = remember { MutableInteractionSource() },
                                         indication = null
                                     )

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

@@ -143,7 +143,7 @@ fun PopupNotify(
             Modifier
                 .width(22.dp)
                 .height(22.dp)
-                .offset(x = Spacing.M / 2, y = -Spacing.M)
+                .offset(x = -(4).dp, y = (-10).dp)
                 .background(
                     color = AppTheme.current.colors.text.default,
                     shape = RoundedCornerShape(Radius.M)

package/ios/Swipeable/SwipeCell.swift

@@ -10,9 +10,9 @@ public struct SwipeCellModifier: ViewModifier {
     var trailingSideGroup: [SwipeCellActionItem] = []
     @Binding var currentUserInteractionCellID: String?
     var settings: SwipeCellSettings = .init()
-    
+
     @State private var offsetX: CGFloat = 0
-    
+
     let generator = UINotificationFeedbackGenerator()
     @State private var hapticFeedbackOccurred: Bool = false
     @State private var openSideLock: SwipeGroupSide?
@@ -22,15 +22,23 @@ public struct SwipeCellModifier: ViewModifier {
             if self.leadingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.leadingSideGroup, side: .leading)
             }
-                
+
             if self.trailingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.trailingSideGroup, side: .trailing)
             }
-                
+
             content
                 .offset(x: self.offsetX)
-                .gesture(DragGesture(minimumDistance: 30, coordinateSpace: .local).onChanged(self.dragOnChanged(value:)).onEnded(dragOnEnded(value:)))
-                    
+                .simultaneousGesture(
+                    DragGesture(minimumDistance: 30, coordinateSpace: .local)
+                        .onChanged { value in
+                            self.dragOnChanged(value: value)
+                        }
+                        .onEnded { value in
+                            self.dragOnEnded(value: value)
+                        }
+                )
+
         }.frame(width: cellWidth)
             .edgesIgnoringSafeArea(.horizontal)
             .clipped()
@@ -43,7 +51,7 @@ public struct SwipeCellModifier: ViewModifier {
                 }
             }
     }
-    
+
     internal func swipeToRevealArea(swipeItemGroup: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         HStack {
             if side == .trailing {
@@ -63,17 +71,17 @@ public struct SwipeCellModifier: ViewModifier {
                     }
                 }
             }.opacity(self.swipeRevealAreaOpacity(side: side))
-    
+
             if side == .leading {
                 Spacer()
             }
         }
     }
-    
+
     internal func buttonContentView(item: SwipeCellActionItem, group: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         ZStack {
             item.backgroundColor
-                
+
             HStack {
                 if self.warnSwipeOutCondition(side: side, hasSwipeOut: item.swipeOutAction) && item.swipeOutButtonView != nil {
                     item.swipeOutButtonView!()
@@ -81,28 +89,28 @@ public struct SwipeCellModifier: ViewModifier {
                     item.buttonView()
                 }
             }
-        
+
         }.frame(width: self.itemButtonWidth(item: item, itemGroup: group, side: side))
     }
-    
+
     internal func menuWidth(side: SwipeGroupSide)->CGFloat {
         switch side {
         case .leading:
             return self.leadingSideGroup.map { $0.buttonWidth }.reduce(0, +)
-          
+
         case .trailing:
             return self.trailingSideGroup.map { $0.buttonWidth }.reduce(0, +)
         }
     }
-    
+
     // MARK: drag gesture
-    
+
     internal func dragOnChanged(value: DragGesture.Value) {
         let horizontalTranslation = value.translation.width
         if self.nonDraggableCondition(horizontalTranslation: horizontalTranslation) {
             return
         }
-        
+
         if self.openSideLock != nil {
             // if one side is open, we need to add the menu width!
             let menuWidth = self.openSideLock == .leading ? self.menuWidth(side: .leading) : self.menuWidth(side: .trailing)
@@ -110,9 +118,9 @@ public struct SwipeCellModifier: ViewModifier {
             self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
             return
         }
-        
+
         self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
-        
+
         if horizontalTranslation > 8 || horizontalTranslation < -8 { // makes sure the swipe cell doesn't open too easily
             self.currentUserInteractionCellID = self.id
             self.offsetX = horizontalTranslation
@@ -120,11 +128,11 @@ public struct SwipeCellModifier: ViewModifier {
             self.offsetX = 0
         }
     }
-    
+
     internal func nonDraggableCondition(horizontalTranslation: CGFloat)->Bool {
         return self.offsetX == 0 && (self.leadingSideGroup.isEmpty && horizontalTranslation > 0 || self.trailingSideGroup.isEmpty && horizontalTranslation < 0)
     }
-    
+
     internal func dragOnEnded(value: DragGesture.Value) {
         let swipeOutTriggerValue = self.cellWidth * self.settings.swipeOutTriggerRatio
 
@@ -139,7 +147,7 @@ public struct SwipeCellModifier: ViewModifier {
                 } else {
                     self.lockSideMenu(side: .leading)
                 }
-                
+
             } else {
                 // leading group emtpy
                 self.setOffsetX(value: 0)
@@ -160,7 +168,7 @@ public struct SwipeCellModifier: ViewModifier {
             }
         }
     }
-    
+
     internal func triggerHapticFeedbackIfNeeded(horizontalTranslation: CGFloat) {
         let side: SwipeGroupSide = horizontalTranslation > 0 ? .leading : .trailing
         let group = side == .leading ? self.leadingSideGroup : self.trailingSideGroup
@@ -170,7 +178,7 @@ public struct SwipeCellModifier: ViewModifier {
             self.hapticFeedbackOccurred = true
         }
     }
-    
+
     internal func swipeOutItemWithHapticFeedback(group: [SwipeCellActionItem])->SwipeCellActionItem? {
         if let item = group.filter({ $0.swipeOutAction == true }).first {
             if item.swipeOutHapticFeedbackType != nil {
@@ -179,7 +187,7 @@ public struct SwipeCellModifier: ViewModifier {
         }
         return nil
     }
-    
+
     internal func swipeOutAction(item: SwipeCellActionItem, sideFactor: CGFloat) {
         if item.swipeOutIsDestructive {
             let swipeOutWidth = cellWidth + 10
@@ -188,12 +196,12 @@ public struct SwipeCellModifier: ViewModifier {
         } else {
             self.setOffsetX(value: 0) // open side lock set in function!
         }
-      
+
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             item.actionCallback()
         }
     }
-    
+
     internal func lockSideMenu(side: SwipeGroupSide) {
         self.setOffsetX(value: side.sideFactor * self.menuWidth(side: side))
         self.openSideLock = side
@@ -214,7 +222,7 @@ public struct SwipeCellModifier: ViewModifier {
         let dynamicButtonWidth = self.dynamicButtonWidth(item: item, itemCount: itemGroup.count, side: side)
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         let swipeOutActionCondition = side == .leading ? self.offsetX > triggerValue : self.offsetX < -triggerValue
-        
+
         if item.swipeOutAction && swipeOutActionCondition {
             return self.offsetX.magnitude + settings.addWidthMargin
         } else if swipeOutActionCondition && item.swipeOutAction == false && itemGroup.contains(where: { $0.swipeOutAction == true }) {
@@ -223,12 +231,12 @@ public struct SwipeCellModifier: ViewModifier {
             return dynamicButtonWidth
         }
     }
-    
+
     internal func dynamicButtonWidth(item: SwipeCellActionItem, itemCount: Int, side: SwipeGroupSide)->CGFloat {
         let menuWidth = self.menuWidth(side: side)
         return (self.offsetX.magnitude + settings.addWidthMargin) * (item.buttonWidth / menuWidth)
     }
-    
+
     internal func warnSwipeOutCondition(side: SwipeGroupSide, hasSwipeOut: Bool)->Bool {
         if hasSwipeOut == false {
             return false
@@ -236,11 +244,11 @@ public struct SwipeCellModifier: ViewModifier {
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         return (side == .trailing && self.offsetX < -triggerValue) || (side == .leading && self.offsetX > triggerValue)
     }
-    
+
     internal func swipeRevealAreaOpacity(side: SwipeGroupSide)->Double {
         switch side {
         case .leading:
-        
+
             return self.offsetX > 5 ? 1 : 0
         case .trailing:
             return self.offsetX < -5 ? 1 : 0

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sun Mar 02 11:30:14 ICT 2025
-sdk.dir=/Users/nguyenhoangson/Library/Android/sdk
+#Wed Aug 21 14:20:12 ICT 2024
+sdk.dir=/Users/huynhdung/Library/Android/sdk

package/package.json

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