diff --git a/packages/react-native/Libraries/Image/ImageBackground.js b/packages/react-native/Libraries/Image/ImageBackground.js index c08bf495576..2a3082e0955 100644 --- a/packages/react-native/Libraries/Image/ImageBackground.js +++ b/packages/react-native/Libraries/Image/ImageBackground.js @@ -55,14 +55,7 @@ class ImageBackground extends React.Component { _viewRef: ?React.ElementRef = null; - _captureRef = ( - ref: null | React$ElementRef< - React$AbstractComponent< - ViewProps, - React.ElementRef>, - >, - >, - ) => { + _captureRef = (ref: null | React.ElementRef>) => { this._viewRef = ref; }; diff --git a/packages/react-native/Libraries/Utilities/__tests__/useMergeRefs-test.js b/packages/react-native/Libraries/Utilities/__tests__/useMergeRefs-test.js index 770416c1296..a06d7da697d 100644 --- a/packages/react-native/Libraries/Utilities/__tests__/useMergeRefs-test.js +++ b/packages/react-native/Libraries/Utilities/__tests__/useMergeRefs-test.js @@ -89,11 +89,8 @@ function mockRefRegistry(): { test('accepts a callback ref', () => { let root; - const {mockCallbackRef, registry} = mockRefRegistry>, - >, + const {mockCallbackRef, registry} = mockRefRegistry, > | null>(); const refA = mockCallbackRef('refA'); @@ -126,11 +123,8 @@ test('accepts a callback ref', () => { test('accepts an object ref', () => { let root; - const {mockObjectRef, registry} = mockRefRegistry>, - >, + const {mockObjectRef, registry} = mockRefRegistry, > | null>(); const refA = mockObjectRef('refA'); @@ -164,12 +158,7 @@ test('invokes refs in order', () => { let root; const {mockCallbackRef, mockObjectRef, registry} = - mockRefRegistry>, - >, - > | null>(); + mockRefRegistry> | null>(); const refA = mockCallbackRef('refA'); const refB = mockObjectRef('refB'); const refC = mockCallbackRef('refC'); @@ -207,11 +196,8 @@ test('invokes refs in order', () => { test('invokes all refs if any ref changes', () => { let root; - const {mockCallbackRef, registry} = mockRefRegistry>, - >, + const {mockCallbackRef, registry} = mockRefRegistry, > | null>(); const refA = mockCallbackRef('refA'); const refB = mockCallbackRef('refB'); diff --git a/packages/rn-tester/js/examples/DrawerLayoutAndroid/DrawerLayoutAndroidExample.js b/packages/rn-tester/js/examples/DrawerLayoutAndroid/DrawerLayoutAndroidExample.js index 004ce324a22..c677c8947f7 100644 --- a/packages/rn-tester/js/examples/DrawerLayoutAndroid/DrawerLayoutAndroidExample.js +++ b/packages/rn-tester/js/examples/DrawerLayoutAndroid/DrawerLayoutAndroidExample.js @@ -24,7 +24,7 @@ import { const Drawer = () => { const theme = useContext(RNTesterThemeContext); - const drawer = useRef>(null); + const drawer = useRef(null); const [drawerPosition, setDrawerPosition] = useState('left'); const changeDrawerPosition = () => { if (drawerPosition === 'left') { diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js index 24efcc3c816..e2a19c25a71 100644 --- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js +++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js @@ -172,13 +172,7 @@ function PointerEventAttributesHoverablePointersTestCase( [harness], ); - const square1Ref = - useRef>, - >, - >>(); + const square1Ref = useRef>>(); const square1Handlers = useTestEventHandler(eventList, (event, eventType) => { if (!square1Visible) { return; @@ -207,13 +201,7 @@ function PointerEventAttributesHoverablePointersTestCase( } }); - const square2Ref = - useRef>, - >, - >>(); + const square2Ref = useRef>>(); const square2Handlers = useTestEventHandler(eventList, (event, eventType) => { const square2Elem = square2Ref.current; if (square2Elem != null) { diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js index 181b3ef1a1f..f337f6484a3 100644 --- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js +++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js @@ -140,13 +140,7 @@ function PointerEventAttributesNoHoverPointersTestCase( [harness], ); - const square1Ref = - useRef>, - >, - >>(); + const square1Ref = useRef>>(); const square1Handlers = useTestEventHandler(eventList, (event, eventType) => { if (!square1Visible) { return; @@ -175,13 +169,7 @@ function PointerEventAttributesNoHoverPointersTestCase( } }); - const square2Ref = - useRef>, - >, - >>(); + const square2Ref = useRef>>(); const square2Handlers = useTestEventHandler(eventList, (event, eventType) => { const square2Elem = square2Ref.current; if (square2Elem != null) { diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js index 0b274fed843..5358381de5d 100644 --- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js +++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js @@ -61,28 +61,14 @@ function PointerEventPointerOverOutTestCase( const outerNativeTagRef = useRef(-1); const handleInnerRefCallback = useCallback( - ( - elem: null | React$ElementRef< - React$AbstractComponent< - ViewProps, - React.ElementRef>, - >, - >, - ) => { + (elem: null | React.ElementRef>) => { const nativeTag = getNativeTagFromHostElement(elem); innerNativeTagRef.current = nativeTag != null ? nativeTag : -1; }, [], ); const handleOuterRefCallback = useCallback( - ( - elem: null | React$ElementRef< - React$AbstractComponent< - ViewProps, - React.ElementRef>, - >, - >, - ) => { + (elem: null | React.ElementRef>) => { const nativeTag = getNativeTagFromHostElement(elem); outerNativeTagRef.current = nativeTag != null ? nativeTag : -1; }, diff --git a/packages/virtualized-lists/Lists/VirtualizedSectionList.js b/packages/virtualized-lists/Lists/VirtualizedSectionList.js index de79239147a..9c4f11e8bb7 100644 --- a/packages/virtualized-lists/Lists/VirtualizedSectionList.js +++ b/packages/virtualized-lists/Lists/VirtualizedSectionList.js @@ -447,8 +447,8 @@ class VirtualizedSectionList< _updateHighlightMap: {[string]: (boolean) => void} = {}; _updatePropsMap: {[string]: void | (boolean => void)} = {}; - _listRef: ?React.ElementRef; - _captureRef = (ref: null | React$ElementRef>) => { + _listRef: ?VirtualizedList; + _captureRef = (ref: null | VirtualizedList) => { this._listRef = ref; }; }