Merge branch 'develop' of https://github.com/wordpress-mobile/gutenbe…

…rg-mobile into callstack/rnmobile-is-appender
wordpress-mobile · Sep 27, 2019 · 8fff319 · 8fff319
2 parents d91f56c + c364ab4
commit 8fff319
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/gutenberg b/gutenberg
diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -245,14 +245,23 @@ class RCTAztecView: Aztec.TextView {
     }
 
     override func paste(_ sender: Any?) {
-        let start = selectedRange.location
-        let end = selectedRange.location + selectedRange.length
-
         let pasteboard = UIPasteboard.general
         let text = readText(from: pasteboard) ?? ""
         let html = readHTML(from: pasteboard) ?? ""
         let imagesURLs = readImages(from: pasteboard)
+        sendPasteCallback(text: text, html: html, imagesURLs: imagesURLs);
+    }
 
+    override func pasteWithoutFormatting(_ sender: Any?) {
+        let pasteboard = UIPasteboard.general
+        let text = readText(from: pasteboard) ?? ""
+        let imagesURLs = readImages(from: pasteboard)
+        sendPasteCallback(text: text, html: "", imagesURLs: imagesURLs);
+    }
+
+    private func sendPasteCallback(text: String, html: String, imagesURLs: [String]) {
+        let start = selectedRange.location
+        let end = selectedRange.location + selectedRange.length
         onPaste?([
             "currentContent": cleanHTML(),
             "selectionStart": start,
+1 −0		packages/block-editor/src/components/index.native.js
+140 −0		packages/block-editor/src/components/media-upload-progress/README.md
+9 −1		packages/block-editor/src/components/media-upload-progress/image-size.native.js
+0 −0		packages/block-editor/src/components/media-upload-progress/index.native.js
+4 −0		packages/block-editor/src/components/media-upload-progress/styles.native.scss
+1 −1		packages/block-editor/src/components/media-upload-progress/test/index.native.js
+1 −1		packages/block-library/src/image/edit.native.js
+0 −5		packages/block-library/src/image/styles.native.scss
+1 −1		packages/block-library/src/video/edit.native.js
+1 −1		packages/blocks/src/api/raw-handling/list-reducer.js
+4 −4		packages/blocks/src/api/validation.js
+1 −1		packages/components/src/disabled/test/index.js
+1 −1		packages/components/src/draggable/index.js
+1 −1		packages/components/src/higher-order/navigate-regions/index.js
+1 −1		packages/dom/src/focusable.js
+1 −1		packages/edit-post/src/components/admin-notices/index.js