Merge branch 'develop' into zh-table-ot

slab · Mar 3, 2022 · fbb887b · fbb887b
2 parents 4313e90 + 0f20a58
commit fbb887b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/core/quill.js b/core/quill.js
@@ -125,11 +125,13 @@ class Quill {
         Quill.sources.USER,
       );
     });
-    const contents = this.clipboard.convert({
-      html: `${html}<p><br></p>`,
-      text: '\n',
-    });
-    this.setContents(contents);
+    if (html) {
+      const contents = this.clipboard.convert({
+        html: `${html}<p><br></p>`,
+        text: '\n',
+      });
+      this.setContents(contents);
+    }
     this.history.clear();
     if (this.options.placeholder) {
       this.root.setAttribute('data-placeholder', this.options.placeholder);

diff --git a/core/selection.js b/core/selection.js
@@ -194,6 +194,12 @@ class Selection {
   }
 
   getRange() {
+    const root = this.scroll.domNode;
+    if ('isConnected' in root && !root.isConnected) {
+      // document.getSelection() forces layout on Blink, so we trend to
+      // not calling it.
+      return [null, null];
+    }
     const normalized = this.getNativeRange();
     if (normalized == null) return [null, null];
     const range = this.normalizedToRange(normalized);