Pressing esc closes (un)commited changes filter

This commit is contained in:
Abdelilah El Aissaoui 2023-04-24 02:06:30 +02:00
parent 9dfd5073bd
commit 3ee8163e2d
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
3 changed files with 15 additions and 0 deletions

View File

@ -160,6 +160,7 @@ fun CommitChangesView(
searchFilter = searchFilter,
onSearchFilterChanged = onSearchFilterChanged,
searchFocusRequester = searchFocusRequester,
onClose = { onSearchFilterToggled(false) },
)
}

View File

@ -663,6 +663,7 @@ private fun EntriesList(
searchFilter = searchFilter,
onSearchFilterChanged = onSearchFilterChanged,
searchFocusRequester = searchFocusRequester,
onClose = { onSearchFilterToggled(false) },
)
}

View File

@ -10,19 +10,32 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
import com.jetpackduba.gitnuro.keybindings.KeybindingOption
import com.jetpackduba.gitnuro.keybindings.matchesBinding
@Composable
fun SearchTextField(
searchFilter: TextFieldValue,
onSearchFilterChanged: (TextFieldValue) -> Unit,
searchFocusRequester: FocusRequester,
onClose: () -> Unit,
) {
Box(
modifier = Modifier
.background(MaterialTheme.colors.background)
.padding(horizontal = 4.dp, vertical = 4.dp)
.onPreviewKeyEvent { keyEvent ->
if (keyEvent.matchesBinding(KeybindingOption.EXIT) && keyEvent.type == KeyEventType.KeyDown) {
onClose()
true
} else
false
},
) {
AdjustableOutlinedTextField(
value = searchFilter,