@momo-kits/native-kits 0.110.1-beta.1 → 0.110.1-beta.30

package/compose/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.jetbrains.kotlin.multiplatform)
     alias(libs.plugins.compose)
     alias(libs.plugins.kotlin.compose.compiler)
+    kotlin("plugin.serialization")
     id("maven-publish")
 }
 
@@ -39,6 +40,7 @@ kotlin {
                 implementation(libs.coil.multiplatform.compose)
                 implementation(libs.coil.multiplatform.core)
                 implementation(libs.coil.multiplatform.network.ktor)
+                implementation(libs.jetbrains.serialization.json)
             }
         }
         val androidMain by getting {

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

@@ -73,11 +73,19 @@ fun HeaderBackground(
         targetValue = (1 - (scrollState / 200f)).coerceIn(0f, 1f),
     )
 
+    val backgroundColor = if (scrollState == 0) {
+        Color.Transparent
+    } else {
+        AppTheme.current.colors.background.surface
+    }
+
+
     when (headerType) {
         HeaderType.DEFAULT -> {
             val height = statusBarHeight + 52.dp
             Box(
                 modifier = Modifier.fillMaxWidth().height(height)
+                    .background(backgroundColor)
                     .bottomBorder(
                         strokeWidth = 1.dp,
                         color = AppTheme.current.colors.border.default
@@ -101,6 +109,7 @@ fun HeaderBackground(
                 )
                 if (AppTheme.current.assets.headerBackground != null) {
                     Image(
+                        loading = false,
                         source = AppTheme.current.assets.headerBackground!!,
                         modifier = Modifier.fillMaxWidth().height(height),
                         options = Options(
@@ -113,6 +122,7 @@ fun HeaderBackground(
         }
 
         HeaderType.EXTENDED -> {
+
             Box(
                 modifier = Modifier.fillMaxWidth().height(154.dp)
                     .alpha(opacityAni)
@@ -128,13 +138,19 @@ fun HeaderBackground(
                     )
             ) {
                 if (AppTheme.current.assets.headerBackground != null) {
-                    Image(
-                        source = AppTheme.current.assets.headerBackground!!,
-                        modifier = Modifier.fillMaxWidth().height(154.dp),
-                        options = Options(
-                            contentScale = ContentScale.FillWidth
+                    Box(
+                        modifier = Modifier.fillMaxWidth()
+                            .background(backgroundColor)
+                    ) {
+                        Image(
+                            loading = false,
+                            source = AppTheme.current.assets.headerBackground!!,
+                            modifier = Modifier.fillMaxWidth().height(154.dp),
+                            options = Options(
+                                contentScale = ContentScale.FillWidth
+                            )
                         )
-                    )
+                    }
                 }
             }
         }
@@ -246,7 +262,7 @@ fun Header(
                 }
                 if (inputSearchProps != null) {
                     InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
-                } else{
+                } else {
                     Box(
                         Modifier.weight(1f).graphicsLayer {
                             alpha = if (animatedHeader !== null) opacity ?: 1f else 1f

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

@@ -1,64 +1,77 @@
 package vn.momo.kits.application
 
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.unit.Dp
+import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Theme
+import vn.momo.kits.const.ThemeAssets
 import vn.momo.kits.const.defaultTheme
 import vn.momo.kits.platform.disableOverscroll
 import vn.momo.kits.platform.getStatusBarHeight
 
-val AppNavigator = staticCompositionLocalOf<Navigator> {
-    error("no navigator provided!")
-}
-
-class Navigator {
-    fun push(content: @Composable () -> Unit) {
-    }
-
-    fun present(content: @Composable () -> Unit) {
-
-    }
-
-    fun reset(content: @Composable () -> Unit) {
-
-    }
-
-    fun pop() {
-    }
+val PlatformApi = staticCompositionLocalOf<Any?> { null }
 
-    fun replace(content: @Composable () -> Unit) {
-    }
-
-    fun popToTop() {
-    }
-
-    fun showModal(
-        onClose: () -> Unit = {},
-        canBackgroundClose: Boolean = true,
-        content: @Composable () -> Unit,
-    ) {
-    }
-
-    fun showBottomSheet(content: @Composable () -> Unit) {
-    }
+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,
-    content: @Composable () -> Unit,
+    composeApi: ComposeApi? = null,
+    statusBarHeight: Dp? = AppStatusBar.current ?: getStatusBarHeight(),
+    content: @Composable () -> Unit
 ) {
+    var appTheme by remember { mutableStateOf(theme) }
+    val coroutineScope = rememberCoroutineScope()
+
+    LaunchedEffect(Unit) {
+        try {
+            composeApi?.request("getConfig", "DESIGN_SYSTEM") {
+                val json = Json { ignoreUnknownKeys = true }
+                val response = json.parseToJsonElement(it).jsonObject["response"]
+                val headerBar = response
+                    ?.jsonObject
+                    ?.get("headerBar")
+                    ?.jsonPrimitive
+                    ?.content
+                if (headerBar != null && appTheme.assets.headerBackground == null) {
+                    coroutineScope.launch {
+                        appTheme = appTheme.copy(
+                            assets = ThemeAssets(
+                                headerBackground = headerBar
+                            )
+                        )
+                    }
+                }
+            }
+        }
+        catch (e: Exception) {
+            print("@@ == NavigationContainer fetch config error $e")
+        }
+    }
+
     disableOverscroll()
     CompositionLocalProvider(
-        AppTheme provides theme,
-        AppNavigator provides Navigator(),
-        AppStatusBar provides getStatusBarHeight(),
+        AppTheme provides appTheme,
+        PlatformApi provides composeApi,
+        AppStatusBar provides statusBarHeight,
     ) {
         content()
     }

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

@@ -87,7 +87,9 @@ fun Screen(
     )
 
     val headerAnimated =
-        @Composable { animatedHeader?.composable?.invoke(scrollState.value) }
+        @Composable {
+            animatedHeader?.composable?.invoke(scrollState.value)
+        }
 
     Box(
         Modifier.fillMaxSize()
@@ -95,7 +97,10 @@ fun Screen(
     ) {
 
         if (animatedHeader === null) {
-            HeaderBackground(headerType = headerType, scrollState = scrollState.value)
+            HeaderBackground(
+                headerType = headerType,
+                scrollState = scrollState.value,
+            )
         } else {
             Box(
                 Modifier.zIndex(2f)
@@ -104,7 +109,7 @@ fun Screen(
             ) {
                 HeaderBackground(
                     headerType = headerType,
-                    scrollState = scrollState.value
+                    scrollState = scrollState.value,
                 )
             }
         }

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

@@ -98,6 +98,7 @@ data class InputSearchProps(
     val keyboardActions: KeyboardActions = KeyboardActions.Default,
     val modifier: Modifier = Modifier,
     val iconModifier: Modifier = Modifier,
+    val onClearPress: () -> Unit = {}
 )
 
 @Composable
@@ -176,8 +177,8 @@ fun InputSearch(
                                     Text(
                                         text = inputSearchProps.placeholder,
                                         style = TextStyle(
-                                            fontSize = 16.sp,
-                                            lineHeight = 24.sp,
+                                            fontSize = 14.sp,
+                                            lineHeight = 20.sp,
                                             fontWeight = inputSearchProps.fontWeight.value
                                         ),
                                         maxLines = 1,
@@ -195,7 +196,10 @@ fun InputSearch(
                                         size = 16.dp,
                                         color = AppTheme.current.colors.text.hint,
                                         modifier = Modifier.clickable(
-                                            onClick = { inputSearchProps.text.value = "" },
+                                            onClick = {
+                                                inputSearchProps.text.value = ""
+                                                inputSearchProps.onClearPress.invoke()
+                                            },
                                             interactionSource = remember { MutableInteractionSource() },
                                             indication = null
                                         )
@@ -211,20 +215,20 @@ fun InputSearch(
                             )
                         }
                     }
-                    if (inputSearchProps.showButtonText) {
-                        Text(
-                            text = inputSearchProps.buttonText,
-                            style = Typography.actionDefault,
-                            color = AppTheme.current.colors.text.default,
-                            modifier = Modifier.padding(start = Spacing.L).clickable(
-                                interactionSource = remember { MutableInteractionSource() },
-                                indication = null,
-                                onClick = inputSearchProps.onPressButtonText
-                            )
-                        )
-                    }
                 }
             },
         )
+        if (inputSearchProps.showButtonText) {
+            Text(
+                text = inputSearchProps.buttonText,
+                style = Typography.actionDefault,
+                color = AppTheme.current.colors.text.default,
+                modifier = Modifier.padding(start = Spacing.L).clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = inputSearchProps.onPressButtonText
+                )
+            )
+        }
     }
 }

package/ios/Checkbox/Checkbox.swift

@@ -4,98 +4,35 @@ import SwiftUI
 public struct Checkbox: View{
     @Binding var checked: Bool
     var disabled: Bool
-    //    var onChange: ((Bool)->Void)?
-    var onCheckedChange: ((Bool) -> Void)?
-    var indeterminate: Bool
-    var title: String
+    var onChange: ((Bool)->Void)?
     
-    
-    public init(_ checked: Binding<Bool>,disabled: Bool = false, onCheckedChange: ( (Bool) -> Void)?,
-                indeterminate: Bool = false,
-                title: String = ""){
+    public init(_ checked: Binding<Bool>,disabled: Bool = false, onChange: ((Bool)->Void)? = nil){
         self._checked = checked
+        self.onChange = onChange
         self.disabled = disabled
-        self.onCheckedChange = onCheckedChange
-        self.indeterminate = indeterminate
-        self.title = title
     }
     
     func onCheck(){
         checked.toggle()
-        onCheckedChange?(checked)
+        onChange?(checked)
     }
     
-    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")
+    public var body: some View{
+        return SwiftUI.Button(action: onCheck) {
+            HStack {
+                if (checked) {
+                    Image(systemName: "checkmark.square.fill")
                         .resizable()
-                        .foregroundColor(Colors.black20)
-                        .frame(width: 12, height: 12)
+                        .foregroundColor(disabled ? Colors.black07 : Colors.primary)
+                        .frame(width: 24, height: 24)
                 }
-            }
-            .onTapGesture {
-                if !disabled {
-                    onCheckedChange?(checked)
-                }
-            }
-            
-            // Title
-            if !title.isEmpty {
-                Text(title)
-                    .font(.description1)
-            }
-        }
-    }
-    
-    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
+            }.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)
     }
     
-
-    
-//    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/Input/Input.swift

@@ -71,22 +71,12 @@ 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, 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){
         self.placeholder = placeholder
         self.floatingValue = floatingValue
         self.errorMessage = errorMessage
@@ -96,16 +86,6 @@ 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){
@@ -113,137 +93,57 @@ public struct Input: View {
     }
     
     public var body: some View {
-            VStack(alignment: .leading, spacing: 4) {
-                ZStack(alignment: .topLeading) {
-                    HStack(alignment: .center) {
-                        if let leadingIcon = leadingIcon {
-                            ImageLoader(url: URL(string: leadingIcon)!)
-                                .frame(width: 20, height: 20)
-                                .foregroundColor(leadingIconColor)
-                        }
-                        
-                        if !isSecure {
-                            TextField("", text: $value, onEditingChanged: { isChange in
-                                self.focused = isChange
-                            })
-                            .disabled(disabled)
-                            .font(fontWeight == .bold ? .headline : .body)
-                        } else {
-                            DotTextField(value: $value)
-                                .disabled(disabled)
+        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)
                         }
                         
-                        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
+                        
                     }
-                    .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, 12)
-                            .padding(.top, 12)
-                            .allowsHitTesting(false)
+                }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)
                     }
-                    
-                    if !floatingValue.isEmpty {
-                        FloatingComponent(floatingValue, floatingIcon: floatingIconURL.map { url in
-                            AnyView(ImageLoader(url: URL(string: url)!)
-                                        .frame(width: 20, height: 20)
-                                        .background(floatingIconColor))
-                        })
-                    }
-                }
-                
-                if !errorMessage.isEmpty {
-                    Text(errorMessage)
-                        .foregroundColor(.red)
-                        .font(.caption)
-                } else if let hint = hintText {
-                    Text(hint)
-                        .foregroundColor(Colors.black09)
-                        .font(.caption)
                 }
             }
-        }
-}
-
-struct ImageLoader: View {
-    @ObservedObject private var loader: ImageLoaderObject
-    
-    init(url: URL) {
-        loader = ImageLoaderObject(url: url)
-    }
-    
-    var body: some View {
-        Group {
-            if let image = loader.image {
-                Image(uiImage: image)
-                    .resizable()
-                    .aspectRatio(contentMode: .fit)
-            } else {
-                // Use UIActivityIndicatorView for earlier iOS versions
-                ActivityIndicator(isAnimating: .constant(true), style: .medium)
+            .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()
-    }
-}
-
-class ImageLoaderObject: ObservableObject {
-    @Published var image: UIImage?
-    private let url: URL
     
-    init(url: URL) {
-        self.url = url
-        loadImage()
-    }
-    
-    private func loadImage() {
-        URLSession.shared.dataTask(with: url) { data, _, _ in
-            if let data = data, let loadedImage = UIImage(data: data) {
-                DispatchQueue.main.async {
-                    self.image = loadedImage
-                }
-            }
-        }.resume()
-    }
-}
-
-public enum InputSize {
-    case small
-    case large
-}
-
-public enum InputFontWeight {
-    case regular
-    case bold
 }

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.
-#Wed Aug 21 14:20:12 ICT 2024
-sdk.dir=/Users/huynhdung/Library/Android/sdk
+#Tue Apr 23 16:40:15 ICT 2024
+sdk.dir=/Users/hung.dao1/Library/Android/sdk

package/package.json

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

package/ios/Input/InputSearch.swift

@@ -1,182 +0,0 @@
-//
-//  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

@@ -1,242 +0,0 @@
-//
-//  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
-        }
-
-    }
-}
-
-