style(fabric, textinput): dont' nil check the window before calling f…

…ocus / blur
microsoft · Nov 20, 2024 · 2b7bbcf · 2b7bbcf
1 parent edbec15
commit 2b7bbcf
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/.../react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/.../react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
@@ -531,10 +531,8 @@ - (void)focus
 #if !TARGET_OS_OSX // [macOS]
   [_backedTextInputView becomeFirstResponder];
 #else // [macOS
-  NSWindow *window = _backedTextInputView.window;
-  if (window) {
-    [window makeFirstResponder:_backedTextInputView];
-  }
+  NSWindow *window = [_backedTextInputView window];
+  [window makeFirstResponder:_backedTextInputView];
 #endif // macOS]
 
   const auto &props = static_cast<const TextInputProps &>(*_props);
@@ -555,12 +553,9 @@ - (void)blur
 #if !TARGET_OS_OSX // [macOS]
   [_backedTextInputView resignFirstResponder];
 #else // [macOS
-  NSWindow *window = _backedTextInputView.window;
-  if (window && window.firstResponder == _backedTextInputView) {
-    // Calling makeFirstResponder with nil will call resignFirstResponder and make the window the first responder
-    [window makeFirstResponder:nil];
-  }
-#endif // macOS];
+  NSWindow *window = [_backedTextInputView window];
+  [window makeFirstResponder:nil];
+#endif // macOS]
 }
 
 - (void)setTextAndSelection:(NSInteger)eventCount