Merge pull request #50 from wordpress-mobile/try/add-onEnter-callback…

…-to-ios Adds an onEnter callback to iOS.
WordPress · Sep 6, 2018 · b8cec63 · b8cec63
2 parents 79388a6 + e9dfd53
commit b8cec63
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/example/editor.js b/example/editor.js
@@ -46,6 +46,7 @@ export default class Editor extends Component {
                 placeholderTextColor = {'lightgray'} // See http://facebook.github.io/react-native/docs/colors                
                 onContentSizeChange= { onContentSizeChange }
                 onChange= {(event) => console.log(event.nativeEvent) }
+                onEnter= {(event) => console.log("asta") }
                 onEndEditing= {(event) => console.log(event.nativeEvent) }
                 onActiveFormatsChange = { this.onActiveFormatsChange }
                 color = {'black'}

diff --git a/ios/RNTAztecView/RCTAztecView.swift b/ios/RNTAztecView/RCTAztecView.swift
@@ -4,6 +4,7 @@ import UIKit
 
 class RCTAztecView: Aztec.TextView {
     @objc var onChange: RCTBubblingEventBlock? = nil
+    @objc var onEnter: RCTBubblingEventBlock? = nil
     @objc var onContentSizeChange: RCTBubblingEventBlock? = nil
 
     @objc var onActiveFormatsChange: RCTBubblingEventBlock? = nil
@@ -61,8 +62,14 @@ class RCTAztecView: Aztec.TextView {
     // MARK: - Edits
 
     open override func insertText(_ text: String) {
+        guard text != "\n" else {            
+            onEnter?([:])
+            return
+        }
+
         super.insertText(text)
         updatePlaceholderVisibility()
+
         if let onChange = onChange {
             let text = packForRN(getHTML(), withName: "text")
             onChange(text)
@@ -72,6 +79,7 @@ class RCTAztecView: Aztec.TextView {
     open override func deleteBackward() {
         super.deleteBackward()
         updatePlaceholderVisibility()
+
         if let onChange = onChange {
             let text = packForRN(getHTML(), withName: "text")
             onChange(text)
@@ -81,7 +89,8 @@ class RCTAztecView: Aztec.TextView {
     // MARK: - Native-to-RN Value Packing Logic
 
     func packForRN(_ text: String, withName name: String) -> [AnyHashable: Any] {
-        return [name: text, "eventCount": 1]
+        return [name: text,
+                "eventCount": 1]
     }
 
     func packForRN(_ size: CGSize, withName name: String) -> [AnyHashable: Any] {

diff --git a/ios/RNTAztecView/RCTAztecViewManager.m b/ios/RNTAztecView/RCTAztecViewManager.m
@@ -10,6 +10,7 @@ @implementation RCTAztecViewManager (RCTExternModule)
 RCT_REMAP_VIEW_PROPERTY(text, contents, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(onContentSizeChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onEnter, RCTBubblingEventBlock)
 
 RCT_EXPORT_VIEW_PROPERTY(onActiveFormatsChange, RCTBubblingEventBlock)
 

diff --git a/src/AztecView.js b/src/AztecView.js
@@ -13,6 +13,7 @@ class AztecView extends React.Component {
     minImagesWidth: PropTypes.number,
     onChange: PropTypes.func,
     onContentSizeChange: PropTypes.func,
+    onEnter: PropTypes.func,
     onScroll: PropTypes.func,
     onActiveFormatsChange: PropTypes.func,
     ...ViewPropTypes, // include the default view properties