@momo-kits/native-kits 0.156.6-beta.2-debug → 0.156.6-beta.3-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.156.6-beta.2-debug"
+        version = "0.156.6-beta.3-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

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

@@ -370,9 +370,14 @@ private class LiteScreenHeaderPolicy(
                 maxWidth = (realConstraints.maxWidth * (1 - scrollPercent)).toInt()
                     .coerceAtLeast(minWidth)
             )
-        } else realConstraints.copy(
-            maxWidth = realConstraints.maxWidth - backIconPlaceable.safeWidth - headerRightPlaceable.safeWidth - spacing12 * 2
-        )
+        } else {
+            var spaceConsumed = 0
+            if (backIconPlaceable.safeWidth != 0) spaceConsumed += backIconPlaceable.safeWidth + spacing12
+            if (headerRightPlaceable.safeWidth != 0) spaceConsumed += headerRightPlaceable.safeWidth + spacing12
+            realConstraints.copy(
+                maxWidth = realConstraints.maxWidth - spaceConsumed
+            )
+        }
         val inputSearchPlaceable = measurables.find { it.layoutId == HeaderId.INPUT_SEARCH_ID }
             ?.measure(inputSearchConstraints)
         val titlePlaceable = measurables.find { it.layoutId == HeaderId.TITLE_ID }?.measure(
@@ -516,7 +521,7 @@ private fun LiteInputSearch(
 
     val isShowBtnText by remember(inputSearchProps.isShowBtnText, inputSearchProps.btnText) {
         derivedStateOf {
-            inputSearchProps.isShowBtnText && inputSearchProps.btnText.isNullOrEmpty()
+            inputSearchProps.isShowBtnText && !inputSearchProps.btnText.isNullOrEmpty()
         }
     }
     val inputFieldStyle = remember(theme) {

package/ios/Input/InputPhoneNumber.swift

@@ -21,7 +21,8 @@ public struct InputPhoneNumber: View {
     public var onFocus: (() -> Void)?
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
-    
+    public var inputAccessibilityId: String
+
     @State private var isFocused: Bool = false
     
     public init(
@@ -38,7 +39,8 @@ public struct InputPhoneNumber: View {
         onChangeText: ((String) -> Void)? = nil,
         onFocus: (() -> Void)? = nil,
         onBlur: (() -> Void)? = nil,
-        onRightIconPressed: (() -> Void)? = nil
+        onRightIconPressed: (() -> Void)? = nil,
+        inputAccessibilityId: String = ""
     ) {
         self._text = text
         self.placeholder = placeholder
@@ -53,6 +55,7 @@ public struct InputPhoneNumber: View {
         self.onFocus = onFocus
         self.onBlur = onBlur
         self.onRightIconPressed = onRightIconPressed
+        self.inputAccessibilityId = inputAccessibilityId
     }
     
     // MARK: - Body
@@ -94,6 +97,7 @@ public struct InputPhoneNumber: View {
                     .foregroundColor(Colors.black17)
                     .applyPrimaryCursorColor()
                     .lineLimit(1)
+                    .accessibility(identifier: inputAccessibilityId)
                 }
                 
                 // Clear button

package/ios/Popup/PopupDisplay.swift

@@ -113,7 +113,11 @@ public struct PopupDisplay: View {
                 }
                 
                 VStack(spacing: 0) {
-                    if(!url.isEmpty) {
+                    if(url.isEmpty) {
+                        Icon(source: "media_fail")
+                            .frame(width: .infinity, height: 184)
+                    }
+                    else {
                         WebImage(url: URL(string: url), isAnimating: .constant(true))
                             .resizable()
                             .placeholder {

package/package.json

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