fix: race condition between keyboardWillHide and KVO

kirillzyusko · May 14, 2024 · 4e3bb90 · 4e3bb90
1 parent 02002e9
commit 4e3bb90
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/ios/observers/FocusedInputObserver.swift b/ios/observers/FocusedInputObserver.swift
@@ -126,16 +126,18 @@ public class FocusedInputObserver: NSObject {
     let focusedInput = currentInput
     let globalFrame = focusedInput?.globalFrame
 
+    guard let frame = globalFrame, let input = focusedInput else { return }
+
     let data: [String: Any] = [
       "target": responder.reactViewTag,
       "parentScrollViewTarget": responder.parentScrollViewTarget,
       "layout": [
-        "absoluteX": globalFrame?.origin.x,
-        "absoluteY": globalFrame?.origin.y,
-        "width": focusedInput?.frame.width,
-        "height": focusedInput?.frame.height,
-        "x": focusedInput?.frame.origin.x,
-        "y": focusedInput?.frame.origin.y,
+        "absoluteX": frame.origin.x,
+        "absoluteY": frame.origin.y,
+        "width": input.frame.width,
+        "height": input.frame.height,
+        "x": input.frame.origin.x,
+        "y": input.frame.origin.y,
       ],
     ]