|
4 | 4 | * This source code is licensed under the MIT license found in the |
5 | 5 | * LICENSE file in the root directory of this source tree. |
6 | 6 | * |
7 | | - * @fantom_flags enableNativeEventTargetEventDispatching:* |
8 | 7 | * @fantom_flags enableImperativeEvents:* |
9 | 8 | * @flow strict-local |
10 | 9 | * @format |
@@ -480,13 +479,10 @@ describe('EventTarget-based Event Dispatching', () => { |
480 | 479 | }); |
481 | 480 |
|
482 | 481 | // --- addEventListener / removeEventListener on refs --- |
483 | | - // These tests require both `enableNativeEventTargetEventDispatching` and |
484 | | - // `enableImperativeEvents` to be enabled, since the public `addEventListener` |
485 | | - // API on element refs is only available when both flags are on. They are |
486 | | - // skipped for the other flag combinations. |
| 482 | + // These tests require `enableImperativeEvents` to be enabled, since the |
| 483 | + // public `addEventListener` API on element refs is only available then. |
487 | 484 |
|
488 | | - (ReactNativeFeatureFlags.enableNativeEventTargetEventDispatching() && |
489 | | - ReactNativeFeatureFlags.enableImperativeEvents() |
| 485 | + (ReactNativeFeatureFlags.enableImperativeEvents() === true |
490 | 486 | ? describe |
491 | 487 | : describe.skip)('addEventListener / removeEventListener', () => { |
492 | 488 | it('addEventListener on a ref receives dispatched events', () => { |
@@ -869,74 +865,66 @@ describe('EventTarget-based Event Dispatching', () => { |
869 | 865 | } |
870 | 866 | }); |
871 | 867 |
|
872 | | - (ReactNativeFeatureFlags.enableNativeEventTargetEventDispatching() |
873 | | - ? it |
874 | | - : it.skip)( |
875 | | - 'event.target points to the original target and event.currentTarget changes at each step', |
876 | | - () => { |
877 | | - const root = Fantom.createRoot(); |
878 | | - const parentRef = React.createRef<React.ElementRef<typeof View>>(); |
879 | | - const childRef = React.createRef<React.ElementRef<typeof View>>(); |
880 | | - const targets: Array<{target: unknown, currentTarget: unknown}> = []; |
| 868 | + it('event.target points to the original target and event.currentTarget changes at each step', () => { |
| 869 | + const root = Fantom.createRoot(); |
| 870 | + const parentRef = React.createRef<React.ElementRef<typeof View>>(); |
| 871 | + const childRef = React.createRef<React.ElementRef<typeof View>>(); |
| 872 | + const targets: Array<{target: unknown, currentTarget: unknown}> = []; |
881 | 873 |
|
882 | | - Fantom.runTask(() => { |
883 | | - root.render( |
| 874 | + Fantom.runTask(() => { |
| 875 | + root.render( |
| 876 | + <View |
| 877 | + ref={parentRef} |
| 878 | + onPointerUpCapture={(e: $FlowFixMe) => { |
| 879 | + targets.push({ |
| 880 | + target: e.target, |
| 881 | + currentTarget: e.currentTarget, |
| 882 | + }); |
| 883 | + }} |
| 884 | + onPointerUp={(e: $FlowFixMe) => { |
| 885 | + targets.push({ |
| 886 | + target: e.target, |
| 887 | + currentTarget: e.currentTarget, |
| 888 | + }); |
| 889 | + }}> |
884 | 890 | <View |
885 | | - ref={parentRef} |
886 | | - onPointerUpCapture={(e: $FlowFixMe) => { |
887 | | - targets.push({ |
888 | | - target: e.target, |
889 | | - currentTarget: e.currentTarget, |
890 | | - }); |
891 | | - }} |
| 891 | + ref={childRef} |
892 | 892 | onPointerUp={(e: $FlowFixMe) => { |
893 | 893 | targets.push({ |
894 | 894 | target: e.target, |
895 | 895 | currentTarget: e.currentTarget, |
896 | 896 | }); |
897 | | - }}> |
898 | | - <View |
899 | | - ref={childRef} |
900 | | - onPointerUp={(e: $FlowFixMe) => { |
901 | | - targets.push({ |
902 | | - target: e.target, |
903 | | - currentTarget: e.currentTarget, |
904 | | - }); |
905 | | - }} |
906 | | - /> |
907 | | - </View>, |
908 | | - ); |
909 | | - }); |
910 | | - |
911 | | - Fantom.dispatchNativeEvent( |
912 | | - childRef, |
913 | | - 'onPointerUp', |
914 | | - {x: 0, y: 0}, |
915 | | - { |
916 | | - category: Fantom.NativeEventCategory.Discrete, |
917 | | - }, |
| 897 | + }} |
| 898 | + /> |
| 899 | + </View>, |
918 | 900 | ); |
| 901 | + }); |
919 | 902 |
|
920 | | - expect(targets).toHaveLength(3); |
| 903 | + Fantom.dispatchNativeEvent( |
| 904 | + childRef, |
| 905 | + 'onPointerUp', |
| 906 | + {x: 0, y: 0}, |
| 907 | + { |
| 908 | + category: Fantom.NativeEventCategory.Discrete, |
| 909 | + }, |
| 910 | + ); |
921 | 911 |
|
922 | | - // event.target is always the original target element |
923 | | - expect(targets[0].target).toBe(childRef.current); |
924 | | - expect(targets[1].target).toBe(childRef.current); |
925 | | - expect(targets[2].target).toBe(childRef.current); |
| 912 | + expect(targets).toHaveLength(3); |
926 | 913 |
|
927 | | - // event.currentTarget changes at each propagation step |
928 | | - // Capture: parent |
929 | | - expect(targets[0].currentTarget).toBe(parentRef.current); |
930 | | - // Bubble: child, then parent |
931 | | - expect(targets[1].currentTarget).toBe(childRef.current); |
932 | | - expect(targets[2].currentTarget).toBe(parentRef.current); |
933 | | - }, |
934 | | - ); |
| 914 | + // event.target is always the original target element |
| 915 | + expect(targets[0].target).toBe(childRef.current); |
| 916 | + expect(targets[1].target).toBe(childRef.current); |
| 917 | + expect(targets[2].target).toBe(childRef.current); |
935 | 918 |
|
936 | | - (ReactNativeFeatureFlags.enableNativeEventTargetEventDispatching() && |
937 | | - ReactNativeFeatureFlags.enableImperativeEvents() |
938 | | - ? it |
939 | | - : it.skip)( |
| 919 | + // event.currentTarget changes at each propagation step |
| 920 | + // Capture: parent |
| 921 | + expect(targets[0].currentTarget).toBe(parentRef.current); |
| 922 | + // Bubble: child, then parent |
| 923 | + expect(targets[1].currentTarget).toBe(childRef.current); |
| 924 | + expect(targets[2].currentTarget).toBe(parentRef.current); |
| 925 | + }); |
| 926 | + |
| 927 | + (ReactNativeFeatureFlags.enableImperativeEvents() === true ? it : it.skip)( |
940 | 928 | 'direct (non-bubbling) events do not propagate via addEventListener', |
941 | 929 | () => { |
942 | 930 | const root = Fantom.createRoot(); |
@@ -983,8 +971,7 @@ describe('EventTarget-based Event Dispatching', () => { |
983 | 971 | }, |
984 | 972 | ); |
985 | 973 |
|
986 | | - (ReactNativeFeatureFlags.enableNativeEventTargetEventDispatching() && |
987 | | - ReactNativeFeatureFlags.enableImperativeEvents() |
| 974 | + (ReactNativeFeatureFlags.enableImperativeEvents() === true |
988 | 975 | ? describe |
989 | 976 | : describe.skip)('bubbling to document element and document', () => { |
990 | 977 | it('event bubbles from child up to the document element', () => { |
@@ -1374,9 +1361,7 @@ describe('EventTarget-based Event Dispatching', () => { |
1374 | 1361 | }); |
1375 | 1362 | }); |
1376 | 1363 |
|
1377 | | - (ReactNativeFeatureFlags.enableNativeEventTargetEventDispatching() |
1378 | | - ? describe |
1379 | | - : describe.skip)('event timestamps', () => { |
| 1364 | + describe('event timestamps', () => { |
1380 | 1365 | it('event preserves native timestamp from nativeEvent.timeStamp', () => { |
1381 | 1366 | const root = Fantom.createRoot(); |
1382 | 1367 | const ref = React.createRef<React.ElementRef<typeof View>>(); |
@@ -1661,11 +1646,8 @@ describe('EventTarget-based Event Dispatching', () => { |
1661 | 1646 | }); |
1662 | 1647 |
|
1663 | 1648 | // The dispatch-behavior tests use `addEventListener` on refs and the |
1664 | | - // document element, which is only available when both |
1665 | | - // `enableNativeEventTargetEventDispatching` and `enableImperativeEvents` |
1666 | | - // are enabled. |
1667 | | - (ReactNativeFeatureFlags.enableNativeEventTargetEventDispatching() && |
1668 | | - ReactNativeFeatureFlags.enableImperativeEvents() |
| 1649 | + // document element, which requires `enableImperativeEvents` to be enabled. |
| 1650 | + (ReactNativeFeatureFlags.enableImperativeEvents() === true |
1669 | 1651 | ? describe |
1670 | 1652 | : describe.skip)('direct events (rnIsDirect) — dispatch behavior', () => { |
1671 | 1653 | it('dispatches onLayout to the target but never to ancestor onLayout props or bubble listeners', () => { |
|
0 commit comments