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.

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

Convert BeforeInputEventPlugin to createRoot #28199

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Convert BeforeInputEventPlugin to createRoot #28199

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
127 changes: 70 additions & 57 deletions packages/react-dom/src/events/plugins/__tests__/BeforeInputEventPlugin-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@
'use strict';

let React;
let ReactDOM;
let ReactDOMClient;
let act;

describe('BeforeInputEventPlugin', () => {
let container;

function loadReactDOM(envSimulator) {
function loadReactDOMClientAndAct(envSimulator) {
jest.resetModules();
if (envSimulator) {
envSimulator();
}
return require('react-dom');
return {
ReactDOMClient: require('react-dom/client'),
act: require('internal-test-utils').act,
};
}

function simulateIE11() {
Expand Down Expand Up @@ -724,32 +728,36 @@ describe('BeforeInputEventPlugin', () => {
},
];

const testInputComponent = (env, scenes) => {
const testInputComponent = async (env, scenes) => {
let beforeInputEvent;
let compositionStartEvent;
let compositionUpdateEvent;
let spyOnBeforeInput;
let spyOnCompositionStart;
let spyOnCompositionUpdate;
ReactDOM = loadReactDOM(env.emulator);
const node = ReactDOM.render(
<input
type="text"
onBeforeInput={e => {
spyOnBeforeInput();
beforeInputEvent = e;
}}
onCompositionStart={e => {
spyOnCompositionStart();
compositionStartEvent = e;
}}
onCompositionUpdate={e => {
spyOnCompositionUpdate();
compositionUpdateEvent = e;
}}
/>,
container,
);
({ReactDOMClient, act} = loadReactDOMClientAndAct(env.emulator));
const root = ReactDOMClient.createRoot(container);
await act(() => {
root.render(
<input
type="text"
onBeforeInput={e => {
spyOnBeforeInput();
beforeInputEvent = e;
}}
onCompositionStart={e => {
spyOnCompositionStart();
compositionStartEvent = e;
}}
onCompositionUpdate={e => {
spyOnCompositionUpdate();
compositionUpdateEvent = e;
}}
/>,
);
});

const node = container.firstChild;

scenes.forEach((s, id) => {
beforeInputEvent = null;
Expand All @@ -770,32 +778,37 @@ describe('BeforeInputEventPlugin', () => {
});
};

const testContentEditableComponent = (env, scenes) => {
const testContentEditableComponent = async (env, scenes) => {
let beforeInputEvent;
let compositionStartEvent;
let compositionUpdateEvent;
let spyOnBeforeInput;
let spyOnCompositionStart;
let spyOnCompositionUpdate;
ReactDOM = loadReactDOM(env.emulator);
const node = ReactDOM.render(
<div
contentEditable={true}
onBeforeInput={e => {
spyOnBeforeInput();
beforeInputEvent = e;
}}
onCompositionStart={e => {
spyOnCompositionStart();
compositionStartEvent = e;
}}
onCompositionUpdate={e => {
spyOnCompositionUpdate();
compositionUpdateEvent = e;
}}
/>,
container,
);
({ReactDOMClient, act} = loadReactDOMClientAndAct(env.emulator));
const root = ReactDOMClient.createRoot(container);

await act(() => {
root.render(
<div
contentEditable={true}
onBeforeInput={e => {
spyOnBeforeInput();
beforeInputEvent = e;
}}
onCompositionStart={e => {
spyOnCompositionStart();
compositionStartEvent = e;
}}
onCompositionUpdate={e => {
spyOnCompositionUpdate();
compositionUpdateEvent = e;
}}
/>,
);
});

const node = container.firstChild;

scenes.forEach((s, id) => {
beforeInputEvent = null;
Expand All @@ -816,33 +829,33 @@ describe('BeforeInputEventPlugin', () => {
});
};

it('should extract onBeforeInput when simulating in Webkit on input[type=text]', () => {
testInputComponent(environments[0], scenarios);
it('should extract onBeforeInput when simulating in Webkit on input[type=text]', async () => {
await testInputComponent(environments[0], scenarios);
});
it('should extract onBeforeInput when simulating in Webkit on contenteditable', () => {
testContentEditableComponent(environments[0], scenarios);
it('should extract onBeforeInput when simulating in Webkit on contenteditable', async () => {
await testContentEditableComponent(environments[0], scenarios);
});

it('should extract onBeforeInput when simulating in IE11 on input[type=text]', () => {
testInputComponent(environments[1], scenarios);
it('should extract onBeforeInput when simulating in IE11 on input[type=text]', async () => {
await testInputComponent(environments[1], scenarios);
});
it('should extract onBeforeInput when simulating in IE11 on contenteditable', () => {
testContentEditableComponent(environments[1], scenarios);
it('should extract onBeforeInput when simulating in IE11 on contenteditable', async () => {
await testContentEditableComponent(environments[1], scenarios);
});

it('should extract onBeforeInput when simulating in env with no CompositionEvent on input[type=text]', () => {
testInputComponent(environments[2], scenarios);
it('should extract onBeforeInput when simulating in env with no CompositionEvent on input[type=text]', async () => {
await testInputComponent(environments[2], scenarios);
});

// in an environment using composition fallback onBeforeInput will not work
// as expected on a contenteditable as keydown and keyup events are translated
// to keypress events

it('should extract onBeforeInput when simulating in env with only CompositionEvent on input[type=text]', () => {
testInputComponent(environments[3], scenarios);
it('should extract onBeforeInput when simulating in env with only CompositionEvent on input[type=text]', async () => {
await testInputComponent(environments[3], scenarios);
});

it('should extract onBeforeInput when simulating in env with only CompositionEvent on contenteditable', () => {
testContentEditableComponent(environments[3], scenarios);
it('should extract onBeforeInput when simulating in env with only CompositionEvent on contenteditable', async () => {
await testContentEditableComponent(environments[3], scenarios);
});
});