Skip to content

refactor: guard KeyboardLayoutGuide path through config (instead of direct checks) #1517

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

Merged
kirillzyusko merged 1 commit into from
Jun 26, 2026
Merged

refactor: guard KeyboardLayoutGuide path through config (instead of direct checks) #1517

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
16 changes: 16 additions & 0 deletions ios/core/KeyboardControllerConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// KeyboardControllerConfiguration.swift
// Pods
//
// Created by Kiryl Ziusko on 25/06/2026.
//

enum KeyboardControllerConfiguration {
static var usesKeyboardLayoutGuideTracking: Bool {
if #available(iOS 26.0, *) {
return true
}

return false
}
}
10 changes: 6 additions & 4 deletions ios/observers/movement/KeyboardTrackingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import UIKit

/**
* A compatibility view that resolves to `KeyboardView` on iOS < 26
* and uses `keyboardLayoutGuide` on iOS 26+.
* A compatibility view that resolves to `KeyboardView` for the legacy path
* and uses `keyboardLayoutGuide` for configured iOS 26+ behavior.
*/
public final class KeyboardTrackingView: UIView {
private var keyboardView: UIView? {
Expand Down Expand Up @@ -69,6 +69,8 @@ public final class KeyboardTrackingView: UIView {
}

@objc public func attachToTopmostView(toWindow window: UIWindow? = nil) {
guard KeyboardControllerConfiguration.usesKeyboardLayoutGuideTracking else { return }

var topViewController = window?.rootViewController
if let rootVC = topViewController, let topView = rootVC.view, topView.window != nil {
// ok, attach
Expand Down Expand Up @@ -120,7 +122,7 @@ public final class KeyboardTrackingView: UIView {
}

@objc var view: UIView? {
if #available(iOS 26.0, *) {
if KeyboardControllerConfiguration.usesKeyboardLayoutGuideTracking {
return self
} else {
return keyboardView
Expand All @@ -135,7 +137,7 @@ public final class KeyboardTrackingView: UIView {
let keyboardPosition = keyboardWindowH - keyboardFrameY

// for `keyboardLayoutGuide` case we can just read keyboard position directly - no interpolation needed
if #available(iOS 26.0, *) {
if KeyboardControllerConfiguration.usesKeyboardLayoutGuideTracking {
if keyboardPosition > keyboardHeight {
return Self.invalidPosition
}
Expand Down
Loading