diff --git a/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js index a419af5768b5..e9cb81003979 100644 --- a/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js +++ b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js @@ -13,9 +13,6 @@ const propTypes = { /* Callback function passing torch/flashlight capability as bool param of the browser */ onTorchAvailability: PropTypes.func, - - /* Whether we're in a tab navigator */ - isInTabNavigator: PropTypes.bool.isRequired, }; const defaultProps = { @@ -25,7 +22,7 @@ const defaultProps = { }; // Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused. -function NavigationAwareCamera({torchOn, onTorchAvailability, ...props}, ref) { +const NavigationAwareCamera = React.forwardRef(({torchOn, onTorchAvailability, ...props}, ref) => { const trackRef = useRef(null); const isCameraActive = useIsFocused(); @@ -69,10 +66,10 @@ function NavigationAwareCamera({torchOn, onTorchAvailability, ...props}, ref) { /> ); -} +}); NavigationAwareCamera.propTypes = propTypes; NavigationAwareCamera.displayName = 'NavigationAwareCamera'; NavigationAwareCamera.defaultProps = defaultProps; -export default React.forwardRef(NavigationAwareCamera); +export default NavigationAwareCamera; diff --git a/src/pages/iou/ReceiptSelector/NavigationAwareCamera.native.js b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.native.js index 56fc311f0d46..9fb420791539 100644 --- a/src/pages/iou/ReceiptSelector/NavigationAwareCamera.native.js +++ b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.native.js @@ -3,21 +3,17 @@ import {Camera} from 'react-native-vision-camera'; import {useTabAnimation} from '@react-navigation/material-top-tabs'; import {useNavigation} from '@react-navigation/native'; import PropTypes from 'prop-types'; -import refPropTypes from '../../../components/refPropTypes'; const propTypes = { /* The index of the tab that contains this camera */ cameraTabIndex: PropTypes.number.isRequired, - /* Forwarded ref */ - forwardedRef: refPropTypes.isRequired, - /* Whether we're in a tab navigator */ isInTabNavigator: PropTypes.bool.isRequired, }; // Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused. -function NavigationAwareCamera({cameraTabIndex, forwardedRef, isInTabNavigator, ...props}) { +const NavigationAwareCamera = React.forwardRef(({cameraTabIndex, isInTabNavigator, ...props}, ref) => { // Get navigation to get initial isFocused value (only needed once during init!) const navigation = useNavigation(); const [isCameraActive, setIsCameraActive] = useState(navigation.isFocused()); @@ -66,21 +62,15 @@ function NavigationAwareCamera({cameraTabIndex, forwardedRef, isInTabNavigator, return ( ); -} +}); NavigationAwareCamera.propTypes = propTypes; NavigationAwareCamera.displayName = 'NavigationAwareCamera'; -export default React.forwardRef((props, ref) => ( - -)); +export default NavigationAwareCamera;