fix: Don't wrap a collapsed selection with tags

livingdocsIO · Dec 7, 2023 · fa09d39 · fa09d39
1 parent 14a013a
commit fa09d39
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/spec/selection.spec.js b/spec/selection.spec.js
@@ -462,6 +462,26 @@ describe('Selection', function () {
       const html = getHtml(spanTags[0])
       expect(html).to.equal('<span class="foo">foobar</span>')
     })
+
+    it('does not apply tags to whitespace when toggling', function () {
+      const range = createRange()
+      range.setStart(this.wordWithWhitespace.firstChild, 0)
+      range.setEnd(this.wordWithWhitespace.firstChild, 1)
+      const selection = new Selection(this.wordWithWhitespace, range)
+      selection.toggleBold()
+      expect(selection.toString()).to.equal('')
+      expect(this.wordWithWhitespace.innerHTML).to.equal(' foobar ')
+    })
+
+    it('does not apply tags to whitespace when wrapping', function () {
+      const range = createRange()
+      range.setStart(this.wordWithWhitespace.firstChild, 0)
+      range.setEnd(this.wordWithWhitespace.firstChild, 1)
+      const selection = new Selection(this.wordWithWhitespace, range)
+      selection.makeBold()
+      expect(selection.toString()).to.equal('')
+      expect(this.wordWithWhitespace.innerHTML).to.equal(' foobar ')
+    })
   })
 
   describe('inherits form Cursor', function () {

diff --git a/src/selection.js b/src/selection.js
@@ -156,6 +156,7 @@ export default class Selection extends Cursor {
   // e.g. toggle('<em>')
   toggle (elem) {
     if (block.isPlainTextBlock(this.host)) return
+    if (this.range.collapsed) return
     elem = this.adoptElement(elem)
     this.range = content.toggleTag(this.host, this.range, elem)
     this.setVisibleSelection()
@@ -320,6 +321,7 @@ export default class Selection extends Cursor {
   // remove first.
   forceWrap (elem) {
     if (block.isPlainTextBlock(this.host)) return
+    if (this.range.collapsed) return
     elem = this.adoptElement(elem)
     this.range = content.forceWrap(this.host, this.range, elem)
     this.setVisibleSelection()