Add type identifier to every hook#34933

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

Closed
blazejkustra wants to merge 1 commit into from
Closed

Add type identifier to every hook #34933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 49 additions & 22 deletions packages/react-reconciler/src/ReactFiberHooks.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
baseQueue: Update<any, any> | null,
queue: any,
next: Hook | null,
type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
const hook: Hook = {
memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
queue: null,

next: null,
type,
};

if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
initialArg: I,
init?: I => S,
): [S, Dispatch<A>] {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useReducer');
let initialState;
if (init !== undefined) {
initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
getServerSnapshot?: () => T,
): T {
const fiber = currentlyRenderingFiber;
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useSyncExternalStore');

let nextSnapshot;
const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
}
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
initialState: (() => S) | S,
type: HookType | null,
): Hook {
const hook = mountWorkInProgressHook(type);
if (typeof initialState === 'function') {
const initialStateInitializer = initialState;
// $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
const hook = mountStateImpl(initialState);
const hook = mountStateImpl(initialState, 'useState');
const queue = hook.queue;
const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
passthrough: S,
reducer: ?(S, A) => S,
): [S, (A) => void] {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useOptimistic');
hook.memoizedState = hook.baseState = passthrough;
const queue: UpdateQueue<S, A> = {
pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

// State hook. The state is stored in a thenable which is then unwrapped by
// the `use` algorithm during render.
const stateHook = mountWorkInProgressHook();
const stateHook = mountWorkInProgressHook('useActionState');
stateHook.memoizedState = stateHook.baseState = initialState;
// TODO: Typing this "correctly" results in recursion limit errors
// const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

// Pending state. This is used to store the pending state of the action.
// Tracked optimistically, like a transition pending state.
const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
const pendingStateHook = mountStateImpl(
(false: Thenable<boolean> | boolean),
null,
);
const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
null,
currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
// shared between all instances of the hook. Similar to a regular state queue,
// but different because the actions are run sequentially, and they run in
// an event instead of during render.
const actionQueueHook = mountWorkInProgressHook();
const actionQueueHook = mountWorkInProgressHook(null);
const actionQueue: ActionStateQueue<S, P> = {
state: initialState,
dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useRef');
const ref = {current: initialValue};
hook.memoizedState = ref;
return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
hookFlags: HookFlags,
create: () => (() => void) | void,
deps: Array<mixed> | void | null,
type: HookType | null,
): void {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook(type);
const nextDeps = deps === undefined ? null : deps;
currentlyRenderingFiber.flags |= fiberFlags;
hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
HookPassive,
create,
deps,
'useEffect',
);
} else {
mountEffectImpl(
PassiveEffect | PassiveStaticEffect,
HookPassive,
create,
deps,
'useEffect',
);
}
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
callback: F,
): F {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useEffectEvent');
const ref = {impl: callback};
hook.memoizedState = ref;
// $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
create: () => (() => void) | void,
deps: Array<mixed> | void | null,
): void {
mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
mountEffectImpl(
UpdateEffect,
HookInsertion,
create,
deps,
'useInsertionEffect',
);
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
) {
fiberFlags |= MountLayoutDevEffect;
}
return mountEffectImpl(fiberFlags, HookLayout, create, deps);
return mountEffectImpl(
fiberFlags,
HookLayout,
create,
deps,
'useLayoutEffect',
);
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
HookLayout,
imperativeHandleEffect.bind(null, create, ref),
effectDeps,
'useImperativeHandle',
);
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useCallback');
const nextDeps = deps === undefined ? null : deps;
hook.memoizedState = [callback, nextDeps];
return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
nextCreate: () => T,
deps: Array<mixed> | void | null,
): T {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useMemo');
const nextDeps = deps === undefined ? null : deps;
const nextValue = nextCreate();
if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useDeferredValue');
return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
boolean,
(callback: () => void, options?: StartTransitionOptions) => void,
] {
const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
const stateHook = mountStateImpl(
(false: Thenable<boolean> | boolean),
'useTransition',
);
// The `start` method never changes.
const start = startTransition.bind(
null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
true,
false,
);
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook(null);
hook.memoizedState = start;
return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useId');

const root = ((getWorkInProgressRoot(): any): FiberRoot);
// TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
const hook = mountWorkInProgressHook();
const hook = mountWorkInProgressHook('useCacheRefresh');
const refresh = (hook.memoizedState = refreshCache.bind(
null,
currentlyRenderingFiber,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add type identifier to every hook#34933

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

 Closed

blazejkustra
wants to merge
1
commit into

from

 Closed


Add type identifier to every hook
#34933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


71 changes: 49 additions & 22 deletions
packages/react-reconciler/src/ReactFiberHooks.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
 baseQueue: Update<any, any> | null,
 queue: any,
 next: Hook | null,
 type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
 thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
 const hook: Hook = {
 memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
 queue: null,

 next: null,
 type,
 };

 if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
 initialArg: I,
 init?: I => S,
): [S, Dispatch<A>] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useReducer');
 let initialState;
 if (init !== undefined) {
 initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
 getServerSnapshot?: () => T,
): T {
 const fiber = currentlyRenderingFiber;
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useSyncExternalStore');

 let nextSnapshot;
 const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
 }
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
 const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
 initialState: (() => S) | S,
 type: HookType | null,
): Hook {
 const hook = mountWorkInProgressHook(type);
 if (typeof initialState === 'function') {
 const initialStateInitializer = initialState;
 // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
 initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
 const hook = mountStateImpl(initialState);
 const hook = mountStateImpl(initialState, 'useState');
 const queue = hook.queue;
 const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
 null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
 passthrough: S,
 reducer: ?(S, A) => S,
): [S, (A) => void] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useOptimistic');
 hook.memoizedState = hook.baseState = passthrough;
 const queue: UpdateQueue<S, A> = {
 pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

 // State hook. The state is stored in a thenable which is then unwrapped by
 // the `use` algorithm during render.
 const stateHook = mountWorkInProgressHook();
 const stateHook = mountWorkInProgressHook('useActionState');
 stateHook.memoizedState = stateHook.baseState = initialState;
 // TODO: Typing this "correctly" results in recursion limit errors
 // const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

 // Pending state. This is used to store the pending state of the action.
 // Tracked optimistically, like a transition pending state.
 const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const pendingStateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 null,
 );
 const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
 null,
 currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
 // shared between all instances of the hook. Similar to a regular state queue,
 // but different because the actions are run sequentially, and they run in
 // an event instead of during render.
 const actionQueueHook = mountWorkInProgressHook();
 const actionQueueHook = mountWorkInProgressHook(null);
 const actionQueue: ActionStateQueue<S, P> = {
 state: initialState,
 dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useRef');
 const ref = {current: initialValue};
 hook.memoizedState = ref;
 return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
 hookFlags: HookFlags,
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
 type: HookType | null,
): void {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(type);
 const nextDeps = deps === undefined ? null : deps;
 currentlyRenderingFiber.flags |= fiberFlags;
 hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 } else {
 mountEffectImpl(
 PassiveEffect | PassiveStaticEffect,
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 }
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
 callback: F,
): F {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useEffectEvent');
 const ref = {impl: callback};
 hook.memoizedState = ref;
 // $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
): void {
 mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
 mountEffectImpl(
 UpdateEffect,
 HookInsertion,
 create,
 deps,
 'useInsertionEffect',
 );
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
 ) {
 fiberFlags |= MountLayoutDevEffect;
 }
 return mountEffectImpl(fiberFlags, HookLayout, create, deps);
 return mountEffectImpl(
 fiberFlags,
 HookLayout,
 create,
 deps,
 'useLayoutEffect',
 );
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
 HookLayout,
 imperativeHandleEffect.bind(null, create, ref),
 effectDeps,
 'useImperativeHandle',
 );
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCallback');
 const nextDeps = deps === undefined ? null : deps;
 hook.memoizedState = [callback, nextDeps];
 return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
 nextCreate: () => T,
 deps: Array<mixed> | void | null,
): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useMemo');
 const nextDeps = deps === undefined ? null : deps;
 const nextValue = nextCreate();
 if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useDeferredValue');
 return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
 boolean,
 (callback: () => void, options?: StartTransitionOptions) => void,
] {
 const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const stateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 'useTransition',
 );
 // The `start` method never changes.
 const start = startTransition.bind(
 null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
 true,
 false,
 );
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(null);
 hook.memoizedState = start;
 return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useId');

 const root = ((getWorkInProgressRoot(): any): FiberRoot);
 // TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCacheRefresh');
 const refresh = (hook.memoizedState = refreshCache.bind(
 null,
 currentlyRenderingFiber,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add type identifier to every hook#34933

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

 Closed

blazejkustra
wants to merge
1
commit into

from

 Closed


Add type identifier to every hook
#34933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


71 changes: 49 additions & 22 deletions
packages/react-reconciler/src/ReactFiberHooks.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
 baseQueue: Update<any, any> | null,
 queue: any,
 next: Hook | null,
 type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
 thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
 const hook: Hook = {
 memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
 queue: null,

 next: null,
 type,
 };

 if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
 initialArg: I,
 init?: I => S,
): [S, Dispatch<A>] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useReducer');
 let initialState;
 if (init !== undefined) {
 initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
 getServerSnapshot?: () => T,
): T {
 const fiber = currentlyRenderingFiber;
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useSyncExternalStore');

 let nextSnapshot;
 const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
 }
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
 const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
 initialState: (() => S) | S,
 type: HookType | null,
): Hook {
 const hook = mountWorkInProgressHook(type);
 if (typeof initialState === 'function') {
 const initialStateInitializer = initialState;
 // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
 initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
 const hook = mountStateImpl(initialState);
 const hook = mountStateImpl(initialState, 'useState');
 const queue = hook.queue;
 const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
 null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
 passthrough: S,
 reducer: ?(S, A) => S,
): [S, (A) => void] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useOptimistic');
 hook.memoizedState = hook.baseState = passthrough;
 const queue: UpdateQueue<S, A> = {
 pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

 // State hook. The state is stored in a thenable which is then unwrapped by
 // the `use` algorithm during render.
 const stateHook = mountWorkInProgressHook();
 const stateHook = mountWorkInProgressHook('useActionState');
 stateHook.memoizedState = stateHook.baseState = initialState;
 // TODO: Typing this "correctly" results in recursion limit errors
 // const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

 // Pending state. This is used to store the pending state of the action.
 // Tracked optimistically, like a transition pending state.
 const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const pendingStateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 null,
 );
 const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
 null,
 currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
 // shared between all instances of the hook. Similar to a regular state queue,
 // but different because the actions are run sequentially, and they run in
 // an event instead of during render.
 const actionQueueHook = mountWorkInProgressHook();
 const actionQueueHook = mountWorkInProgressHook(null);
 const actionQueue: ActionStateQueue<S, P> = {
 state: initialState,
 dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useRef');
 const ref = {current: initialValue};
 hook.memoizedState = ref;
 return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
 hookFlags: HookFlags,
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
 type: HookType | null,
): void {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(type);
 const nextDeps = deps === undefined ? null : deps;
 currentlyRenderingFiber.flags |= fiberFlags;
 hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 } else {
 mountEffectImpl(
 PassiveEffect | PassiveStaticEffect,
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 }
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
 callback: F,
): F {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useEffectEvent');
 const ref = {impl: callback};
 hook.memoizedState = ref;
 // $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
): void {
 mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
 mountEffectImpl(
 UpdateEffect,
 HookInsertion,
 create,
 deps,
 'useInsertionEffect',
 );
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
 ) {
 fiberFlags |= MountLayoutDevEffect;
 }
 return mountEffectImpl(fiberFlags, HookLayout, create, deps);
 return mountEffectImpl(
 fiberFlags,
 HookLayout,
 create,
 deps,
 'useLayoutEffect',
 );
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
 HookLayout,
 imperativeHandleEffect.bind(null, create, ref),
 effectDeps,
 'useImperativeHandle',
 );
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCallback');
 const nextDeps = deps === undefined ? null : deps;
 hook.memoizedState = [callback, nextDeps];
 return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
 nextCreate: () => T,
 deps: Array<mixed> | void | null,
): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useMemo');
 const nextDeps = deps === undefined ? null : deps;
 const nextValue = nextCreate();
 if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useDeferredValue');
 return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
 boolean,
 (callback: () => void, options?: StartTransitionOptions) => void,
] {
 const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const stateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 'useTransition',
 );
 // The `start` method never changes.
 const start = startTransition.bind(
 null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
 true,
 false,
 );
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(null);
 hook.memoizedState = start;
 return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useId');

 const root = ((getWorkInProgressRoot(): any): FiberRoot);
 // TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCacheRefresh');
 const refresh = (hook.memoizedState = refreshCache.bind(
 null,
 currentlyRenderingFiber,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add type identifier to every hook#34933

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

 Closed

blazejkustra
wants to merge
1
commit into

from

 Closed


Add type identifier to every hook
#34933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


71 changes: 49 additions & 22 deletions
packages/react-reconciler/src/ReactFiberHooks.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
 baseQueue: Update<any, any> | null,
 queue: any,
 next: Hook | null,
 type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
 thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
 const hook: Hook = {
 memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
 queue: null,

 next: null,
 type,
 };

 if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
 initialArg: I,
 init?: I => S,
): [S, Dispatch<A>] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useReducer');
 let initialState;
 if (init !== undefined) {
 initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
 getServerSnapshot?: () => T,
): T {
 const fiber = currentlyRenderingFiber;
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useSyncExternalStore');

 let nextSnapshot;
 const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
 }
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
 const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
 initialState: (() => S) | S,
 type: HookType | null,
): Hook {
 const hook = mountWorkInProgressHook(type);
 if (typeof initialState === 'function') {
 const initialStateInitializer = initialState;
 // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
 initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
 const hook = mountStateImpl(initialState);
 const hook = mountStateImpl(initialState, 'useState');
 const queue = hook.queue;
 const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
 null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
 passthrough: S,
 reducer: ?(S, A) => S,
): [S, (A) => void] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useOptimistic');
 hook.memoizedState = hook.baseState = passthrough;
 const queue: UpdateQueue<S, A> = {
 pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

 // State hook. The state is stored in a thenable which is then unwrapped by
 // the `use` algorithm during render.
 const stateHook = mountWorkInProgressHook();
 const stateHook = mountWorkInProgressHook('useActionState');
 stateHook.memoizedState = stateHook.baseState = initialState;
 // TODO: Typing this "correctly" results in recursion limit errors
 // const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

 // Pending state. This is used to store the pending state of the action.
 // Tracked optimistically, like a transition pending state.
 const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const pendingStateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 null,
 );
 const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
 null,
 currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
 // shared between all instances of the hook. Similar to a regular state queue,
 // but different because the actions are run sequentially, and they run in
 // an event instead of during render.
 const actionQueueHook = mountWorkInProgressHook();
 const actionQueueHook = mountWorkInProgressHook(null);
 const actionQueue: ActionStateQueue<S, P> = {
 state: initialState,
 dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useRef');
 const ref = {current: initialValue};
 hook.memoizedState = ref;
 return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
 hookFlags: HookFlags,
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
 type: HookType | null,
): void {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(type);
 const nextDeps = deps === undefined ? null : deps;
 currentlyRenderingFiber.flags |= fiberFlags;
 hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 } else {
 mountEffectImpl(
 PassiveEffect | PassiveStaticEffect,
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 }
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
 callback: F,
): F {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useEffectEvent');
 const ref = {impl: callback};
 hook.memoizedState = ref;
 // $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
): void {
 mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
 mountEffectImpl(
 UpdateEffect,
 HookInsertion,
 create,
 deps,
 'useInsertionEffect',
 );
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
 ) {
 fiberFlags |= MountLayoutDevEffect;
 }
 return mountEffectImpl(fiberFlags, HookLayout, create, deps);
 return mountEffectImpl(
 fiberFlags,
 HookLayout,
 create,
 deps,
 'useLayoutEffect',
 );
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
 HookLayout,
 imperativeHandleEffect.bind(null, create, ref),
 effectDeps,
 'useImperativeHandle',
 );
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCallback');
 const nextDeps = deps === undefined ? null : deps;
 hook.memoizedState = [callback, nextDeps];
 return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
 nextCreate: () => T,
 deps: Array<mixed> | void | null,
): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useMemo');
 const nextDeps = deps === undefined ? null : deps;
 const nextValue = nextCreate();
 if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useDeferredValue');
 return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
 boolean,
 (callback: () => void, options?: StartTransitionOptions) => void,
] {
 const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const stateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 'useTransition',
 );
 // The `start` method never changes.
 const start = startTransition.bind(
 null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
 true,
 false,
 );
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(null);
 hook.memoizedState = start;
 return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useId');

 const root = ((getWorkInProgressRoot(): any): FiberRoot);
 // TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCacheRefresh');
 const refresh = (hook.memoizedState = refreshCache.bind(
 null,
 currentlyRenderingFiber,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add type identifier to every hook#34933

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

 Closed

blazejkustra
wants to merge
1
commit into

from

 Closed


Add type identifier to every hook
#34933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


71 changes: 49 additions & 22 deletions
packages/react-reconciler/src/ReactFiberHooks.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
 baseQueue: Update<any, any> | null,
 queue: any,
 next: Hook | null,
 type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
 thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
 const hook: Hook = {
 memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
 queue: null,

 next: null,
 type,
 };

 if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
 initialArg: I,
 init?: I => S,
): [S, Dispatch<A>] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useReducer');
 let initialState;
 if (init !== undefined) {
 initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
 getServerSnapshot?: () => T,
): T {
 const fiber = currentlyRenderingFiber;
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useSyncExternalStore');

 let nextSnapshot;
 const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
 }
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
 const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
 initialState: (() => S) | S,
 type: HookType | null,
): Hook {
 const hook = mountWorkInProgressHook(type);
 if (typeof initialState === 'function') {
 const initialStateInitializer = initialState;
 // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
 initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
 const hook = mountStateImpl(initialState);
 const hook = mountStateImpl(initialState, 'useState');
 const queue = hook.queue;
 const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
 null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
 passthrough: S,
 reducer: ?(S, A) => S,
): [S, (A) => void] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useOptimistic');
 hook.memoizedState = hook.baseState = passthrough;
 const queue: UpdateQueue<S, A> = {
 pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

 // State hook. The state is stored in a thenable which is then unwrapped by
 // the `use` algorithm during render.
 const stateHook = mountWorkInProgressHook();
 const stateHook = mountWorkInProgressHook('useActionState');
 stateHook.memoizedState = stateHook.baseState = initialState;
 // TODO: Typing this "correctly" results in recursion limit errors
 // const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

 // Pending state. This is used to store the pending state of the action.
 // Tracked optimistically, like a transition pending state.
 const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const pendingStateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 null,
 );
 const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
 null,
 currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
 // shared between all instances of the hook. Similar to a regular state queue,
 // but different because the actions are run sequentially, and they run in
 // an event instead of during render.
 const actionQueueHook = mountWorkInProgressHook();
 const actionQueueHook = mountWorkInProgressHook(null);
 const actionQueue: ActionStateQueue<S, P> = {
 state: initialState,
 dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useRef');
 const ref = {current: initialValue};
 hook.memoizedState = ref;
 return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
 hookFlags: HookFlags,
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
 type: HookType | null,
): void {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(type);
 const nextDeps = deps === undefined ? null : deps;
 currentlyRenderingFiber.flags |= fiberFlags;
 hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 } else {
 mountEffectImpl(
 PassiveEffect | PassiveStaticEffect,
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 }
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
 callback: F,
): F {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useEffectEvent');
 const ref = {impl: callback};
 hook.memoizedState = ref;
 // $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
): void {
 mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
 mountEffectImpl(
 UpdateEffect,
 HookInsertion,
 create,
 deps,
 'useInsertionEffect',
 );
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
 ) {
 fiberFlags |= MountLayoutDevEffect;
 }
 return mountEffectImpl(fiberFlags, HookLayout, create, deps);
 return mountEffectImpl(
 fiberFlags,
 HookLayout,
 create,
 deps,
 'useLayoutEffect',
 );
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
 HookLayout,
 imperativeHandleEffect.bind(null, create, ref),
 effectDeps,
 'useImperativeHandle',
 );
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCallback');
 const nextDeps = deps === undefined ? null : deps;
 hook.memoizedState = [callback, nextDeps];
 return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
 nextCreate: () => T,
 deps: Array<mixed> | void | null,
): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useMemo');
 const nextDeps = deps === undefined ? null : deps;
 const nextValue = nextCreate();
 if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useDeferredValue');
 return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
 boolean,
 (callback: () => void, options?: StartTransitionOptions) => void,
] {
 const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const stateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 'useTransition',
 );
 // The `start` method never changes.
 const start = startTransition.bind(
 null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
 true,
 false,
 );
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(null);
 hook.memoizedState = start;
 return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useId');

 const root = ((getWorkInProgressRoot(): any): FiberRoot);
 // TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCacheRefresh');
 const refresh = (hook.memoizedState = refreshCache.bind(
 null,
 currentlyRenderingFiber,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add type identifier to every hook#34933

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

 Closed

blazejkustra
wants to merge
1
commit into

from

 Closed


Add type identifier to every hook
#34933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


71 changes: 49 additions & 22 deletions
packages/react-reconciler/src/ReactFiberHooks.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
 baseQueue: Update<any, any> | null,
 queue: any,
 next: Hook | null,
 type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
 thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
 const hook: Hook = {
 memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
 queue: null,

 next: null,
 type,
 };

 if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
 initialArg: I,
 init?: I => S,
): [S, Dispatch<A>] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useReducer');
 let initialState;
 if (init !== undefined) {
 initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
 getServerSnapshot?: () => T,
): T {
 const fiber = currentlyRenderingFiber;
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useSyncExternalStore');

 let nextSnapshot;
 const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
 }
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
 const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
 initialState: (() => S) | S,
 type: HookType | null,
): Hook {
 const hook = mountWorkInProgressHook(type);
 if (typeof initialState === 'function') {
 const initialStateInitializer = initialState;
 // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
 initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
 const hook = mountStateImpl(initialState);
 const hook = mountStateImpl(initialState, 'useState');
 const queue = hook.queue;
 const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
 null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
 passthrough: S,
 reducer: ?(S, A) => S,
): [S, (A) => void] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useOptimistic');
 hook.memoizedState = hook.baseState = passthrough;
 const queue: UpdateQueue<S, A> = {
 pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

 // State hook. The state is stored in a thenable which is then unwrapped by
 // the `use` algorithm during render.
 const stateHook = mountWorkInProgressHook();
 const stateHook = mountWorkInProgressHook('useActionState');
 stateHook.memoizedState = stateHook.baseState = initialState;
 // TODO: Typing this "correctly" results in recursion limit errors
 // const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

 // Pending state. This is used to store the pending state of the action.
 // Tracked optimistically, like a transition pending state.
 const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const pendingStateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 null,
 );
 const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
 null,
 currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
 // shared between all instances of the hook. Similar to a regular state queue,
 // but different because the actions are run sequentially, and they run in
 // an event instead of during render.
 const actionQueueHook = mountWorkInProgressHook();
 const actionQueueHook = mountWorkInProgressHook(null);
 const actionQueue: ActionStateQueue<S, P> = {
 state: initialState,
 dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useRef');
 const ref = {current: initialValue};
 hook.memoizedState = ref;
 return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
 hookFlags: HookFlags,
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
 type: HookType | null,
): void {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(type);
 const nextDeps = deps === undefined ? null : deps;
 currentlyRenderingFiber.flags |= fiberFlags;
 hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 } else {
 mountEffectImpl(
 PassiveEffect | PassiveStaticEffect,
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 }
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
 callback: F,
): F {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useEffectEvent');
 const ref = {impl: callback};
 hook.memoizedState = ref;
 // $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
): void {
 mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
 mountEffectImpl(
 UpdateEffect,
 HookInsertion,
 create,
 deps,
 'useInsertionEffect',
 );
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
 ) {
 fiberFlags |= MountLayoutDevEffect;
 }
 return mountEffectImpl(fiberFlags, HookLayout, create, deps);
 return mountEffectImpl(
 fiberFlags,
 HookLayout,
 create,
 deps,
 'useLayoutEffect',
 );
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
 HookLayout,
 imperativeHandleEffect.bind(null, create, ref),
 effectDeps,
 'useImperativeHandle',
 );
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCallback');
 const nextDeps = deps === undefined ? null : deps;
 hook.memoizedState = [callback, nextDeps];
 return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
 nextCreate: () => T,
 deps: Array<mixed> | void | null,
): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useMemo');
 const nextDeps = deps === undefined ? null : deps;
 const nextValue = nextCreate();
 if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useDeferredValue');
 return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
 boolean,
 (callback: () => void, options?: StartTransitionOptions) => void,
] {
 const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const stateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 'useTransition',
 );
 // The `start` method never changes.
 const start = startTransition.bind(
 null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
 true,
 false,
 );
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(null);
 hook.memoizedState = start;
 return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useId');

 const root = ((getWorkInProgressRoot(): any): FiberRoot);
 // TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCacheRefresh');
 const refresh = (hook.memoizedState = refreshCache.bind(
 null,
 currentlyRenderingFiber,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add type identifier to every hook#34933

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

 Closed

blazejkustra
wants to merge
1
commit into

from

 Closed


Add type identifier to every hook
#34933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


71 changes: 49 additions & 22 deletions
packages/react-reconciler/src/ReactFiberHooks.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
 baseQueue: Update<any, any> | null,
 queue: any,
 next: Hook | null,
 type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
 thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
 const hook: Hook = {
 memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
 queue: null,

 next: null,
 type,
 };

 if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
 initialArg: I,
 init?: I => S,
): [S, Dispatch<A>] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useReducer');
 let initialState;
 if (init !== undefined) {
 initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
 getServerSnapshot?: () => T,
): T {
 const fiber = currentlyRenderingFiber;
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useSyncExternalStore');

 let nextSnapshot;
 const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
 }
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
 const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
 initialState: (() => S) | S,
 type: HookType | null,
): Hook {
 const hook = mountWorkInProgressHook(type);
 if (typeof initialState === 'function') {
 const initialStateInitializer = initialState;
 // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
 initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
 const hook = mountStateImpl(initialState);
 const hook = mountStateImpl(initialState, 'useState');
 const queue = hook.queue;
 const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
 null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
 passthrough: S,
 reducer: ?(S, A) => S,
): [S, (A) => void] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useOptimistic');
 hook.memoizedState = hook.baseState = passthrough;
 const queue: UpdateQueue<S, A> = {
 pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

 // State hook. The state is stored in a thenable which is then unwrapped by
 // the `use` algorithm during render.
 const stateHook = mountWorkInProgressHook();
 const stateHook = mountWorkInProgressHook('useActionState');
 stateHook.memoizedState = stateHook.baseState = initialState;
 // TODO: Typing this "correctly" results in recursion limit errors
 // const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

 // Pending state. This is used to store the pending state of the action.
 // Tracked optimistically, like a transition pending state.
 const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const pendingStateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 null,
 );
 const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
 null,
 currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
 // shared between all instances of the hook. Similar to a regular state queue,
 // but different because the actions are run sequentially, and they run in
 // an event instead of during render.
 const actionQueueHook = mountWorkInProgressHook();
 const actionQueueHook = mountWorkInProgressHook(null);
 const actionQueue: ActionStateQueue<S, P> = {
 state: initialState,
 dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useRef');
 const ref = {current: initialValue};
 hook.memoizedState = ref;
 return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
 hookFlags: HookFlags,
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
 type: HookType | null,
): void {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(type);
 const nextDeps = deps === undefined ? null : deps;
 currentlyRenderingFiber.flags |= fiberFlags;
 hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 } else {
 mountEffectImpl(
 PassiveEffect | PassiveStaticEffect,
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 }
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
 callback: F,
): F {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useEffectEvent');
 const ref = {impl: callback};
 hook.memoizedState = ref;
 // $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
): void {
 mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
 mountEffectImpl(
 UpdateEffect,
 HookInsertion,
 create,
 deps,
 'useInsertionEffect',
 );
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
 ) {
 fiberFlags |= MountLayoutDevEffect;
 }
 return mountEffectImpl(fiberFlags, HookLayout, create, deps);
 return mountEffectImpl(
 fiberFlags,
 HookLayout,
 create,
 deps,
 'useLayoutEffect',
 );
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
 HookLayout,
 imperativeHandleEffect.bind(null, create, ref),
 effectDeps,
 'useImperativeHandle',
 );
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCallback');
 const nextDeps = deps === undefined ? null : deps;
 hook.memoizedState = [callback, nextDeps];
 return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
 nextCreate: () => T,
 deps: Array<mixed> | void | null,
): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useMemo');
 const nextDeps = deps === undefined ? null : deps;
 const nextValue = nextCreate();
 if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useDeferredValue');
 return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
 boolean,
 (callback: () => void, options?: StartTransitionOptions) => void,
] {
 const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const stateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 'useTransition',
 );
 // The `start` method never changes.
 const start = startTransition.bind(
 null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
 true,
 false,
 );
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(null);
 hook.memoizedState = start;
 return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useId');

 const root = ((getWorkInProgressRoot(): any): FiberRoot);
 // TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCacheRefresh');
 const refresh = (hook.memoizedState = refreshCache.bind(
 null,
 currentlyRenderingFiber,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add type identifier to every hook#34933

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

 Closed

blazejkustra
wants to merge
1
commit into

from

 Closed


Add type identifier to every hook
#34933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


71 changes: 49 additions & 22 deletions
packages/react-reconciler/src/ReactFiberHooks.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,7 @@ export type Hook = {
 baseQueue: Update<any, any> | null,
 queue: any,
 next: Hook | null,
 type: HookType | null,
};

// The effect "instance" is a shared object that remains the same for the entire
Expand DownExpand Up@@ -977,7 +978,7 @@ export function resetHooksOnUnwind(workInProgress: Fiber): void {
 thenableState = null;
}

function mountWorkInProgressHook(): Hook {
function mountWorkInProgressHook(type: HookType | null): Hook {
 const hook: Hook = {
 memoizedState: null,

Expand All@@ -986,6 +987,7 @@ function mountWorkInProgressHook(): Hook {
 queue: null,

 next: null,
 type,
 };

 if (workInProgressHook === null) {
Expand DownExpand Up@@ -1259,7 +1261,7 @@ function mountReducer<S, I, A>(
 initialArg: I,
 init?: I => S,
): [S, Dispatch<A>] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useReducer');
 let initialState;
 if (init !== undefined) {
 initialState = init(initialArg);
Expand DownExpand Up@@ -1637,7 +1639,7 @@ function mountSyncExternalStore<T>(
 getServerSnapshot?: () => T,
): T {
 const fiber = currentlyRenderingFiber;
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useSyncExternalStore');

 let nextSnapshot;
 const isHydrating = getIsHydrating();
Expand DownExpand Up@@ -1892,8 +1894,11 @@ function forceStoreRerender(fiber: Fiber) {
 }
}

function mountStateImpl<S>(initialState: (() => S) | S): Hook {
 const hook = mountWorkInProgressHook();
function mountStateImpl<S>(
 initialState: (() => S) | S,
 type: HookType | null,
): Hook {
 const hook = mountWorkInProgressHook(type);
 if (typeof initialState === 'function') {
 const initialStateInitializer = initialState;
 // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types
Expand DownExpand Up@@ -1923,7 +1928,7 @@ function mountStateImpl<S>(initialState: (() => S) | S): Hook {
function mountState<S>(
 initialState: (() => S) | S,
): [S, Dispatch<BasicStateAction<S>>] {
 const hook = mountStateImpl(initialState);
 const hook = mountStateImpl(initialState, 'useState');
 const queue = hook.queue;
 const dispatch: Dispatch<BasicStateAction<S>> = (dispatchSetState.bind(
 null,
Expand All@@ -1950,7 +1955,7 @@ function mountOptimistic<S, A>(
 passthrough: S,
 reducer: ?(S, A) => S,
): [S, (A) => void] {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useOptimistic');
 hook.memoizedState = hook.baseState = passthrough;
 const queue: UpdateQueue<S, A> = {
 pending: null,
Expand DownExpand Up@@ -2377,7 +2382,7 @@ function mountActionState<S, P>(

 // State hook. The state is stored in a thenable which is then unwrapped by
 // the `use` algorithm during render.
 const stateHook = mountWorkInProgressHook();
 const stateHook = mountWorkInProgressHook('useActionState');
 stateHook.memoizedState = stateHook.baseState = initialState;
 // TODO: Typing this "correctly" results in recursion limit errors
 // const stateQueue: UpdateQueue<S | Awaited<S>, S | Awaited<S>> = {
Expand All@@ -2398,7 +2403,10 @@ function mountActionState<S, P>(

 // Pending state. This is used to store the pending state of the action.
 // Tracked optimistically, like a transition pending state.
 const pendingStateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const pendingStateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 null,
 );
 const setPendingState: boolean => void = (dispatchOptimisticSetState.bind(
 null,
 currentlyRenderingFiber,
Expand All@@ -2413,7 +2421,7 @@ function mountActionState<S, P>(
 // shared between all instances of the hook. Similar to a regular state queue,
 // but different because the actions are run sequentially, and they run in
 // an event instead of during render.
 const actionQueueHook = mountWorkInProgressHook();
 const actionQueueHook = mountWorkInProgressHook(null);
 const actionQueue: ActionStateQueue<S, P> = {
 state: initialState,
 dispatch: (null: any), // circular
Expand DownExpand Up@@ -2601,7 +2609,7 @@ function createEffectInstance(): EffectInstance {
}

function mountRef<T>(initialValue: T): {current: T} {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useRef');
 const ref = {current: initialValue};
 hook.memoizedState = ref;
 return ref;
Expand All@@ -2617,8 +2625,9 @@ function mountEffectImpl(
 hookFlags: HookFlags,
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
 type: HookType | null,
): void {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(type);
 const nextDeps = deps === undefined ? null : deps;
 currentlyRenderingFiber.flags |= fiberFlags;
 hook.memoizedState = pushSimpleEffect(
Expand DownExpand Up@@ -2682,13 +2691,15 @@ function mountEffect(
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 } else {
 mountEffectImpl(
 PassiveEffect | PassiveStaticEffect,
 HookPassive,
 create,
 deps,
 'useEffect',
 );
 }
}
Expand DownExpand Up@@ -2723,7 +2734,7 @@ function useEffectEventImpl<Args, Return, F: (...Array<Args>) => Return>(
function mountEvent<Args, Return, F: (...Array<Args>) => Return>(
 callback: F,
): F {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useEffectEvent');
 const ref = {impl: callback};
 hook.memoizedState = ref;
 // $FlowIgnore[incompatible-return]
Expand DownExpand Up@@ -2758,7 +2769,13 @@ function mountInsertionEffect(
 create: () => (() => void) | void,
 deps: Array<mixed> | void | null,
): void {
 mountEffectImpl(UpdateEffect, HookInsertion, create, deps);
 mountEffectImpl(
 UpdateEffect,
 HookInsertion,
 create,
 deps,
 'useInsertionEffect',
 );
}

function updateInsertionEffect(
Expand All@@ -2779,7 +2796,13 @@ function mountLayoutEffect(
 ) {
 fiberFlags |= MountLayoutDevEffect;
 }
 return mountEffectImpl(fiberFlags, HookLayout, create, deps);
 return mountEffectImpl(
 fiberFlags,
 HookLayout,
 create,
 deps,
 'useLayoutEffect',
 );
}

function updateLayoutEffect(
Expand DownExpand Up@@ -2855,6 +2878,7 @@ function mountImperativeHandle<T>(
 HookLayout,
 imperativeHandleEffect.bind(null, create, ref),
 effectDeps,
 'useImperativeHandle',
 );
}

Expand DownExpand Up@@ -2894,7 +2918,7 @@ function mountDebugValue<T>(value: T, formatterFn: ?(value: T) => mixed): void {
const updateDebugValue = mountDebugValue;

function mountCallback<T>(callback: T, deps: Array<mixed> | void | null): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCallback');
 const nextDeps = deps === undefined ? null : deps;
 hook.memoizedState = [callback, nextDeps];
 return callback;
Expand All@@ -2918,7 +2942,7 @@ function mountMemo<T>(
 nextCreate: () => T,
 deps: Array<mixed> | void | null,
): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useMemo');
 const nextDeps = deps === undefined ? null : deps;
 const nextValue = nextCreate();
 if (shouldDoubleInvokeUserFnsInHooksDEV) {
Expand DownExpand Up@@ -2961,7 +2985,7 @@ function updateMemo<T>(
}

function mountDeferredValue<T>(value: T, initialValue?: T): T {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useDeferredValue');
 return mountDeferredValueImpl(hook, value, initialValue);
}

Expand DownExpand Up@@ -3399,7 +3423,10 @@ function mountTransition(): [
 boolean,
 (callback: () => void, options?: StartTransitionOptions) => void,
] {
 const stateHook = mountStateImpl((false: Thenable<boolean> | boolean));
 const stateHook = mountStateImpl(
 (false: Thenable<boolean> | boolean),
 'useTransition',
 );
 // The `start` method never changes.
 const start = startTransition.bind(
 null,
Expand All@@ -3408,7 +3435,7 @@ function mountTransition(): [
 true,
 false,
 );
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook(null);
 hook.memoizedState = start;
 return [false, start];
}
Expand DownExpand Up@@ -3448,7 +3475,7 @@ function useHostTransitionStatus(): TransitionStatus {
}

function mountId(): string {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useId');

 const root = ((getWorkInProgressRoot(): any): FiberRoot);
 // TODO: In Fizz, id generation is specific to each server config. Maybe we
Expand DownExpand Up@@ -3491,7 +3518,7 @@ function updateId(): string {
}

function mountRefresh(): any {
 const hook = mountWorkInProgressHook();
 const hook = mountWorkInProgressHook('useCacheRefresh');
 const refresh = (hook.memoizedState = refreshCache.bind(
 null,
 currentlyRenderingFiber,
Expand Down
Loading