Skip to content
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.

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

Fix link preview size #24052

Merged
merged 2 commits into from
Aug 3, 2023
Merged
Changes from all commits
Commits
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
18 changes: 5 additions & 13 deletions src/pages/home/report/LinkPreviewer.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React, {useState, useEffect} from 'react';
import React from 'react';
import {View, Image} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import {uniqBy} from 'lodash';
import useWindowDimensions from '../../../hooks/useWindowDimensions';
import Text from '../../../components/Text';
import TextLink from '../../../components/TextLink';
import * as StyleUtils from '../../../styles/StyleUtils';
Expand All @@ -12,8 +11,8 @@ import variables from '../../../styles/variables';
import colors from '../../../styles/colors';

const IMAGE_TYPES = ['jpg', 'jpeg', 'png'];
const MAX_IMAGE_SIZE = 350;
const SMALL_SCREEN_MAX_IMAGE_SIZE = 180;
const MAX_IMAGE_HEIGHT = 180;
const MAX_IMAGE_WIDTH = 340;

const propTypes = {
/** Data about links provided in message. */
Expand Down Expand Up @@ -67,13 +66,6 @@ const defaultProps = {
};

function LinkPreviewer(props) {
const {windowHeight} = useWindowDimensions();
const [maxImageSize, setMaxImageSize] = useState(MAX_IMAGE_SIZE);

useEffect(() => {
setMaxImageSize(windowHeight / 2 < MAX_IMAGE_SIZE ? SMALL_SCREEN_MAX_IMAGE_SIZE : MAX_IMAGE_SIZE);
}, [windowHeight]);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition was true for browsers on mobile, so mobile styles were being applied on browsers on mobile but not for mobile apps.


return _.map(
_.take(uniqBy(props.linkMetadata, 'url'), props.maxAmountOfPreviews >= 0 ? Math.min(props.maxAmountOfPreviews, props.linkMetadata.length) : props.linkMetadata.length),
(linkData) => {
Expand Down Expand Up @@ -120,10 +112,10 @@ function LinkPreviewer(props) {
styles.linkPreviewImage,
{
aspectRatio: image.width / image.height,
maxHeight: Math.min(image.height, maxImageSize),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image also keeps the aspect ratio maintained which also affects the height and width.

maxHeight: Math.min(image.height, MAX_IMAGE_HEIGHT),

// Calculate maximum width when image is too tall, so it doesn't move away from left
maxWidth: Math.min((Math.min(image.height, maxImageSize) / image.height) * image.width, maxImageSize),
maxWidth: Math.min((Math.min(image.height, MAX_IMAGE_HEIGHT) / image.height) * image.width, MAX_IMAGE_WIDTH),
},
]}
resizeMode="contain"
Expand Down
Loading