Skip to content

fix(react): track owners separately, mutate updaters with dispatcher #130

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

Merged
marvinhagemeister merged 10 commits into from
Sep 14, 2022
Merged

fix(react): track owners separately, mutate updaters with dispatcher #130

Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57b2ec4
fix(react): track owners separately, create updaters per dispatcher
CodyJasonBennett Sep 12, 2022
57a679d
fix(react): move updaterForComponent check inside api guard
CodyJasonBennett Sep 12, 2022
402f5a6
refactor(react): don't create a component queue, track non-null compo…
CodyJasonBennett Sep 13, 2022
0fb92e1
Merge branch 'main' into fix/react-stale-dispatcher
CodyJasonBennett Sep 13, 2022
72a41ce
chore(react): cleanup
CodyJasonBennett Sep 13, 2022
1050f72
chore(react): cleanup owner/component semantics
CodyJasonBennett Sep 13, 2022
3166861
fix(react): set lastDispatcher with updater
CodyJasonBennett Sep 13, 2022
cdd21e6
chore(react): cleanup owner/dispatcher types
CodyJasonBennett Sep 13, 2022
762d7d8
fix(react): mutate updater in subsequent runs
CodyJasonBennett Sep 13, 2022
e3ead4a
chore(tests): add react strictmode case
CodyJasonBennett Sep 14, 2022
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
28 changes: 18 additions & 10 deletions packages/react/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,22 @@ Object.defineProperties(Signal.prototype, {
});

// Track the current owner (roughly equiv to current vnode)
// let currentOwner: ReactOwner;
// Object.defineProperty(internals.ReactCurrentOwner, "current", {
// get() { return currentOwner; },
// set(owner) { currentOwner = owner; },
// });
let lastOwner: ReactOwner;
let currentOwner: ReactOwner;
Object.defineProperty(internals.ReactCurrentOwner, "current", {
get() {
return currentOwner;
},
set(owner) {
currentOwner = owner;
if (currentOwner) lastOwner = currentOwner;
},
});
Comment thread
CodyJasonBennett marked this conversation as resolved.
Outdated

// Track the current dispatcher (roughly equiv to current component impl)
let lock = false;
const UPDATE = () => ({});
let lastDispatcher: ReactDispatcher;
let currentDispatcher: ReactDispatcher;
Object.defineProperty(internals.ReactCurrentDispatcher, "current", {
get() {
Expand All @@ -108,17 +115,18 @@ Object.defineProperty(internals.ReactCurrentDispatcher, "current", {
set(api) {
currentDispatcher = api;
if (lock) return;
if (api && !isInvalidHookAccessor(api)) {
if (lastOwner && api && !isInvalidHookAccessor(api)) {
// prevent re-injecting useReducer when the Dispatcher
// context changes to run the reducer callback:
lock = true;
const rerender = api.useReducer(UPDATE, {})[1];
lock = false;
const currentOwner = internals.ReactCurrentOwner.current;
let updater = updaterForComponent.get(currentOwner);
if (!updater) {

let updater = updaterForComponent.get(lastOwner);
if (!updater || !lastDispatcher !== api) {
updater = createUpdater(rerender);
updaterForComponent.set(currentOwner, updater);
updaterForComponent.set(lastOwner, updater);
lastDispatcher = api;
}
setCurrentUpdater(updater);
} else {
Expand Down