Skip to content

Muukii/fix keyboard #71

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
muukii merged 3 commits into from
Jul 21, 2026
Merged

Muukii/fix keyboard #71

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc60da9
Update
muukii Jul 21, 2026
cc8c182
Fix keyboard handling if its 0
muukii Jul 21, 2026
137be6f
Merge branch 'main' into muukii/fix-keyboard
muukii Jul 21, 2026
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
20 changes: 14 additions & 6 deletions Rideau/Core/RideauView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,21 @@ public final class RideauView: RideauTouchThroughView {
return
}

var keyboardHeight: CGFloat? {
guard let v = note.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue else {
return nil
var keyboardOverlapHeight: CGFloat {
guard
let value = note.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue,
let window
else {
return 0
}

let screenHeight = UIScreen.main.bounds.height
return max(0, screenHeight - v.cgRectValue.minY)
let frame = convert(value.cgRectValue, from: window.screen.coordinateSpace)

guard !frame.isEmpty, frame.maxY >= bounds.maxY else {
return 0
}

return max(0, bounds.maxY - frame.minY)
}

var animationDuration: Double {
Expand All @@ -307,7 +315,7 @@ public final class RideauView: RideauTouchThroughView {
delay: 0,
options: UIView.AnimationOptions(rawValue: UInt(animationCurve << 16)),
animations: {
self.bottom.constant = -keyboardHeight!
self.bottom.constant = -keyboardOverlapHeight
self.layoutIfNeeded()
},
completion: nil
Expand Down
Loading