Skip to content
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.

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

devtools: Display actual ReactDOM API name in root type #22363

Merged
merged 2 commits into from
Sep 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ describe('InspectedElement', () => {
"a": 1,
"b": "abc",
},
"rootType": "render()",
"state": null,
}
`);
Expand Down Expand Up @@ -1584,6 +1585,7 @@ describe('InspectedElement', () => {
"a": 1,
"b": "abc",
},
"rootType": "render()",
"state": null,
}
`);
Expand Down Expand Up @@ -1912,6 +1914,7 @@ describe('InspectedElement', () => {
"id": 2,
"owners": null,
"props": Object {},
"rootType": "render()",
"state": null,
}
`);
Expand Down Expand Up @@ -1944,11 +1947,67 @@ describe('InspectedElement', () => {
"id": 2,
"owners": null,
"props": Object {},
"rootType": "render()",
"state": null,
}
`);
});

it('should display the root type for ReactDOM.hydrate', async () => {
const Example = () => <div />;

await utils.actAsync(() => {
const container = document.createElement('div');
container.innerHTML = '<div></div>';
withErrorsOrWarningsIgnored(
['ReactDOM.hydrate is no longer supported in React 18'],
() => {
ReactDOM.hydrate(<Example />, container);
},
);
}, false);

const inspectedElement = await inspectElementAtIndex(0);
expect(inspectedElement.rootType).toMatchInlineSnapshot(`"hydrate()"`);
});

it('should display the root type for ReactDOM.render', async () => {
const Example = () => <div />;

await utils.actAsync(() => {
const container = document.createElement('div');
legacyRender(<Example />, container);
}, false);

const inspectedElement = await inspectElementAtIndex(0);
expect(inspectedElement.rootType).toMatchInlineSnapshot(`"render()"`);
});

it('should display the root type for ReactDOM.hydrateRoot', async () => {
const Example = () => <div />;

await utils.actAsync(() => {
const container = document.createElement('div');
container.innerHTML = '<div></div>';
ReactDOM.hydrateRoot(container).render(<Example />);
}, false);

const inspectedElement = await inspectElementAtIndex(0);
expect(inspectedElement.rootType).toMatchInlineSnapshot(`"hydrateRoot()"`);
});

it('should display the root type for ReactDOM.createRoot', async () => {
const Example = () => <div />;

await utils.actAsync(() => {
const container = document.createElement('div');
ReactDOM.createRoot(container).render(<Example />);
}, false);

const inspectedElement = await inspectElementAtIndex(0);
expect(inspectedElement.rootType).toMatchInlineSnapshot(`"createRoot()"`);
});

describe('$r', () => {
it('should support function components', async () => {
const Example = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export function print(inspectedElement, serialize, indent) {
id: inspectedElement.id,
owners: inspectedElement.owners,
props: inspectedElement.props,
rootType: inspectedElement.rootType,
state: inspectedElement.state,
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ describe('InspectedElementContext', () => {
"a": 1,
"b": "abc",
},
"rootType": null,
"state": null,
}
`);
Expand Down Expand Up @@ -133,6 +134,7 @@ describe('InspectedElementContext', () => {
"value_null": null,
"value_undefined": undefined,
},
"rootType": null,
"state": null,
}
`);
Expand Down Expand Up @@ -408,6 +410,7 @@ describe('InspectedElementContext', () => {
"preview_long": Generator,
},
},
"rootType": null,
"state": null,
}
`);
Expand Down Expand Up @@ -461,6 +464,7 @@ describe('InspectedElementContext', () => {
"number": 42,
},
},
"rootType": null,
"state": null,
}
`);
Expand Down Expand Up @@ -552,6 +556,7 @@ describe('InspectedElementContext', () => {
"enumerableStringBase": 1,
},
},
"rootType": null,
"state": null,
}
`);
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactFiberRoot.new.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ function FiberRootNode(containerInfo, tag, hydrate) {
if (__DEV__) {
switch (tag) {
case ConcurrentRoot:
this._debugRootType = 'createRoot()';
this._debugRootType = hydrate ? 'hydrateRoot()' : 'createRoot()';
break;
case LegacyRoot:
this._debugRootType = 'createLegacyRoot()';
this._debugRootType = hydrate ? 'hydrate()' : 'render()';
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactFiberRoot.old.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ function FiberRootNode(containerInfo, tag, hydrate) {
if (__DEV__) {
switch (tag) {
case ConcurrentRoot:
this._debugRootType = 'createRoot()';
this._debugRootType = hydrate ? 'hydrateRoot()' : 'createRoot()';
break;
case LegacyRoot:
this._debugRootType = 'createLegacyRoot()';
this._debugRootType = hydrate ? 'hydrate()' : 'render()';
break;
}
}
Expand Down