Skip to content

[Mobile] - Image block - Fix height and border regression #34957

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
geriux merged 2 commits into from
Sep 21, 2021
Merged

[Mobile] - Image block - Fix height and border regression #34957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1014fa
Mobile - Fix Image block height regression
Sep 20, 2021
4d8122d
Mobile - Image block - Check context exists
Sep 20, 2021
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
15 changes: 11 additions & 4 deletions packages/block-library/src/image/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,11 +509,14 @@ export class ImageEdit extends Component {
image,
clientId,
imageDefaultSize,
context: { imageCrop = false } = {},
context,
featuredImageId,
wasBlockJustInserted,
} = this.props;
const { align, url, alt, id, sizeSlug, className } = attributes;
const hasImageContext = context
? Object.keys( context ).length > 0
: false;

const imageSizes = Array.isArray( this.props.imageSizes )
? this.props.imageSizes
Expand Down Expand Up @@ -627,9 +630,11 @@ export class ImageEdit extends Component {

const additionalImageProps = {
height: '100%',
resizeMode: imageCrop ? 'cover' : 'contain',
resizeMode: context?.imageCrop ? 'cover' : 'contain',
};

const imageContainerStyles = [ hasImageContext && styles.fixedHeight ];

const getImageComponent = ( openMediaOptions, getMediaOptions ) => (
<Badge label={ __( 'Featured' ) } show={ isFeaturedImage }>
<TouchableWithoutFeedback
Expand Down Expand Up @@ -662,7 +667,7 @@ export class ImageEdit extends Component {
retryMessage,
} ) => {
return (
<View style={ styles.isGallery }>
<View style={ imageContainerStyles }>
<Image
align={
align && alignToFlex[ align ]
Expand All @@ -686,7 +691,9 @@ export class ImageEdit extends Component {
url={ url }
shapeStyle={ styles[ className ] }
width={ this.getWidth() }
{ ...additionalImageProps }
{ ...( hasImageContext
? additionalImageProps
: {} ) }
/>
</View>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/image/styles.native.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
padding-bottom: $grid-unit;
}

.isGallery {
.fixedHeight {
height: 150;
overflow: visible;
}
Expand Down