Skip to content

17060 - migrated ImageView to PressableWithoutFeedback #20269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techievivek merged 3 commits into from
Jun 15, 2023
Merged

17060 - migrated ImageView to PressableWithoutFeedback #20269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18810b6
migrated ImageView to PressableWithoutFeedback
Skalakid Jun 6, 2023
04959e5
Merge branch 'main' into 17060-migrate-ImageView
Skalakid Jun 13, 2023
cbb88e4
added accessibility props
Skalakid Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/AttachmentView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ const AttachmentView = (props) => {
<ImageView
onScaleChanged={props.onScaleChanged}
url={props.source}
fileName={props.file.name}
isAuthTokenRequired={isImage && props.isAuthTokenRequired}
/>
);
Expand Down
13 changes: 10 additions & 3 deletions src/components/ImageView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 */
Expand All @@ -18,6 +19,10 @@ const propTypes = {

/** URL to full-sized image */
url: PropTypes.string.isRequired,

/** image file name */
fileName: PropTypes.string.isRequired,

...windowDimensionsPropTypes,
};

Expand Down Expand Up @@ -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,
Expand All @@ -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}}
Expand All @@ -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>
Expand Down