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

fix tests

Browse Source
This commit is contained in:
Philipp Kühn
2020-12-02 12:05:35 +01:00
parent 88f89df479
commit cd46e5ebd2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/CommandManager.ts
View File

@@ -53,7 +53,7 @@ export default class CommandManager {
const method = (...args: any) => { const method = (...args: any) => {
const callback = command(...args)(props) const callback = command(...args)(props)
if (tr.steps.length) { if (!tr.getMeta('preventDispatch')) {
view.dispatch(tr) view.dispatch(tr)
} }
@@ -74,7 +74,7 @@ export default class CommandManager {
return new Proxy({}, { return new Proxy({}, {
get: (_, name: string, proxy) => { get: (_, name: string, proxy) => {
if (name === 'run') { if (name === 'run') {
if (!hasStartTransaction && shouldDispatch && tr.steps.length) { if (!hasStartTransaction && shouldDispatch && !tr.getMeta('preventDispatch')) {
view.dispatch(tr) view.dispatch(tr)
} }

8
packages/extension-collaboration/src/index.ts
View File

@@ -22,13 +22,17 @@ const Collaboration = Extension.create({
/** /**
* Undo recent changes * Undo recent changes
*/ */
undo: (): Command => ({ state }) => { undo: (): Command => ({ tr, state }) => {
tr.setMeta('preventDispatch', true)
return undo(state) return undo(state)
}, },
/** /**
* Reapply reverted changes * Reapply reverted changes
*/ */
redo: (): Command => ({ state }) => { redo: (): Command => ({ tr, state }) => {
tr.setMeta('preventDispatch', true)
return redo(state) return redo(state)
}, },
} }