Merge pull request #20269 from Skalakid/17060-migrate-ImageView

17060 - migrated ImageView to PressableWithoutFeedback
Expensify · Jun 15, 2023 · 4c1739b · 4c1739b
2 parents 4280edd + cbb88e4
commit 4c1739b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/components/AttachmentView.js b/src/components/AttachmentView.js
@@ -116,6 +116,7 @@ function AttachmentView(props) {
             <ImageView
                 onScaleChanged={props.onScaleChanged}
                 url={props.source}
+                fileName={props.file.name}
                 isAuthTokenRequired={isImage && props.isAuthTokenRequired}
             />
         );

diff --git a/src/components/ImageView/index.js b/src/components/ImageView/index.js
@@ -1,12 +1,13 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {View, Pressable} from 'react-native';
+import {View} from 'react-native';
 import Image from '../Image';
 import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
 import FullscreenLoadingIndicator from '../FullscreenLoadingIndicator';
+import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
 
 const propTypes = {
     /** Whether source url requires authentication */
@@ -18,6 +19,10 @@ const propTypes = {
 
     /** URL to full-sized image */
     url: PropTypes.string.isRequired,
+
+    /** image file name */
+    fileName: PropTypes.string.isRequired,
+
     ...windowDimensionsPropTypes,
 };
 
@@ -266,7 +271,7 @@ class ImageView extends PureComponent {
                 onLayout={this.onContainerLayoutChanged}
                 style={[styles.imageViewContainer, styles.overflowAuto, styles.pRelative]}
             >
-                <Pressable
+                <PressableWithoutFeedback
                     style={{
                         ...StyleUtils.getZoomSizingStyle(
                             this.state.isZoomed,
@@ -283,6 +288,8 @@ class ImageView extends PureComponent {
                     }}
                     onPressIn={this.onContainerPressIn}
                     onPress={this.onContainerPress}
+                    accessibilityRole="image"
+                    accessibilityLabel={this.props.fileName}
                 >
                     <Image
                         source={{uri: this.props.url}}
@@ -292,7 +299,7 @@ class ImageView extends PureComponent {
                         onLoadStart={this.imageLoadingStart}
                         onLoad={this.imageLoad}
                     />
-                </Pressable>
+                </PressableWithoutFeedback>
 
                 {this.state.isLoading && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
             </View>