ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix more commands for cell selections

Browse Source
This commit is contained in:
Philipp Kühn
2021-03-28 21:30:47 +02:00
parent ffde0a382e
commit 4717d7ff9a
4 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,9 +14,10 @@ declare module '@tiptap/core' {
export const clearNodes: RawCommands['clearNodes'] = () => ({ state, tr, dispatch }) => { export const clearNodes: RawCommands['clearNodes'] = () => ({ state, tr, dispatch }) => {
const { selection } = tr const { selection } = tr
const { from, to } = selection const { ranges } = selection
state.doc.nodesBetween(from, to, (node, pos) => { ranges.forEach(range => {
state.doc.nodesBetween(range.$from.pos, range.$to.pos, (node, pos) => {
if (!node.type.isText) { if (!node.type.isText) {
const fromPos = tr.doc.resolve(tr.mapping.map(pos + 1)) const fromPos = tr.doc.resolve(tr.mapping.map(pos + 1))
const toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1)) const toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1))
@@ -35,6 +36,7 @@ export const clearNodes: RawCommands['clearNodes'] = () => ({ state, tr, dispatc
} }
} }
}) })
})
return true return true
} }

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

@@ -17,13 +17,15 @@ declare module '@tiptap/core' {
export const resetNodeAttributes: RawCommands['resetNodeAttributes'] = (typeOrName, attributes) => ({ tr, state, dispatch }) => { export const resetNodeAttributes: RawCommands['resetNodeAttributes'] = (typeOrName, attributes) => ({ tr, state, dispatch }) => {
const type = getNodeType(typeOrName, state.schema) const type = getNodeType(typeOrName, state.schema)
const { selection } = tr const { selection } = tr
const { from, to } = selection const { ranges } = selection
state.doc.nodesBetween(from, to, (node, pos) => { ranges.forEach(range => {
state.doc.nodesBetween(range.$from.pos, range.$to.pos, (node, pos) => {
if (node.type === type && dispatch) { if (node.type === type && dispatch) {
tr.setNodeMarkup(pos, undefined, deleteProps(node.attrs, attributes)) tr.setNodeMarkup(pos, undefined, deleteProps(node.attrs, attributes))
} }
}) })
})
return true return true
} }

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

@@ -13,7 +13,7 @@ declare module '@tiptap/core' {
export const unsetAllMarks: RawCommands['unsetAllMarks'] = () => ({ tr, state, dispatch }) => { export const unsetAllMarks: RawCommands['unsetAllMarks'] = () => ({ tr, state, dispatch }) => {
const { selection } = tr const { selection } = tr
const { from, to, empty } = selection const { empty, ranges } = selection
if (empty) { if (empty) {
return true return true
@@ -23,7 +23,9 @@ export const unsetAllMarks: RawCommands['unsetAllMarks'] = () => ({ tr, state, d
Object Object
.entries(state.schema.marks) .entries(state.schema.marks)
.forEach(([, mark]) => { .forEach(([, mark]) => {
tr.removeMark(from, to, mark as any) ranges.forEach(range => {
tr.removeMark(range.$from.pos, range.$to.pos, mark as any)
})
}) })
} }

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

@@ -16,9 +16,10 @@ declare module '@tiptap/core' {
export const updateNodeAttributes: RawCommands['updateNodeAttributes'] = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => { export const updateNodeAttributes: RawCommands['updateNodeAttributes'] = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => {
const type = getNodeType(typeOrName, state.schema) const type = getNodeType(typeOrName, state.schema)
const { selection } = tr const { selection } = tr
const { from, to } = selection const { ranges } = selection
state.doc.nodesBetween(from, to, (node, pos) => { ranges.forEach(range => {
state.doc.nodesBetween(range.$from.pos, range.$to.pos, (node, pos) => {
if (node.type === type && dispatch) { if (node.type === type && dispatch) {
tr.setNodeMarkup(pos, undefined, { tr.setNodeMarkup(pos, undefined, {
...node.attrs, ...node.attrs,
@@ -26,6 +27,7 @@ export const updateNodeAttributes: RawCommands['updateNodeAttributes'] = (typeOr
}) })
} }
}) })
})
return true return true
} }