Skip to content

Disable image preview for invalid images #23103

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

Closed
wants to merge 12 commits into from
Closed

Disable image preview for invalid images #23103

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
472424c
Disable image preview for invalid images
youssef-lr Jul 17, 2023
2a2dc4c
Code cleanup
youssef-lr Jul 19, 2023
b724b2b
Add onError to native ImageView
youssef-lr Jul 28, 2023
a2a2012
Merge branch 'main' into youssef_disable_invalid_image_preview
youssef-lr Aug 15, 2023
c802b8c
Conflicts
youssef-lr Aug 15, 2023
ae70be8
Merge branch 'main' into youssef_disable_invalid_image_preview
youssef-lr Aug 26, 2023
dd92d2c
Linting
youssef-lr Aug 26, 2023
0e2a20e
Merge branch 'main' into youssef_disable_invalid_image_preview
youssef-lr Nov 3, 2023
c49fb31
Conflicts
youssef-lr Nov 3, 2023
9c5fa6e
Merge branch 'main' into youssef_disable_invalid_image_preview
youssef-lr Nov 3, 2023
a0b75ed
Lint
youssef-lr Nov 4, 2023
e7febdf
Use fallback source when offline and necessary
youssef-lr Nov 4, 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
6 changes: 4 additions & 2 deletions src/components/AttachmentView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ const defaultProps = {
function AttachmentView(props) {
const [loadComplete, setLoadComplete] = useState(false);
const containerStyles = [styles.flex1, styles.flexRow, styles.alignSelfStretch];
const [isValidImage, setIsValidImage] = useState(true);

// Handles case where source is a component (ex: SVG)
if (_.isFunction(props.source)) {
Expand Down Expand Up @@ -104,14 +105,15 @@ function AttachmentView(props) {

// For this check we use both source and file.name since temporary file source is a blob
// both PDFs and images will appear as images when pasted into the the text field
const isImage = Str.isImage(props.source);
if (isImage || (props.file && Str.isImage(props.file.name))) {
const isImage = Str.isImage(props.source) || (props.file && Str.isImage(props.file.name));
if (isImage && isValidImage) {
const children = (
<ImageView
onScaleChanged={props.onScaleChanged}
url={props.source}
fileName={props.file.name}
isAuthTokenRequired={isImage && props.isAuthTokenRequired}
onError={() => setIsValidImage(false)}
/>
);
return props.onPress ? (
Expand Down
2 changes: 2 additions & 0 deletions src/components/ImageView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ class ImageView extends PureComponent {
resizeMode={this.state.zoomScale > 1 ? Image.resizeMode.center : Image.resizeMode.contain}
onLoadStart={this.imageLoadingStart}
onLoad={this.imageLoad}
onError={this.props.onError}
/>
{this.state.isLoading && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
</View>
Expand Down Expand Up @@ -299,6 +300,7 @@ class ImageView extends PureComponent {
resizeMode={Image.resizeMode.contain}
onLoadStart={this.imageLoadingStart}
onLoad={this.imageLoad}
onError={this.props.onError}
/>
</PressableWithoutFeedback>

Expand Down