mirror/tiptap
1
0
Fork 0
mirror of https://github.com/ueberdosis/tiptap.git synced 2024-11-25 21:35:53 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix updating marks for multiple table cells, fix #186

Browse Source
This commit is contained in:
Philipp Kühn 2021-03-28 21:07:56 +02:00
parent bb1dad7560
commit 9595a23eb8
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/src/commands/setMark.ts
View File

@ -16,7 +16,7 @@ declare module '@tiptap/core' {
export const setMark: RawCommands['setMark'] = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => { export const setMark: RawCommands['setMark'] = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => {
const { selection } = tr const { selection } = tr
const { from, to, empty } = selection const { empty, ranges } = selection
const type = getMarkType(typeOrName, state.schema) const type = getMarkType(typeOrName, state.schema)
const oldAttributes = getMarkAttributes(state, type) const oldAttributes = getMarkAttributes(state, type)
const newAttributes = { const newAttributes = {
@ -28,7 +28,9 @@ export const setMark: RawCommands['setMark'] = (typeOrName, attributes = {}) =>
if (empty) { if (empty) {
tr.addStoredMark(type.create(newAttributes)) tr.addStoredMark(type.create(newAttributes))
} else { } else {
tr.addMark(from, to, type.create(newAttributes)) ranges.forEach(range => {
tr.addMark(range.$from.pos, range.$to.pos, type.create(newAttributes))
})
} }
} }

29
packages/core/src/commands/unsetMark.ts
View File

@ -17,20 +17,25 @@ declare module '@tiptap/core' {
export const unsetMark: RawCommands['unsetMark'] = typeOrName => ({ tr, state, dispatch }) => { export const unsetMark: RawCommands['unsetMark'] = typeOrName => ({ tr, state, dispatch }) => {
const { selection } = tr const { selection } = tr
const type = getMarkType(typeOrName, state.schema) const type = getMarkType(typeOrName, state.schema)
let { from, to } = selection const { $from, empty, ranges } = selection
const { $from, empty } = selection
if (empty) {
const range = getMarkRange($from, type)
if (range) {
from = range.from
to = range.to
}
}
if (dispatch) { if (dispatch) {
tr.removeMark(from, to, type) if (empty) {
let { from, to } = selection
const range = getMarkRange($from, type)
if (range) {
from = range.from
to = range.to
}
tr.removeMark(from, to, type)
} else {
ranges.forEach(range => {
tr.removeMark(range.$from.pos, range.$to.pos, type)
})
}
tr.removeStoredMark(type) tr.removeStoredMark(type)
} }