From 855e25f8da2d5dfd16a50aaf08405c3b8e6634ef Mon Sep 17 00:00:00 2001
From: song <songeun.you7@gmail.com>
Date: Wed, 18 Nov 2020 23:44:37 -0700
Subject: [PATCH] UnhangRange considers void nodes

- Include void node in range
- Add delete-void-at-end test
- Add delete-void-and-newline-at-end test
---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 packages/slate/src/interfaces/editor.ts       |   9 +++-
 .../delete-void-and-newline-at-end.tsx        |  40 ++++++++++++++++++
 .../delete/voids-true/delete-void-at-end.tsx  |  34 +++++++++++++++
 site/.DS_Store                                | Bin 0 -> 6148 bytes
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store
 create mode 100644 packages/slate/test/transforms/delete/voids-true/delete-void-and-newline-at-end.tsx
 create mode 100644 packages/slate/test/transforms/delete/voids-true/delete-void-at-end.tsx
 create mode 100644 site/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..03dcbfd4e851303c96fbd9d9f02ddde73bfefe0a
GIT binary patch
literal 6148
zcmeHK&2G~`5T0#A>x5Jd5>hz&g2W+;(t;=zLW<IIsKfyg1P4H=9h=mU*iq~dl@OE*
z?@%6rH{lI<5FP-&+1<AOX*eQ;cBI{Jc0J?S`F7XqB_h$8dOJilBC=2zOBGaC2tVgi
zkTu<N11RJ>2ISL_A{tP$U~M`K1BQWrjRD@fRXU&(awx>Uz1+Ve@{Wd4-yKFSZ1@B5
z5arG<DbR>EsE@rK(pw5>khA@kv)x7vwoPaPYnP_b0vWMMg-D{F^DdDG?>@!ZDB?@b
zu7a<Rj|d^MY0^82IcCo1XTj$QM$(602zwuXh4IMD&r+FJVH;sgKJ{SD+Ehl)jgOdx
zw4WvYW-G_Wd8h5GG)5+UdXJjtW>rqiL)y>E`Q^qXn1i%^nV#Y84)PeSW<Xde21?*6
zz#RHnb~)p#?c7;B)@$jzJ01pc(rWz>YwM+J8=IC@u_{}YH{FwH)=ivb8h4z@D{eh?
zk`q_!&!cE~p*!x2z@PPMHxHsPae~mFNaw)wVe<NA5PH$96HP-emhb7R2bNW~%Dq~B
zKHq)Nuy^<O7Y%#9x7TXe_wL?bEXr2>_RgcD<I(BI`KQI_Gq3~^INPLbYdnXqP%e1*
z(4B<CC>)@V?Ki>C6tghK>X=ZHWr^2!hNUeq8K-yCpJqDaS*BCW8?X4LJbAHJa<MSi
z8ISYPt8t=bUBB!ynqj~&U>J}L@OR8cVQgz$D&#KimsbE_iQ6pD`B#C_*4Wm#REQ@K
zp<IE=Rp={*Q10lrwOw1|QlWAup)VgoM;7{qB4l*D-<IYi+6ql=7%&WE8CX}%8lV4<
zSKt4$PNroTFbw=x42aTU_ppPM^x0ZSj?Y>f<rsy9?Uo9q3o3maONEc(TPRZS%w`4H
V*0@xN9*Fr7kTjUeFz{Cy_zgZ~9033T

literal 0
HcmV?d00001

diff --git a/packages/slate/src/interfaces/editor.ts b/packages/slate/src/interfaces/editor.ts
index 7340e60326..b095fc2ab8 100755
--- a/packages/slate/src/interfaces/editor.ts
+++ b/packages/slate/src/interfaces/editor.ts
@@ -1265,6 +1265,13 @@ export const Editor = {
       at: end,
       match: n => Editor.isBlock(editor, n),
     })
+
+    // If last element is a void node, unhang range by including void node in range
+    if (Editor.isVoid(editor, endBlock[0])) {
+      end = { path: end.path, offset: 1 }
+      return { anchor: start, focus: end }
+    }
+
     const blockPath = endBlock ? endBlock[1] : []
     const first = Editor.start(editor, [])
     const before = { anchor: first, focus: end }
@@ -1274,7 +1281,7 @@ export const Editor = {
       at: before,
       match: Text.isText,
       reverse: true,
-      voids,
+      voids: true,
     })) {
       if (skip) {
         skip = false
diff --git a/packages/slate/test/transforms/delete/voids-true/delete-void-and-newline-at-end.tsx b/packages/slate/test/transforms/delete/voids-true/delete-void-and-newline-at-end.tsx
new file mode 100644
index 0000000000..980a82bfcb
--- /dev/null
+++ b/packages/slate/test/transforms/delete/voids-true/delete-void-and-newline-at-end.tsx
@@ -0,0 +1,40 @@
+/** @jsx jsx */
+import { Editor, Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const input = (
+  <editor>
+    <block>
+      <text>
+        <anchor />
+        This is a first paragraph
+      </text>
+    </block>
+    <block>
+      <text>This is the second paragraph</text>
+    </block>
+    <block void>
+      <text />
+    </block>
+    <block>
+      <text>
+        <focus />
+      </text>
+    </block>
+  </editor>
+)
+export const run = editor => {
+  editor.deleteFragment(editor)
+}
+export const output = (
+  <editor>
+    <block>
+      <text>
+        <cursor />
+      </text>
+    </block>
+    <block>
+      <text />
+    </block>
+  </editor>
+)
diff --git a/packages/slate/test/transforms/delete/voids-true/delete-void-at-end.tsx b/packages/slate/test/transforms/delete/voids-true/delete-void-at-end.tsx
new file mode 100644
index 0000000000..7243586805
--- /dev/null
+++ b/packages/slate/test/transforms/delete/voids-true/delete-void-at-end.tsx
@@ -0,0 +1,34 @@
+/** @jsx jsx */
+import { Editor, Transforms } from 'slate'
+import { jsx } from '../../..'
+
+export const input = (
+  <editor>
+    <block>
+      <text>
+        <anchor />
+        This is a first paragraph
+      </text>
+    </block>
+    <block>
+      <text>This is the second paragraph</text>
+    </block>
+    <block void>
+      <text>
+        <focus />
+      </text>
+    </block>
+  </editor>
+)
+export const run = editor => {
+  editor.deleteFragment(editor)
+}
+export const output = (
+  <editor>
+    <block>
+      <text>
+        <cursor />
+      </text>
+    </block>
+  </editor>
+)
diff --git a/site/.DS_Store b/site/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f4ddc634d202c9ca29513438f033a6ec78d28cd3
GIT binary patch
literal 6148
zcmeHK(QeZ)6un-%krq1oFsVG|1&N1JbpvfoXi`<i!`_gJ-~rH<v}Fs*;;Kp4LMh4%
z|1ds*Kj9Df5Iz9TwarLUcpQSsSGqoqeUIIH65BNqiSA^uNmM5y2hLcoqWFz*Kl_rc
zn3fwrp~jFD(GZ?cycBI4tO8bne@y{iyX({^NvAYI`D^{Q)GD4GgtG64(nlO`5)a{b
zzAHnGH-;h2$W!bP^|%oKxe#AdGt4mdUA0r3QHus}>==2bXcU<17tEIWy%D{pfR4d^
zv&8*a;Fgftgp$Gx-wIKyP{6~8%UN*N=b5ZCk^VFu8GXL^qcDh*cKfSXDV0~(t~pNC
zsn)8mdM9$)OT1(fcfIioetP01C%&mal`_1jd;YUvI6bUyJd#o31<`P<$iZNUkeAPc
zXdtIuIf(|b8mFf_9H-(`4(pBieCt8e-P+w<G~M~mPP^&ezqh?uRGh}`&Ao%8)3@*D
z?-w7=kqt~>&sKKR;7|C3N+!dz-Z%<nbc|MJtU;v-`4mF^eqK@Hx1H4~7kfpO%H>$l
zs;1TuuddwJ%FlV_)YqO>4nkhKnfLEpzx0{x1Xcm7!2hNI?+-4Vv12gRsJ0Fi>IwiX
zqgfg1{5OF)uECDMR3my|LQ{d7D$Er_Xgb<m6W1}AYSeTR=JFxT%);DIgqj`WyDFSS
zN24vR0#<>%0ww)e=kx#ZpYQ*9l6|rYSOu<>0;0U%+wUSJbG9xe$7ihzKZ3JyT&ht~
kP?+ObRrn~r1y_bXmn*=I!Bit!VD^uIlED^MfxoK25BZS-3jhEB

literal 0
HcmV?d00001