Skip to content

Bugfix: Only Dismiss Keyboard on User Scroll #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fhasse95 wants to merge 1 commit into
base: main
Choose a base branch
from
+39 −8
Open

Bugfix: Only Dismiss Keyboard on User Scroll #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions Sources/SkipUI/SkipUI/Compose/ComposeExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2023–2026 Skip
// SPDX-License-Identifier: MPL-2.0
#if SKIP
import androidx.compose.foundation.gestures.awaitEachGesture
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
Expand All @@ -10,6 +11,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredHeightIn
import androidx.compose.foundation.layout.requiredWidthIn
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Modifier
Expand All @@ -19,12 +22,15 @@ import androidx.compose.ui.layout.boundsInWindow
import androidx.compose.ui.layout.layout
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.input.pointer.PointerEventPass
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import kotlin.math.abs

extension Modifier {
/// Fill available width similar to `.frame(maxWidth: .infinity)`.
Expand Down Expand Up @@ -154,10 +160,33 @@ extension Modifier {
let focusManager = rememberUpdatedState(LocalFocusManager.current)
let imeInsets = WindowInsets.ime
let density = LocalDensity.current
let isUserScrollActive = remember { mutableStateOf(false) }
let nestedScrollConnection = remember {
KeyboardDismissingNestedScrollConnection(keyboardController: keyboardController, focusManager: focusManager, imeInsets: imeInsets, density: density)
KeyboardDismissingNestedScrollConnection(keyboardController: keyboardController, focusManager: focusManager, imeInsets: imeInsets, density: density, isUserScrollActive: isUserScrollActive)
}
return self.nestedScroll(nestedScrollConnection)
return self.pointerInput(mode) {
let slop = viewConfiguration.touchSlop
awaitEachGesture {
isUserScrollActive.value = false
let downEvent = awaitPointerEvent(pass: PointerEventPass.Initial)
guard let start = downEvent.changes.firstOrNull({ $0.pressed })?.position else {
return
}
var pressed = true
while pressed {
let event = awaitPointerEvent(pass: PointerEventPass.Initial)
if let change = event.changes.firstOrNull() {
pressed = change.pressed
if abs(change.position.x - start.x) > slop || abs(change.position.y - start.y) > slop {
isUserScrollActive.value = true
}
} else {
pressed = false
}
}
isUserScrollActive.value = false
}
}.nestedScroll(nestedScrollConnection)
}
}

Expand Down
14 changes: 8 additions & 6 deletions Sources/SkipUI/SkipUI/System/Keyboard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@ struct KeyboardDismissingNestedScrollConnection: NestedScrollConnection {
let focusManager: State<FocusManager?>
let imeInsets: WindowInsets
let density: Density
let isUserScrollActive: State<Bool>

override func onPreScroll(available: Offset, source: NestedScrollSource) -> Offset {
if source == NestedScrollSource.Drag {
let keyboardIsVisible = imeInsets.getBottom(density) > 0
if keyboardIsVisible {
keyboardController.value?.hide()
focusManager.value?.clearFocus()
}
guard source == NestedScrollSource.Drag,
imeInsets.getBottom(density) > 0,
isUserScrollActive.value else {
return Offset.Zero
}

keyboardController.value?.hide()
focusManager.value?.clearFocus()
return Offset.Zero
}
}
Expand Down
Loading