Skip to content

Commit a41ebfc

Browse files
authored
Use createRoot in useFocus-test (#28083)
1 parent b123b9c commit a41ebfc

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

packages/react-interactions/events/src/dom/create-event-handle/__tests__/useFocus-test.internal.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {createEventTarget, setPointerEvent} from 'dom-event-testing-library';
1313

1414
let React;
1515
let ReactFeatureFlags;
16-
let ReactDOM;
16+
let ReactDOMClient;
1717
let useFocus;
1818
let act;
1919

@@ -23,7 +23,7 @@ function initializeModules(hasPointerEvents) {
2323
ReactFeatureFlags = require('shared/ReactFeatureFlags');
2424
ReactFeatureFlags.enableCreateEventHandleAPI = true;
2525
React = require('react');
26-
ReactDOM = require('react-dom');
26+
ReactDOMClient = require('react-dom/client');
2727
act = require('internal-test-utils').act;
2828
// TODO: This import throws outside of experimental mode. Figure out better
2929
// strategy for gated imports.
@@ -45,7 +45,6 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
4545
});
4646

4747
afterEach(() => {
48-
ReactDOM.render(null, container);
4948
document.body.removeChild(container);
5049
container = null;
5150
});
@@ -65,8 +64,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
6564
});
6665
return <div ref={ref} />;
6766
};
67+
const root = ReactDOMClient.createRoot(container);
6868
await act(() => {
69-
ReactDOM.render(<Component />, container);
69+
root.render(<Component />);
7070
});
7171
};
7272

@@ -93,8 +93,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
9393
});
9494
return <div ref={ref} />;
9595
};
96+
const root = ReactDOMClient.createRoot(container);
9697
await act(() => {
97-
ReactDOM.render(<Component />, container);
98+
root.render(<Component />);
9899
});
99100
};
100101

@@ -125,8 +126,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
125126
</div>
126127
);
127128
};
129+
const root = ReactDOMClient.createRoot(container);
128130
await act(() => {
129-
ReactDOM.render(<Component />, container);
131+
root.render(<Component />);
130132
});
131133
};
132134

@@ -164,8 +166,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
164166
</div>
165167
);
166168
};
169+
const root = ReactDOMClient.createRoot(container);
167170
await act(() => {
168-
ReactDOM.render(<Component />, container);
171+
root.render(<Component />);
169172
});
170173
};
171174

@@ -209,8 +212,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
209212
</div>
210213
);
211214
};
215+
const root = ReactDOMClient.createRoot(container);
212216
await act(() => {
213-
ReactDOM.render(<Component />, container);
217+
root.render(<Component />);
214218
});
215219
};
216220

@@ -305,8 +309,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
305309
);
306310
};
307311

312+
const root = ReactDOMClient.createRoot(container);
308313
await act(() => {
309-
ReactDOM.render(<Outer />, container);
314+
root.render(<Outer />);
310315
});
311316
const innerTarget = createEventTarget(innerRef.current);
312317
const outerTarget = createEventTarget(outerRef.current);

0 commit comments

Comments
 (0)