diff --git a/designsystem/src/commonMain/kotlin/io/github/shadowrz/projectkafka/designsystem/TextField.kt b/designsystem/src/commonMain/kotlin/io/github/shadowrz/projectkafka/designsystem/TextField.kt index ec4cbcf7..31df2b7c 100644 --- a/designsystem/src/commonMain/kotlin/io/github/shadowrz/projectkafka/designsystem/TextField.kt +++ b/designsystem/src/commonMain/kotlin/io/github/shadowrz/projectkafka/designsystem/TextField.kt @@ -1,7 +1,6 @@ package io.github.shadowrz.projectkafka.designsystem import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.input.InputTransformation import androidx.compose.foundation.text.input.OutputTransformation @@ -12,114 +11,6 @@ import androidx.compose.material3.TextFieldLabelScope import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.input.TextFieldValue -import androidx.compose.ui.text.input.VisualTransformation - -@Composable -fun TextField( - value: String, - onValueChange: (String) -> Unit, - modifier: Modifier = Modifier, - enabled: Boolean = true, - readOnly: Boolean = false, - textStyle: TextStyle = LocalTextStyle.current, - label: String? = null, - placeholder: String? = null, - leadingIcon: @Composable (() -> Unit)? = null, - trailingIcon: @Composable (() -> Unit)? = null, - prefix: @Composable (() -> Unit)? = null, - suffix: @Composable (() -> Unit)? = null, - supportingText: String? = null, - isError: Boolean = false, - visualTransformation: VisualTransformation = VisualTransformation.None, - keyboardOptions: KeyboardOptions = KeyboardOptions.Default, - keyboardActions: KeyboardActions = KeyboardActions.Default, - singleLine: Boolean = false, - maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, - minLines: Int = 1, - interactionSource: MutableInteractionSource? = null, -) { - val labelContent: (@Composable () -> Unit)? = label?.let { { Text(it) } } - val placeholderContent: (@Composable () -> Unit)? = placeholder?.let { { Text(it) } } - val supportingContent: (@Composable () -> Unit)? = supportingText?.let { { Text(it) } } - - androidx.compose.material3.OutlinedTextField( - modifier = modifier, - value = value, - onValueChange = onValueChange, - enabled = enabled, - readOnly = readOnly, - textStyle = textStyle, - label = labelContent, - placeholder = placeholderContent, - leadingIcon = leadingIcon, - trailingIcon = trailingIcon, - prefix = prefix, - suffix = suffix, - supportingText = supportingContent, - isError = isError, - visualTransformation = visualTransformation, - keyboardOptions = keyboardOptions, - keyboardActions = keyboardActions, - singleLine = singleLine, - maxLines = maxLines, - minLines = minLines, - interactionSource = interactionSource, - ) -} - -@Composable -fun TextField( - value: TextFieldValue, - onValueChange: (TextFieldValue) -> Unit, - modifier: Modifier = Modifier, - enabled: Boolean = true, - readOnly: Boolean = false, - textStyle: TextStyle = LocalTextStyle.current, - label: String? = null, - placeholder: String? = null, - leadingIcon: @Composable (() -> Unit)? = null, - trailingIcon: @Composable (() -> Unit)? = null, - prefix: @Composable (() -> Unit)? = null, - suffix: @Composable (() -> Unit)? = null, - supportingText: String? = null, - isError: Boolean = false, - visualTransformation: VisualTransformation = VisualTransformation.None, - keyboardOptions: KeyboardOptions = KeyboardOptions.Default, - keyboardActions: KeyboardActions = KeyboardActions.Default, - singleLine: Boolean = false, - maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, - minLines: Int = 1, - interactionSource: MutableInteractionSource? = null, -) { - val labelContent: (@Composable () -> Unit)? = label?.let { { Text(it) } } - val placeholderContent: (@Composable () -> Unit)? = placeholder?.let { { Text(it) } } - val supportingContent: (@Composable () -> Unit)? = supportingText?.let { { Text(it) } } - - androidx.compose.material3.OutlinedTextField( - modifier = modifier, - value = value, - onValueChange = onValueChange, - enabled = enabled, - readOnly = readOnly, - textStyle = textStyle, - label = labelContent, - placeholder = placeholderContent, - leadingIcon = leadingIcon, - trailingIcon = trailingIcon, - prefix = prefix, - suffix = suffix, - supportingText = supportingContent, - isError = isError, - visualTransformation = visualTransformation, - keyboardOptions = keyboardOptions, - keyboardActions = keyboardActions, - singleLine = singleLine, - maxLines = maxLines, - minLines = minLines, - interactionSource = interactionSource, - ) -} @Composable fun TextField( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cafd7249..438087d1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ browser = "1.10.0" buildconfig = "6.1.2" coil = "3.6.3" compose-hot-reload = "1.2.0" -compose-multiplatform = "1.13.0-alpha01" +compose-multiplatform = "1.13.0-alpha02" compose-rich-editor = "1.2.1" compose-unstyled = "2.10.0" core = "1.19.1"