mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-16 20:24:01 +02:00
Code Issues Releases Wiki Activity

refactor slate-hotkeys, fix deleting at start of block (#2048)

Browse Source
This commit is contained in:
Ian Storm Taylor
2018-08-07 15:58:33 -07:00
committed by GitHub
parent 3eabdea8d6
commit fd9243b8f5
6 changed files with 101 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/slate-react/src/plugins/after.js
View File

@@ -377,11 +377,11 @@ function AfterPlugin() {
: change.splitBlock()
}
if (Hotkeys.isDeleteCharBackward(event) && !IS_IOS) {
if (Hotkeys.isDeleteBackward(event) && !IS_IOS) {
return change.deleteCharBackward()
}
if (Hotkeys.isDeleteCharForward(event) && !IS_IOS) {
if (Hotkeys.isDeleteForward(event) && !IS_IOS) {
return change.deleteCharForward()
}
@@ -412,12 +412,12 @@ function AfterPlugin() {
// COMPAT: Certain browsers don't handle the selection updates properly. In
// Chrome, the selection isn't properly extended. And in Firefox, the
// selection isn't properly collapsed. (2017/10/17)
if (Hotkeys.isCollapseLineBackward(event)) {
if (Hotkeys.isMoveLineBackward(event)) {
event.preventDefault()
return change.moveToStartOfBlock()
}
if (Hotkeys.isCollapseLineForward(event)) {
if (Hotkeys.isMoveLineForward(event)) {
event.preventDefault()
return change.moveToEndOfBlock()
}
@@ -435,7 +435,7 @@ function AfterPlugin() {
// COMPAT: If a void node is selected, or a zero-width text node adjacent to
// an inline is selected, we need to handle these hotkeys manually because
// browsers won't know what to do.
if (Hotkeys.isCollapseCharBackward(event)) {
if (Hotkeys.isMoveBackward(event)) {
const { document, isInVoid, previousText, startText } = value
const isPreviousInVoid =
previousText && document.hasVoidParent(previousText.key)
@@ -446,7 +446,7 @@ function AfterPlugin() {
}
}
if (Hotkeys.isCollapseCharForward(event)) {
if (Hotkeys.isMoveForward(event)) {
const { document, isInVoid, nextText, startText } = value
const isNextInVoid = nextText && document.hasVoidParent(nextText.key)
@@ -456,7 +456,7 @@ function AfterPlugin() {
}
}
if (Hotkeys.isExtendCharBackward(event)) {
if (Hotkeys.isExtendBackward(event)) {
const { document, isInVoid, previousText, startText } = value
const isPreviousInVoid =
previousText && document.hasVoidParent(previousText.key)
@@ -467,7 +467,7 @@ function AfterPlugin() {
}
}
if (Hotkeys.isExtendCharForward(event)) {
if (Hotkeys.isExtendForward(event)) {
const { document, isInVoid, nextText, startText } = value
const isNextInVoid = nextText && document.hasVoidParent(nextText.key)

23
packages/slate-react/src/plugins/before.js
View File

@@ -387,13 +387,28 @@ function BeforePlugin() {
// typing. However, certain characters also move the selection before
// we're able to handle it, so prevent their default behavior.
if (isComposing) {
if (Hotkeys.isComposing(event)) event.preventDefault()
if (Hotkeys.isCompose(event)) event.preventDefault()
return true
}
// Certain hotkeys have native behavior in contenteditable elements which
// will cause our value to be out of sync, so prevent them.
if (Hotkeys.isContentEditable(event) && !IS_IOS) {
// Certain hotkeys have native editing behaviors in `contenteditable`
// elements which will change the DOM and cause our value to be out of sync,
// so they need to always be prevented.
if (
!IS_IOS &&
(Hotkeys.isBold(event) ||
Hotkeys.isDeleteBackward(event) ||
Hotkeys.isDeleteForward(event) ||
Hotkeys.isDeleteLineBackward(event) ||
Hotkeys.isDeleteLineForward(event) ||
Hotkeys.isDeleteWordBackward(event) ||
Hotkeys.isDeleteWordForward(event) ||
Hotkeys.isItalic(event) ||
Hotkeys.isRedo(event) ||
Hotkeys.isSplitBlock(event) ||
Hotkeys.isTransposeCharacter(event) ||
Hotkeys.isUndo(event))
) {
event.preventDefault()
}