Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup all uses of internal flow type React$ElementRef in react-native (#45904)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/45904

Flow will error on these dollar types soon. For all the ones changed here, they can all be further simplified.

Changelog: [Internal]

Reviewed By: gkz

Differential Revision: D60786768

fbshipit-source-id: e26bf0be1c4a933fc0bd8b59827e10cbd7242a83
This commit is contained in:
Sam Zhou
2024-08-05 14:51:30 -07:00
committed by Facebook GitHub Bot
parent fbcb3d469c
commit 4f47b385fa
7 changed files with 17 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/Libraries/Image/ImageBackground.js
Vendored
+1 -8
View File
@@ -55,14 +55,7 @@ class ImageBackground extends React.Component<ImageBackgroundProps> {
_viewRef: ?React.ElementRef<typeof View> = null;
_captureRef = (
ref: null | React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
>,
) => {
_captureRef = (ref: null | React.ElementRef<HostComponent<ViewProps>>) => {
this._viewRef = ref;
};
packages/react-native/Libraries/Utilities/__tests__/useMergeRefs-test.js
Vendored
+7 -21
View File
@@ -89,11 +89,8 @@ function mockRefRegistry<T>(): {
test('accepts a callback ref', () => {
let root;
const {mockCallbackRef, registry} = mockRefRegistry<React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
const {mockCallbackRef, registry} = mockRefRegistry<React.ElementRef<
HostComponent<ViewProps>,
> | 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<React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
const {mockObjectRef, registry} = mockRefRegistry<React.ElementRef<
HostComponent<ViewProps>,
> | null>();
const refA = mockObjectRef('refA');
@@ -164,12 +158,7 @@ test('invokes refs in order', () => {
let root;
const {mockCallbackRef, mockObjectRef, registry} =
mockRefRegistry<React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
> | null>();
mockRefRegistry<React.ElementRef<HostComponent<ViewProps>> | 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<React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
const {mockCallbackRef, registry} = mockRefRegistry<React.ElementRef<
HostComponent<ViewProps>,
> | null>();
const refA = mockCallbackRef('refA');
const refB = mockCallbackRef('refB');
packages/rn-tester/js/examples/DrawerLayoutAndroid/DrawerLayoutAndroidExample.js
+1 -1
View File
@@ -24,7 +24,7 @@ import {
const Drawer = () => {
const theme = useContext(RNTesterThemeContext);
const drawer = useRef<null | React$ElementRef<any>>(null);
const drawer = useRef<null | any>(null);
const [drawerPosition, setDrawerPosition] = useState('left');
const changeDrawerPosition = () => {
if (drawerPosition === 'left') {
packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js
+2 -14
View File
@@ -172,13 +172,7 @@ function PointerEventAttributesHoverablePointersTestCase(
[harness],
);
const square1Ref =
useRef<?React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
>>();
const square1Ref = useRef<?React.ElementRef<HostComponent<ViewProps>>>();
const square1Handlers = useTestEventHandler(eventList, (event, eventType) => {
if (!square1Visible) {
return;
@@ -207,13 +201,7 @@ function PointerEventAttributesHoverablePointersTestCase(
}
});
const square2Ref =
useRef<?React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
>>();
const square2Ref = useRef<?React.ElementRef<HostComponent<ViewProps>>>();
const square2Handlers = useTestEventHandler(eventList, (event, eventType) => {
const square2Elem = square2Ref.current;
if (square2Elem != null) {
packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js
+2 -14
View File
@@ -140,13 +140,7 @@ function PointerEventAttributesNoHoverPointersTestCase(
[harness],
);
const square1Ref =
useRef<?React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
>>();
const square1Ref = useRef<?React.ElementRef<HostComponent<ViewProps>>>();
const square1Handlers = useTestEventHandler(eventList, (event, eventType) => {
if (!square1Visible) {
return;
@@ -175,13 +169,7 @@ function PointerEventAttributesNoHoverPointersTestCase(
}
});
const square2Ref =
useRef<?React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
>>();
const square2Ref = useRef<?React.ElementRef<HostComponent<ViewProps>>>();
const square2Handlers = useTestEventHandler(eventList, (event, eventType) => {
const square2Elem = square2Ref.current;
if (square2Elem != null) {
packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js
+2 -16
View File
@@ -61,28 +61,14 @@ function PointerEventPointerOverOutTestCase(
const outerNativeTagRef = useRef(-1);
const handleInnerRefCallback = useCallback(
(
elem: null | React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
>,
) => {
(elem: null | React.ElementRef<HostComponent<ViewProps>>) => {
const nativeTag = getNativeTagFromHostElement(elem);
innerNativeTagRef.current = nativeTag != null ? nativeTag : -1;
},
[],
);
const handleOuterRefCallback = useCallback(
(
elem: null | React$ElementRef<
React$AbstractComponent<
ViewProps,
React.ElementRef<HostComponent<ViewProps>>,
>,
>,
) => {
(elem: null | React.ElementRef<HostComponent<ViewProps>>) => {
const nativeTag = getNativeTagFromHostElement(elem);
outerNativeTagRef.current = nativeTag != null ? nativeTag : -1;
},
packages/virtualized-lists/Lists/VirtualizedSectionList.js
+2 -2
View File
@@ -447,8 +447,8 @@ class VirtualizedSectionList<
_updateHighlightMap: {[string]: (boolean) => void} = {};
_updatePropsMap: {[string]: void | (boolean => void)} = {};
_listRef: ?React.ElementRef<typeof VirtualizedList>;
_captureRef = (ref: null | React$ElementRef<Class<VirtualizedList>>) => {
_listRef: ?VirtualizedList;
_captureRef = (ref: null | VirtualizedList) => {
this._listRef = ref;
};
}