mirror of
https://github.com/zebrajr/react.git
synced 2025-12-06 00:20:04 +01:00
Revert "Fix:- Improve HOC support and state preservation in React Refresh" (#32214)
Reverts facebook/react#30660 I don’t feel confident in the approach. This part of code is supposed to rely on the module bundler behaving as expected. _Maybe_ this is correct but I need to review it closer — it was intentionally _not_ implemented this way originally. I’ll try to take a closer look some time this week. We don’t have to merge this revert right now but just flagging that I don’t understand the thinking behind the new approach and don’t have confidence in it.
This commit is contained in:
dan
GitHub
parent
476f53879e
commit
86d5ac0882
68
packages/react-refresh/src/ReactFreshRuntime.js
vendored
68
packages/react-refresh/src/ReactFreshRuntime.js
vendored
|
|
@ -146,21 +146,6 @@ function canPreserveStateBetween(prevType: any, nextType: any) {
|
|||
if (isReactClass(prevType) || isReactClass(nextType)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (typeof prevType !== typeof nextType) {
|
||||
return false;
|
||||
} else if (
|
||||
typeof prevType === 'object' &&
|
||||
prevType !== null &&
|
||||
nextType !== null
|
||||
) {
|
||||
if (
|
||||
getProperty(prevType, '$$typeof') !== getProperty(nextType, '$$typeof')
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (haveEqualSignatures(prevType, nextType)) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -198,18 +183,6 @@ function getProperty(object: any, property: string) {
|
|||
}
|
||||
}
|
||||
|
||||
function registerRefreshUpdate(
|
||||
update: RefreshUpdate,
|
||||
family: Family,
|
||||
shouldPreserveState: boolean,
|
||||
) {
|
||||
if (shouldPreserveState) {
|
||||
update.updatedFamilies.add(family);
|
||||
} else {
|
||||
update.staleFamilies.add(family);
|
||||
}
|
||||
}
|
||||
|
||||
export function performReactRefresh(): RefreshUpdate | null {
|
||||
if (!__DEV__) {
|
||||
throw new Error(
|
||||
|
|
@ -227,11 +200,6 @@ export function performReactRefresh(): RefreshUpdate | null {
|
|||
try {
|
||||
const staleFamilies = new Set<Family>();
|
||||
const updatedFamilies = new Set<Family>();
|
||||
// TODO: rename these fields to something more meaningful.
|
||||
const update: RefreshUpdate = {
|
||||
updatedFamilies, // Families that will re-render preserving state
|
||||
staleFamilies, // Families that will be remounted
|
||||
};
|
||||
|
||||
const updates = pendingUpdates;
|
||||
pendingUpdates = [];
|
||||
|
|
@ -243,34 +211,20 @@ export function performReactRefresh(): RefreshUpdate | null {
|
|||
updatedFamiliesByType.set(nextType, family);
|
||||
family.current = nextType;
|
||||
|
||||
const shouldPreserveState = canPreserveStateBetween(prevType, nextType);
|
||||
|
||||
if (typeof prevType === 'object' && prevType !== null) {
|
||||
const nextFamily = {
|
||||
current:
|
||||
getProperty(nextType, '$$typeof') === REACT_FORWARD_REF_TYPE
|
||||
? nextType.render
|
||||
: getProperty(nextType, '$$typeof') === REACT_MEMO_TYPE
|
||||
? nextType.type
|
||||
: nextType,
|
||||
};
|
||||
switch (getProperty(prevType, '$$typeof')) {
|
||||
case REACT_FORWARD_REF_TYPE: {
|
||||
updatedFamiliesByType.set(prevType.render, nextFamily);
|
||||
registerRefreshUpdate(update, nextFamily, shouldPreserveState);
|
||||
break;
|
||||
}
|
||||
case REACT_MEMO_TYPE:
|
||||
updatedFamiliesByType.set(prevType.type, nextFamily);
|
||||
registerRefreshUpdate(update, nextFamily, shouldPreserveState);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Determine whether this should be a re-render or a re-mount.
|
||||
registerRefreshUpdate(update, family, shouldPreserveState);
|
||||
if (canPreserveStateBetween(prevType, nextType)) {
|
||||
updatedFamilies.add(family);
|
||||
} else {
|
||||
staleFamilies.add(family);
|
||||
}
|
||||
});
|
||||
|
||||
// TODO: rename these fields to something more meaningful.
|
||||
const update: RefreshUpdate = {
|
||||
updatedFamilies, // Families that will re-render preserving state
|
||||
staleFamilies, // Families that will be remounted
|
||||
};
|
||||
|
||||
helpersByRendererID.forEach(helpers => {
|
||||
// Even if there are no roots, set the handler on first update.
|
||||
// This ensures that if *new* roots are mounted, they'll use the resolve handler.
|
||||
|
|
|
|||
|
|
@ -699,242 +699,6 @@ describe('ReactFresh', () => {
|
|||
}
|
||||
});
|
||||
|
||||
it('can remount when change function to memo', async () => {
|
||||
if (__DEV__) {
|
||||
await act(async () => {
|
||||
await render(() => {
|
||||
function Test() {
|
||||
return <p>hi test</p>;
|
||||
}
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
// Check the initial render
|
||||
const el = container.firstChild;
|
||||
expect(el.textContent).toBe('hi test');
|
||||
|
||||
// Patch to change function to memo
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
function Test2() {
|
||||
return <p>hi memo</p>;
|
||||
}
|
||||
const Test = React.memo(Test2);
|
||||
$RefreshReg$(Test2, 'Test2');
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
// Check remount
|
||||
expect(container.firstChild).not.toBe(el);
|
||||
const nextEl = container.firstChild;
|
||||
expect(nextEl.textContent).toBe('hi memo');
|
||||
|
||||
// Patch back to original function
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
function Test() {
|
||||
return <p>hi test</p>;
|
||||
}
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
// Check final remount
|
||||
expect(container.firstChild).not.toBe(nextEl);
|
||||
const newEl = container.firstChild;
|
||||
expect(newEl.textContent).toBe('hi test');
|
||||
}
|
||||
});
|
||||
|
||||
it('can remount when change memo to forwardRef', async () => {
|
||||
if (__DEV__) {
|
||||
await act(async () => {
|
||||
await render(() => {
|
||||
function Test2() {
|
||||
return <p>hi memo</p>;
|
||||
}
|
||||
const Test = React.memo(Test2);
|
||||
$RefreshReg$(Test2, 'Test2');
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
// Check the initial render
|
||||
const el = container.firstChild;
|
||||
expect(el.textContent).toBe('hi memo');
|
||||
|
||||
// Patch to change memo to forwardRef
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
function Test2() {
|
||||
return <p>hi forwardRef</p>;
|
||||
}
|
||||
const Test = React.forwardRef(Test2);
|
||||
$RefreshReg$(Test2, 'Test2');
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
// Check remount
|
||||
expect(container.firstChild).not.toBe(el);
|
||||
const nextEl = container.firstChild;
|
||||
expect(nextEl.textContent).toBe('hi forwardRef');
|
||||
|
||||
// Patch back to memo
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
function Test2() {
|
||||
return <p>hi memo</p>;
|
||||
}
|
||||
const Test = React.memo(Test2);
|
||||
$RefreshReg$(Test2, 'Test2');
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
// Check final remount
|
||||
expect(container.firstChild).not.toBe(nextEl);
|
||||
const newEl = container.firstChild;
|
||||
expect(newEl.textContent).toBe('hi memo');
|
||||
}
|
||||
});
|
||||
|
||||
it('can remount when change function to forwardRef', async () => {
|
||||
if (__DEV__) {
|
||||
await act(async () => {
|
||||
await render(() => {
|
||||
function Test() {
|
||||
return <p>hi test</p>;
|
||||
}
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
// Check the initial render
|
||||
const el = container.firstChild;
|
||||
expect(el.textContent).toBe('hi test');
|
||||
|
||||
// Patch to change function to forwardRef
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
function Test2() {
|
||||
return <p>hi forwardRef</p>;
|
||||
}
|
||||
const Test = React.forwardRef(Test2);
|
||||
$RefreshReg$(Test2, 'Test2');
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
// Check remount
|
||||
expect(container.firstChild).not.toBe(el);
|
||||
const nextEl = container.firstChild;
|
||||
expect(nextEl.textContent).toBe('hi forwardRef');
|
||||
|
||||
// Patch back to a new function
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
function Test() {
|
||||
return <p>hi test1</p>;
|
||||
}
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
// Check final remount
|
||||
expect(container.firstChild).not.toBe(nextEl);
|
||||
const newEl = container.firstChild;
|
||||
expect(newEl.textContent).toBe('hi test1');
|
||||
}
|
||||
});
|
||||
|
||||
it('resets state when switching between different component types', async () => {
|
||||
if (__DEV__) {
|
||||
await act(async () => {
|
||||
await render(() => {
|
||||
function Test() {
|
||||
const [count, setCount] = React.useState(0);
|
||||
return (
|
||||
<div onClick={() => setCount(c => c + 1)}>count: {count}</div>
|
||||
);
|
||||
}
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
expect(container.firstChild.textContent).toBe('count: 0');
|
||||
await act(async () => {
|
||||
container.firstChild.click();
|
||||
});
|
||||
expect(container.firstChild.textContent).toBe('count: 1');
|
||||
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
function Test2() {
|
||||
const [count, setCount] = React.useState(0);
|
||||
return (
|
||||
<div onClick={() => setCount(c => c + 1)}>count: {count}</div>
|
||||
);
|
||||
}
|
||||
const Test = React.memo(Test2);
|
||||
$RefreshReg$(Test2, 'Test2');
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
expect(container.firstChild.textContent).toBe('count: 0');
|
||||
await act(async () => {
|
||||
container.firstChild.click();
|
||||
});
|
||||
expect(container.firstChild.textContent).toBe('count: 1');
|
||||
|
||||
await act(async () => {
|
||||
await patch(() => {
|
||||
const Test = React.forwardRef((props, ref) => {
|
||||
const [count, setCount] = React.useState(0);
|
||||
const handleClick = () => setCount(c => c + 1);
|
||||
|
||||
// Ensure ref is extensible
|
||||
const divRef = React.useRef(null);
|
||||
React.useEffect(() => {
|
||||
if (ref) {
|
||||
if (typeof ref === 'function') {
|
||||
ref(divRef.current);
|
||||
} else if (Object.isExtensible(ref)) {
|
||||
ref.current = divRef.current;
|
||||
}
|
||||
}
|
||||
}, [ref]);
|
||||
|
||||
return (
|
||||
<div ref={divRef} onClick={handleClick}>
|
||||
count: {count}
|
||||
</div>
|
||||
);
|
||||
});
|
||||
$RefreshReg$(Test, 'Test');
|
||||
return Test;
|
||||
});
|
||||
});
|
||||
|
||||
expect(container.firstChild.textContent).toBe('count: 0');
|
||||
await act(async () => {
|
||||
container.firstChild.click();
|
||||
});
|
||||
expect(container.firstChild.textContent).toBe('count: 1');
|
||||
}
|
||||
});
|
||||
|
||||
it('can update simple memo function in isolation', async () => {
|
||||
if (__DEV__) {
|
||||
await render(() => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user