@momo-kits/native-kits 0.110.1-sp.4 → 0.110.1-sp.6

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

@@ -22,6 +22,14 @@ import vn.momo.kits.const.defaultTheme
 import vn.momo.kits.platform.disableOverscroll
 import vn.momo.kits.platform.getStatusBarHeight
 
+val PlatformApi = staticCompositionLocalOf<Any?> { null }
+
+interface ComposeApi {
+    fun request(funcName: String, params: String?): String
+    fun request(funcName: String, params: String?, onResponse: ((String) -> Unit)?): String
+    fun requestCallback(funcName: String, params: String?, onResponse: ((String) -> Unit)?)
+    fun removeCallback(id: String)
+}
 
 val AppNavigator = staticCompositionLocalOf<Navigator> {
     error("no navigator provided!")
@@ -59,15 +67,6 @@ class Navigator {
     }
 }
 
-val PlatformApi = staticCompositionLocalOf<Any?> { null }
-
-interface ComposeApi {
-    fun request(funcName: String, params: String?): String
-    fun request(funcName: String, params: String?, onResponse: ((String) -> Unit)?): String
-    fun requestCallback(funcName: String, params: String?, onResponse: ((String) -> Unit)?)
-    fun removeCallback(id: String)
-}
-
 @Composable
 fun ApplicationContainer(
     theme: Theme = defaultTheme,

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

@@ -45,6 +45,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.setAutomationId
 
 data class InputSizeDetail(
     val borderWidth: Dp,
@@ -178,6 +179,7 @@ fun Input(
     required: Boolean = false,
     fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     keyboardType: KeyboardType = KeyboardType.Text,
+    modifier: Modifier = Modifier,
 ) {
     var isFocused by remember { mutableStateOf(false) }
     var passHidden by remember { mutableStateOf(false) }
@@ -203,9 +205,9 @@ fun Input(
 
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
-    Column(modifier = Modifier.semantics {
-        contentDescription = floatingValue; testTag = testId
-    }) {
+    Column(modifier = Modifier.
+    setAutomationId(testId)
+    ) {
         BasicTextField(
             enabled = !disabled,
             readOnly = readOnly,

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

@@ -3,9 +3,6 @@ package vn.momo.kits.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
@@ -18,7 +15,6 @@ import vn.momo.kits.const.Typography
 import vn.momo.kits.const.getFontFamily
 import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.setAutomationId
-import vn.momo.kits.platform.getPlatformName
 
 @Composable
 fun Text(
@@ -38,7 +34,7 @@ fun Text(
     val font = getFontFamily(fontFamily, style.fontWeight)
 
     androidx.compose.material3.Text(
-        modifier = modifier.setAutomationId(accessibilityId?:text),
+        modifier = modifier.setAutomationId(accessibilityId?:text, text),
         text = text,
         color = color ?: AppTheme.current.colors.text.default,
         style = style,

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/AutomationId.kt

@@ -11,7 +11,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import vn.momo.kits.platform.getPlatformName
 
-fun Modifier.setAutomationId(accessibilityId : String) : Modifier {
+fun Modifier.setAutomationId(accessibilityId : String, label: String? = null) : Modifier {
     return if (getPlatformName() == "Android") {
         semantics {
             contentDescription = accessibilityId
@@ -19,6 +19,7 @@ fun Modifier.setAutomationId(accessibilityId : String) : Modifier {
     } else {
         semantics {
             testTag = accessibilityId
+            contentDescription = label ?: accessibilityId
         }
     }
 }

package/ios/Checkbox/Checkbox.swift

@@ -5,11 +5,18 @@ public struct Checkbox: View{
     @Binding var checked: Bool
     var disabled: Bool
     var onChange: ((Bool)->Void)?
+    var indeterminate: Bool
+    var title: String
     
-    public init(_ checked: Binding<Bool>,disabled: Bool = false, onChange: ((Bool)->Void)? = nil){
+    
+    public init(_ checked: Binding<Bool>,disabled: Bool = false, onChange: ( (Bool) -> Void)? = nil,
+                indeterminate: Bool = false,
+                title: String = ""){
         self._checked = checked
-        self.onChange = onChange
         self.disabled = disabled
+        self.onChange = onChange
+        self.indeterminate = indeterminate
+        self.title = title
     }
     
     func onCheck(){
@@ -17,22 +24,77 @@ public struct Checkbox: View{
         onChange?(checked)
     }
     
-    public var body: some View{
-        return SwiftUI.Button(action: onCheck) {
-            HStack {
-                if (checked) {
-                    Image(systemName: "checkmark.square.fill")
+    public var body: some View {
+        HStack(spacing: Spacing.S) {
+            // Checkbox
+            ZStack {
+                RoundedRectangle(cornerRadius: Radius.XS)
+                    .fill(backgroundColor)
+                    .frame(width: 20, height: 20)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: Radius.XS)
+                            .stroke(borderColor, lineWidth: Spacing.XXS)
+                    )
+                
+                if checked {
+                    Image(systemName: indeterminate ? "minus" : "checkmark")
                         .resizable()
-                        .foregroundColor(disabled ? Colors.black07 : Colors.primary)
-                        .frame(width: 24, height: 24)
+                        .foregroundColor(Colors.black01)
+                        .frame(width: 12, height: 12)
                 }
-            }.frame(width: 24, height: 24)
-                .overlay(RoundedRectangle(cornerRadius: 4).stroke(Colors.black20,lineWidth: checked ? 0 : 1))
-            .background(Colors.black01)
-                
+            }
+            .onTapGesture {
+                if !disabled {
+                    onChange?(checked)
+                }
+            }
+            
+            // Title
+            if !title.isEmpty {
+                Text(title)
+                    .font(.description1)
+            }
         }
-        .opacity(disabled ? 0.4 : 1)
-        .disabled(disabled)
     }
     
+    private var borderColor: Color {
+        if disabled {
+            return Colors.black03
+        } else if checked {
+            return Colors.primary
+        } else {
+            return Colors.text
+        }
+    }
+    
+    private var backgroundColor: Color {
+        if disabled && checked {
+            return Colors.pink08
+        } else if checked {
+            return Colors.primary
+        } else {
+            return Colors.black01
+        }
+    }
+    
+
+    
+//    public var body: some View{
+//        return SwiftUI.Button(action: onCheck) {
+//            HStack {
+//                if (checked) {
+//                    Image(systemName: "checkmark.square.fill")
+//                        .resizable()
+//                        .foregroundColor(disabled ? Colors.black07 : Colors.primary)
+//                        .frame(width: 24, height: 24)
+//                }
+//            }.frame(width: 24, height: 24)
+//                .overlay(RoundedRectangle(cornerRadius: 4).stroke(Colors.black20,lineWidth: checked ? 0 : 1))
+//            .background(Colors.black01)
+//                
+//        }
+//        .opacity(disabled ? 0.4 : 1)
+//        .disabled(disabled)
+//    }
+    
 }

package/ios/Icon/Icon.swift

@@ -0,0 +1,53 @@
+import SwiftUI
+
+struct IconSource: Codable {
+    let uri: String
+}
+
+func loadIconSources() -> [String: IconSource] {
+    guard let url = Bundle.main.url(forResource: "icon", withExtension: "json") else {
+        print("Error: icon.json not found")
+        return [:]
+    }
+    
+    do {
+        let data = try Data(contentsOf: url)
+        let decoded = try JSONDecoder().decode([String: IconSource].self, from: data)
+        return decoded
+    } catch {
+        print("Error decoding icon.json: \(error)")
+        return [:]
+    }
+}
+
+// Load the JSON data into a global variable
+let iconSources: [String: IconSource] = loadIconSources()
+
+// Icon ViewModel
+public struct Icon: View {
+    var source: String
+    var size: CGFloat
+    var color: Color?
+    var accessibilityLabel: String?
+    
+    public init(
+            source: String,
+            size: CGFloat = 24,
+            color: Color? = nil,
+            accessibilityLabel: String? = nil
+        ) {
+            self.source = source
+            self.size = size
+            self.color = color
+            self.accessibilityLabel = accessibilityLabel
+        }
+
+    public var body: some View {
+        if let uri = iconSources[source]?.uri {
+            ImageView(uri)
+                .frame(width: size, height: size)
+                .foregroundColor(color)
+        }
+    }
+}
+

package/ios/Input/Input.swift

@@ -71,12 +71,22 @@ public struct Input: View {
     var rightIcon: AnyView?
     var onChange: ((String) -> Void)?
     var onBlur: (() -> Void)?
+    var floatingIconURL: String?
+    var floatingIconColor: Color?
+    var size: InputSize
+    var fontWeight: InputFontWeight
+    var disabled: Bool
+    var leadingIcon: String?
+    var leadingIconColor: Color?
+    var loading: Bool
+    var required: Bool
+    var hintText: String?
     
     func onCancel(){
         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){
+    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){
         self.placeholder = placeholder
         self.floatingValue = floatingValue
         self.errorMessage = errorMessage
@@ -86,6 +96,16 @@ public struct Input: View {
         self.rightIcon = rightIcon
         self.floatingIcon = floatingIcon
         self.onChange = onChange
+        self.floatingIconURL = floatingIconURL
+        self.floatingIconColor = floatingIconColor
+        self.size = size
+        self.fontWeight = fontWeight
+        self.disabled = disabled
+        self.leadingIcon = leadingIcon
+        self.leadingIconColor = leadingIconColor
+        self.loading = loading
+        self.required = required
+        self.hintText = hintText
     }
     
     func onChangeText(value: String){
@@ -93,57 +113,95 @@ public struct Input: View {
     }
     
     public var body: some View {
-        return ZStack (alignment: .topLeading){
-            HStack(alignment: .center){
-                if (!isSecure){
-                    TextField("",text: $value, onEditingChanged:{ isChange in
-                        self.focused = isChange
-                    })
-                    .font(.paragraph)
-                    .padding(.horizontal, 12)
-                    .accentColor(Colors.pink03)
-                    .keyboardType(keyboardType)
-                    .valueChanged(value: value, onChange: onChangeText)
-                    
-                    HStack{
-                        SwiftButton(action: onCancel){
-                            Image(systemName: "x.circle.fill")
-                                .foregroundColor(Colors.text)
-                                .frame(width: 16, height: 16)
-                                .padding(.leading, -4)
-                                .padding(.trailing, 8)
+            VStack(alignment: .leading, spacing: 4) {
+                ZStack(alignment: .topLeading) {
+                    HStack(alignment: .center) {
+                        if let leadingIcon = leadingIcon {
+                            Icon(source: leadingIcon, size: 16, color: leadingIconColor)
                         }
                         
-                        rightIcon
+                        if !isSecure {
+                            TextField("", text: $value, onEditingChanged: { isChange in
+                                self.focused = isChange
+                            })
+                            .disabled(disabled)
+                            .font(fontWeight == .bold ? .headline : .body)
+                        } else {
+                            DotTextField(value: $value)
+                                .disabled(disabled)
+                        }
                         
+                        if loading {
+                            ActivityIndicator(isAnimating: .constant(true), style: .medium)
+                                .frame(width: 20, height: 20)
+                        } else if !value.isEmpty {
+                            SwiftButton(action: onCancel){
+                                Image(systemName: "x.circle.fill")
+                                    .foregroundColor(Colors.text)
+                                    .frame(width: 16, height: 16)
+                                    .padding(.leading, -4)
+                                    .padding(.trailing, 8)
+                            }
+                        }
+
+                        rightIcon
                     }
-                }else{
-                    DotTextField(value: $value)
-                        .padding(.horizontal, 12)
-                        .accentColor(Colors.pink03)
-                    SwiftButton(action: onCancel){
-                        Image(systemName: "x.circle.fill")
-                            .foregroundColor(Colors.text)
-                            .frame(width: 16, height: 16)
-                            .padding(.leading, -4)
-                            .padding(.trailing, 8)
+                    .padding(.horizontal, 12)
+                    .frame(height: size == .small ? 40 : 48)
+                    .background(disabled ? Colors.black01 : Color.white)
+                    .overlay(RoundedRectangle(cornerRadius: 8).stroke(focused ? Colors.pink03 : Colors.border, lineWidth: 1))
+                    
+                    if value.isEmpty {
+                        Text(placeholder + (required ? " *" : ""))
+                            .foregroundColor(Colors.black09)
+                            .padding(.horizontal, leadingIcon == nil ? 12 : 32)
+                            .padding(.top, 12)
+                            .allowsHitTesting(false)
+                    }
+                    
+                    if !floatingValue.isEmpty {
+                        FloatingComponent(floatingValue, floatingIcon: floatingIconURL.map { url in
+                            AnyView(
+                                Icon(source: url, size: 16, color: floatingIconColor)
+                                )
+                        })
+                            
                     }
                 }
+                
+                if !errorMessage.isEmpty {
+                    Text(errorMessage)
+                        .foregroundColor(.red)
+                        .font(.caption)
+                } else if let hint = hintText {
+                    Text(hint)
+                        .foregroundColor(Colors.black09)
+                        .font(.caption)
+                }
             }
-            .frame(maxWidth: .infinity, minHeight: 48)
-            .overlay(RoundedRectangle(cornerRadius: 8).stroke(focused == true ? Colors.pink03 : Colors.border, lineWidth: 1))
-            .padding(.horizontal, 1)
-            if (value.isEmpty){
-                Text(placeholder)
-                    .font(.paragraph)
-                    .font(.system(size: 16))
-                    .foregroundColor(Colors.black09)
-                    .padding(.leading, 12)
-                    .padding(.top, 16)
-                    .allowsHitTesting(false)
-            }
-            if (!floatingValue.isEmpty) {FloatingComponent(floatingValue, floatingIcon: floatingIcon)}
-        }.padding(.bottom, 8)
+        }
+}
+
+
+struct ActivityIndicator: UIViewRepresentable {
+    @Binding var isAnimating: Bool
+    let style: UIActivityIndicatorView.Style
+
+    func makeUIView(context: UIViewRepresentableContext<ActivityIndicator>) -> UIActivityIndicatorView {
+        return UIActivityIndicatorView(style: style)
     }
-    
+
+    func updateUIView(_ uiView: UIActivityIndicatorView, context: UIViewRepresentableContext<ActivityIndicator>) {
+        isAnimating ? uiView.startAnimating() : uiView.stopAnimating()
+    }
+}
+
+public enum InputSize {
+    case small
+    case large
+}
+
+public enum InputFontWeight {
+    case regular
+    case bold
 }

package/ios/Input/InputSearch.swift

@@ -0,0 +1,182 @@
+//
+//  InputSearch.swift
+//  Pods
+//
+//  Created by dung.pham2 on 3/12/24.
+//
+import SwiftUI
+
+// MARK: - RenderRightIconSearch
+
+struct RenderRightIconSearch: View {
+    let loading: Bool
+    let icon: String
+    let color: Color
+    let onClick: () -> Void
+    
+    var body: some View {
+        HStack(spacing: 0) {
+            if loading {
+                ActivityIndicator(isAnimating: .constant(true), style: .medium)
+                    .frame(width: 16, height: 16)
+                    .padding(.horizontal, Spacing.S)
+            }
+            if !icon.isEmpty {
+                Divider()
+                    .frame(width: 1)
+                    .background(Colors.primary)
+                    .padding(.leading, Spacing.S)
+                
+                Image(systemName: icon)
+                    .foregroundColor(color)
+                    .frame(width: 24, height: 24)
+                    .padding(.leading, Spacing.S)
+                    .onTapGesture(perform: onClick)
+            }
+        }
+    }
+}
+
+// MARK: - InputSearch
+
+public struct InputSearch: View {
+    @Binding var text: String
+    var buttonText: String = ""
+    var showButtonText: Bool = false
+    var showBorder: Bool = true
+    var placeholder: String = ""
+    var onChangeText: (String) -> Void = { _ in }
+    var onPressButtonText: () -> Void = {}
+    var error: String = ""
+    var disabled: Bool = false
+    var icon: String = ""
+    var iconColor: Color = Colors.text
+    var onRightIconPressed: () -> Void = {}
+    var onFocus: () -> Void = {}
+    var onBlur: () -> Void = {}
+    var loading: Bool = false
+    var fontWeight: Font.Weight = .regular
+    var keyboardType: UIKeyboardType = .default
+    
+    @State private var isFocused = false
+    @State private var isBlurred = false
+    
+    public init(text: Binding<String>,
+                buttonText: String = "",
+                showButtonText: Bool = false,
+                showBorder: Bool = true,
+                placeholder: String = "",
+                onChangeText: @escaping (String) -> Void = { _ in },
+                onPressButtonText: @escaping () -> Void = {},
+                error: String = "",
+                disabled: Bool = false,
+                icon: String = "",
+                iconColor: Color = Colors.text,
+                onRightIconPressed: @escaping () -> Void = {},
+                onFocus: @escaping () -> Void = {},
+                onBlur: @escaping () -> Void = {},
+                loading: Bool = false,
+                fontWeight: Font.Weight = .regular,
+                keyboardType: UIKeyboardType = .default) {
+        self._text = text
+        self.buttonText = buttonText
+        self.showButtonText = showButtonText
+        self.showBorder = showBorder
+        self.placeholder = placeholder
+        self.onChangeText = onChangeText
+        self.onPressButtonText = onPressButtonText
+        self.error = error
+        self.disabled = disabled
+        self.icon = icon
+        self.iconColor = iconColor
+        self.onRightIconPressed = onRightIconPressed
+        self.onFocus = onFocus
+        self.onBlur = onBlur
+        self.loading = loading
+        self.fontWeight = fontWeight
+        self.keyboardType = keyboardType
+        }
+
+    
+    public var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            HStack(spacing: 0) {
+                HStack {
+                    Image(systemName: "magnifyingglass")
+                        .foregroundColor(Colors.black12)
+                        .frame(width: 24, height: 24)
+                        .padding(.trailing, Spacing.XS)
+                    
+                    ZStack(alignment: .leading) {
+                        if text.isEmpty {
+                            Text(placeholder)
+                                .foregroundColor(disabled ? Colors.black08 : Colors.black12)
+                                .font(.system(size: 16, weight: fontWeight))
+                        }
+                        TextField("", text: $text, onEditingChanged: { editing in
+                            isFocused = editing
+                            if editing {
+                                onFocus()
+                            } else if isBlurred {
+                                onBlur()
+                            }
+                            if editing && !isBlurred {
+                                isBlurred = true
+                            }
+                        }, onCommit: {})
+                        .disabled(disabled)
+                        .foregroundColor(disabled ? Colors.black08 : Colors.black17)
+                        .font(.system(size: 15, weight: fontWeight))
+                        .keyboardType(keyboardType)
+                    }
+                    
+                    if isFocused && !text.isEmpty {
+                        SwiftButton(action: { text = "" }) {
+                            Image(systemName: "xmark.circle.fill")
+                                .foregroundColor(Colors.black12)
+                                .frame(width: 16, height: 16)
+                        }
+                        .padding(.leading, Spacing.S)
+                    }
+                    
+                    RenderRightIconSearch(loading: loading, icon: icon, color: disabled ? Colors.black08 : iconColor, onClick: onRightIconPressed)
+                }
+                .padding(.horizontal, Spacing.M)
+                .padding(.vertical, Spacing.S)
+                .background(Colors.black01)
+                .cornerRadius(Radius.XL)
+                .overlay(
+                    RoundedRectangle(cornerRadius: Radius.XL)
+                        .stroke(getBorderColor(isFocused: isFocused, error: error, disabled: disabled), lineWidth: showBorder ? 1 : 0)
+                )
+                .frame(maxWidth: showButtonText ? .infinity : nil, alignment: .leading)
+                
+                if showButtonText {
+                    SwiftButton(action: onPressButtonText) {
+                        Text(buttonText)
+                            .foregroundColor(Colors.black17)
+                            .font(.system(size: 14, weight: .medium))
+                    }
+                    .padding(.leading, Spacing.L)
+                }
+            }
+        }
+    }
+}
+
+// MARK: - Helper Functions
+
+func getBorderColor(isFocused: Bool, error: String, disabled: Bool) -> Color {
+    if disabled {
+        return Colors.black08
+    } else if !error.isEmpty {
+        return Colors.red03
+    } else if isFocused {
+        return Colors.primary
+    } else {
+        return Colors.black04
+    }
+}
+
+
+

package/ios/Input/InputTextArea.swift

@@ -0,0 +1,242 @@
+//
+//  InputTextArea.swift
+//  Pods
+//
+//  Created by dung.pham2 on 2/12/24.
+//
+import SwiftUI
+
+// Make these constants public
+public let MAX_LENGTH = 300
+public let DEFAULT_HEIGHT: CGFloat = 104
+
+struct UITextViewWrapper: UIViewRepresentable {
+    @Binding var text: String
+    var onDone: (() -> Void)?
+    var onFocus: (() -> Void)?
+    var onBlur: (() -> Void)?
+    
+    func makeUIView(context: Context) -> UITextView {
+        let textView = UITextView()
+        textView.delegate = context.coordinator
+        return textView
+    }
+    
+    func updateUIView(_ uiView: UITextView, context: Context) {
+        uiView.text = text
+    }
+    
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+    
+    class Coordinator: NSObject, UITextViewDelegate {
+        var parent: UITextViewWrapper
+        
+        init(_ parent: UITextViewWrapper) {
+            self.parent = parent
+        }
+        
+        func textViewDidChange(_ textView: UITextView) {
+            parent.text = textView.text
+        }
+        
+        func textViewDidBeginEditing(_ textView: UITextView) {
+            parent.onFocus?()
+        }
+        
+        func textViewDidEndEditing(_ textView: UITextView) {
+            parent.onBlur?()
+        }
+        
+        func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+            if text == "\n" {
+                parent.onDone?()
+                return false
+            }
+            return true
+        }
+    }
+}
+
+// Make the struct public
+public struct InputTextArea: View {
+    @Binding var text: String
+    var maxLength: Int = MAX_LENGTH
+    var height: CGFloat = DEFAULT_HEIGHT
+    var floatingValue: String = ""
+    var floatingValueColor: Color = .gray
+    var floatingIcon: String = ""
+    var floatingIconColor: Color = .black
+    var placeholder: String = ""
+    var onChangeText: (String) -> Void = { _ in }
+    var error: String = ""
+    var errorSpacing: Bool = false
+    var disabled: Bool = false
+    var icon: String = ""
+    var iconColor: Color = .black
+    var onRightIconPressed: () -> Void = {}
+    var onFocus: () -> Void = {}
+    var onBlur: () -> Void = {}
+    var loading: Bool = false
+    var required: Bool = false
+    var fontWeight: Font.Weight = .regular
+    var keyboardType: UIKeyboardType = .default
+    
+    @State private var isFocused = false
+    @State private var isBlurred = false
+    
+    // Make the initializer public
+    public init(
+        text: Binding<String>,
+        maxLength: Int = MAX_LENGTH,
+        height: CGFloat = DEFAULT_HEIGHT,
+        floatingValue: String = "",
+        floatingValueColor: Color = .gray,
+        floatingIcon: String = "",
+        floatingIconColor: Color = .black,
+        placeholder: String = "",
+        onChangeText: @escaping (String) -> Void = { _ in },
+        error: String = "",
+        errorSpacing: Bool = false,
+        disabled: Bool = false,
+        icon: String = "",
+        iconColor: Color = Colors.pink03,
+        onRightIconPressed: @escaping () -> Void = {},
+        onFocus: @escaping () -> Void = {},
+        onBlur: @escaping () -> Void = {},
+        loading: Bool = false,
+        required: Bool = false,
+        fontWeight: Font.Weight = .regular,
+        keyboardType: UIKeyboardType = .default
+    ) {
+        self._text = text
+        self.maxLength = maxLength
+        self.height = height
+        self.floatingValue = floatingValue
+        self.floatingValueColor = floatingValueColor
+        self.floatingIcon = floatingIcon
+        self.floatingIconColor = floatingIconColor
+        self.placeholder = placeholder
+        self.onChangeText = onChangeText
+        self.error = error
+        self.errorSpacing = errorSpacing
+        self.disabled = disabled
+        self.icon = icon
+        self.iconColor = iconColor
+        self.onRightIconPressed = onRightIconPressed
+        self.onFocus = onFocus
+        self.onBlur = onBlur
+        self.loading = loading
+        self.required = required
+        self.fontWeight = fontWeight
+        self.keyboardType = keyboardType
+    }
+    
+    public var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+                    ZStack(alignment: .topLeading) {
+                        if !floatingValue.isEmpty || !floatingIcon.isEmpty {
+                            HStack(spacing: 4) {
+                                Text(floatingValue)
+                                    .font(.caption)
+                                    .foregroundColor(disabled ? .gray : floatingValueColor)
+                                
+                                if required {
+                                    Text("*")
+                                        .font(.caption)
+                                        .foregroundColor(.red)
+                                }
+                                
+                                if !floatingIcon.isEmpty {
+                                    Image(systemName: floatingIcon)
+                                        .font(.caption)
+                                        .foregroundColor(disabled ? .gray : floatingIconColor)
+                                }
+                            }
+                            .padding(.horizontal, 8)
+                            .background(Colors.black01)
+                            .offset(x: Spacing.S, y: -height / 10)
+                            .zIndex(10)
+                        }
+                        
+                        VStack {
+                            ZStack(alignment: .topLeading) {
+                                if text.isEmpty {
+                                    Text(placeholder)
+                                        .foregroundColor(disabled ? .gray : .gray)
+                                        .font(.system(size: 16, weight: fontWeight))
+                                        .padding(.horizontal, 16)
+                                        .padding(.vertical, 12)
+                                }
+                                
+                                UITextViewWrapper(text: $text, onDone: {
+                                    // Handle done action if needed
+                                },
+                                onFocus: {
+                                    isFocused = true
+                                    onFocus()
+                                }, onBlur: {
+                                    isFocused = false
+                                    isBlurred = true
+                                    onBlur()
+                                })
+                                .frame(height: height)
+                                .padding(.horizontal, 12)
+                                .padding(.vertical, 8)
+                                .disabled(disabled)                            }
+                            
+                            HStack {
+                                Spacer()
+                                Text("\(text.count)/\(maxLength)")
+                                    .font(.caption)
+                                    .foregroundColor(.gray)
+                            }
+                            .padding(.horizontal, 16)
+                            .padding(.bottom, 12)
+                        }
+                        .background(Color.white)
+                        .cornerRadius(8)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 8)
+                                .stroke(borderColor, lineWidth: 1)
+                        )
+                    }
+                    
+                    if !error.isEmpty {
+                        Text(error)
+                            .font(.caption)
+                            .foregroundColor(.red)
+                            .padding(.top, errorSpacing ? 8 : 4)
+                    }
+                }
+                .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillShowNotification)) { _ in
+                    if !isBlurred {
+                        isFocused = true
+                        onFocus()
+                    }
+                }
+                .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification)) { _ in
+                    if isFocused {
+                        isFocused = false
+                        isBlurred = true
+                        onBlur()
+                    }
+                }
+    }
+    
+    private var borderColor: Color {
+        if disabled {
+            return Colors.black03
+        } else if !error.isEmpty {
+            return .red
+        } else if isFocused {
+            return Colors.pink03
+        } else {
+            return Colors.border
+        }
+
+    }
+}
+
+

package/ios/Switch/Switch.swift

@@ -12,33 +12,33 @@ public struct Switch: View{
         self.onChange = onChange
     }
     
-        public var body: some View {
-            SwiftUI.Button(action: {
-                withAnimation{
-                    onChange?(value)
-                    value.toggle()
-                }
-            }){
-                  HStack{
-                      HStack {
-                      }
-                      .frame(width: 6, height: 6)
-                      .background(value ? Colors.green03 : Colors.black07)
-                      .clipShape(Circle())
-                      .opacity(disabled ? 0.4 : 1)
+    
+    public var body: some View {
+        SwiftUI.Button(action: {
+            withAnimation{
+                value.toggle()
+                onChange?(value)
+            }
+        }){
+              HStack{
+                  HStack {
                   }
-                  .frame(width: 14, height: 14)
-                  .background(Colors.black01)
+                  .frame(width: 6, height: 6)
+                  .background(value ? Colors.pink03 : Colors.black07)
                   .clipShape(Circle())
-                  .padding(.leading,5)
-                  .padding(.trailing,5)
-    
+                  .opacity(disabled ? 0.4 : 1)
               }
-              .disabled(disabled)
-              .frame(width: 40, height: 24, alignment: value == true ? .trailing : .leading)
-              .background(value ? Colors.green03 : Colors.black05)
-              .clipShape(Capsule())
-              .opacity(disabled ? 0.4 : 1)
-        }
-    
+              .frame(width: 14, height: 14)
+              .background(Colors.black01)
+              .clipShape(Circle())
+              .padding(.leading,5)
+              .padding(.trailing,5)
+              
+          }
+          .disabled(disabled)
+          .frame(width: 40, height: 24, alignment: value == true ? .trailing : .leading)
+          .background(value ? Colors.pink03 : Colors.black07)
+          .clipShape(Capsule())
+          .opacity(disabled ? 0.4 : 1)
+    }
 }

package/ios/Typography/Typography.swift

@@ -4,18 +4,61 @@ public extension Font {
     static func appFont(size: CGFloat) -> Font {
         return Font.custom("SFProText", size: size)
     }
-
-    static let h1 = appFont(size: 36).weight(.semibold)
+    
+    // New supported typography styles
+    static let headline_default_bold = appFont(size: 24).weight(.bold)
+    static let header_m_bold = appFont(size: 18).weight(.bold)
+    static let header_default_bold = appFont(size: 16).weight(.bold)
+    static let header_s_semibold = appFont(size: 14).weight(.semibold)
+    static let header_xs_semibold = appFont(size: 12).weight(.semibold)
+    static let body_default_regular = appFont(size: 14).weight(.regular)
+    static let description_default_regular = appFont(size: 12).weight(.regular)
+    static let description_xs_regular = appFont(size: 10).weight(.regular)
+    static let label_default_medium = appFont(size: 14).weight(.medium)
+    static let label_s_medium = appFont(size: 12).weight(.medium)
+    static let label_xs_medium = appFont(size: 10).weight(.medium)
+    static let action_default_bold = appFont(size: 16).weight(.bold)
+    static let action_s_bold = appFont(size: 14).weight(.bold)
+    static let action_xs_bold = appFont(size: 12).weight(.bold)
+    static let action_xxs_bold = appFont(size: 10).weight(.bold)
+    
+    // Legacy styles
+    static let headline_default = appFont(size: 28).weight(.semibold)
+    static let headline_s = appFont(size: 24).weight(.semibold)
+    static let headline_l = appFont(size: 32).weight(.semibold)
+    static let headline_xl = appFont(size: 36).weight(.semibold)
+    static let title_default = appFont(size: 20).weight(.bold)
+    static let title_xs = appFont(size: 16).weight(.bold)
+    static let title_s = appFont(size: 18).weight(.bold)
+    static let header_default = appFont(size: 15).weight(.semibold)
+    static let header_xs = appFont(size: 12).weight(.semibold)
+    static let header_s = appFont(size: 14).weight(.semibold)
+    static let paragraph_default = appFont(size: 15).weight(.regular)
+    static let paragraph_bold = appFont(size: 15).weight(.bold)
+    static let description_default = appFont(size: 14).weight(.regular)
+    static let description_xs = appFont(size: 10).weight(.regular)
+    static let description_s = appFont(size: 12).weight(.regular)
+    static let label_default = appFont(size: 14).weight(.medium)
+    static let label_xxs = appFont(size: 8).weight(.medium)
+    static let label_xs = appFont(size: 10).weight(.medium)
+    static let label_s = appFont(size: 12).weight(.medium)
+    static let action_default = appFont(size: 16).weight(.bold)
+    static let action_xxs = appFont(size: 10).weight(.bold)
+    static let action_xs = appFont(size: 12).weight(.bold)
+    static let action_s = appFont(size: 15).weight(.bold)
+    
+    // deprecated
+    static let h1 = appFont(size: 36).weight(.semibold) //headline_xl
     static let h2 = appFont(size: 32).weight(.semibold)
     static let h3 = appFont(size: 28).weight(.semibold)
     static let h4 = appFont(size: 24).weight(.semibold)
     static let title1 = appFont(size: 20).weight(.bold)
     static let title2 = appFont(size: 18).weight(.bold)
     static let title3 = appFont(size: 16).weight(.bold)
-    static let headerText1 = appFont(size: 15).weight(.semibold)
+    static let headerText1 = appFont(size: 15).weight(.semibold) //header_default
     static let headerText2 = appFont(size: 14).weight(.semibold)
     static let headerText3 = appFont(size: 12).weight(.semibold)
-    static let paragraph = appFont(size: 15).weight(.regular)
+    static let paragraph = appFont(size: 15).weight(.regular) //paragraph_default
     static let description1 = appFont(size: 14).weight(.regular)
     static let description2 = appFont(size: 12).weight(.regular)
     static let description3 = appFont(size: 10).weight(.regular)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.110.1-sp.04",
+  "version": "0.110.1-sp.6",
   "private": false,
   "dependencies": {},
   "devDependencies": {},