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

Jump to bottom

Consolidate and resolve display issues between InserterPreviewPanel and BlockStylesPreviewPanel #56011

Merged
merged 7 commits into from
Dec 2, 2023
Merged

Consolidate and resolve display issues between InserterPreviewPanel and BlockStylesPreviewPanel #56011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a783703
BlockCard: render description markup only when available
richtabor Nov 9, 2023
dec5173
Consolidate BlockCard styles
richtabor Nov 9, 2023
14154ee
Remove unnecessary specific block card styles
richtabor Nov 9, 2023
1508c77
Adjust BlockStyles Popover offset
richtabor Nov 9, 2023
51d024c
Remove InserterPreviewPanel overrides in BlockStyles scss
richtabor Nov 9, 2023
9547e40
Use a popover for inserter previews
richtabor Nov 9, 2023
f0b7645
Clean up block preview
richtabor Nov 9, 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
8 changes: 5 additions & 3 deletions packages/block-editor/src/components/block-card/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ function BlockCard( { title, icon, description, blockType, className } ) {
<BlockIcon icon={ icon } showColors />
<div className="block-editor-block-card__content">
<h2 className="block-editor-block-card__title">{ title }</h2>
<span className="block-editor-block-card__description">
{ description }
</span>
{ description && (
<span className="block-editor-block-card__description">
{ description }
</span>
) }
</div>
</div>
);
Expand Down
10 changes: 7 additions & 3 deletions packages/block-editor/src/components/block-card/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
.block-editor-block-card {
display: flex;
align-items: flex-start;
color: $gray-900;
display: flex;
padding: $grid-unit-20;
}

.block-editor-block-card__content {
flex-grow: 1;
margin-bottom: $grid-unit-05;
}

.block-editor-block-card__title {
font-weight: 500;

&.block-editor-block-card__title {
font-size: $default-font-size;
line-height: $button-size-small;
margin: 0 0 $grid-unit-05;
margin: 0;
}
}

.block-editor-block-card__description {
display: block;
font-size: $default-font-size;
margin-top: $grid-unit-05;
}

.block-editor-block-card .block-editor-block-icon {
Expand Down
4 changes: 0 additions & 4 deletions packages/block-editor/src/components/block-inspector/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
// Ensures this PanelBody is treated like the ToolsPanel, removing double borders.
margin-top: -$border-width;
}

.block-editor-block-card {
padding: $grid-unit-20;
}
}

.block-editor-block-inspector__no-blocks,
Expand Down
1 change: 1 addition & 0 deletions packages/block-editor/src/components/block-preview/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// The preview component measures the pixel width of this item, so as to calculate the scale factor.
// But without this baseline width, it collapses to 0.
width: 100%;
height: 100%;
Copy link
Contributor

Choose a reason for hiding this comment

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

This style seems to affect the layout of the pattern in the inserter. The problem is summarized in #56812. We may want to apply this style only to a single block preview.


overflow: hidden;

Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/block-styles/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function BlockStyles( { clientId, onSwitch = noop, onHoverClassName = noop } ) {
{ hoveredStyle && ! isMobileViewport && (
<Popover
placement="left-start"
offset={ 20 }
offset={ 34 }
focusOnMount={ false }
>
<div
Expand Down
11 changes: 0 additions & 11 deletions packages/block-editor/src/components/block-styles/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@
display: block;
}

// Overrides for InserterPreviewPanel.
.block-editor-inserter__preview-container {
left: auto;
right: auto;
top: auto;
position: static;
}

.block-editor-block-card__title.block-editor-block-card__title {
margin: 0;
}
.block-editor-block-icon {
display: none;
}
Expand Down
12 changes: 10 additions & 2 deletions packages/block-editor/src/components/inserter/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
useImperativeHandle,
useRef,
} from '@wordpress/element';
import { VisuallyHidden, SearchControl } from '@wordpress/components';
import { VisuallyHidden, SearchControl, Popover } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useSelect } from '@wordpress/data';

Expand Down Expand Up @@ -293,7 +293,15 @@ function InserterMenu(
/>
) }
{ showInserterHelpPanel && hoveredItem && (
<InserterPreviewPanel item={ hoveredItem } />
<Popover
className="block-editor-inserter__preview-container__popover"
placement="right-start"
offset={ 16 }
focusOnMount={ false }
animate={ false }
>
<InserterPreviewPanel item={ hoveredItem } />
</Popover>
) }
{ showPatternPanel && (
<PatternCategoryPreviewPanel
Expand Down
4 changes: 2 additions & 2 deletions packages/block-editor/src/components/inserter/preview-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ function InserterPreviewPanel( { item } ) {
blocks={ blocks }
viewportWidth={ example?.viewportWidth ?? 500 }
additionalStyles={ [
{ css: 'body { padding: 16px; }' },
{ css: 'body { padding: 24px; }' },
] }
/>
</div>
) : (
<div className="block-editor-inserter__preview-content-missing">
{ __( 'No Preview Available.' ) }
{ __( 'No preview available.' ) }
</div>
) }
</div>
Expand Down
22 changes: 10 additions & 12 deletions packages/block-editor/src/components/inserter/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,14 @@ $block-inserter-tabs-height: 44px;
}
}

.block-editor-inserter__preview-container__popover {
top: $grid-unit-20 !important;
}

.block-editor-inserter__preview-container {
display: none;
width: 300px;
background: $white;
border-radius: $radius-block-ui;
border: $border-width solid $gray-300;
position: absolute;
top: $grid-unit-20;
left: calc(100% + #{$grid-unit-20});
width: $sidebar-width;
padding: $grid-unit-20;
max-height: calc(100% - #{$grid-unit-40});
overflow-y: hidden;

Expand All @@ -231,11 +230,9 @@ $block-inserter-tabs-height: 44px;
}

.block-editor-block-card {
padding: $grid-unit-20;
}

.block-editor-block-card__title {
font-size: $default-font-size;
padding-left: 0;
padding-right: 0;
padding-bottom: $grid-unit-05;
}
}

Expand Down Expand Up @@ -366,6 +363,7 @@ $block-inserter-tabs-height: 44px;
min-height: $grid-unit-60 * 3;
color: $gray-700;
background: $gray-100;
border-radius: $radius-block-ui;
}

.block-editor-inserter__tips {
Expand Down
Loading