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.

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

Image block: Set image display to grid when no alignment sent to properly align caption on resize #35787

Merged
merged 8 commits into from
Dec 9, 2021
Merged

Image block: Set image display to grid when no alignment sent to properly align caption on resize #35787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af53208
Set image display to table when no explicit alignment set to properly…
Oct 20, 2021
b275247
Switch from display table to grid
Oct 20, 2021
34bc561
Fix sizing issue with placeholder and non resized images
Dec 6, 2021
1b96298
Fix failing e2e test
Dec 7, 2021
9206390
Fix for resize box not adjusting to smaller images
Dec 8, 2021
791bad9
Fix issue with Safari not having correct classes
Dec 8, 2021
834996c
Trying a different combination of css grid options and crossing fingers
Dec 9, 2021
67f02ed
Fix e2e test
Dec 9, 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
18 changes: 18 additions & 0 deletions packages/block-library/src/image/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,24 @@ figure.wp-block-image:not(.wp-block) {
}
}

*:not([data-align]) {
> .wp-block-image {
display: grid;
grid-template-columns: [image] minmax(0, max-content) [placeholder] auto;
.components-placeholder {
grid-column: placeholder;
}
> div:not(.components-placeholder) {
grid-column: image;
}
> figcaption {
grid-column: image;
display: table-caption;
caption-side: bottom;
}
}
}

.wp-block[data-align="left"] > .wp-block-image {
margin-right: 1em;
margin-left: 0;
Expand Down
3 changes: 3 additions & 0 deletions packages/e2e-tests/specs/editor/blocks/cover.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ describe( 'Cover', () => {
await insertBlock( 'Image' );
// Upload image and transform to the Cover block
await upload( '.wp-block-image' );
// Click the block wrapper before trying to convert to make sure figcaption toolbar is not obscuring
// the block toolbar.
await page.click( '.wp-block-image' );
await transformBlockTo( 'Cover' );

// Get the block's background dim color and its opacity
Expand Down
5 changes: 3 additions & 2 deletions packages/e2e-tests/specs/editor/blocks/image.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ describe( 'Image', () => {
`<!-- wp:image {"id":\\d+,"sizeSlug":"full","linkDestination":"none"} -->\\s*<figure class="wp-block-image size-full"><img src="[^"]+\\/${ filename2 }\\.png" alt="" class="wp-image-\\d+"/></figure>\\s*<!-- \\/wp:image -->`
);
expect( await getEditedPostContent() ).toMatch( regex3 );

await page.click( '.wp-block-image' );
// For some reason just clicking the block wrapper causes figcaption to get focus
// in puppeteer but not in live browser, so clicking on the image wrapper div here instead.
await page.click( '.wp-block-image > div' );
await page.keyboard.press( 'Backspace' );

expect( await getEditedPostContent() ).toBe( '' );
Expand Down