Merge pull request #159 from bbqsrc/fix/on-submit-editing-text-field

Fix onSubmitEditing for text fields

Author: ptmt

Libraries/Components/TextInput/TextInput.js

@@ -521,8 +521,10 @@ const TextInput = React.createClass({
   },
 
   render: function() {
-    if (Platform.OS === 'ios' || Platform.OS === 'macos') {
+    if (Platform.OS === 'ios') {
       return this._renderIOS();
+    } else if (Platform.OS === 'macos') {
+      return this._renderMacOS();
     } else if (Platform.OS === 'android') {
       return this._renderAndroid();
     }
@@ -534,6 +536,90 @@ const TextInput = React.createClass({
       this.props.defaultValue;
   },
 
+  _renderMacOS: function() {
+    var textContainer;
+
+    var onSelectionChange;
+    if (this.props.selectionState || this.props.onSelectionChange) {
+      onSelectionChange = (event: Event) => {
+        if (this.props.selectionState) {
+          var selection = event.nativeEvent.selection;
+          this.props.selectionState.update(selection.start, selection.end);
+        }
+        this.props.onSelectionChange && this.props.onSelectionChange(event);
+      };
+    }
+
+    var props = Object.assign({}, this.props);
+    props.style = [styles.input, this.props.style];
+    if (!props.multiline) {
+      if (__DEV__) {
+        for (var propKey in onlyMultiline) {
+          if (props[propKey]) {
+            const error = new Error(
+              'TextInput prop `' + propKey + '` is only supported with multiline.'
+            );
+            warning(false, '%s', error.stack);
+          }
+        }
+      }
+      var TextField = props.password ? RCTSecureTextField : RCTTextField;
+      textContainer =
+        <TextField
+          ref="input"
+          {...props}
+          onFocus={this._onFocus}
+          onBlur={this._onBlur}
+          onChange={this._onChange}
+          onSubmitEditing={this.props.onSubmitEditing}
+          onSelectionChange={onSelectionChange}
+          onSelectionChangeShouldSetResponder={emptyFunction.thatReturnsTrue}
+          text={this._getText()}
+        />;
+    } else {
+      var children = props.children;
+      var childCount = 0;
+      ReactChildren.forEach(children, () => ++childCount);
+      invariant(
+        !(props.value && childCount),
+        'Cannot specify both value and children.'
+      );
+      if (childCount >= 1) {
+        children = <Text style={props.style}>{children}</Text>;
+      }
+      if (props.inputView) {
+        children = [children, props.inputView];
+      }
+      textContainer =
+        <RCTTextView
+          ref="input"
+          {...props}
+          children={children}
+          onFocus={this._onFocus}
+          onBlur={this._onBlur}
+          onChange={this._onChange}
+          onContentSizeChange={this.props.onContentSizeChange}
+          onSelectionChange={onSelectionChange}
+          onSubmitEditing={this.props.onSubmitEditing}
+          onTextInput={this._onTextInput}
+          onSelectionChangeShouldSetResponder={emptyFunction.thatReturnsTrue}
+          placeholderTextColor={processColor(props.placeholderTextColor)}
+          text={this._getText()}
+          dataDetectorTypes={this.props.dataDetectorTypes}
+        />;
+    }
+
+    return (
+      <TouchableWithoutFeedback
+        onLayout={props.onLayout}
+        onPress={this._onPress}
+        rejectResponderTermination={true}
+        testID={props.testID}>
+        {textContainer}
+      </TouchableWithoutFeedback>
+    );
+  },
+
   _renderIOS: function() {
     var textContainer;
 

Libraries/Text/RCTTextField.h

@@ -16,7 +16,7 @@
 @interface TextFieldCellWithPaddings : NSTextFieldCell
 @end
 
-@interface RCTTextField : NSTextField <NSTextFieldDelegate>
+@interface RCTTextField : NSTextField <NSTextFieldDelegate, NSControlTextEditingDelegate>
 
 @property (nonatomic, assign) BOOL caretHidden;
 @property (nonatomic, assign) BOOL autoCorrect;
@@ -35,5 +35,6 @@
 //- (void)textFieldDidChange:(NSNotification *)aNotification;
 - (void)sendKeyValueForString:(NSString *)string;
 - (BOOL)textFieldShouldEndEditing:(RCTTextField *)textField;
+- (void)textFieldSubmitEditingWithString:(NSString *)key;
 
 @end

Libraries/Text/RCTTextField.m

@@ -185,13 +185,13 @@ - (void)textDidEndEditing:(NSNotification *)aNotification
                                       key:nil
                                eventCount:_nativeEventCount];
 }
-- (void)textFieldSubmitEditing
+- (void)textFieldSubmitEditingWithString:(NSString *)key
 {
   _submitted = YES;
   [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
                                  reactTag:self.reactTag
                                      text:[self stringValue]
-                                      key:nil
+                                      key:key
                                eventCount:_nativeEventCount];
 }
 

Libraries/Text/RCTTextFieldManager.m

@@ -40,6 +40,21 @@ - (NSView *)view
   return textField;
 }
 
+- (BOOL)control:(NSControl *)control textView:(NSTextView * __unused)textView doCommandBySelector:(SEL)commandSelector {
+  if (![control isKindOfClass:[RCTTextField class]]) {
+    return YES;
+  }
+  
+  RCTTextField *textField = (RCTTextField*)control;
+  
+  if (commandSelector == @selector(insertNewline:)) {
+    [textField textFieldSubmitEditingWithString:@"\n"];
+    return YES;
+  }
+  
+  return NO;
+}
+
 - (BOOL)textField:(RCTTextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
 {
   // Only allow single keypresses for onKeyPress, pasted text will not be sent.
@@ -52,6 +67,7 @@ - (BOOL)textField:(RCTTextField *)textField shouldChangeCharactersInRange:(NSRan
   if (textField.maxLength == nil || [string isEqualToString:@"\n"]) {  // Make sure forms can be submitted via return
     return YES;
   }
+  
   return YES;
 }