Skip to content

Refactor useEvent #25336

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
merged 5 commits into from
Sep 29, 2022
Merged

Refactor useEvent #25336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5158b13
Refactor useEvent
poteto Sep 27, 2022
a015335
Naming changes
poteto Sep 29, 2022
a731886
Flow types
poteto Sep 29, 2022
436d6a5
Flatten EventFunctionPayload
poteto Sep 29, 2022
2abf7db
Apparently Flow doesn't like variables called event
poteto Sep 29, 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
Prev Previous commit
Apparently Flow doesn't like variables called event
  • Loading branch information
@poteto
poteto committed Sep 29, 2022
commit 2abf7dba5d40a1b098f4359695bd52437344d87e
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactFiberCommitWork.new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,9 @@ function commitUseEventMount(finishedWork: Fiber) {
// [EventFunctionWrapper, EventFunction, ...], so increment by 2 each iteration to find the next
// pair.
for (let ii = 0; ii < eventPayloads.length; ii += 2) {
const event: EventFunctionWrapper<any, any, any> = eventPayloads[ii];
const eventFn: EventFunctionWrapper<any, any, any> = eventPayloads[ii];
const nextImpl = eventPayloads[ii + 1];
event._impl = nextImpl;
eventFn._impl = nextImpl;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactFiberCommitWork.old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,9 @@ function commitUseEventMount(finishedWork: Fiber) {
// [EventFunctionWrapper, EventFunction, ...], so increment by 2 each iteration to find the next
// pair.
for (let ii = 0; ii < eventPayloads.length; ii += 2) {
const event: EventFunctionWrapper<any, any, any> = eventPayloads[ii];
const eventFn: EventFunctionWrapper<any, any, any> = eventPayloads[ii];
const nextImpl = eventPayloads[ii + 1];
event._impl = nextImpl;
eventFn._impl = nextImpl;
}
}
}
Expand Down
19 changes: 9 additions & 10 deletions packages/react-reconciler/src/ReactFiberHooks.new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,29 +1898,28 @@ function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
callback: F,
): EventFunctionWrapper<Args, Return, F> {
const hook = mountWorkInProgressHook();

const event: EventFunctionWrapper<Args, Return, F> = function event() {
const eventFn: EventFunctionWrapper<Args, Return, F> = function eventFn() {
if (isInvalidExecutionContextForEventFunction()) {
throw new Error(
"A function wrapped in useEvent can't be called during rendering.",
);
}
return event._impl.apply(undefined, arguments);
return eventFn._impl.apply(undefined, arguments);
};
event._impl = callback;
eventFn._impl = callback;

useEventImpl(event, callback);
hook.memoizedState = event;
return event;
useEventImpl(eventFn, callback);
hook.memoizedState = eventFn;
return eventFn;
}

function updateEvent<Args, Return, F: (...Array<Args>) => Return>(
callback: F,
): EventFunctionWrapper<Args, Return, F> {
const hook = updateWorkInProgressHook();
const event = hook.memoizedState;
useEventImpl(event, callback);
return event;
const eventFn = hook.memoizedState;
useEventImpl(eventFn, callback);
return eventFn;
}

function mountInsertionEffect(
Expand Down
19 changes: 9 additions & 10 deletions packages/react-reconciler/src/ReactFiberHooks.old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,29 +1898,28 @@ function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
callback: F,
): EventFunctionWrapper<Args, Return, F> {
const hook = mountWorkInProgressHook();

const event: EventFunctionWrapper<Args, Return, F> = function event() {
const eventFn: EventFunctionWrapper<Args, Return, F> = function eventFn() {
if (isInvalidExecutionContextForEventFunction()) {
throw new Error(
"A function wrapped in useEvent can't be called during rendering.",
);
}
return event._impl.apply(undefined, arguments);
return eventFn._impl.apply(undefined, arguments);
};
event._impl = callback;
eventFn._impl = callback;

useEventImpl(event, callback);
hook.memoizedState = event;
return event;
useEventImpl(eventFn, callback);
hook.memoizedState = eventFn;
return eventFn;
}

function updateEvent<Args, Return, F: (...Array<Args>) => Return>(
callback: F,
): EventFunctionWrapper<Args, Return, F> {
const hook = updateWorkInProgressHook();
const event = hook.memoizedState;
useEventImpl(event, callback);
return event;
const eventFn = hook.memoizedState;
useEventImpl(eventFn, callback);
return eventFn;
}

function mountInsertionEffect(
Expand Down