From 378bc4ff35c89fe0f42d2bb51d79d035b5202f23 Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Thu, 5 Oct 2023 11:17:50 +0800 Subject: [PATCH 1/4] Fix scrollbars on pattern transforms --- packages/block-editor/src/components/block-switcher/style.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss index d587dddc35f99e..aef2f6a881596a 100644 --- a/packages/block-editor/src/components/block-switcher/style.scss +++ b/packages/block-editor/src/components/block-switcher/style.scss @@ -98,6 +98,7 @@ .block-editor-block-switcher__preview__popover { display: none; + overflow: hidden; // Position correctly. Needs specificity. &.components-popover { @@ -115,6 +116,7 @@ border-radius: $radius-block-ui; outline: none; box-shadow: none; + overflow: auto; } .block-editor-block-switcher__preview { @@ -123,7 +125,6 @@ margin: $grid-unit-20 0; // Use padding to prevent the pattern previews focus style from being cut-off. padding: 0 $grid-unit-20; - overflow: hidden; } } From 805abf7c788b0e18030ec4fb998c686ac821a7bf Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Thu, 5 Oct 2023 11:57:24 +0800 Subject: [PATCH 2/4] Fix single pattern previews --- .../src/components/block-switcher/preview-block-popover.js | 2 +- .../block-editor/src/components/block-switcher/style.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/block-editor/src/components/block-switcher/preview-block-popover.js b/packages/block-editor/src/components/block-switcher/preview-block-popover.js index 78e29f4ad09fba..4ce3993bf1b1d2 100644 --- a/packages/block-editor/src/components/block-switcher/preview-block-popover.js +++ b/packages/block-editor/src/components/block-switcher/preview-block-popover.js @@ -18,7 +18,7 @@ export default function PreviewBlockPopover( { blocks } ) { placement="bottom-start" focusOnMount={ false } > -
+
{ __( 'Preview' ) }
diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss index aef2f6a881596a..097f7b021e824b 100644 --- a/packages/block-editor/src/components/block-switcher/style.scss +++ b/packages/block-editor/src/components/block-switcher/style.scss @@ -125,6 +125,10 @@ margin: $grid-unit-20 0; // Use padding to prevent the pattern previews focus style from being cut-off. padding: 0 $grid-unit-20; + + &.is-single-pattern-preview { + overflow: hidden; + } } } From 5611256487b7f26ca106e4b8cec832dc83fe8648 Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Thu, 5 Oct 2023 12:02:46 +0800 Subject: [PATCH 3/4] Improve classname semantics --- .../block-switcher/pattern-transformations-menu.js | 2 +- .../src/components/block-switcher/preview-block-popover.js | 2 +- .../block-editor/src/components/block-switcher/style.scss | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js b/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js index 83eecd329d8c4c..68853766e7e8ac 100644 --- a/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js +++ b/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js @@ -60,7 +60,7 @@ function PreviewPatternsPopover( { patterns, onSelect } ) { className="block-editor-block-switcher__preview__popover" position="bottom right" > -
+
{ __( 'Preview' ) }
diff --git a/packages/block-editor/src/components/block-switcher/preview-block-popover.js b/packages/block-editor/src/components/block-switcher/preview-block-popover.js index 4ce3993bf1b1d2..78e29f4ad09fba 100644 --- a/packages/block-editor/src/components/block-switcher/preview-block-popover.js +++ b/packages/block-editor/src/components/block-switcher/preview-block-popover.js @@ -18,7 +18,7 @@ export default function PreviewBlockPopover( { blocks } ) { placement="bottom-start" focusOnMount={ false } > -
+
{ __( 'Preview' ) }
diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss index 097f7b021e824b..b8503a0811e420 100644 --- a/packages/block-editor/src/components/block-switcher/style.scss +++ b/packages/block-editor/src/components/block-switcher/style.scss @@ -125,9 +125,10 @@ margin: $grid-unit-20 0; // Use padding to prevent the pattern previews focus style from being cut-off. padding: 0 $grid-unit-20; + overflow: hidden; - &.is-single-pattern-preview { - overflow: hidden; + &.is-pattern-list-preview { + overflow: unset; } } } From 7002c18afe9a81dd39b2f0e90fd476465c5551b1 Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Tue, 10 Oct 2023 11:01:18 +0800 Subject: [PATCH 4/4] Remove modal title --- .../components/block-switcher/pattern-transformations-menu.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js b/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js index 68853766e7e8ac..f9a4b7190a6dd8 100644 --- a/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js +++ b/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js @@ -61,9 +61,6 @@ function PreviewPatternsPopover( { patterns, onSelect } ) { position="bottom right" >
-
- { __( 'Preview' ) } -