Skip to content

Commit 0518ab2

Browse files
committed
.
1 parent 9f734a1 commit 0518ab2

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

src/__tests__/deprecated-fire-event-sync.test.tsx renamed to src/__tests__/deprecated/fire-event-sync.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
View,
1010
} from 'react-native';
1111

12-
import { deprecated_fireEventSync, render, screen } from '..';
12+
import { deprecated_fireEventSync, render, screen } from '../..';
1313

1414
type OnPressComponentProps = {
1515
onPress: () => void;

src/__tests__/render-hook-sync.test.tsx renamed to src/__tests__/deprecated/render-hook-sync.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { ReactNode } from 'react';
22
import * as React from 'react';
33

4-
import { deprecated_renderHookSync } from '../pure';
4+
import { deprecated_renderHookSync } from '../../pure';
55

66
test('renders hook and returns committed result', () => {
77
const { result } = deprecated_renderHookSync(() => {

src/fire-event.ts

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ type EventName = StringWithAutocomplete<
126126
| EventNameExtractor<ScrollViewProps>
127127
>;
128128

129-
function deprecated_fireEventSync(element: HostElement, eventName: EventName, ...data: unknown[]) {
129+
async function fireEvent(element: HostElement, eventName: EventName, ...data: unknown[]) {
130130
if (!isElementMounted(element)) {
131131
return;
132132
}
@@ -139,23 +139,25 @@ function deprecated_fireEventSync(element: HostElement, eventName: EventName, ..
139139
}
140140

141141
let returnValue;
142-
void act(() => {
142+
// eslint-disable-next-line require-await
143+
await act(async () => {
143144
returnValue = handler(...data);
144145
});
145146

146147
return returnValue;
147148
}
148149

149-
deprecated_fireEventSync.press = (element: HostElement, ...data: unknown[]) =>
150-
deprecated_fireEventSync(element, 'press', ...data);
150+
fireEvent.press = async (element: HostElement, ...data: unknown[]) =>
151+
await fireEvent(element, 'press', ...data);
151152

152-
deprecated_fireEventSync.changeText = (element: HostElement, ...data: unknown[]) =>
153-
deprecated_fireEventSync(element, 'changeText', ...data);
153+
fireEvent.changeText = async (element: HostElement, ...data: unknown[]) =>
154+
await fireEvent(element, 'changeText', ...data);
154155

155-
deprecated_fireEventSync.scroll = (element: HostElement, ...data: unknown[]) =>
156-
deprecated_fireEventSync(element, 'scroll', ...data);
156+
fireEvent.scroll = async (element: HostElement, ...data: unknown[]) =>
157+
await fireEvent(element, 'scroll', ...data);
157158

158-
async function fireEvent(element: HostElement, eventName: EventName, ...data: unknown[]) {
159+
/** @deprecated - Use async `fireEvent` instead. */
160+
function deprecated_fireEventSync(element: HostElement, eventName: EventName, ...data: unknown[]) {
159161
if (!isElementMounted(element)) {
160162
return;
161163
}
@@ -168,25 +170,26 @@ async function fireEvent(element: HostElement, eventName: EventName, ...data: un
168170
}
169171

170172
let returnValue;
171-
// eslint-disable-next-line require-await
172-
await act(async () => {
173+
void act(() => {
173174
returnValue = handler(...data);
174175
});
175176

176177
return returnValue;
177178
}
178179

179-
fireEvent.press = async (element: HostElement, ...data: unknown[]) =>
180-
await fireEvent(element, 'press', ...data);
180+
/** @deprecated - Use async `fireEvent.press` instead. */
181+
deprecated_fireEventSync.press = (element: HostElement, ...data: unknown[]) =>
182+
deprecated_fireEventSync(element, 'press', ...data);
181183

182-
fireEvent.changeText = async (element: HostElement, ...data: unknown[]) =>
183-
await fireEvent(element, 'changeText', ...data);
184+
/** @deprecated - Use async `fireEvent.changeText` instead. */
185+
deprecated_fireEventSync.changeText = (element: HostElement, ...data: unknown[]) =>
186+
deprecated_fireEventSync(element, 'changeText', ...data);
184187

185-
fireEvent.scroll = async (element: HostElement, ...data: unknown[]) =>
186-
await fireEvent(element, 'scroll', ...data);
188+
/** @deprecated - Use async `fireEvent.scroll` instead. */
189+
deprecated_fireEventSync.scroll = (element: HostElement, ...data: unknown[]) =>
190+
deprecated_fireEventSync(element, 'scroll', ...data);
187191

188192
export { fireEvent, deprecated_fireEventSync };
189-
export default fireEvent;
190193

191194
const scrollEventNames = new Set([
192195
'scroll',

src/pure.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export { default as act } from './act';
22
export { default as cleanup, cleanupAsync } from './cleanup';
3-
export { default as fireEvent, deprecated_fireEventSync } from './fire-event';
3+
export { fireEvent, deprecated_fireEventSync } from './fire-event';
44
export { default as render } from './render';
55
export { default as renderAsync } from './render-async';
66
export { default as waitFor } from './wait-for';

0 commit comments

Comments
 (0)