Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve behavior when using insertContent #2147

Merged
merged 4 commits into from
Nov 8, 2021
Merged

Improve behavior when using insertContent #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a743f4
check if we can replace the wrapping node by the newly inserted content
philippkuehn Nov 8, 2021
50f14b5
we dont need this anymore
philippkuehn Nov 8, 2021
6f86f67
set selection to inserted content instead of below
philippkuehn Nov 8, 2021
e96dc16
improve hr cursor behavior
philippkuehn Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions packages/core/src/commands/insertContentAt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,40 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
return true
}

const { from, to } = typeof position === 'number'
let { from, to } = typeof position === 'number'
? { from: position, to: position }
: position

let isOnlyBlockContent = true

content.forEach(node => {
isOnlyBlockContent = isOnlyBlockContent
? node.isBlock
: false
})

// check if we can replace the wrapping node by
// the newly inserted content
// example:
// replace an empty paragraph by an inserted image
// instead of inserting the image below the paragraph
if (from === to && isOnlyBlockContent) {
const $from = tr.doc.resolve(from)
const isEmptyTextBlock = $from.parent.isTextblock
&& !$from.parent.type.spec.code
&& !$from.parent.textContent

if (isEmptyTextBlock) {
from -= 1
to += 1
}
}

tr.replaceWith(from, to, content)

// set cursor at end of inserted content
if (options.updateSelection) {
selectionToInsertionEnd(tr, tr.steps.length - 1, 1)
selectionToInsertionEnd(tr, tr.steps.length - 1, -1)
}
}

Expand Down
27 changes: 5 additions & 22 deletions packages/extension-horizontal-rule/src/horizontal-rule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,18 @@ export const HorizontalRule = Node.create<HorizontalRuleOptions>({
return {
setHorizontalRule: () => ({ chain }) => {
return chain()
// remove node before hr if it’s an empty text block
.command(({ tr, dispatch }) => {
const { selection } = tr
const { empty, $anchor } = selection
const isEmptyTextBlock = $anchor.parent.isTextblock
&& !$anchor.parent.type.spec.code
&& !$anchor.parent.textContent

if (!empty || !isEmptyTextBlock || !dispatch) {
return true
}

const from = $anchor.before()
const to = $anchor.start()

tr.deleteRange(from, to)
tr.setSelection(TextSelection.create(tr.doc, from))

return true
})
.insertContent({ type: this.name })
// add node after hr if it’s the end of the document
// set cursor after horizontal rule
.command(({ tr, dispatch }) => {
if (dispatch) {
const { parent, pos } = tr.selection.$from
const posAfter = pos + 1
const nodeAfter = tr.doc.nodeAt(posAfter)

if (!nodeAfter) {
if (nodeAfter) {
tr.setSelection(TextSelection.create(tr.doc, posAfter))
} else {
// add node after horizontal rule if it’s the end of the document
const node = parent.type.contentMatch.defaultType?.create()

if (node) {
Expand Down