DataViews: Fix table view cell wrapper and BlockPreviews #58062
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ntsekouras
added
[Type] Bug
|
Size Change: +17 B (0%) Total Size: 1.7 MB
ℹ️ View Unchanged
|
|
The flex layout and min-height on the wrapper were to ensure vertical alignment across fields, with equal top/bottom padding. Note in the screenshot below (based on this PR) that only the checkbox and action buttons are aligned, while the title, description, and author have wandered: 
Here's what we're aiming for: 
It's essentially the same as applying 
I couldn't think of a way to achieve this other than the one currently on trunk. But will do some further investigation. Is there no other way to get the previews working? |
ntsekouras
commented
Jan 22, 2024
| @@ -185,6 +185,10 @@ | |||
| min-height: $grid-unit-40; | |||
| display: flex; | |||
| align-items: center; | |||
|
|
|||
| > * { | |||
There was a problem hiding this comment.
@jameskoster I gave it a try to be able to render block previews with this, but I'm not 100% sure if it's the right solution.
In general the previews issue stems from useResizeObserver, where it seems it can determine a width if we have just the display:flex. I'm not sure if @ciampo has any thoughts on this about whether it's something that should be handled by the hook.
There was a problem hiding this comment.
Thanks Nik. Visually this looks a lot better. Subject to Marco's feedback we can probably add a fixed height to the previews in table layout so they are consistent. It would also be nice to apply the theme background color to the container to avoid these awkward gray spaces in grid layout:
There was a problem hiding this comment.
Subject to Marco's feedback we can probably add a fixed height to the previews in table layout so they are consistent.
It already looks like we crop template previews to a max-height in the table view, so we could easily lower that number — although that means that if a template preview image is shorter than that image, that row will take less space.
If instead we want to enforce a fixed height, we could adopt the same technique employed for the Grid layout (basically the object-fit: cover behavior).
In any case, this could be discussed / applied in a separate PR, since the goal of this PR is to fix the markup and make sure that the preview image appears correctly.
It would also be nice to apply the theme background color to the container to avoid these awkward gray spaces in grid layout
I hacked around and managed to achieve that with this code
diff --git a/packages/dataviews/src/view-grid.js b/packages/dataviews/src/view-grid.js
index c8cc3516e1..16d39dac3a 100644
--- a/packages/dataviews/src/view-grid.js
+++ b/packages/dataviews/src/view-grid.js
@@ -1,6 +1,7 @@
/**
* WordPress dependencies
*/
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import {
__experimentalGrid as Grid,
__experimentalHStack as HStack,
@@ -13,6 +14,9 @@ import { useAsyncList } from '@wordpress/compose';
* Internal dependencies
*/
import ItemActions from './item-actions';
+import { unlock } from './lock-unlock';
+
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
export default function ViewGrid( {
data,
@@ -22,6 +26,8 @@ export default function ViewGrid( {
getItemId,
deferredRendering,
} ) {
+ const [ backgroundColor ] = useGlobalStyle( 'color.background' );
+
const mediaField = fields.find(
( field ) => field.id === view.layout.mediaField
);
@@ -50,7 +56,10 @@ export default function ViewGrid( {
key={ getItemId( item ) }
className="dataviews-view-grid__card"
>
- <div className="dataviews-view-grid__media">
+ <div
+ className="dataviews-view-grid__media"
+ style={ { backgroundColor } }
+ >
{ mediaField?.render( { item } ) }
</div>
<HStack
Although we should probably expose an API and apply a background color only when we are certain that the media that we are previewing would actually match that background color (like when managing templates).
This is also something that we should probably experiment with in a separate PR.
Finally, I wanted to flag that, when I pick the Grid layout and reload the page, the template preview images didn't load. In order to have them load correctly, I had to switch to the Table layout, and enable the preview field.
|
Flaky tests detected in af67ba2. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/7622882064
|
ntsekouras
force-pushed
the
fix/view-table-wrapper-html-block-previews
branch
from
df418f6
to
af67ba2
Compare
ciampo
approved these changes
Jan 25, 2024
| @@ -185,6 +185,10 @@ | |||
| min-height: $grid-unit-40; | |||
| display: flex; | |||
| align-items: center; | |||
|
|
|||
| > * { | |||
There was a problem hiding this comment.
Subject to Marco's feedback we can probably add a fixed height to the previews in table layout so they are consistent.
It already looks like we crop template previews to a max-height in the table view, so we could easily lower that number — although that means that if a template preview image is shorter than that image, that row will take less space.
If instead we want to enforce a fixed height, we could adopt the same technique employed for the Grid layout (basically the object-fit: cover behavior).
In any case, this could be discussed / applied in a separate PR, since the goal of this PR is to fix the markup and make sure that the preview image appears correctly.
It would also be nice to apply the theme background color to the container to avoid these awkward gray spaces in grid layout
I hacked around and managed to achieve that with this code
diff --git a/packages/dataviews/src/view-grid.js b/packages/dataviews/src/view-grid.js
index c8cc3516e1..16d39dac3a 100644
--- a/packages/dataviews/src/view-grid.js
+++ b/packages/dataviews/src/view-grid.js
@@ -1,6 +1,7 @@
/**
* WordPress dependencies
*/
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import {
__experimentalGrid as Grid,
__experimentalHStack as HStack,
@@ -13,6 +14,9 @@ import { useAsyncList } from '@wordpress/compose';
* Internal dependencies
*/
import ItemActions from './item-actions';
+import { unlock } from './lock-unlock';
+
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
export default function ViewGrid( {
data,
@@ -22,6 +26,8 @@ export default function ViewGrid( {
getItemId,
deferredRendering,
} ) {
+ const [ backgroundColor ] = useGlobalStyle( 'color.background' );
+
const mediaField = fields.find(
( field ) => field.id === view.layout.mediaField
);
@@ -50,7 +56,10 @@ export default function ViewGrid( {
key={ getItemId( item ) }
className="dataviews-view-grid__card"
>
- <div className="dataviews-view-grid__media">
+ <div
+ className="dataviews-view-grid__media"
+ style={ { backgroundColor } }
+ >
{ mediaField?.render( { item } ) }
</div>
<HStack
Although we should probably expose an API and apply a background color only when we are certain that the media that we are previewing would actually match that background color (like when managing templates).
This is also something that we should probably experiment with in a separate PR.
Finally, I wanted to flag that, when I pick the Grid layout and reload the page, the template preview images didn't load. In order to have them load correctly, I had to switch to the Table layout, and enable the preview field.
ntsekouras
added
the
Backport to Gutenberg RC
westonruter
added a commit
that referenced
this pull request
Jan 26, 2024
…zy-hydration * origin/trunk: (47 commits) Interactivity API: Break up long hydration task in interactivity init (#58227) Add supports.interactivity to Query block (#58316) Font Library: Make notices more consistent (#58180) Fix Global styles text settings bleeding into placeholder component (#58303) Fix the position and size of the Options menu, (#57515) DataViews: Fix safari grid row height issue (#58302) Try a fix (#58282) Navigation Submenu Block: Make block name affect list view (#58296) Apply custom scroll style to fixed header block toolbar (#57444) Add support for transform and letter spacing controls in Global Styles > Typography > Elements (#58142) DataViews: Fix table view cell wrapper and BlockPreviews (#58062) Workflows: Add 'Technical Prototype' to the type-related labels list (#58163) Block Editor: Optimize the 'useBlockDisplayTitle' hook (#58250) Remove noahtallen from .wp-env codeowners (#58283) Global styles revisions: fix is-selected rules from affecting other areas of the editor (#58228) Try: Disable text selection for post content placeholder block. (#58169) Remove `template-only` mode from editor and edit-post packages (#57700) Refactored download/upload logic to support font faces with multiple src assets (#58216) Components: Expand theming support in COLORS (#58097) Implementing new UX for invoking rich text Link UI (#57986) ...
cbravobernal
pushed a commit
that referenced
this pull request
Jan 30, 2024
* DataViews: Fix table view cell wrapper and BlockPreviews * try preserving flex
|
I just cherry-picked this PR to the release/17.6 branch to get it included in the next release: 4ab5e88 |
cbravobernal
removed
the
Backport to Gutenberg RC
youknowriad
pushed a commit
that referenced
this pull request
Jan 31, 2024
* DataViews: Fix table view cell wrapper and BlockPreviews * try preserving flex
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What?
Follow up of: #57804
It was missed that we cannot have an inline element(span) as a wrapper because it creates invalid html.
Also, the addition of styling this as
display:flextoo, make the previews not render because of the width calculation. In this PR I'm removing this, but would love @jameskoster confirmation that doesn't affect something else..Testing instructions
previewfield and observe it's rendered properly.