Additional null check for focusing/blurring views

discord · Dec 2, 2024 · 9b863e4 · 9b863e4
1 parent af518c4
commit 9b863e4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...native/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java b/...native/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
@@ -64,6 +64,10 @@ public void handleKeyEvent(KeyEvent ev) {
 
   /** Called from {@link ReactRootView} when focused view changes. */
   public void onFocusChanged(View newFocusedView) {
+    if (newFocusedView == null) {
+      return;
+    }
+
     if (mLastFocusedViewId == newFocusedView.getId()) {
       return;
     }