Skip to content
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.

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

[Polyfill] FIx - Deduplicate watched signals #191

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
14 changes: 14 additions & 0 deletions packages/signal-polyfill/src/wrapper.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,20 @@ describe("Watcher", () => {
signal.set(1);
expect(mockGetPending).toBeCalled();
});

it("does not store duplicated watchers for the same signal", () => {
const watcher = new Signal.subtle.Watcher(() => {});
const signal = new Signal.State<number>(0);
const computed = new Signal.Computed(() => signal.get() + 1);
watcher.watch(signal);
watcher.watch(signal);
watcher.watch(computed);
watcher.watch(computed);
watcher.watch(computed);
expect(Signal.subtle.introspectSources(watcher).length).toBe(2);
expect(Signal.subtle.introspectSources(watcher)[0]).toBe(signal);
expect(Signal.subtle.introspectSources(watcher)[1]).toBe(computed);
});
});

describe("Expected class shape", () => {
Expand Down
7 changes: 6 additions & 1 deletion packages/signal-polyfill/src/wrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,15 @@ export namespace subtle {
this.#assertSignals(signals);

const node = this[NODE];
assertConsumerNode(node);

node.dirty = false; // Give the watcher a chance to trigger again
const prev = setActiveConsumer(node);

for (const signal of signals) {
producerAccessed(signal[NODE]);
if(!node.producerNode.includes(signal[NODE])) {
producerAccessed(signal[NODE]);
}
}
setActiveConsumer(prev);
}
Expand Down