@momo-kits/native-kits 0.154.2-test.11 → 0.154.2-test.12

package/ios/Input/ErrorView.swift

@@ -0,0 +1,55 @@
+//
+//  ErrorView.swift
+//  Pods
+//
+//  Created by sophia on 13/1/26.
+//
+
+import SwiftUI
+
+public struct ErrorView: View {
+    public var errorMessage: String
+    public var errorSpacing: Bool
+    public var hintText: String
+    
+    public init(
+        errorMessage: String = "",
+        errorSpacing: Bool = false,
+        hintText: String = ""
+    ) {
+        self.errorMessage = errorMessage
+        self.errorSpacing = errorSpacing
+        self.hintText = hintText
+    }
+    
+    public var body: some View {
+        if !errorMessage.isEmpty || !hintText.isEmpty {
+            HStack(alignment: .top, spacing: 4) {
+                Icon(source: "ic_error", size: scaleSize(16), color: displayColor())
+                MomoText(
+                    displayText(),
+                    typography: .descriptionDefaultRegular,
+                    color: displayColor()
+                )
+            }
+            .padding(.top, Spacing.XS)
+        } else if errorSpacing {
+            Spacer()
+                .padding(.top, Spacing.XS)
+                .frame(height: 18)
+        }
+    }
+    
+    // MARK: - Helpers
+    
+    private func displayColor() -> Color {
+        !errorMessage.isEmpty ? Colors.red03 : Colors.black12
+    }
+    
+    private func displayText() -> String {
+        if !errorMessage.isEmpty {
+            return errorMessage
+        }
+        return hintText.isEmpty ? "Không thể chỉnh sửa" : hintText
+    }
+}

package/ios/Input/Input.swift

@@ -65,6 +65,7 @@ public struct Input: View {
     var placeholder: String
     var floatingValue: String
     var errorMessage: String
+    var errorSpacing: Bool
     var isSecure: Bool
     var keyboardType: UIKeyboardType
     var floatingIcon: AnyView?
@@ -86,7 +87,7 @@ public struct Input: View {
         self.value.removeAll()
     }
     
-    public init(_ value: Binding<String>, placeholder: String  = "", floatingValue: String = "", multilines: Bool  = false, errorMessage: String = "", isSecure: Bool = false, keyboardType: UIKeyboardType = .default, floatingIcon:  AnyView? = nil, rightIcon:  AnyView? = nil, onChange: ((String)->Void)? = nil, onBlur: (()->Void)? = nil, floatingIconURL: String? = nil, floatingIconColor: Color? = Colors.pink03, size: InputSize = .small, fontWeight: InputFontWeight = .regular, disabled: Bool = false, leadingIcon: String? = nil, leadingIconColor: Color? = Colors.pink03, loading: Bool = false, required: Bool = false, hintText: String? = nil){
+    public init(_ value: Binding<String>, placeholder: String  = "", floatingValue: String = "", multilines: Bool  = false, errorMessage: String = "", isSecure: Bool = false, keyboardType: UIKeyboardType = .default, floatingIcon:  AnyView? = nil, rightIcon:  AnyView? = nil, onChange: ((String)->Void)? = nil, onBlur: (()->Void)? = nil, floatingIconURL: String? = nil, floatingIconColor: Color? = Colors.pink03, size: InputSize = .small, fontWeight: InputFontWeight = .regular, disabled: Bool = false, leadingIcon: String? = nil, leadingIconColor: Color? = Colors.pink03, loading: Bool = false, required: Bool = false, hintText: String? = nil, errorSpacing: Bool = false){
         self.placeholder = placeholder
         self.floatingValue = floatingValue
         self.errorMessage = errorMessage
@@ -106,6 +107,7 @@ public struct Input: View {
         self.loading = loading
         self.required = required
         self.hintText = hintText
+        self.errorSpacing = errorSpacing
     }
     
     func onChangeText(value: String){
@@ -147,13 +149,15 @@ public struct Input: View {
                         rightIcon
                     }
                     .padding(.horizontal, 12)
-                    .frame(height: size == .small ? 40 : 48)
-                    .background(disabled ? Colors.black01 : Color.white)
+                    .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
+                    .background(
+                        RoundedRectangle(cornerRadius: Radius.S)
+                            .fill(Colors.black01)
+                    )
                     .overlay(RoundedRectangle(cornerRadius: 8).stroke(focused ? Colors.pink03 : Colors.border, lineWidth: 1))
                     
                     if value.isEmpty {
-                        Text(placeholder + (required ? " *" : ""))
-                            .foregroundColor(Colors.black09)
+                        MomoText(placeholder + (required ? " *" : ""), typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black09)
                             .padding(.horizontal, leadingIcon == nil ? 12 : 32)
                             .padding(.top, 12)
                             .allowsHitTesting(false)
@@ -169,15 +173,11 @@ public struct Input: View {
                     }
                 }
                 
-                if !errorMessage.isEmpty {
-                    Text(errorMessage)
-                        .foregroundColor(.red)
-                        .font(.caption)
-                } else if let hint = hintText {
-                    Text(hint)
-                        .foregroundColor(Colors.black09)
-                        .font(.caption)
-                }
+                ErrorView(
+                    errorMessage: errorMessage,
+                    errorSpacing: errorSpacing,
+                    hintText: hintText ?? ""
+                )
             }
         }
 }

package/ios/Input/InputPhoneNumber.swift

@@ -70,9 +70,7 @@ public struct InputPhoneNumber: View {
                 // Text input
                 ZStack(alignment: .leading) {
                     if text.isEmpty {
-                        Text(placeholder)
-                            .foregroundColor(Colors.black12)
-                            .font(size == .small ? .header_s_semibold : .header_m_bold)
+                        MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
                     
                     TextField("", text: $text, onEditingChanged: { focused in
@@ -96,18 +94,8 @@ public struct InputPhoneNumber: View {
                 
                 // Loading indicator
                 if loading {
-                    if #available(iOS 14.0, *) {
-                        ProgressView()
-                            .progressViewStyle(CircularProgressViewStyle(tint: Colors.black17))
-                            .frame(width: 16, height: 16)
-                            .padding(.leading, Spacing.S)
-                    } else {
-                        Image(systemName: "clock")
-                            .rotationEffect(.degrees(isFocused ? 360 : 0))
-                            .animation(Animation.linear(duration: 1).repeatForever(autoreverses: false))
-                            .frame(width: 16, height: 16)
-                            .padding(.leading, Spacing.S)
-                    }
+                    ActivityIndicator(isAnimating: .constant(true), style: .medium)
+                        .frame(width: 16, height: 16)
                 }
                 
                 // ✅ Right icon
@@ -119,24 +107,22 @@ public struct InputPhoneNumber: View {
                 }
             }
             .padding(.horizontal, Spacing.M)
-            .frame(height: size == .small ? 48 : 56)
+            .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
+            .background(
+                RoundedRectangle(cornerRadius: Radius.S)
+                    .fill(Colors.black01)
+            )
             .overlay(
                 RoundedRectangle(cornerRadius: Radius.S)
-                    .stroke(borderColor(), lineWidth: isFocused ? 1.5 : 1) 
+                    .stroke(borderColor(), lineWidth: isFocused ? 1.5 : 1)
             )
             
             // Error or hint
-            if (!error.isEmpty || !hintText.isEmpty) {
-                HStack(spacing: 4) {
-                    Icon(source: "ic_error", size: 16, color: errorColor())
-                    MomoText(
-                        error.isEmpty ? (hintText.isEmpty ? "Không thể chỉnh sửa" : hintText) : error,
-                        typography: .descriptionDefaultRegular,
-                        color: errorColor()
-                    )
-                }
-                .padding(.top, Spacing.XS)
-            }
+            ErrorView(
+                errorMessage: error,
+                errorSpacing: false,
+                hintText: hintText
+            )
         }
     }
     
@@ -156,10 +142,6 @@ public struct InputPhoneNumber: View {
         if isFocused { return Colors.primary }
         return Colors.black04
     }
-    
-    private func errorColor() -> Color {
-        !error.isEmpty ? Colors.red03 : Colors.black12
-    }
 }
 
 private extension View {

package/ios/Typography/Text.swift

@@ -1,8 +1,8 @@
 import SwiftUI
 
-public func scaleSize(_ size: CGFloat) -> CGFloat {
+public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
     let defaultScreenSize: CGFloat = 375
-    let maxFontScale: CGFloat = 1.5
+    let maxFontScale: CGFloat = scaleRate ?? 1.5
     let maxDeviceScale: CGFloat = 5
     
     let deviceWidth = UIScreen.main.bounds.width

package/ios/Typography/Typography.swift

@@ -3,7 +3,7 @@ import SwiftUI
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
         let defaultScreenSize: CGFloat = 375
-        let maxFontScale: CGFloat = 1.2
+        let maxFontScale: CGFloat = 1.5
         let maxDeviceScale: CGFloat = 5
         
         let deviceWidth = UIScreen.main.bounds.width

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.154.2-test.11",
+  "version": "0.154.2-test.12",
   "private": false,
   "dependencies": {},
   "devDependencies": {},