github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-03 00:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: #1018 paste error when the lastblock is html block (#1042)

Browse Source
This commit is contained in:
Ran Luo 2019-05-25 22:20:07 +08:00 committed by Felix Häusler
parent 630bc3f498
commit 5b1cd85d95
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/muya/lib/contentState/pasteCtrl.js
View File

@ -1,5 +1,5 @@
import { sanitize } from '../utils' import { sanitize } from '../utils'
import { PARAGRAPH_TYPES, PREVIEW_DOMPURIFY_CONFIG } from '../config' import { PARAGRAPH_TYPES, PREVIEW_DOMPURIFY_CONFIG, HAS_TEXT_BLOCK_REG } from '../config'
const LIST_REG = /ul|ol/ const LIST_REG = /ul|ol/
const LINE_BREAKS_REG = /\n/ const LINE_BREAKS_REG = /\n/
@ -239,15 +239,18 @@ const pasteCtrl = ContentState => {
const len = blocks.length const len = blocks.length
const lastBlock = blocks[len - 1] const lastBlock = blocks[len - 1]
if (lastBlock.children.length === 0) { if (lastBlock.children.length === 0 && HAS_TEXT_BLOCK_REG.test(lastBlock.type)) {
return lastBlock return lastBlock
} else { } else {
return getLastBlock(lastBlock.children) if (lastBlock.editable === false) {
return getLastBlock(blocks[len - 2].children)
} else {
return getLastBlock(lastBlock.children)
}
} }
} }
const lastBlock = getLastBlock(stateFragments) const lastBlock = getLastBlock(stateFragments)
let key = lastBlock.key let key = lastBlock.key
let offset = lastBlock.text.length let offset = lastBlock.text.length
lastBlock.text += cacheText lastBlock.text += cacheText