Merge pull request #1239 from wordpress-mobile/release/1.13.0

Release/1.13.0

Author: SergioEstevao

Aztec/Classes/Constants/Metrics.swift

@@ -4,12 +4,12 @@ import Foundation
 /// A collection of constants and metrics shared between the Aztec importer
 /// and the editor.
 ///
-enum Metrics {
+public enum Metrics {
 
-    static let defaultIndentation = CGFloat(12)
-    static let maxIndentation = CGFloat(200)    
-    static let listTextIndentation = CGFloat(16)
-    static let tabStepInterval = 8
-    static let tabStepCount = 12
-    static let paragraphSpacing = CGFloat(6)
+    public static var defaultIndentation = CGFloat(12)
+    public static var maxIndentation = CGFloat(200)
+    public static var listTextIndentation = CGFloat(16)
+    public static var tabStepInterval = 8
+    public static var tabStepCount = 12
+    public static var paragraphSpacing = CGFloat(6)
 }

Aztec/Classes/TextKit/LayoutManager.swift

@@ -283,7 +283,7 @@ private extension LayoutManager {
         var resultAttributes = attributes
         var indent: CGFloat = 0
         if let style = attributes[.paragraphStyle] as? ParagraphStyle {
-            indent = style.listIndent + Metrics.listTextIndentation
+            indent = style.listIndent + Metrics.listTextIndentation - (Metrics.listTextIndentation / 4)
         }
 
         resultAttributes[.paragraphStyle] = markerParagraphStyle(indent: indent)

Aztec/Classes/TextKit/MediaAttachment.swift

@@ -45,6 +45,12 @@ open class MediaAttachment: NSTextAttachment {
         }
     }
 
+    /// Indicates if the media is loaded
+    ///
+    public var isLoaded: Bool {
+        return !needsNewAsset && !isFetchingImage
+    }
+
     /// Indicates if a new Asset should be retrieved, or we're current!.
     ///
     fileprivate var needsNewAsset = true

Aztec/Classes/TextKit/TextView.swift

@@ -242,12 +242,20 @@ open class TextView: UITextView {
             .font: defaultFont,
             .paragraphStyle: defaultParagraphStyle,
         ]
-        if let color = textColor {
+        if let color = defaultTextColor {
             attributes[.foregroundColor] = color
         }
         return attributes
     }
-    
+
+    open lazy var defaultTextColor: UIColor? = {
+        if #available(iOS 13.0, *) {
+            return UIColor.label
+        } else {
+            return UIColor.darkText
+        }        
+    }()
+
     // MARK: - Plugin Loading
 
     var pluginManager: PluginManager {
@@ -637,7 +645,7 @@ open class TextView: UITextView {
         evaluateRemovalOfSingleLineParagraphAttributesAfterSelectionChange()
         ensureRemovalOfParagraphAttributesWhenPressingBackspaceAndEmptyingTheDocument()
         ensureCursorRedraw(afterEditing: deletedString.string)
-
+        recalculateTypingAttributes()
         notifyTextViewDidChange()
     }
 
@@ -1237,6 +1245,7 @@ open class TextView: UITextView {
     private func recalculateTypingAttributes(at location: Int) {
 
         guard storage.length > 0 else {
+            typingAttributes = defaultAttributes
             return
         }
 

Aztec/Classes/TextKit/TextViewPasteboardDelegate.swift

@@ -58,7 +58,7 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {
         guard let string = UIPasteboard.general.attributedString() else {
             return false
         }
-
+        string.loadLazyAttachments()
         let selectedRange = textView.selectedRange
         let storage = textView.storage
 
@@ -69,9 +69,9 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {
             textView?.undoTextReplacement(of: originalText, finalRange: finalRange)
         })
 
-        string.loadLazyAttachments()
+        let colorCorrectedString = fixColors(in: string, using: textView.defaultTextColor)
 
-        storage.replaceCharacters(in: selectedRange, with: string)
+        storage.replaceCharacters(in: selectedRange, with: colorCorrectedString)
         textView.notifyTextViewDidChange()
 
         let newSelectedRange = NSRange(location: selectedRange.location + string.length, length: 0)
@@ -80,6 +80,21 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {
         return true
     }
 
+    private func fixColors(in string: NSAttributedString, using baseColor: UIColor?) -> NSAttributedString {
+        guard #available(iOS 13.0, *) else {
+            return string
+        }
+        let colorToUse = baseColor ?? UIColor.label
+
+        let newString = NSMutableAttributedString(attributedString: string)
+        newString.enumerateAttributes(in: newString.rangeOfEntireString, options: []) { (attributes, range, stop) in
+            if attributes[.foregroundColor] == nil {
+                newString.setAttributes([.foregroundColor: colorToUse], range: range)
+            }
+        }
+        return newString
+    }
+
     /// Tries to paste raw text from the clipboard, replacing the selected range.
     ///
     /// - Returns: True if the paste succeeds, false if it does not.

AztecTests/Resources/UIImageResizeImage1_3x.png.dat

@@ -2078,4 +2078,32 @@ class TextViewTests: XCTestCase {
         XCTAssertEqual(UIPasteboard.general.html(), "<p><strong>bol</strong></p>")
     }
 
+    /// Check if pasting attributed text without color, the color is set to default color
+    func testPasteAttributedText() {
+        let sourceAttributedText = NSAttributedString(string: "Hello world")
+        var pasteItems = [String:Any]()
+        pasteItems[kUTTypePlainText as String] = try! sourceAttributedText.data(from: sourceAttributedText.rangeOfEntireString, documentAttributes: [.documentType: DocumentType.plain])
+        UIPasteboard.general.setItems([pasteItems], options: [:])
+        let textView = TextViewStub(withHTML: "")
+        textView.defaultTextColor = UIColor.red
+        textView.paste(nil)
+
+        let attributedString = textView.attributedText!
+
+        let attributes = attributedString.attributes(at: 0, effectiveRange: nil)
+
+        XCTAssertEqual(attributes[.foregroundColor] as! UIColor, UIColor.red)
+        XCTAssertEqual(textView.text, "Hello world")
+    }
+
+    /// Check that deleting all text resets the typying attributes to the default attributes
+    func testDeleteAllTextSetTypyingAttributesToDefault() {
+        let textView = TextViewStub(withHTML: "<p style=\"color:0xFF0000\">Hello world</p>")
+        textView.defaultTextColor = UIColor.green
+        textView.selectedRange = textView.attributedText!.rangeOfEntireString
+        textView.deleteBackward()
+        let attributes = textView.typingAttributes
+        XCTAssertEqual(attributes[.foregroundColor] as! UIColor,UIColor.green)
+    }
+
 }

AztecTests/Resources/UIImageResizeImage2_3x.png.dat

@@ -0,0 +1,5 @@
+1.13.0
+-----
+* Fix a bug when copying and pasting from other apps when running dark mode.
+* Improve list indentation for markers.
+ 

AztecTests/TextKit/TextViewTests.swift

@@ -65,7 +65,7 @@ class EditorDemoController: UIViewController {
 
     private func setupHTMLTextView(_ textView: UITextView) {
         let accessibilityLabel = NSLocalizedString("HTML Content", comment: "Post HTML content")
-        self.configureDefaultProperties(for: textView, accessibilityLabel: accessibilityLabel)
+        self.configureDefaultProperties(htmlTextView: textView, accessibilityLabel: accessibilityLabel)
 
         textView.isHidden = true
         textView.delegate = self
@@ -171,6 +171,8 @@ class EditorDemoController: UIViewController {
         view.addSubview(titleTextView)
         view.addSubview(titlePlaceholderLabel)
         view.addSubview(separatorView)
+        Aztec.Metrics.listTextIndentation = 24
+        editorView.richTextView.textContainer.lineFragmentPadding = 0
         // color setup
         if #available(iOS 13.0, *) {
             view.backgroundColor = UIColor.systemBackground
@@ -325,7 +327,22 @@ class EditorDemoController: UIViewController {
     }
 
 
-    private func configureDefaultProperties(for textView: UITextView, accessibilityLabel: String) {
+    private func configureDefaultProperties(for textView: TextView, accessibilityLabel: String) {
+        textView.accessibilityLabel = accessibilityLabel
+        textView.font = Constants.defaultContentFont
+        textView.keyboardDismissMode = .interactive
+        if #available(iOS 13.0, *) {
+            textView.textColor = UIColor.label
+            textView.defaultTextColor = UIColor.label
+        } else {
+            // Fallback on earlier versions
+            textView.textColor = UIColor(red: 0x1A/255.0, green: 0x1A/255.0, blue: 0x1A/255.0, alpha: 1)
+            textView.defaultTextColor = 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 configureDefaultProperties(htmlTextView textView: UITextView, accessibilityLabel: String) {
         textView.accessibilityLabel = accessibilityLabel
         textView.font = Constants.defaultContentFont
         textView.keyboardDismissMode = .interactive