From a5db812eab4ca81b81663cbb3b2cd62a842ad106 Mon Sep 17 00:00:00 2001
From: Joanna Qu <55368679+joannaquu@users.noreply.github.com>
Date: Fri, 10 Jul 2026 15:37:10 -0700
Subject: [PATCH 1/2] fix vision build

---
 .../Libraries/Text/TextInput/Multiline/RCTUITextView.mm         | 2 +-
 .../Libraries/Text/TextInput/Singleline/RCTUITextField.mm       | 2 +-
 packages/react-native/React/CoreModules/RCTDeviceInfo.mm        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
index ded82954d237..089ca685cbe1 100644
--- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
+++ b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
@@ -322,8 +322,8 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
-  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 #endif
+  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 }
 
 #pragma mark - Overrides
diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
index 93bae1fff225..42fba1aef84a 100644
--- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
+++ b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
@@ -439,8 +439,8 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
-  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 #endif
+  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 }
 
 #pragma mark - Placeholder
diff --git a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm
index 897987b34edb..c86830ea0e30 100644
--- a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm
+++ b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm
@@ -84,7 +84,7 @@ - (void)initialize
 
   _currentInterfaceDimensions = [self _exportedDimensions];
 
-#if !TARGET_OS_OSX // [macOS]
+#if TARGET_OS_IOS // [macOS] [visionOS]
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceOrientationDidChange)
                                                name:UIApplicationDidBecomeActiveNotification

From 7f684643883358b8a521bd158cbb34730cd580ac Mon Sep 17 00:00:00 2001
From: Joanna Qu <55368679+joannaquu@users.noreply.github.com>
Date: Mon, 13 Jul 2026 10:09:39 -0700
Subject: [PATCH 2/2] match upstream

---
 .../Libraries/Text/TextInput/Multiline/RCTUITextView.mm         | 2 +-
 .../Libraries/Text/TextInput/Singleline/RCTUITextField.mm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
index 089ca685cbe1..8e7169c30d33 100644
--- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
+++ b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
@@ -306,6 +306,7 @@ - (void)textDidChange
 
 - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
 {
+  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 #if TARGET_OS_IOS
   // Initialize the initial values only once
   if (_initialValueLeadingBarButtonGroups == nil) {
@@ -323,7 +324,6 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
 #endif
-  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 }
 
 #pragma mark - Overrides
diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
index 42fba1aef84a..0f988c19d5c2 100644
--- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
+++ b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
@@ -423,6 +423,7 @@ - (void)setSecureTextEntry:(BOOL)secureTextEntry
 
 - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
 {
+  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 #if TARGET_OS_IOS
   // Initialize the initial values only once
   if (_initialValueLeadingBarButtonGroups == nil) {
@@ -440,7 +441,6 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
     self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
   }
 #endif
-  _disableKeyboardShortcuts = disableKeyboardShortcuts;
 }
 
 #pragma mark - Placeholder