mirror of
https://github.com/ueberdosis/tiptap.git
synced 2025-01-18 22:36:14 +08:00
fix: replace the whole node in nodeInputRule (#4341)
Co-authored-by: Nicolas Gryman <ngryman@gmail.com>
This commit is contained in:
parent
c09d9e9e42
commit
ffeefe21ff
@ -1,5 +1,4 @@
|
||||
import { NodeType } from '@tiptap/pm/model'
|
||||
import { NodeSelection, TextSelection } from '@tiptap/pm/state'
|
||||
|
||||
import { InputRule, InputRuleFinder } from '../InputRule.js'
|
||||
import { ExtendedRegExpMatchArray } from '../types.js'
|
||||
@ -20,18 +19,6 @@ export function nodeInputRule(config: {
|
||||
*/
|
||||
type: NodeType
|
||||
|
||||
/**
|
||||
* Should the input rule replace the node or append to it
|
||||
* If true, the node will be replaced
|
||||
*/
|
||||
blockReplace?: boolean
|
||||
|
||||
/**
|
||||
* Insert empty paragraph after inserting the node
|
||||
* Only works if blockReplace is true
|
||||
*/
|
||||
addExtraNewline?: boolean
|
||||
|
||||
/**
|
||||
* A function that returns the attributes for the node
|
||||
* can also be an object of attributes
|
||||
@ -47,13 +34,11 @@ export function nodeInputRule(config: {
|
||||
handler: ({ state, range, match }) => {
|
||||
const attributes = callOrReturn(config.getAttributes, undefined, match) || {}
|
||||
const { tr } = state
|
||||
const start = config.blockReplace ? range.from - 1 : range.from
|
||||
const start = range.from
|
||||
let end = range.to
|
||||
|
||||
const newNode = config.type.create(attributes)
|
||||
|
||||
const { $to } = tr.selection
|
||||
|
||||
if (match[1]) {
|
||||
const offset = match[0].lastIndexOf(match[1])
|
||||
let matchStart = start + offset
|
||||
@ -72,32 +57,13 @@ export function nodeInputRule(config: {
|
||||
// insert node from input rule
|
||||
tr.replaceWith(matchStart, end, newNode)
|
||||
} else if (match[0]) {
|
||||
tr.replaceWith(start, end, newNode)
|
||||
tr.insert(start - 1, config.type.create(attributes)).delete(
|
||||
tr.mapping.map(start),
|
||||
tr.mapping.map(end),
|
||||
)
|
||||
}
|
||||
|
||||
if (config.blockReplace && config.addExtraNewline) {
|
||||
if ($to.nodeAfter) {
|
||||
if ($to.nodeAfter.isTextblock) {
|
||||
tr.setSelection(TextSelection.create(tr.doc, $to.pos + 1))
|
||||
} else if ($to.nodeAfter.isBlock) {
|
||||
tr.setSelection(NodeSelection.create(tr.doc, $to.pos))
|
||||
} else {
|
||||
tr.setSelection(TextSelection.create(tr.doc, $to.pos - 1))
|
||||
}
|
||||
} else {
|
||||
// add node after horizontal rule if it’s the end of the document
|
||||
const defaultNode = $to.parent.type.contentMatch.defaultType?.create() || state.doc.type.contentMatch.defaultType?.create()
|
||||
|
||||
if (defaultNode) {
|
||||
const newPos = start + newNode.nodeSize
|
||||
|
||||
tr.insert(newPos, defaultNode)
|
||||
tr.setSelection(TextSelection.create(tr.doc, newPos))
|
||||
}
|
||||
}
|
||||
|
||||
tr.scrollIntoView()
|
||||
}
|
||||
tr.scrollIntoView()
|
||||
},
|
||||
})
|
||||
}
|
||||
|
@ -91,8 +91,6 @@ export const HorizontalRule = Node.create<HorizontalRuleOptions>({
|
||||
nodeInputRule({
|
||||
find: /^(?:---|—-|___\s|\*\*\*\s)$/,
|
||||
type: this.type,
|
||||
blockReplace: true,
|
||||
addExtraNewline: true,
|
||||
}),
|
||||
]
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user