Merge branch 'release/1.7.0'

Author: SergioEstevao

Aztec/Classes/Libxml2/DOM/Data/ElementNode.swift

@@ -255,7 +255,7 @@ public class ElementNode: Node {
     /// - Returns: Returns `true` if it can be the last one, false otherwise.
     ///
     func canBeLastInTree() -> Bool {
-        return hasAttributes() || type == .li
+        return hasAttributes() || isBlockLevel()
     }
 
     /// Find out if this is a block-level element.

Aztec/Classes/TextKit/TextStorage.swift

@@ -369,6 +369,10 @@ open class TextStorage: NSTextStorage {
     open func getHTML(prettify: Bool = false, range: NSRange) -> String {
         return htmlConverter.html(from: self.attributedSubstring(from: range), prettify: prettify)
     }
+
+    open func getHTML(prettify: Bool = false, from attributedString: NSAttributedString) -> String {
+        return htmlConverter.html(from: attributedString, prettify: prettify)
+    }
 
     func setHTML(_ html: String, defaultAttributes: [NSAttributedString.Key: Any]) {
         let originalLength = length

Aztec/Classes/TextKit/TextView.swift

@@ -226,11 +226,13 @@ open class TextView: UITextView {
     var defaultMissingImage: UIImage
 
     fileprivate var defaultAttributes: [NSAttributedString.Key: Any] {
-        let attributes: [NSAttributedString.Key: Any] = [
+        var attributes: [NSAttributedString.Key: Any] = [
             .font: defaultFont,
-            .paragraphStyle: defaultParagraphStyle
+            .paragraphStyle: defaultParagraphStyle,
         ]
-
+        if let color = textColor {
+            attributes[.foregroundColor] = color
+        }
         return attributes
     }
 

Example/Example/EditorDemoController.swift

@@ -324,7 +324,8 @@ class EditorDemoController: UIViewController {
         textView.accessibilityLabel = accessibilityLabel
         textView.font = Constants.defaultContentFont
         textView.keyboardDismissMode = .interactive
-        textView.textColor = UIColor.darkText
+        textView.textColor = UIColor(red: 0x1A/255.0, green: 0x1A/255.0, blue: 0x1A/255.0, alpha: 1)
+        textView.linkTextAttributes = [.foregroundColor: UIColor(red: 0x01 / 255.0, green: 0x60 / 255.0, blue: 0x87 / 255.0, alpha: 1), NSAttributedString.Key.underlineStyle: NSNumber(value: NSUnderlineStyle.single.rawValue)]
     }
 
     private func registerAttachmentImageProviders() {

WordPress-Aztec-iOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Aztec-iOS'
-  s.version          = '1.6.6'
+  s.version          = '1.7.0'
   s.summary          = 'The native HTML Editor.'
 
 # This description is used to generate tags and improve search results.

WordPress-Editor-iOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Editor-iOS'
-  s.version          = '1.6.6'
+  s.version          = '1.7.0'
   s.summary          = 'The WordPress HTML Editor.'
 
 # This description is used to generate tags and improve search results.