Collapse expanded selection before move word (#4211)

ianstormtaylor · May 3, 2021 · 1c32b97 · 1c32b97
1 parent 737aaa9
commit 1c32b97
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.changeset/move-word-collapse.md b/.changeset/move-word-collapse.md
@@ -0,0 +1,5 @@
+---
+'slate-react': patch
+---
+
+Collapse expanded selection before handling `moveWordBackward` (`alt + left`) and `moveWordForward` (`alt + right`) hotkeys.
diff --git a/packages/slate-react/src/components/editable.tsx b/packages/slate-react/src/components/editable.tsx
@@ -915,12 +915,22 @@ export const Editable = (props: EditableProps) => {
 
                 if (Hotkeys.isMoveWordBackward(nativeEvent)) {
                   event.preventDefault()
+
+                  if (selection && Range.isExpanded(selection)) {
+                    Transforms.collapse(editor, { edge: 'focus' })
+                  }
+
                   Transforms.move(editor, { unit: 'word', reverse: !isRTL })
                   return
                 }
 
                 if (Hotkeys.isMoveWordForward(nativeEvent)) {
                   event.preventDefault()
+
+                  if (selection && Range.isExpanded(selection)) {
+                    Transforms.collapse(editor, { edge: 'focus' })
+                  }
+
                   Transforms.move(editor, { unit: 'word', reverse: isRTL })
                   return
                 }