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

remove unnecessary changes from deleteAtRange

Browse Source
This commit is contained in:
Ian Storm Taylor
2017-09-21 13:30:20 -07:00
parent 95fcf27472
commit f983a58d3b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/slate/src/changes/at-range.js
View File

@@ -154,6 +154,7 @@ Changes.deleteAtRange = (change, range, options = {}) => {
const startText = document.getNode(startKey) const startText = document.getNode(startKey)
const endText = document.getNode(endKey) const endText = document.getNode(endKey)
const startLength = startText.text.length - startOffset const startLength = startText.text.length - startOffset
const endLength = endOffset
const ancestor = document.getCommonAncestor(startKey, endKey) const ancestor = document.getCommonAncestor(startKey, endKey)
const startChild = ancestor.getFurthestAncestor(startKey) const startChild = ancestor.getFurthestAncestor(startKey)
@@ -161,6 +162,7 @@ Changes.deleteAtRange = (change, range, options = {}) => {
const startParent = document.getParent(startBlock.key) const startParent = document.getParent(startBlock.key)
const startParentIndex = startParent.nodes.indexOf(startBlock) const startParentIndex = startParent.nodes.indexOf(startBlock)
const endParentIndex = startParent.nodes.indexOf(endBlock)
let child let child
@@ -205,8 +207,13 @@ Changes.deleteAtRange = (change, range, options = {}) => {
} }
// Remove any overlapping text content from the leaf text nodes. // Remove any overlapping text content from the leaf text nodes.
change.removeTextByKey(startKey, startOffset, startLength, { normalize: false }) if (startLength != 0) {
change.removeTextByKey(endKey, 0, endOffset, { normalize: false }) change.removeTextByKey(startKey, startOffset, startLength, { normalize: false })
}
if (endLength != 0) {
change.removeTextByKey(endKey, 0, endOffset, { normalize: false })
}
// If the start and end blocks aren't the same, move and merge the end block // If the start and end blocks aren't the same, move and merge the end block
// into the start block. // into the start block.
@@ -215,7 +222,9 @@ Changes.deleteAtRange = (change, range, options = {}) => {
const lonely = document.getFurthestOnlyChildAncestor(endBlock.key) const lonely = document.getFurthestOnlyChildAncestor(endBlock.key)
// Move the end block to be right after the start block. // Move the end block to be right after the start block.
change.moveNodeByKey(endBlock.key, startParent.key, startParentIndex + 1) if (endParentIndex != startParentIndex + 1) {
change.moveNodeByKey(endBlock.key, startParent.key, startParentIndex + 1)
}
// If the selection is hanging, just remove the start block, otherwise // If the selection is hanging, just remove the start block, otherwise
// merge the end block into it. // merge the end block into it.