diff --git a/packages/react-native/Libraries/ReactNative/AppContainer-dev.js b/packages/react-native/Libraries/ReactNative/AppContainer-dev.js index 1163a4cdac2..feef7006050 100644 --- a/packages/react-native/Libraries/ReactNative/AppContainer-dev.js +++ b/packages/react-native/Libraries/ReactNative/AppContainer-dev.js @@ -24,6 +24,7 @@ import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer'; import StyleSheet from '../StyleSheet/StyleSheet'; import {RootTagContext, createRootTag} from './RootTag'; import * as React from 'react'; +import {useRef} from 'react'; const {useEffect, useState, useCallback} = React; @@ -95,9 +96,9 @@ const AppContainer = ({ WrapperComponent, rootViewStyle, }: Props): React.Node => { - const appContainerRootViewRef: AppContainerRootViewRef = React.useRef(null); - const innerViewRef: InspectedViewRef = React.useRef(null); - const debuggingOverlayRef: DebuggingOverlayRef = React.useRef(null); + const appContainerRootViewRef: AppContainerRootViewRef = useRef(null); + const innerViewRef: InspectedViewRef = useRef(null); + const debuggingOverlayRef: DebuggingOverlayRef = useRef(null); useSubscribeToDebuggingOverlayRegistry( appContainerRootViewRef, diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js index 5e773df1194..b783bfdff0e 100644 --- a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js +++ b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js @@ -17,7 +17,7 @@ import RNTesterText from '../../components/RNTesterText'; import checkImageSource from './check.png'; import mixedCheckboxImageSource from './mixed.png'; import uncheckImageSource from './uncheck.png'; -import React, {createRef, useState} from 'react'; +import React, {createRef, useRef, useState} from 'react'; import { AccessibilityInfo, Alert, @@ -1314,7 +1314,7 @@ class AnnounceForAccessibility extends React.Component<{}> { } function SetAccessibilityFocusExample(props: {}): React.Node { - const myRef = React.useRef>(null); + const myRef = useRef>(null); const onPress = () => { if (myRef && myRef.current) { diff --git a/packages/rn-tester/js/examples/Animated/ComposingExample.js b/packages/rn-tester/js/examples/Animated/ComposingExample.js index 04304e4c0c9..87f7f1a24e7 100644 --- a/packages/rn-tester/js/examples/Animated/ComposingExample.js +++ b/packages/rn-tester/js/examples/Animated/ComposingExample.js @@ -17,7 +17,7 @@ import RNTesterButton from '../../components/RNTesterButton'; import {RNTesterThemeContext} from '../../components/RNTesterTheme'; import ToggleNativeDriver from './utils/ToggleNativeDriver'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import { Animated, FlatList, @@ -148,10 +148,8 @@ function ComposingExampleItem({ // account the window width, box size, and padding const maxXTranslation = windowWidth - boxSize - 4 * padding; const boxIndexes = React.useMemo(() => [0, 1, 2, 3, 4], []); - const xTranslations = React.useRef( - boxIndexes.map(() => new Animated.Value(0)), - ); - const animation = React.useRef( + const xTranslations = useRef(boxIndexes.map(() => new Animated.Value(0))); + const animation = useRef( compositeAnimation(xTranslations.current, useNativeDriver), ); const theme = React.useContext(RNTesterThemeContext); diff --git a/packages/rn-tester/js/examples/Animated/EasingExample.js b/packages/rn-tester/js/examples/Animated/EasingExample.js index ad66b1bbb5d..939612908f3 100644 --- a/packages/rn-tester/js/examples/Animated/EasingExample.js +++ b/packages/rn-tester/js/examples/Animated/EasingExample.js @@ -15,7 +15,7 @@ import RNTesterButton from '../../components/RNTesterButton'; import {RNTesterThemeContext} from '../../components/RNTesterTheme'; import ToggleNativeDriver from './utils/ToggleNativeDriver'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import { Animated, Easing, @@ -87,8 +87,8 @@ function EasingItem({ item: EasingListItem, useNativeDriver: boolean, }): React.Node { - const opacityAndScale = React.useRef(new Animated.Value(1)); - const animation = React.useRef( + const opacityAndScale = useRef(new Animated.Value(1)); + const animation = useRef( Animated.timing(opacityAndScale.current, { toValue: 1, duration: 1200, diff --git a/packages/rn-tester/js/examples/Animated/MovingBoxExample.js b/packages/rn-tester/js/examples/Animated/MovingBoxExample.js index 1185e156ec5..12694ca92c4 100644 --- a/packages/rn-tester/js/examples/Animated/MovingBoxExample.js +++ b/packages/rn-tester/js/examples/Animated/MovingBoxExample.js @@ -14,7 +14,7 @@ import RNTConfigurationBlock from '../../components/RNTConfigurationBlock'; import RNTesterButton from '../../components/RNTesterButton'; import ToggleNativeDriver from './utils/ToggleNativeDriver'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {Animated, StyleSheet, Text, View} from 'react-native'; const containerWidth = 200; @@ -59,7 +59,7 @@ const styles = StyleSheet.create({ type Props = $ReadOnly<{}>; function MovingBoxView({useNativeDriver}: {useNativeDriver: boolean}) { - const x = React.useRef(new Animated.Value(0)); + const x = useRef(new Animated.Value(0)); const [update, setUpdate] = useState(0); const [boxVisible, setBoxVisible] = useState(true); diff --git a/packages/rn-tester/js/examples/Animated/PressabilityWithNativeDrivers.js b/packages/rn-tester/js/examples/Animated/PressabilityWithNativeDrivers.js index 113c73852ac..2b92ca80a27 100644 --- a/packages/rn-tester/js/examples/Animated/PressabilityWithNativeDrivers.js +++ b/packages/rn-tester/js/examples/Animated/PressabilityWithNativeDrivers.js @@ -11,13 +11,13 @@ import type {RNTesterModuleExample} from '../../types/RNTesterTypes'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {Animated, Button, Text, View} from 'react-native'; const componentList: number[] = Array.from({length: 100}, (_, i) => i + 1); function PressableWithNativeDriver() { - const currScroll = React.useRef(new Animated.Value(0)).current; + const currScroll = useRef(new Animated.Value(0)).current; const [count, setCount] = useState(0); return ( diff --git a/packages/rn-tester/js/examples/Experimental/Compatibility/CompatibilityAnimatedPointerMove.js b/packages/rn-tester/js/examples/Experimental/Compatibility/CompatibilityAnimatedPointerMove.js index a10840c8a6f..d2bd7a96f17 100644 --- a/packages/rn-tester/js/examples/Experimental/Compatibility/CompatibilityAnimatedPointerMove.js +++ b/packages/rn-tester/js/examples/Experimental/Compatibility/CompatibilityAnimatedPointerMove.js @@ -12,7 +12,7 @@ import type {RNTesterModuleExample} from '../../../types/RNTesterTypes'; import ToggleNativeDriver from '../../Animated/utils/ToggleNativeDriver'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {Animated, StyleSheet, Text} from 'react-native'; const WIDTH = 200; @@ -39,8 +39,8 @@ const styles = StyleSheet.create({ }); function CompatibilityAnimatedPointerMove(): React.Node { - const xCoord = React.useRef(new Animated.Value(0)).current; - const yCoord = React.useRef(new Animated.Value(0)).current; + const xCoord = useRef(new Animated.Value(0)).current; + const yCoord = useRef(new Animated.Value(0)).current; const [useNativeDriver, setUseNativeDriver] = useState(true); return ( diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventsEventfulView.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventsEventfulView.js index 93df240ba89..3910820bdc5 100644 --- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventsEventfulView.js +++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventsEventfulView.js @@ -11,7 +11,7 @@ import type {PointerEvent, ViewProps} from 'react-native'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {StyleSheet, Text, View} from 'react-native'; export default function EventfulView(props: { @@ -36,7 +36,7 @@ export default function EventfulView(props: { log: string => void, ...ViewProps, }): React.Node { - const ref = React.useRef>(); + const ref = useRef>(); React.useEffect(() => { // $FlowFixMe[prop-missing] Using private property setTag(ref.current?._nativeTag); diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-BaseOnViewableItemsChanged.js b/packages/rn-tester/js/examples/FlatList/FlatList-BaseOnViewableItemsChanged.js index 60852de5182..49433111af1 100644 --- a/packages/rn-tester/js/examples/FlatList/FlatList-BaseOnViewableItemsChanged.js +++ b/packages/rn-tester/js/examples/FlatList/FlatList-BaseOnViewableItemsChanged.js @@ -14,7 +14,7 @@ import type {ViewToken} from 'react-native/Libraries/Lists/ViewabilityHelper'; import BaseFlatListExample from './BaseFlatListExample'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {FlatList, StyleSheet, View} from 'react-native'; type FlatListProps = React.ElementProps; @@ -53,7 +53,7 @@ export function FlatList_BaseOnViewableItemsChanged(props: { horizontal, }; - const ref = React.useRef(null); + const ref = useRef(null); const onTest = useScrollRefScroll === true ? () => { diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js b/packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js index 627239d5217..14ac62cdd03 100644 --- a/packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js +++ b/packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js @@ -14,7 +14,7 @@ import type {RNTesterModuleExample} from '../../types/RNTesterTypes'; import BaseFlatListExample from './BaseFlatListExample'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; export function FlatList_onEndReached(): React.Node { const [output, setOutput] = useState(''); @@ -23,7 +23,7 @@ export function FlatList_onEndReached(): React.Node { setOutput('onEndReached'), onEndReachedThreshold: 0, }; - const ref = React.useRef(null); + const ref = useRef(null); const onTest = () => { const scrollResponder = ref?.current?.getScrollResponder(); diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-onStartReached.js b/packages/rn-tester/js/examples/FlatList/FlatList-onStartReached.js index c42f300bc4e..91697fa7a12 100644 --- a/packages/rn-tester/js/examples/FlatList/FlatList-onStartReached.js +++ b/packages/rn-tester/js/examples/FlatList/FlatList-onStartReached.js @@ -14,7 +14,7 @@ import type {RNTesterModuleExample} from '../../types/RNTesterTypes'; import BaseFlatListExample, {ITEM_HEIGHT} from './BaseFlatListExample'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {FlatList} from 'react-native'; export function FlatList_onStartReached(): React.Node { @@ -30,7 +30,7 @@ export function FlatList_onStartReached(): React.Node { index, }), }; - const ref = React.useRef>(null); + const ref = useRef>(null); const onTest = () => { ref.current?.scrollToOffset({offset: 0}); diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js b/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js index f046e26e2cd..2ced8706deb 100644 --- a/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js +++ b/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js @@ -9,10 +9,12 @@ */ 'use strict'; + import type {RNTesterModuleExample} from '../../types/RNTesterTypes'; import BaseFlatListExample from './BaseFlatListExample'; import * as React from 'react'; +import {useRef} from 'react'; import {StyleSheet, Text, View} from 'react-native'; const Separator = @@ -44,7 +46,7 @@ export function FlatList_withSeparators(): React.Node { const exampleProps = { ItemSeparatorComponent: Separator('lightgreen', 'green'), }; - const ref = React.useRef<$FlowFixMe>(null); + const ref = useRef<$FlowFixMe>(null); return ; } diff --git a/packages/rn-tester/js/examples/PopupMenuAndroid/PopupMenuAndroidExample.js b/packages/rn-tester/js/examples/PopupMenuAndroid/PopupMenuAndroidExample.js index f4ccfe80059..fed5c839305 100644 --- a/packages/rn-tester/js/examples/PopupMenuAndroid/PopupMenuAndroidExample.js +++ b/packages/rn-tester/js/examples/PopupMenuAndroid/PopupMenuAndroidExample.js @@ -15,13 +15,13 @@ import type {Node} from 'react'; import PopupMenuAndroid from '@react-native/popup-menu-android'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {Button, StyleSheet, Text, View} from 'react-native'; type Fruit = 'Apple' | 'Pear' | 'Banana' | 'Orange' | 'Kiwi'; const PopupMenu = () => { - const popupRef = React.useRef(); + const popupRef = useRef(); const [fruit, setFruit] = useState(); const fruits: Array = ['Apple', 'Pear', 'Banana', 'Orange', 'Kiwi']; const items = fruits.map(item => ({ diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js index c0d44afaa77..b31535f6d9a 100644 --- a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js +++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js @@ -15,7 +15,7 @@ import RNTesterText from '../../components/RNTesterText'; import ScrollViewPressableStickyHeaderExample from './ScrollViewPressableStickyHeaderExample'; import nullthrows from 'nullthrows'; import * as React from 'react'; -import {useCallback, useState} from 'react'; +import {useCallback, useRef, useState} from 'react'; import { Platform, RefreshControl, @@ -569,7 +569,7 @@ const HorizontalScrollView = (props: { itemCount?: number, }) => { const {direction} = props; - const scrollRef = React.useRef>(); + const scrollRef = useRef>(); const title = direction === 'ltr' ? 'LTR Layout' : 'RTL Layout'; const items = props.itemCount == null ? ITEMS : ITEMS.slice(0, props.itemCount); @@ -1013,7 +1013,7 @@ const KeyboardExample = () => { const InvertStickyHeaders = () => { const [invertStickyHeaders, setInvertStickyHeaders] = useState(false); - const _scrollView = React.useRef>(null); + const _scrollView = useRef>(null); return ( {/* $FlowFixMe[incompatible-use] */} @@ -1054,7 +1054,7 @@ const InvertStickyHeaders = () => { }; const MultipleStickyHeaders = () => { - const _scrollView = React.useRef>(null); + const _scrollView = useRef>(null); const stickyHeaderStyle = {backgroundColor: 'yellow'}; return ( diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js index b3be802549f..bc40525ddfa 100644 --- a/packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js +++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js @@ -9,7 +9,7 @@ */ import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import { Button, Pressable, @@ -52,7 +52,7 @@ function renderComponent1(i: number) { } export default function ScrollViewPressableStickyHeaderExample(): React.Node { - const scrollRef = React.useRef<$FlowFixMe>(null); + const scrollRef = useRef<$FlowFixMe>(null); const components = []; for (var i = 1; i < 10; i++) { components.push(renderComponent1(i)); diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-BaseOnViewableItemsChanged.js b/packages/rn-tester/js/examples/SectionList/SectionList-BaseOnViewableItemsChanged.js index b0fbacf02f6..093d6915568 100644 --- a/packages/rn-tester/js/examples/SectionList/SectionList-BaseOnViewableItemsChanged.js +++ b/packages/rn-tester/js/examples/SectionList/SectionList-BaseOnViewableItemsChanged.js @@ -12,7 +12,7 @@ import type {ViewToken} from 'react-native/Libraries/Lists/ViewabilityHelper'; import SectionListBaseExample from './SectionListBaseExample'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import {SectionList, StyleSheet, View} from 'react-native'; type SectionListProps = React.ElementProps; @@ -50,7 +50,7 @@ export function SectionList_BaseOnViewableItemsChanged(props: { viewabilityConfig, horizontal, }; - const ref = React.useRef(null); + const ref = useRef(null); const onTest = useScrollRefScroll === true ? () => { diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js b/packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js index a567cf623a8..d0c4f121454 100644 --- a/packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js +++ b/packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js @@ -10,7 +10,7 @@ import SectionListBaseExample from './SectionListBaseExample'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; export function SectionList_onEndReached(): React.Node { const [output, setOutput] = useState(''); @@ -19,7 +19,7 @@ export function SectionList_onEndReached(): React.Node { setOutput('onEndReached'), onEndReachedThreshold: 0, }; - const ref = React.useRef(null); + const ref = useRef(null); const onTest = () => { const scrollResponder = ref?.current?.getScrollResponder(); diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js b/packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js index e6fd81a0cff..565646e6fb1 100644 --- a/packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js +++ b/packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js @@ -28,7 +28,7 @@ import { import RNTesterPage from '../../components/RNTesterPage'; import RNTesterText from '../../components/RNTesterText'; import React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import { Alert, Animated, @@ -213,7 +213,7 @@ export function SectionList_scrollable(Props: {...}): React.MixedElement { setData([...data.slice(0, index), item, ...data.slice(index + 1)]); }; - const ref = React.useRef>>(null); + const ref = useRef>>(null); const scrollToLocation = (sectionIndex: number, itemIndex: number) => { // $FlowFixMe[method-unbinding] added when improving typing for this parameters if (ref != null && ref.current?.scrollToLocation != null) { diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js b/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js index 80358011cc9..c7823baf1de 100644 --- a/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js +++ b/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js @@ -10,6 +10,7 @@ import SectionListBaseExample from './SectionListBaseExample'; import * as React from 'react'; +import {useRef} from 'react'; import {StyleSheet, Text, View} from 'react-native'; const Separator = @@ -37,7 +38,7 @@ export function SectionList_withSeparators(): React.Node { ItemSeparatorComponent: Separator('lightgreen', 'green', false), SectionSeparatorComponent: Separator('lightblue', 'blue', true), }; - const ref = React.useRef(null); + const ref = useRef(null); return ; } diff --git a/packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js b/packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js index b2e5b11e7c9..421eb85388b 100644 --- a/packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js +++ b/packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js @@ -11,7 +11,7 @@ import type {ListRenderItemInfo} from 'react-native'; import * as React from 'react'; -import {useState} from 'react'; +import {useRef, useState} from 'react'; import { Animated, FlatList, @@ -149,7 +149,7 @@ function Card(props: {color: string}) { const separatorComponent = () => ; - const listRef = React.useRef>(); + const listRef = useRef>(); React.useEffect(() => { listRef.current?.scrollToOffset({offset: 0, animated: false}); diff --git a/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js b/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js index 28eaa39d487..eadeccba109 100644 --- a/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js +++ b/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js @@ -20,6 +20,7 @@ import RNTesterText from '../../components/RNTesterText'; import ExampleTextInput from './ExampleTextInput'; import TextInputSharedExamples from './TextInputSharedExamples'; import React from 'react'; +import {useRef} from 'react'; import { Alert, Button, @@ -210,9 +211,9 @@ class SecureEntryExample extends React.Component<$FlowFixMeProps, any> { } const TextInputWithFocusButton = () => { - const inputToFocusRef = React.useRef | null>(null); + const inputToFocusRef = useRef | null>( + null, + ); return ( { Animated.loop(