handle removing text nodes when removing all characters

src/transforms/apply-operation.js

@@ -211,7 +211,6 @@ function removeText(state, operation) {
   let node = document.assertPath(path)
   node = node.removeText(offset, length)
   document = document.updateDescendant(node)
-  document = document.normalize()
   state = state.merge({ document })
   return state
 }

src/transforms/by-key.js

@@ -154,9 +154,32 @@ export function removeNodeByKey(transform, key) {
 
 export function removeTextByKey(transform, key, offset, length) {
   const { state } = transform
-  const { document } = state
+  let { document } = state
   const path = document.getPath(key)
-  return transform.removeTextOperation(path, offset, length)
+  transform.removeTextOperation(path, offset, length)
+
+  // If the text node is now empty, and not needed in the tree, remove it.
+  document = transform.state.document
+  const node = document.getDescendant(key)
+  const parent = document.getParent(key)
+
+  if (node.text != '') {
+    return transform
+  }
+
+  // If the text node is now empty, and not needed in the tree, remove it.
+  const previous = document.getPreviousSibling(key)
+  const next = document.getNextSibling(key)
+
+  if (
+    (parent.nodes.size == 1) ||
+    (previous && previous.isVoid == false) ||
+    (next && next.isVoid == false)
+  ) {
+    transform.removeNodeByKey(key)
+  }
+
+  return transform
 }
 
 /**

test/transforms/fixtures/by-key/remove-text-by-key/adjacent-non-void-inlines/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document, selection } = state
+  const second = document.getTexts().get(1)
+
+  return state
+    .transform()
+    .removeTextByKey(second.key, 0, 1)
+    .apply()
+}

test/transforms/fixtures/by-key/remove-text-by-key/adjacent-non-void-inlines/input.yaml

@@ -0,0 +1,17 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: one
+      - kind: text
+        text: a
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: two

test/transforms/fixtures/by-key/remove-text-by-key/adjacent-non-void-inlines/output.yaml

@@ -0,0 +1,15 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: one
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: two

test/transforms/fixtures/by-key/remove-text-by-key/inline-void/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document, selection } = state
+  const last = document.getTexts().last()
+
+  return state
+    .transform()
+    .removeTextByKey(last.key, 0, 4)
+    .apply()
+}

test/transforms/fixtures/by-key/remove-text-by-key/inline-void/input.yaml

@@ -0,0 +1,12 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        text: ""
+      - kind: inline
+        type: image
+        isVoid: true
+      - kind: text
+        text: word

test/transforms/fixtures/by-key/remove-text-by-key/inline-void/output.yaml

@@ -0,0 +1,12 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        text: ""
+      - kind: inline
+        type: image
+        isVoid: true
+      - kind: text
+        text: ""

test/transforms/fixtures/by-key/remove-text-by-key/inline/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document, selection } = state
+  const first = document.getTexts().first()
+
+  return state
+    .transform()
+    .removeTextByKey(first.key, 3, 1)
+    .apply()
+}

test/transforms/fixtures/by-key/remove-text-by-key/inline/input.yaml

@@ -0,0 +1,10 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: word

test/transforms/fixtures/by-key/remove-text-by-key/inline/output.yaml

@@ -0,0 +1,10 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: wor

test/transforms/fixtures/by-key/remove-text-by-key/next-void-inline/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document, selection } = state
+  const second = document.getTexts().get(1)
+
+  return state
+    .transform()
+    .removeTextByKey(second.key, 0, 1)
+    .apply()
+}

test/transforms/fixtures/by-key/remove-text-by-key/next-void-inline/input.yaml

@@ -0,0 +1,17 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: one
+      - kind: text
+        text: a
+      - kind: inline
+        type: image
+        isVoid: true
+      - kind: text
+        text: ""

test/transforms/fixtures/by-key/remove-text-by-key/next-void-inline/output.yaml

@@ -0,0 +1,15 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: one
+      - kind: inline
+        type: image
+        isVoid: true
+      - kind: text
+        text: ""

test/transforms/fixtures/by-key/remove-text-by-key/previous-void-inline/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document, selection } = state
+  const third = document.getTexts().get(2)
+
+  return state
+    .transform()
+    .removeTextByKey(third.key, 0, 1)
+    .apply()
+}

test/transforms/fixtures/by-key/remove-text-by-key/previous-void-inline/input.yaml

@@ -0,0 +1,17 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        text: ""
+      - kind: inline
+        type: image
+        isVoid: true
+      - kind: text
+        text: a
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: two

test/transforms/fixtures/by-key/remove-text-by-key/previous-void-inline/output.yaml

@@ -0,0 +1,15 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        text: ""
+      - kind: inline
+        type: image
+        isVoid: true
+      - kind: inline
+        type: link
+        nodes:
+          - kind: text
+            text: two

test/transforms/fixtures/by-key/remove-text-by-key/text/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document, selection } = state
+  const first = document.getTexts().first()
+
+  return state
+    .transform()
+    .removeTextByKey(first.key, 3, 1)
+    .apply()
+}

test/transforms/fixtures/by-key/remove-text-by-key/text/input.yaml

@@ -0,0 +1,7 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        text: word

test/transforms/fixtures/by-key/remove-text-by-key/text/output.yaml

@@ -0,0 +1,7 @@
+
+nodes:
+  - kind: block
+    type: paragraph
+    nodes:
+      - kind: text
+        text: wor