Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 45 additions & 0 deletions src/combine-events/combine-events.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1014,3 +1014,48 @@ test('target', () => {
]
`);
});

test('bug: triggers correctly after reset', () => {
const fn = jest.fn();
const initArr = createEvent<number[]>();
const changeArr = createEvent<number[]>();
const anotherChangeArr = createEvent<number[]>();

const $arr = restore(initArr, []).on(anotherChangeArr, (_, arr) => arr);

const changedCombined = combineEvents({
events: { set: changeArr, updates: $arr.updates },
reset: initArr,
});

changedCombined.watch(fn);

changeArr([1]);
anotherChangeArr([2]);

initArr([]);

changeArr([3]);
anotherChangeArr([4]);

expect(argumentHistory(fn)).toMatchInlineSnapshot(`
[
{
"set": [
1,
],
"updates": [
2,
],
},
{
"set": [
3,
],
"updates": [
4,
],
},
]
`);
});
7 changes: 4 additions & 3 deletions src/combine-events/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export function combineEvents<P>(

if (reset) {
sample({ source: reset, target: $counter.reinit });
$results.reset(reset);
sample({ source: reset, target: $results.reinit });
}

for (const key of keys) {
Expand All @@ -83,10 +83,11 @@ export function combineEvents<P>(
.reset(target);

if (reset) {
$isDone.reset(reset);
sample({ source: reset, target: $isDone.reinit });
}

$counter.on($isDone, (value) => value - 1);
$counter.on($isDone, (value, isDone) => (isDone ? value - 1 : value));

$results.on(events[key], (shape, payload) => {
const newShape = (Array.isArray(shape) ? [...shape] : { ...shape }) as any;
newShape[key] = payload;
Expand Down
Loading