Merge pull request #1196 from wordpress-mobile/release/1.6.6

Release 1.6.6

Author: SergioEstevao

Aztec/Classes/TextKit/TextStorage.swift

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

Aztec/Classes/TextKit/TextView.swift

@@ -1,6 +1,6 @@
 import UIKit
 import Foundation
-
+import CoreServices
 
 // MARK: - TextViewAttachmentDelegate
 //
@@ -458,16 +458,20 @@ open class TextView: UITextView {
 
     open override func cut(_ sender: Any?) {
         let data = storage.attributedSubstring(from: selectedRange).archivedData()
+        let html = storage.getHTML(range: selectedRange)
         super.cut(sender)
 
         storeInPasteboard(encoded: data)
+        storeInPasteboard(html: html)
     }
 
     open override func copy(_ sender: Any?) {
         let data = storage.attributedSubstring(from: selectedRange).archivedData()
+        let html = storage.getHTML(range: selectedRange)
         super.copy(sender)
 
         storeInPasteboard(encoded: data)
+        storeInPasteboard(html: html)
     }
 
     open override func paste(_ sender: Any?) {
@@ -562,6 +566,14 @@ open class TextView: UITextView {
         }
     }
 
+    internal func storeInPasteboard(html: String, pasteboard: UIPasteboard = UIPasteboard.general) {
+        if pasteboard.numberOfItems > 0 {
+            pasteboard.items[0][kUTTypeHTML as String] = html;
+        } else {
+            pasteboard.addItems([[kUTTypeHTML as String: html]])
+        }
+    }
+
     // MARK: - Intercept keyboard operations
 
     open override func insertText(_ text: String) {

AztecTests/TextKit/TextViewTests.swift

@@ -2017,7 +2017,7 @@ class TextViewTests: XCTestCase {
         XCTAssertEqual(output, expected)
     }
 
-    // MARK: - Copy tests
+    // MARK: - Copy/Paste tests
 
     func testCopyAndPasteToPlainText() {
         let sourceTextView = TextViewStub(withHTML: "This is text with attributes: <strong>bold</strong>")
@@ -2027,4 +2027,32 @@ class TextViewTests: XCTestCase {
 
         XCTAssertEqual(UIPasteboard.general.string, "This is text with attributes: bold")
     }
+
+    func testCopyHTML() {
+        let sourceTextView = TextViewStub(withHTML: "<p>This is text with attributes: <strong>bold</strong> and <italic>italic</italic></p>")
+
+        sourceTextView.selectedRange = NSRange(location: 0, length: sourceTextView.text.count)
+        sourceTextView.copy(nil)
+
+        XCTAssertEqual(UIPasteboard.general.html(), "<p>This is text with attributes: <strong>bold</strong> and <italic>italic</italic></p>")
+    }
+
+    func testCutHTML() {
+        let sourceTextView = TextViewStub(withHTML: "<p>This is text with attributes: <strong>bold</strong> and <italic>italic</italic></p>")
+
+        sourceTextView.selectedRange = NSRange(location: 0, length: sourceTextView.text.count)
+        sourceTextView.cut(nil)
+
+        XCTAssertEqual(UIPasteboard.general.html(), "<p>This is text with attributes: <strong>bold</strong> and <italic>italic</italic></p>")
+    }
+
+    func testCopyPartialHTML() {
+        let sourceTextView = TextViewStub(withHTML: "<p><strong>bold</strong> and <italic>italic</italic></p>")
+
+        sourceTextView.selectedRange = NSRange(location: 0, length: 3)
+        sourceTextView.copy(nil)
+
+        XCTAssertEqual(UIPasteboard.general.html(), "<p><strong>bol</strong></p>")
+    }
+
 }

WordPress-Aztec-iOS.podspec

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