Fix behaviour where deleteBackward/Forward on empty block deleted the void block above/below (#618)

src/transforms/at-range.js

@@ -204,12 +204,17 @@ export function deleteBackwardAtRange(transform, range, n = 1, options = {}) {
     return
   }
 
-  // If the closest block is void, delete it.
   const block = document.getClosestBlock(startKey)
+  // If the closest block is void, delete it.
   if (block && block.isVoid) {
     transform.removeNodeByKey(block.key, { normalize })
     return
   }
+  // If the closest is not void, but empty, remove it
+  if (block && !block.isVoid && block.isEmpty) {
+    transform.removeNodeByKey(block.key, { normalize })
+    return
+  }
 
   // If the closest inline is void, delete it.
   const inline = document.getClosestInline(startKey)
@@ -383,12 +388,17 @@ export function deleteForwardAtRange(transform, range, n = 1, options = {}) {
     return
   }
 
-  // If the closest block is void, delete it.
   const block = document.getClosestBlock(startKey)
+  // If the closest block is void, delete it.
   if (block && block.isVoid) {
     transform.removeNodeByKey(block.key, { normalize })
     return
   }
+  // If the closest is not void, but empty, remove it
+  if (block && !block.isVoid && block.isEmpty) {
+    transform.removeNodeByKey(block.key, { normalize })
+    return
+  }
 
   // If the closest inline is void, delete it.
   const inline = document.getClosestInline(startKey)

test/transforms/fixtures/at-current-range/delete-backward/empty-after-void-block/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document } = state
+  const nodeToBeFocused = document.nodes.last()
+  return state
+    .transform()
+    .collapseToStartOf(nodeToBeFocused)
+    .deleteBackward()
+    .apply()
+}

test/transforms/fixtures/at-current-range/delete-backward/empty-after-void-block/input.yaml

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

test/transforms/fixtures/at-current-range/delete-backward/empty-after-void-block/output.yaml

@@ -0,0 +1,5 @@
+
+nodes:
+  - kind: block
+    type: image
+    isVoid: true

test/transforms/fixtures/at-current-range/delete-forward/empty-before-void-block/index.js

@@ -0,0 +1,10 @@
+
+export default function (state) {
+  const { document } = state
+  const nodeToBeFocused = document.nodes.first()
+  return state
+    .transform()
+    .collapseToStartOf(nodeToBeFocused)
+    .deleteForward()
+    .apply()
+}

test/transforms/fixtures/at-current-range/delete-forward/empty-before-void-block/input.yaml

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

test/transforms/fixtures/at-current-range/delete-forward/empty-before-void-block/output.yaml

@@ -0,0 +1,5 @@
+
+nodes:
+  - kind: block
+    type: image
+    isVoid: true