Skip to content

Commit

Permalink
History: withNewBatch (ianstormtaylor#5747)
Browse files Browse the repository at this point in the history
* feat

* Create gold-cheetahs-rest.md

* refactor

* fix
  • Loading branch information
zbeyens authored Oct 21, 2024
1 parent 7ce8c0e commit 3dc27b0
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
27 changes: 27 additions & 0 deletions src/history-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { History } from './history'
export const HISTORY = new WeakMap<Editor, History>()
export const SAVING = new WeakMap<Editor, boolean | undefined>()
export const MERGING = new WeakMap<Editor, boolean | undefined>()
export const SPLITTING_ONCE = new WeakMap<Editor, boolean | undefined>()

/**
* `HistoryEditor` contains helpers for history-enabled editors.
Expand Down Expand Up @@ -38,6 +39,18 @@ export const HistoryEditor = {
return MERGING.get(editor)
},

/**
* Get the splitting once flag's current value.
*/

isSplittingOnce(editor: HistoryEditor): boolean | undefined {
return SPLITTING_ONCE.get(editor)
},

setSplittingOnce(editor: HistoryEditor, value: boolean | undefined): void {
SPLITTING_ONCE.set(editor, value)
},

/**
* Get the saving flag's current value.
*/
Expand Down Expand Up @@ -73,6 +86,20 @@ export const HistoryEditor = {
MERGING.set(editor, prev)
},

/**
* Apply a series of changes inside a synchronous `fn`, ensuring that the first
* operation starts a new batch in the history. Subsequent operations will be
* merged as usual.
*/
withNewBatch(editor: HistoryEditor, fn: () => void): void {
const prev = HistoryEditor.isMerging(editor)
MERGING.set(editor, true)
SPLITTING_ONCE.set(editor, true)
fn()
MERGING.set(editor, prev)
SPLITTING_ONCE.delete(editor)
},

/**
* Apply a series of changes inside a synchronous `fn`, without merging any of
* the new operations into previous save point in the history.
Expand Down
7 changes: 6 additions & 1 deletion src/with-history.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Editor, Operation, Path, Range, Transforms } from 'slate'
import { Editor, Operation, Path, Transforms } from 'slate'

import { HistoryEditor } from './history-editor'

Expand Down Expand Up @@ -90,6 +90,11 @@ export const withHistory = <T extends Editor>(editor: T) => {
}
}

if (HistoryEditor.isSplittingOnce(e)) {
merge = false
HistoryEditor.setSplittingOnce(e, undefined)
}

if (lastBatch && merge) {
lastBatch.operations.push(op)
} else {
Expand Down

0 comments on commit 3dc27b0

Please sign in to comment.