Skip to content

Complete DOMPluginEventSystem migration to createRoot #28148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2024
+39 −14
Merged

Complete DOMPluginEventSystem migration to createRoot #28148

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
53 changes: 39 additions & 14 deletions packages/react-dom/src/events/__tests__/DOMPluginEventSystem-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,8 @@ describe('DOMPluginEventSystem', () => {
expect(log[9]).toEqual(['bubble', buttonElement]);
});

it('handle propagation of click events between disjointed legacy comment roots', () => {
// @gate !disableCommentsAsDOMContainers
it('handle propagation of click events between disjointed comment roots', async () => {
const buttonRef = React.createRef();
const divRef = React.createRef();
const log = [];
Expand Down Expand Up @@ -454,19 +455,29 @@ describe('DOMPluginEventSystem', () => {
const disjointedNode = document.createComment(
' react-mount-point-unstable ',
);
ReactDOM.render(<Parent />, container);
const root = ReactDOMClient.createRoot(container);
await act(() => {
root.render(<Parent />);
});
buttonRef.current.appendChild(disjointedNode);
ReactDOM.render(<Child />, disjointedNode);
const disjointedNodeRoot = ReactDOMClient.createRoot(disjointedNode);
await act(() => {
disjointedNodeRoot.render(<Child />);
});

const buttonElement = buttonRef.current;
dispatchClickEvent(buttonElement);
await act(() => {
dispatchClickEvent(buttonElement);
});
expect(onClick).toHaveBeenCalledTimes(1);
expect(onClickCapture).toHaveBeenCalledTimes(1);
expect(log[0]).toEqual(['capture', buttonElement]);
expect(log[1]).toEqual(['bubble', buttonElement]);

const divElement = divRef.current;
dispatchClickEvent(divElement);
await act(() => {
dispatchClickEvent(divElement);
});
expect(onClick).toHaveBeenCalledTimes(3);
expect(onClickCapture).toHaveBeenCalledTimes(3);
expect(log[2]).toEqual(['capture', buttonElement]);
Expand All @@ -475,7 +486,8 @@ describe('DOMPluginEventSystem', () => {
expect(log[5]).toEqual(['bubble', buttonElement]);
});

it('handle propagation of click events between disjointed legacy comment roots #2', () => {
// @gate !disableCommentsAsDOMContainers
it('handle propagation of click events between disjointed comment roots #2', async () => {
const buttonRef = React.createRef();
const divRef = React.createRef();
const spanRef = React.createRef();
Expand Down Expand Up @@ -511,19 +523,29 @@ describe('DOMPluginEventSystem', () => {
const disjointedNode = document.createComment(
' react-mount-point-unstable ',
);
ReactDOM.render(<Parent />, container);
const root = ReactDOMClient.createRoot(container);
await act(() => {
root.render(<Parent />);
});
spanRef.current.appendChild(disjointedNode);
ReactDOM.render(<Child />, disjointedNode);
const disjointedNodeRoot = ReactDOMClient.createRoot(disjointedNode);
await act(() => {
disjointedNodeRoot.render(<Child />);
});

const buttonElement = buttonRef.current;
dispatchClickEvent(buttonElement);
await act(() => {
dispatchClickEvent(buttonElement);
});
expect(onClick).toHaveBeenCalledTimes(1);
expect(onClickCapture).toHaveBeenCalledTimes(1);
expect(log[0]).toEqual(['capture', buttonElement]);
expect(log[1]).toEqual(['bubble', buttonElement]);

const divElement = divRef.current;
dispatchClickEvent(divElement);
await act(() => {
dispatchClickEvent(divElement);
});
expect(onClick).toHaveBeenCalledTimes(3);
expect(onClickCapture).toHaveBeenCalledTimes(3);
expect(log[2]).toEqual(['capture', buttonElement]);
Expand Down Expand Up @@ -2854,8 +2876,8 @@ describe('DOMPluginEventSystem', () => {
document.body.removeChild(container2);
});

// @gate www
it('handle propagation of click events between disjointed legacy comment roots', async () => {
// @gate !disableCommentsAsDOMContainers
it('handle propagation of click events between disjointed comment roots', async () => {
const buttonRef = React.createRef();
const divRef = React.createRef();
const log = [];
Expand Down Expand Up @@ -2902,12 +2924,15 @@ describe('DOMPluginEventSystem', () => {
const disjointedNode = document.createComment(
' react-mount-point-unstable ',
);
const root = ReactDOMClient.createRoot(container);
await act(() => {
ReactDOM.render(<Parent />, container);
root.render(<Parent />);
});
buttonRef.current.appendChild(disjointedNode);
const disjointedNodeRoot =
ReactDOMClient.createRoot(disjointedNode);
await act(() => {
ReactDOM.render(<Child />, disjointedNode);
disjointedNodeRoot.render(<Child />);
});

const buttonElement = buttonRef.current;
Expand Down