mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-23 07:22:55 +02:00
Code Issues Releases Wiki Activity

revert changes to up/down behavior near void nodes, fixes #1063 (#1066)

Browse Source
This commit is contained in:
Ian Storm Taylor
2017-09-06 18:14:35 -07:00
committed by GitHub
parent a75899f57a
commit 53a19c2d0d
1 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/core.js
View File

@@ -653,9 +653,7 @@ function Plugin(options = {}) {
} }
/** /**
* On `up` key down. If the previous block is void, make sure it is collapsed * On `up` key down, for Macs, move the selection to start of the block.
* or extended (if shift) to start.
* For Macs, move the selection to start of the block if `alt` key is pressed.
* *
* COMPAT: Certain browsers don't handle the selection updates properly. In * COMPAT: Certain browsers don't handle the selection updates properly. In
* Chrome, option-shift-up doesn't properly extend the selection. And in * Chrome, option-shift-up doesn't properly extend the selection. And in
@@ -667,21 +665,13 @@ function Plugin(options = {}) {
*/ */
function onKeyDownUp(e, data, change) { function onKeyDownUp(e, data, change) {
const { state } = change
const { selection, document, focusKey, focusBlock } = state
const previousBlock = document.getPreviousBlock(focusKey)
if (previousBlock && previousBlock.isVoid && !data.isAlt) {
const transform = data.isShift ? 'extendToStartOf' : 'collapseToStartOf'
e.preventDefault()
return change[transform](previousBlock)
}
if (!IS_MAC || data.isCtrl || !data.isAlt) return if (!IS_MAC || data.isCtrl || !data.isAlt) return
const { state } = change
const { selection, document, focusKey, focusBlock } = state
const transform = data.isShift ? 'extendToStartOf' : 'collapseToStartOf' const transform = data.isShift ? 'extendToStartOf' : 'collapseToStartOf'
const block = selection.hasFocusAtStartOf(focusBlock) const block = selection.hasFocusAtStartOf(focusBlock)
? previousBlock ? document.getPreviousBlock(focusKey)
: focusBlock : focusBlock
if (!block) return if (!block) return
@@ -692,9 +682,7 @@ function Plugin(options = {}) {
} }
/** /**
* On `down` key down. If the next block is void, make sure it is collapsed * On `down` key down, for Macs, move the selection to end of the block.
* or extended (if shift) to start.
* For Macs, move the selection to end of the block if `alt` key is pressed.
* *
* COMPAT: Certain browsers don't handle the selection updates properly. In * COMPAT: Certain browsers don't handle the selection updates properly. In
* Chrome, option-shift-down doesn't properly extend the selection. And in * Chrome, option-shift-down doesn't properly extend the selection. And in
@@ -706,21 +694,13 @@ function Plugin(options = {}) {
*/ */
function onKeyDownDown(e, data, change) { function onKeyDownDown(e, data, change) {
const { state } = change
const { selection, document, focusKey, focusBlock } = state
const nextBlock = document.getNextBlock(focusKey)
if (nextBlock && nextBlock.isVoid && !data.isAlt) {
const transform = data.isShift ? 'extendToStartOf' : 'collapseToStartOf'
e.preventDefault()
return change[transform](nextBlock)
}
if (!IS_MAC || data.isCtrl || !data.isAlt) return if (!IS_MAC || data.isCtrl || !data.isAlt) return
const { state } = change
const { selection, document, focusKey, focusBlock } = state
const transform = data.isShift ? 'extendToEndOf' : 'collapseToEndOf' const transform = data.isShift ? 'extendToEndOf' : 'collapseToEndOf'
const block = selection.hasFocusAtEndOf(focusBlock) const block = selection.hasFocusAtEndOf(focusBlock)
? nextBlock ? document.getNextBlock(focusKey)
: focusBlock : focusBlock
if (!block) return if (!block) return