Skip leading/trailing whitespace when adding a mark in toggleMark

FIX: `toggleMark` will now skip whitespace at the start and end of the selection
when adding a mark.

See https://discuss.prosemirror.net/t/doubleclick-selection-of-word-and-applying-marks-in-ms-windows/3404

Author: marijnh

src/commands.js

@@ -503,8 +503,15 @@ export function toggleMark(markType, attrs) {
         }
         for (let i = 0; i < ranges.length; i++) {
           let {$from, $to} = ranges[i]
-          if (has) tr.removeMark($from.pos, $to.pos, markType)
-          else tr.addMark($from.pos, $to.pos, markType.create(attrs))
+          if (has) {
+            tr.removeMark($from.pos, $to.pos, markType)
+          } else {
+            let from = $from.pos, to = $to.pos, start = $from.nodeAfter, end = $to.nodeBefore
+            let spaceStart = start && start.isText ? /^\s*/.exec(start.text)[0].length : 0
+            let spaceEnd = end && end.isText ? /\s*$/.exec(end.text)[0].length : 0
+            if (from + spaceStart < to) { from += spaceStart; to -= spaceEnd }
+            tr.addMark(from, to, markType.create(attrs))
+          }
         }
         dispatch(tr.scrollIntoView())
       }

test/test-commands.js

@@ -463,3 +463,42 @@ describe("autoJoin", () => {
            autoJoin(lift, ["bullet_list"]),
            doc(ul(li(p("a")), li(p("b")), li(p("c"))))))
 })
+
+describe("toggleMark", () => {
+  let toggleEm = toggleMark(schema.marks.em), toggleStrong = toggleMark(schema.marks.strong)
+
+  it("can add a mark", () => {
+    apply(doc(p("one <a>two<b>")), toggleEm,
+          doc(p("one ", em("two"))))
+  })
+
+  it("can stack marks", () => {
+    apply(doc(p("one <a>tw", strong("o<b>"))), toggleEm,
+          doc(p("one ", em("tw", strong("o")))))
+  })
+
+  it("can remove marks", () => {
+    apply(doc(p(em("one <a>two<b>"))), toggleEm,
+          doc(p(em("one "), "two")))
+  })
+
+  it("can toggle pending marks", () => {
+    let state = mkState(doc(p("hell<a>o")))
+    toggleEm(state, tr => state = state.apply(tr))
+    ist(state.storedMarks.length, 1)
+    toggleStrong(state, tr => state = state.apply(tr))
+    ist(state.storedMarks.length, 2)
+    toggleEm(state, tr => state = state.apply(tr))
+    ist(state.storedMarks.length, 1)
+  })
+
+  it("skips whitespace at selection ends when adding marks", () => {
+    apply(doc(p("one<a> two  <b>three")), toggleEm,
+          doc(p("one ", em("two"), "  three")))
+  })
+
+  it("doesn't skip whitespace-only selections", () => {
+    apply(doc(p("one<a> <b>two")), toggleEm,
+          doc(p("one", em(" "), "two")))
+  })
+})