Merge branch 'quilljs:develop' into main

blots/scroll.js

@@ -1,4 +1,4 @@
-import { Scope, ScrollBlot, ContainerBlot } from 'parchment';
+import { Scope, ScrollBlot, ContainerBlot, LeafBlot } from 'parchment';
 import Emitter from '../core/emitter';
 import Block, { BlockEmbed } from './block';
 import Break from './break';
@@ -103,7 +103,11 @@ class Scroll extends ScrollBlot {
   }
 
   leaf(index) {
-    return this.path(index).pop() || [null, -1];
+    const last = this.path(index).pop();
+    if (!last || !(last[0] instanceof LeafBlot)) {
+      return [null, -1];
+    }
+    return last;
   }
 
   line(index) {

core/quill.js

@@ -249,6 +249,7 @@ class Quill {
     } else {
       bounds = this.selection.getBounds(index.index, index.length);
     }
+    if (!bounds) return null;
     const containerBounds = this.container.getBoundingClientRect();
     return {
       bottom: bounds.bottom - containerBounds.top,

core/selection.js

@@ -156,6 +156,14 @@ class Selection {
     let side = 'left';
     let rect;
     if (node instanceof Text) {
+      // Return null if the text node is empty because it is
+      // not able to get a useful client rect:
+      // https://github.com/w3c/csswg-drafts/issues/2514.
+      // Empty text nodes are most likely caused by TextBlot#optimize()
+      // not getting called when editor content changes.
+      if (!node.data.length) {
+        return null;
+      }
       if (offset < node.data.length) {
         range.setStart(node, offset);
         range.setEnd(node, offset + 1);

test/unit/core/selection.js

@@ -630,5 +630,14 @@ describe('Selection', function() {
         this.bounds = selection.getBounds(0, 10);
       }).not.toThrow();
     });
+
+    it('empty container', function() {
+      const selection = this.initialize(
+        Selection,
+        '<table><tr><td data-row="a">a</td></tr></table>',
+      );
+      this.quill.updateContents([{ retain: 1 }, { insert: '\n' }]);
+      expect(selection.getBounds(2, 0)).toEqual(null);
+    });
   });
 });