Feature/lists

react-native-aztec/ios/Cartfile

@@ -1,2 +1,2 @@
-github "wordpress-mobile/AztecEditor-iOS" ~> 1.5.0
+github "wordpress-mobile/AztecEditor-iOS" ~> 1.5.2
 

react-native-aztec/ios/Cartfile.resolved

@@ -1 +1 @@
-github "wordpress-mobile/AztecEditor-iOS" "1.5.0"
+github "wordpress-mobile/AztecEditor-iOS" "1.5.2"

react-native-aztec/ios/RNTAztecView/RCTAztecView.swift

@@ -183,6 +183,11 @@ class RCTAztecView: Aztec.TextView {
         return String(data: data, encoding: .utf8)
     }
 
+    private func cleanHTML() -> String {
+        let html = getHTML(prettify: false).replacingOccurrences(of: "\n", with: "")
+        return html
+    }
+
     func saveToDisk(image: UIImage) -> URL? {
         let fileName = "\(ProcessInfo.processInfo.globallyUniqueString)_file.jpg"
 
@@ -217,7 +222,7 @@ class RCTAztecView: Aztec.TextView {
         let imagesURLs = self.images(from: pasteboard)
 
         onPaste?([
-            "currentContent": getHTML(),
+            "currentContent": cleanHTML(),
             "selectionStart": start,
             "selectionEnd": end,
             "pastedText": text,
@@ -264,7 +269,7 @@ class RCTAztecView: Aztec.TextView {
             let onEnter = onEnter else {
                 return false
         }
-        
+
         let caretData = packCaretDataForRN()
         onEnter(caretData)
         return true
@@ -303,7 +308,7 @@ class RCTAztecView: Aztec.TextView {
             (start, end) = (end, start)
         }
 
-        var result: [AnyHashable : Any] = packForRN(getHTML(), withName: "text")
+        var result: [AnyHashable : Any] = packForRN(getHTML(prettify: false), withName: "text")
 
         result["selectionStart"] = start
         result["selectionEnd"] = end
@@ -482,7 +487,7 @@ class RCTAztecView: Aztec.TextView {
 
     func propagateContentChanges() {
         if let onChange = onChange {
-            let text = packForRN(getHTML(), withName: "text")
+            let text = packForRN(cleanHTML(), withName: "text")
             onChange(text)
         }
     }

react-native-aztec/src/AztecView.js

@@ -28,7 +28,7 @@ class AztecView extends React.Component {
     onSelectionChange: PropTypes.func,
     onHTMLContentWithCursor: PropTypes.func,
     onCaretVerticalPositionChange: PropTypes.func,
-    blockType: PropTypes.object,
+	blockType: PropTypes.object,	
     ...ViewPropTypes, // include the default view properties
   }
 
@@ -157,10 +157,13 @@ class AztecView extends React.Component {
           onContentSizeChange = { this._onContentSizeChange }
           onHTMLContentWithCursor = { this._onHTMLContentWithCursor }
           onSelectionChange = { this._onSelectionChange }
-          onEnter = { this._onEnter }
+          onEnter = { this.props.onEnter && this._onEnter }
+          // IMPORTANT: the onFocus events are thrown away as these are handled by onPress() in the upper level.
+          // It's necessary to do this otherwise onFocus may be set by `{...otherProps}` and thus the onPress + onFocus
+          // combination generate an infinite loop as described in https://github.com/wordpress-mobile/gutenberg-mobile/issues/302
           onFocus = { this._onAztecFocus } 
           onBlur = { this._onBlur }
-          onBackspace = { this._onBackspace }
+		      onBackspace = { this._onBackspace }
         />
       </TouchableWithoutFeedback>
     );

src/block-management/block-holder.js

@@ -181,6 +181,7 @@ export class BlockHolder extends React.Component<PropsType, StateType> {
 				insertBlocksAfter={ this.insertBlocksAfter }
 				mergeBlocks={ this.mergeBlocks }
 				onCaretVerticalPositionChange={ this.props.onCaretVerticalPositionChange }
+				clientId={ this.props.clientId }
 			/>
 		);
 	}