Skip to content
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
11 changes: 9 additions & 2 deletions packages/solid/src/reactive/signal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export interface SignalState<T> extends SourceMapValue {
value: T;
observers: Computation<any>[] | null;
observerSlots: number[] | null;
lastObserver: Computation<any> | null;
tValue?: T;
comparator?: (prev: T, next: T) => boolean;
// development-only
Expand Down Expand Up @@ -236,6 +237,7 @@ export function createSignal<T>(
value,
observers: null,
observerSlots: null,
lastObserver: null,
comparator: options.equals || undefined
};

Expand All @@ -257,7 +259,10 @@ export function createSignal<T>(
return writeSignal(s, value);
};

return [readSignal.bind(s), setter];
const result = [readSignal.bind(s), setter] as Signal<T | undefined>;
if (IS_DEV) (result as any).state = s;

return result;
}

export interface BaseOptions {
Expand Down Expand Up @@ -1305,7 +1310,8 @@ export function readSignal(this: SignalState<any> | Memo<any>) {
Updates = updates;
}
}
if (Listener) {
if (Listener && this.lastObserver !== Listener) {
this.lastObserver = Listener;
const sSlot = this.observers ? this.observers.length : 0;
if (!Listener.sources) {
Listener.sources = [this];
Expand Down Expand Up @@ -1691,6 +1697,7 @@ function cleanNode(node: Owner) {
source.observerSlots![index] = s;
}
}
source.lastObserver = null;
}
}

Expand Down
19 changes: 19 additions & 0 deletions packages/solid/test/signals.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,25 @@ describe("catchError", () => {
expect(errored).toBe(true);
});

describe("Repeatedly read the signal", () => {
test("Signal repeated read in for loop", () => {
const a = createSignal(0);
const dispose = createRoot(dispose => {
createEffect(() => {
for (let i = 0; i < 1000; i++) {
a[0]();
}
});
return dispose;
});
expect((a as any).state.observers.length).toBe(1);
expect((a as any).state.observerSlots.length).toBe(1);
expect((a as any).state.observers[0].sources.length).toBe(1);
expect((a as any).state.observers[0].sourceSlots.length).toBe(1);
dispose();
});
});

test("In nested memo", () => {
let errored = false;
expect(() =>
Expand Down