From 8b0af4542e6fd5628fefdc8e1699326c2225c3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= Date: Tue, 7 Jan 2025 13:21:19 -0800 Subject: [PATCH] fix(iOS): enable/disable keyboard shortcuts only on iOS (#48518) Summary: This PR guards code that enables/disables keyboard shortcuts only on iOS (iPadOS included). ![CleanShot 2025-01-07 at 14 49 36@2x](https://github.com/user-attachments/assets/cba4e19c-5a52-4874-94cf-a3e18112c8a3) ## Changelog: [IOS] [FIXED] - enable/disable keyboard shortcuts only on iOS Pull Request resolved: https://github.com/facebook/react-native/pull/48518 Test Plan: CI Green Reviewed By: rshest Differential Revision: D67900442 Pulled By: javache fbshipit-source-id: 249a7c3124d02d2c30303d218e2b26e987ae1f0f --- .../Libraries/Text/TextInput/Multiline/RCTUITextView.mm | 2 ++ .../Libraries/Text/TextInput/RCTBaseTextInputView.mm | 2 ++ .../Libraries/Text/TextInput/Singleline/RCTUITextField.mm | 2 ++ 3 files changed, 6 insertions(+) diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm index f3d4a3f0136..565b0f6afb6 100644 --- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm +++ b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm @@ -138,6 +138,7 @@ static UIColor *defaultPlaceholderColor(void) - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts { +#if TARGET_OS_IOS // Initialize the initial values only once if (_initialValueLeadingBarButtonGroups == nil) { // Capture initial values of leading and trailing button groups @@ -154,6 +155,7 @@ static UIColor *defaultPlaceholderColor(void) self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups; } _disableKeyboardShortcuts = disableKeyboardShortcuts; +#endif } #pragma mark - Overrides diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm index f35faca4051..6a2d4f8f70a 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm @@ -400,6 +400,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame) - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts { +#if TARGET_OS_IOS // Initialize the initial values only once if (_initialValueLeadingBarButtonGroups == nil) { // Capture initial values of leading and trailing button groups @@ -415,6 +416,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame) self.backedTextInputView.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups; self.backedTextInputView.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups; } +#endif } #pragma mark - RCTBackedTextInputDelegate diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm index e9cbeef3415..338a1f4fa99 100644 --- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm +++ b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm @@ -121,6 +121,7 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts { +#if TARGET_OS_IOS // Initialize the initial values only once if (_initialValueLeadingBarButtonGroups == nil) { // Capture initial values of leading and trailing button groups @@ -137,6 +138,7 @@ self.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups; } _disableKeyboardShortcuts = disableKeyboardShortcuts; +#endif } #pragma mark - Placeholder