Merge pull request #3489 from quilljs/zh-get-leaf

getLeaf() should ignore non-leaf blots
slab · Nov 29, 2021 · 7406491 · 7406491
2 parents d2bd71d + ca2c40a
commit 7406491
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/blots/scroll.js b/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) {

diff --git a/core/quill.js b/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,

diff --git a/test/unit/core/selection.js b/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);
+ });
  });
 });