From 1ea96baf9fa884c9fdb4cbb27c6f1dbe7384ead9 Mon Sep 17 00:00:00 2001 From: Conor Cussell Date: Wed, 31 Jan 2018 21:01:43 +0000 Subject: [PATCH] Fix selecting with shift+(left|right) key (#1570) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Account for zero-width whitespace chars when selecting with arrow keys * Change the correct line 😳 * Remove unused const * Fix lint error * Proper fix for shift select towards void nodes --- packages/slate-react/src/constants/hotkeys.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/slate-react/src/constants/hotkeys.js b/packages/slate-react/src/constants/hotkeys.js index 4255d59d4..91cd32b3d 100644 --- a/packages/slate-react/src/constants/hotkeys.js +++ b/packages/slate-react/src/constants/hotkeys.js @@ -48,8 +48,10 @@ const DELETE_WORD_FORWARD_PC = isKeyHotkey('ctrl+delete') const DELETE_WORD_BACKWARD = e => IS_APPLE ? DELETE_WORD_BACKWARD_MAC(e) : DELETE_WORD_BACKWARD_PC(e) const DELETE_WORD_FORWARD = e => IS_APPLE ? DELETE_WORD_FORWARD_MAC(e) : DELETE_WORD_FORWARD_PC(e) -const COLLAPSE_CHAR_FORWARD = isKeyHotkey('right') -const COLLAPSE_CHAR_BACKWARD = isKeyHotkey('left') +const RIGHT_ARROW = isKeyHotkey('right') +const LEFT_ARROW = isKeyHotkey('left') +const COLLAPSE_CHAR_FORWARD = e => RIGHT_ARROW(e) && !EXTEND_CHAR_FORWARD(e) +const COLLAPSE_CHAR_BACKWARD = e => LEFT_ARROW(e) && !EXTEND_CHAR_BACKWARD(e) const COLLAPSE_LINE_BACKWARD_MAC = isKeyHotkey('option+up') const COLLAPSE_LINE_FORWARD_MAC = isKeyHotkey('option+down')