Skip to content

Commit 416ee34

Browse files
trueadmtrueadm
committed
Fix conflicts
Fix flow fix conflict Add missing flag
1 parent 8b9df74 commit 416ee34

7 files changed

Lines changed: 64 additions & 24 deletions

File tree

‎packages/legacy-events/ReactGenericBatching.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,8 @@ export function flushDiscreteUpdatesIfNeeded(timeStamp: number) {
122122
if (
123123
!isInsideEventHandler &&
124124
((!enableDeprecatedFlareAPI && !enableListenerAPI) ||
125-
<<<<<<< HEAD
126-
(timeStamp === 0 || lastFlushedEventTimeStamp !== timeStamp))
127-
=======
128125
timeStamp === 0 ||
129126
lastFlushedEventTimeStamp !== timeStamp)
130-
>>>>>>> Fix prettier
131127
) {
132128
lastFlushedEventTimeStamp = timeStamp;
133129
flushDiscreteUpdatesImpl();

‎packages/react-dom/src/events/__tests__/DOMEventListenerSystem-test.internal.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,11 @@ describe('DOMEventListenerSystem', () => {
210210
click.setListener(buttonRef.current, clickEvent);
211211
});
212212

213-
React.useEffect(
214-
() => {
215-
if (off) {
216-
click.setListener(buttonRef.current, null);
217-
}
218-
},
219-
[off],
220-
);
213+
React.useEffect(() => {
214+
if (off) {
215+
click.setListener(buttonRef.current, null);
216+
}
217+
}, [off]);
221218

222219
return (
223220
<button ref={buttonRef}>

‎packages/react-native-renderer/src/ReactFabricHostConfig.js‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,18 +473,29 @@ export function beforeRemoveInstance(instance: any) {
473473
// noop
474474
}
475475

476-
export function registerListenerEvent(event): void {
476+
export function registerListenerEvent(event: any): void {
477477
// noop
478478
}
479479

480-
export function attachListenerToInstance(linstance, event, callback): any {
480+
export function attachListenerToInstance(
481+
linstance: any,
482+
event: any,
483+
callback: any,
484+
): any {
481485
// noop
482486
}
483487

484-
export function detachListenerFromInstance(instance, event, callback): any {
488+
export function detachListenerFromInstance(
489+
instance: any,
490+
event: any,
491+
callback: any,
492+
): any {
485493
// noop
486494
}
487495

488-
export function validateReactListenerMapSetListener(instance, listener): void {
496+
export function validateReactListenerMapSetListener(
497+
instance: any,
498+
listener: any,
499+
): void {
489500
// noop
490501
}

‎packages/react-native-renderer/src/ReactNativeHostConfig.js‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,18 +525,29 @@ export function beforeRemoveInstance(instance: any) {
525525
// noop
526526
}
527527

528-
export function registerListenerEvent(event): void {
528+
export function registerListenerEvent(event: any): void {
529529
// noop
530530
}
531531

532-
export function attachListenerToInstance(linstance, event, callback): any {
532+
export function attachListenerToInstance(
533+
linstance: any,
534+
event: any,
535+
callback: any,
536+
): any {
533537
// noop
534538
}
535539

536-
export function detachListenerFromInstance(instance, event, callback): any {
540+
export function detachListenerFromInstance(
541+
instance: any,
542+
event: any,
543+
callback: any,
544+
): any {
537545
// noop
538546
}
539547

540-
export function validateReactListenerMapSetListener(instance, listener): void {
548+
export function validateReactListenerMapSetListener(
549+
instance: any,
550+
listener: any,
551+
): void {
541552
// noop
542553
}

‎packages/react-reconciler/src/ReactFiberHooks.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import {
3333
Passive as PassiveEffect,
3434
} from 'shared/ReactSideEffectTags';
3535
import {
36+
NoEffect as NoHookEffect,
3637
HasEffect as HookHasEffect,
3738
Layout as HookLayout,
3839
Passive as HookPassive,
@@ -1600,6 +1601,7 @@ const HooksDispatcherOnRerender: Dispatcher = {
16001601
useResponder: createDeprecatedResponderListener,
16011602
useDeferredValue: rerenderDeferredValue,
16021603
useTransition: rerenderTransition,
1604+
useEvent: updateEventListener,
16031605
};
16041606

16051607
let HooksDispatcherOnMountInDEV: Dispatcher | null = null;
@@ -2115,6 +2117,11 @@ if (__DEV__) {
21152117
updateHookTypesDev();
21162118
return rerenderTransition(config);
21172119
},
2120+
useEvent(event: ReactListenerEvent): ReactListenerMap {
2121+
currentHookNameInDev = 'useEvent';
2122+
updateHookTypesDev();
2123+
return updateEventListener(event);
2124+
},
21182125
};
21192126

21202127
InvalidNestedHooksDispatcherOnMountInDEV = {
@@ -2520,5 +2527,11 @@ if (__DEV__) {
25202527
updateHookTypesDev();
25212528
return rerenderTransition(config);
25222529
},
2530+
useEvent(event: ReactListenerEvent): ReactListenerMap {
2531+
currentHookNameInDev = 'useEvent';
2532+
warnInvalidHookAccess();
2533+
updateHookTypesDev();
2534+
return updateEventListener(event);
2535+
},
25232536
};
25242537
}

‎packages/react-test-renderer/src/ReactTestHostConfig.js‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,18 +380,29 @@ export function beforeRemoveInstance(instance: any) {
380380
// noop
381381
}
382382

383-
export function registerListenerEvent(event): void {
383+
export function registerListenerEvent(event: any): void {
384384
// noop
385385
}
386386

387-
export function attachListenerToInstance(linstance, event, callback): any {
387+
export function attachListenerToInstance(
388+
linstance: any,
389+
event: any,
390+
callback: any,
391+
): any {
388392
// noop
389393
}
390394

391-
export function detachListenerFromInstance(instance, event, callback): any {
395+
export function detachListenerFromInstance(
396+
instance: any,
397+
event: any,
398+
callback: any,
399+
): any {
392400
// noop
393401
}
394402

395-
export function validateReactListenerMapSetListener(instance, listener): void {
403+
export function validateReactListenerMapSetListener(
404+
instance: any,
405+
listener: any,
406+
): void {
396407
// noop
397408
}

‎packages/shared/forks/ReactFeatureFlags.testing.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
2727
export const warnAboutShorthandPropertyCollision = false;
2828
export const enableSchedulerDebugging = false;
2929
export const enableDeprecatedFlareAPI = false;
30+
export const enableListenerAPI = false;
3031
export const enableFundamentalAPI = false;
3132
export const enableScopeAPI = false;
3233
export const enableJSXTransformAPI = false;

0 commit comments

Comments
 (0)