draft implementation

rezkiy37 · rezkiy37 · commit dc40eec2ca7e · 2024-11-18T20:03:40.000+01:00
diff --git a/packages/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js b/packages/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
@@ -162,6 +162,7 @@ const RCTTextInputViewConfig = {
       onChangeSync: true,
       onKeyPressSync: true,
     }),
+    disableKeyboardShortcuts: true,
   },
 };
 
diff --git a/packages/react-native/Libraries/Components/TextInput/TextInput.d.ts b/packages/react-native/Libraries/Components/TextInput/TextInput.d.ts
@@ -136,6 +136,8 @@ export interface DocumentSelectionState extends EventEmitter {
  * @see https://reactnative.dev/docs/textinput#props
  */
 export interface TextInputIOSProps {
+  disableKeyboardShortcuts?: boolean | undefined;
+
   /**
    * enum('never', 'while-editing', 'unless-editing', 'always')
    * When the clear button should appear on the right side of the text view
diff --git a/packages/react-native/Libraries/Components/TextInput/TextInput.flow.js b/packages/react-native/Libraries/Components/TextInput/TextInput.flow.js
@@ -216,6 +216,8 @@ export type enterKeyHintType =
 type PasswordRules = string;
 
 type IOSProps = $ReadOnly<{|
+  disableKeyboardShortcuts?: ?boolean,
+
   /**
    * When the clear button should appear on the right side of the text view.
    * This property is supported only for single-line TextInput component.
diff --git a/packages/react-native/Libraries/Components/TextInput/TextInput.js b/packages/react-native/Libraries/Components/TextInput/TextInput.js
@@ -260,6 +260,8 @@ export type enterKeyHintType =
 type PasswordRules = string;
 
 type IOSProps = $ReadOnly<{|
+  disableKeyboardShortcuts?: ?boolean,
+
   /**
    * When the clear button should appear on the right side of the text view.
    * This property is supported only for single-line TextInput component.
@@ -1290,6 +1292,7 @@ function InternalTextInput(props: Props): React.Node {
     selectionColor,
     selectionHandleColor,
     cursorColor,
+    disableKeyboardShortcuts,
     ...otherProps
   } = props;
 
@@ -1597,6 +1600,8 @@ function InternalTextInput(props: Props): React.Node {
           flattenedStyle.paddingVertical == null &&
           flattenedStyle.paddingTop == null));
 
+    console.debug('[dev] disableKeyboardShortcuts 2', disableKeyboardShortcuts);
+
     textInput = (
       <RCTTextInputView
         // $FlowFixMe[incompatible-type] - Figure out imperative + forward refs.
@@ -1625,6 +1630,7 @@ function InternalTextInput(props: Props): React.Node {
           _style,
         )}
         text={text}
+        disableKeyboardShortcuts={disableKeyboardShortcuts}
       />
     );
   } else if (Platform.OS === 'android') {
@@ -1813,12 +1819,15 @@ const ExportedForwardRef: component(
     inputMode,
     showSoftInputOnFocus,
     keyboardType,
+    disableKeyboardShortcuts,
     ...restProps
   },
   forwardedRef: ReactRefSetter<TextInputInstance>,
 ) {
+  console.debug('[dev] disableKeyboardShortcuts', disableKeyboardShortcuts);
   return (
     <InternalTextInput
+      disableKeyboardShortcuts={disableKeyboardShortcuts}
       allowFontScaling={allowFontScaling}
       rejectResponderTermination={rejectResponderTermination}
       underlineColorAndroid={underlineColorAndroid}
diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h b/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
@@ -52,6 +52,8 @@ NS_ASSUME_NONNULL_BEGIN
 // Use `attributedText.string` instead.
 @property (nonatomic, copy, nullable) NSString *text NS_UNAVAILABLE;
 
+@property (nonatomic, assign) BOOL disableKeyboardShortcuts;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h
@@ -52,6 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSString *inputAccessoryViewButtonLabel;
 @property (nonatomic, assign) UIKeyboardType keyboardType;
 @property (nonatomic, assign) BOOL showSoftInputOnFocus;
+@property (nonatomic, assign) BOOL disableKeyboardShortcuts;
 
 /**
  Sets selection intext input if both start and end are within range of the text input.
diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
@@ -814,4 +814,36 @@ static BOOL findMismatch(NSString *first, NSString *second, NSRange *firstRange,
   return YES;
 }
 
+BOOL _isFirstRender = YES;
+NSArray<UIBarButtonItemGroup *> *_initialValueLeadingBarButtonGroups;
+NSArray<UIBarButtonItemGroup *> *_initialValueTrailingBarButtonGroups;
+
+- (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
+{
+  // Log the call to this method
+  NSLog(@"RCTBaseTextInputView setDisableKeyboardShortcuts called with value: %d", disableKeyboardShortcuts);
+  NSLog(@"RCTBaseTextInputView isFirstRender: %d", _isFirstRender);
+  
+  // Initialize the initial values only once
+  if (_isFirstRender) {
+    _isFirstRender = NO;
+    // Capture initial values of leading and trailing button groups
+    _initialValueLeadingBarButtonGroups = self.backedTextInputView.inputView.inputAssistantItem.leadingBarButtonGroups;
+    _initialValueTrailingBarButtonGroups = self.backedTextInputView.inputView.inputAssistantItem.trailingBarButtonGroups;
+  }
+
+  // Optionally, log the initial values for verification
+  NSLog(@"Initial Leading Bar Button Groups: %@", _initialValueLeadingBarButtonGroups);
+  NSLog(@"Initial Trailing Bar Button Groups: %@", _initialValueTrailingBarButtonGroups);
+  
+  if (disableKeyboardShortcuts) {
+    self.backedTextInputView.inputView.inputAssistantItem.leadingBarButtonGroups = @[];
+    self.backedTextInputView.inputView.inputAssistantItem.trailingBarButtonGroups = @[];
+  } else {
+    // Restore the initial values
+    self.backedTextInputView.inputView.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
+    self.backedTextInputView.inputView.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
+  }
+}
+
 @end
diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
@@ -69,6 +69,8 @@ @implementation RCTBaseTextInputViewManager {
 
 RCT_EXPORT_VIEW_PROPERTY(mostRecentEventCount, NSInteger)
 
+RCT_EXPORT_VIEW_PROPERTY(disableKeyboardShortcuts, BOOL)
+
 RCT_EXPORT_SHADOW_PROPERTY(text, NSString)
 RCT_EXPORT_SHADOW_PROPERTY(placeholder, NSString)
 RCT_EXPORT_SHADOW_PROPERTY(onContentSizeChange, RCTDirectEventBlock)
diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.h
@@ -34,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign, readonly) CGFloat zoomScale;
 @property (nonatomic, assign, readonly) CGPoint contentOffset;
 @property (nonatomic, assign, readonly) UIEdgeInsets contentInset;
+@property (nonatomic, assign) BOOL disableKeyboardShortcuts;
 
 @end
 
diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
@@ -115,6 +115,45 @@ - (void)setSecureTextEntry:(BOOL)secureTextEntry
   self.attributedText = originalText;
 }
 
+- (BOOL)disableKeyboardShortcuts
+{
+  // Log the call to this method
+  NSLog(@"RCTUITextField setDisableKeyboardShortcuts called with value: %d", self.disableKeyboardShortcuts);
+
+  return self.disableKeyboardShortcuts;
+}
+
+BOOL isFirstRender = YES;
+NSArray<UIBarButtonItemGroup *> *initialValueLeadingBarButtonGroups;
+NSArray<UIBarButtonItemGroup *> *initialValueTrailingBarButtonGroups;
+
+- (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
+{
+    // Log the call to this method
+  NSLog(@"RCTUITextField setDisableKeyboardShortcuts called with value: %d", disableKeyboardShortcuts);
+  NSLog(@"RCTBaseTextInputView isFirstRender: %d", isFirstRender);;
+  
+  // Initialize the initial values only once
+  if (isFirstRender) {
+    isFirstRender = NO;
+    // Capture initial values of leading and trailing button groups
+    initialValueLeadingBarButtonGroups = self.inputAssistantItem.leadingBarButtonGroups;
+    initialValueTrailingBarButtonGroups = self.inputAssistantItem.trailingBarButtonGroups;
+  }
+  
+  NSLog(@"Initial Leading Bar Button Groups: %@", initialValueLeadingBarButtonGroups);
+  NSLog(@"Initial Trailing Bar Button Groups: %@", initialValueTrailingBarButtonGroups);
+
+  if (disableKeyboardShortcuts) {
+    self.inputAssistantItem.leadingBarButtonGroups = @[];
+    self.inputAssistantItem.trailingBarButtonGroups = @[];
+  } else {
+    // Restore the initial values
+    self.inputAssistantItem.leadingBarButtonGroups = initialValueLeadingBarButtonGroups;
+    self.inputAssistantItem.trailingBarButtonGroups = initialValueTrailingBarButtonGroups;
+  }
+}
+
 #pragma mark - Placeholder
 
 - (NSDictionary<NSAttributedStringKey, id> *)_placeholderTextAttributes
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
@@ -251,6 +251,9 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
   // because they are being checked on-demand.
 
   // Other props:
+  NSLog(@"newTextInputProps.placeholder: '%@'", RCTNSStringFromString(newTextInputProps.placeholder));
+  NSLog(@"oldTextInputProps.placeholder: '%@'", RCTNSStringFromString(oldTextInputProps.placeholder));
+  
   if (newTextInputProps.placeholder != oldTextInputProps.placeholder) {
     _backedTextInputView.placeholder = RCTNSStringFromString(newTextInputProps.placeholder);
   }
@@ -279,6 +282,14 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
     _backedTextInputView.inputAccessoryViewButtonLabel =
         RCTNSStringFromString(newTextInputProps.inputAccessoryViewButtonLabel);
   }
+  
+  NSLog(@"newTextInputProps.disableKeyboardShortcuts: '%d'", newTextInputProps.disableKeyboardShortcuts);
+  NSLog(@"oldTextInputProps.disableKeyboardShortcuts: '%d'", oldTextInputProps.disableKeyboardShortcuts);
+  
+  if (newTextInputProps.disableKeyboardShortcuts != oldTextInputProps.disableKeyboardShortcuts) {
+    _backedTextInputView.disableKeyboardShortcuts = newTextInputProps.disableKeyboardShortcuts;
+  }
+  
   [super updateProps:props oldProps:oldProps];
 
   [self setDefaultInputAccessoryView];
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm
@@ -45,6 +45,7 @@ void RCTCopyBackedTextInput(
   toTextInput.textContentType = fromTextInput.textContentType;
   toTextInput.smartInsertDeleteType = fromTextInput.smartInsertDeleteType;
   toTextInput.passwordRules = fromTextInput.passwordRules;
+  toTextInput.disableKeyboardShortcuts = fromTextInput.disableKeyboardShortcuts;
 
   [toTextInput setSelectedTextRange:fromTextInput.selectedTextRange notifyDelegate:NO];
 }
diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.cpp
@@ -126,7 +126,13 @@ BaseTextInputProps::BaseTextInputProps(
           rawProps,
           "multiline",
           sourceProps.multiline,
-          {false})) {}
+          {false})),
+      disableKeyboardShortcuts(convertRawProp(
+          context,
+          rawProps,
+          "disableKeyboardShortcuts",
+          sourceProps.disableKeyboardShortcuts,
+          {})) {}
 
 void BaseTextInputProps::setProp(
     const PropsParserContext& context,
@@ -208,6 +214,7 @@ void BaseTextInputProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(readOnly);
     RAW_SET_PROP_SWITCH_CASE_BASIC(submitBehavior);
     RAW_SET_PROP_SWITCH_CASE_BASIC(multiline);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(disableKeyboardShortcuts);
   }
 }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.h
@@ -72,6 +72,8 @@ class BaseTextInputProps : public ViewProps, public BaseTextProps {
 
   bool multiline{false};
 
+  bool disableKeyboardShortcuts{};
+
   SubmitBehavior getNonDefaultSubmitBehavior() const;
 };
 
diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile
@@ -1,3 +1,5 @@
+ENV['RCT_NEW_ARCH_ENABLED'] = '0'
+
 require_relative '../react-native/scripts/react_native_pods'
 
 source 'https://cdn.cocoapods.org/'
@@ -35,7 +37,7 @@ end
 def pods(target_name, options = {})
   project 'RNTesterPods.xcodeproj'
 
-  fabric_enabled = true
+  fabric_enabled = false
 
   # Hermes is now enabled by default.
   # The following line will only disable Hermes if the USE_HERMES envvar is SET to a value other than 1 (e.g. USE_HERMES=0).
@@ -49,6 +51,7 @@ def pods(target_name, options = {})
     app_path: "#{Dir.pwd}",
     config_file_dir: "#{Dir.pwd}/node_modules",
     production: false, #deprecated
+    :new_arch_enabled => false # Disable the New Architecture
   )
   pod 'ReactCommon-Samples', :path => "#{@prefix_path}/ReactCommon/react/nativemodule/samples"
 
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm
diff --git a/packages/rn-tester/js/examples/Playground/RNTesterPlayground.js b/packages/rn-tester/js/examples/Playground/RNTesterPlayground.js
diff --git a/yarn.lock b/yarn.lock
