Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: initial state of the historyAtom #832

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

Open
wants to merge 2 commits into
base: v3
Choose a base branch
from
Open

fix: initial state of the historyAtom #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bd9186
fix: initial state of the historyAtom
DmitriyBadeev Apr 30, 2024
5edc09c
test: test undo with undefined
DmitriyBadeev Apr 30, 2024
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
35 changes: 35 additions & 0 deletions packages/undo/src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,18 @@ test('withUndo without getting historyAtom before first change', async () => {
;('👍') //?
})

test('withUndo with undefined initial state', async () => {
const a = atom<number | undefined>(undefined).pipe(withUndo({ length: 5 }))
const ctx = createTestCtx()

assert.is(ctx.get(a.historyAtom), 1)
assert.is(ctx.get(a.isUndoAtom), false)
a(ctx, 123)

assert.is(ctx.get(a.isUndoAtom), true)
assert.is(ctx.get(a.historyAtom), 2)
})

test('limit', () => {
const a = atom(0).pipe(withUndo({ length: 5 }))
const ctx = createTestCtx()
Expand Down Expand Up @@ -94,31 +106,54 @@ test('reatomUndo', () => {
ctx.subscribeTrack(c)

assert.equal(ctx.get(c), { a: 0, b: 0 })
assert.equal(ctx.get(c.historyAtom).length, 1)
assert.equal(ctx.get(c.isUndoAtom), false)
assert.equal(ctx.get(c.isRedoAtom), false)
assert.equal(ctx.get(c.positionAtom), 0)

a(ctx, 1)
a(ctx, 2)
b(ctx, 3)
a(ctx, 4)
assert.equal(ctx.get(c), { a: 4, b: 3 })
assert.equal(ctx.get(c.isUndoAtom), true)
assert.equal(ctx.get(c.isRedoAtom), false)
assert.equal(ctx.get(c.historyAtom).length, 5)
assert.equal(ctx.get(c.positionAtom), 4)

c.undo(ctx)
assert.equal(ctx.get(c), { a: 2, b: 3 })
assert.is(ctx.get(a), 2)
assert.is(ctx.get(b), 3)
assert.equal(ctx.get(c.isUndoAtom), true)
assert.equal(ctx.get(c.isRedoAtom), true)
assert.equal(ctx.get(c.historyAtom).length, 5)
assert.equal(ctx.get(c.positionAtom), 3)

c.redo(ctx)
assert.equal(ctx.get(c), { a: 4, b: 3 })
assert.is(ctx.get(a), 4)
assert.is(ctx.get(b), 3)
assert.equal(ctx.get(c.isUndoAtom), true)
assert.equal(ctx.get(c.isRedoAtom), false)
assert.equal(ctx.get(c.historyAtom).length, 5)
assert.equal(ctx.get(c.positionAtom), 4)

c.jump(ctx, -2)
assert.equal(ctx.get(c), { a: 2, b: 0 })
assert.is(ctx.get(a), 2)
assert.is(ctx.get(b), 0)
assert.equal(ctx.get(c.isUndoAtom), true)
assert.equal(ctx.get(c.isRedoAtom), true)
assert.equal(ctx.get(c.historyAtom).length, 5)
assert.equal(ctx.get(c.positionAtom), 2)

b(ctx, 5)
assert.equal(ctx.get(c), { a: 2, b: 5 })
assert.is(ctx.get(c.isRedoAtom), false)
assert.equal(ctx.get(c.isUndoAtom), true)
assert.equal(ctx.get(c.historyAtom).length, 4)
assert.equal(ctx.get(c.positionAtom), 3)
;('👍') //?
})

Expand Down
4 changes: 2 additions & 2 deletions packages/undo/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const withUndo =
anAtom.pipe(
withInit((ctx, init) => {
const state = init(ctx)
historyAtom(ctx, [state])
if (state !== undefined) historyAtom(ctx, [state])
return state
}),
)
Expand Down Expand Up @@ -119,7 +119,7 @@ export const withUndo =
Math.max(0, position - (length - 2)),
position + 1,
)
if (!shouldReplace(ctx, state, history, position)) {
if (!shouldReplace(ctx, state, history, position) && history[position] !== undefined) {
position++
}
position = Math.min(position, length - 1)
Expand Down