[feat] #43 엔터 클릭 시 focus 풀리도록 구현

SOPT-all · Jan 19, 2025 · e44cb19 · e44cb19
1 parent cfa91d0
commit e44cb19
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...main/java/org/android/bbangzip/presentation/component/textfield/BbangZipBasicTextField.kt b/...main/java/org/android/bbangzip/presentation/component/textfield/BbangZipBasicTextField.kt
@@ -59,10 +59,15 @@ fun BbangZipBasicTextField(
     onFocusChange: (Boolean) -> Unit = { },
     onDeleteButtonClick: () -> Unit = { },
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Default),
-    keyboardActions: KeyboardActions = KeyboardActions.Default,
-    focusManager: FocusManager
+    focusManager: FocusManager,
+    keyboardActions: KeyboardActions = KeyboardActions(
+        onDone = {
+            focusManager.clearFocus(force = true)
+        }
+    ),
 ) {
     var isFocused by remember { mutableStateOf(false) }
+    val focusRequester = remember { FocusRequester() }
 
     BbangZipTextFieldSlot(
         columnModifier = modifier,
@@ -84,15 +89,15 @@ fun BbangZipBasicTextField(
                     Modifier
                         .weight(1f)
                         .padding(start = 8.dp)
-                        .focusRequester(FocusRequester())
+                        .focusRequester(focusRequester)
                         .onFocusChanged { focusState ->
                             isFocused = focusState.isFocused
                             onFocusChange(focusState.isFocused)
                             Timber.d("[TextField] onFocusChange -> $isFocused")
                         }
                         .onKeyEvent { keyEvent ->
                             if (keyEvent.key == Key.Enter && keyEvent.type == KeyEventType.KeyUp) {
-                                focusManager.clearFocus()
+                                focusManager.clearFocus(force = true)
                                 onFocusChange(false)
                                 true
                             } else {
@@ -104,7 +109,7 @@ fun BbangZipBasicTextField(
                     if (it.length <= maxCharacter) onValueChange(it)
                 },
                 keyboardActions = keyboardActions,
-                keyboardOptions = keyboardOptions,
+                keyboardOptions = keyboardOptions.copy(imeAction = ImeAction.Done),
                 cursorBrush = SolidColor(BbangZipTheme.colors.labelNormal_282119),
                 singleLine = true,
                 textStyle = BbangZipTheme.typography.label1Medium,
@@ -187,7 +192,7 @@ fun BbangZipBasicTextFieldPreview() {
                 text = ""
                 validationState = BbangZipTextFieldInputState.Default
             },
-            focusManager = LocalFocusManager.current
+            focusManager = LocalFocusManager.current,
         )
     }
 }