Skip to content

Commit 4de88db

Browse files
dream-encodedream-encode
committed
Editor: Update packages for 6.1 Beta 3.
Package updates for bug and regression fixes: * @wordpress/annotations: 2.17.3 * @wordpress/block-directory: 3.15.4 * @wordpress/block-editor: 10.0.4 * @wordpress/block-library: 7.14.4 * @wordpress/blocks: 11.16.4 * @wordpress/components: 21.0.4 * @wordpress/core-data: 5.0.4 * @wordpress/customize-widgets: 3.14.4 * @wordpress/data: 7.1.3 * @wordpress/data-controls: 2.17.3 * @wordpress/edit-post: 6.14.4 * @wordpress/edit-site: 4.14.5 * @wordpress/edit-widgets: 4.14.4 * @wordpress/editor: 12.16.4 * @wordpress/format-library: 3.15.4 * @wordpress/interface: 4.16.3 * @wordpress/keyboard-shortcuts: 3.15.3 * @wordpress/list-reusable-blocks: 3.15.4 * @wordpress/notices: 3.17.3 * @wordpress/nux: 5.15.4 * @wordpress/preferences: 2.9.4 * @wordpress/reusable-blocks: 3.15.4 * @wordpress/rich-text: 5.15.3 * @wordpress/server-side-render: 3.15.4 * @wordpress/style-engine: 1.0.3 * @wordpress/viewport: 4.15.3 * @wordpress/widgets: 2.15.4 References: * [WordPress/gutenberg#44634 Gutenberg PR 44634] – Quote block: stop slash inserter popup showing in citation * [WordPress/gutenberg#44630 Gutenberg PR 44630] – Query Loop: Fix condition for displaying 'parents' control * [WordPress/gutenberg#44554 Gutenberg PR 44554] – Hide the Classic block in the Site Editor * [WordPress/gutenberg#44594 Gutenberg PR 44594] – Fix navigation block console error * [WordPress/gutenberg#44555 Gutenberg PR 44555] – Theme export: Fix broken spacingScale export * [WordPress/gutenberg#44580 Gutenberg PR 44580] – Code Block: Add box-sizing to fix inconsistent layout * [WordPress/gutenberg#44556 Gutenberg PR 44556] – Remove border from Global Styles previews * [WordPress/gutenberg#44141 Gutenberg PR 44141] – Spacing presets: Modify the styling of the input controls when in unlinked mode in order to better differentiate sides * [WordPress/gutenberg#44453 Gutenberg PR 44453] – Preserve the generic signature of getEntityRecord and getEntityRecords through currying * [WordPress/gutenberg#44504 Gutenberg PR 44504] – Theme.json: fix some outline properties doesn't work properly on the editor * [WordPress/gutenberg#44516 Gutenberg PR 44516] – Add style engine to editor tsconfig references * [WordPress/gutenberg#44523 Gutenberg PR 44523] – Query Loop Block: Rename Query Loop variations allowControls to allowedControls * [WordPress/gutenberg#44520 Gutenberg PR 44520] – Post Featured Image: Fix application of default border style in editor * [WordPress/gutenberg#44286 Gutenberg PR 44286] – Post Featured Image: Fix borders after addition of overlay feature * [WordPress/gutenberg#44482 Gutenberg PR 44482] – Template Editor: Fix crashes due to undefined variables * [WordPress/gutenberg#44480 Gutenberg PR 44480] – Template Parts: Prevent adding block in post editor or inside post template or content blocks * [WordPress/gutenberg#44425 Gutenberg PR 44425] – Fix rotated image crop area aspect ratio * [WordPress/gutenberg#44485 Gutenberg PR 44485] – Fix padding/margin visualizer accuracy * [WordPress/gutenberg#44569 Gutenberg PR 44569] – Theme.json: Fix some shadow properties that do not work properly in the site editor * [WordPress/gutenberg#44575 Gutenberg PR 44575] – ToggleGroupControl: Fix unselected icon color * [WordPress/gutenberg#44526 Gutenberg PR 44526] – TokenInput Field: Try alternative approach to fix screen reader focus issue * [WordPress/gutenberg#44506 Gutenberg PR 44506] – Edit Post: Optimize legacy post content layout * [WordPress/gutenberg#44258 Gutenberg PR 44258] – Add layout styles from Post Content block to post editor Follow-up to [54257] and [54335]. Props czapla, isabel_brison, wildworks, bernhard-reiter, hellofromTonya. See #56467. Built from https://develop.svn.wordpress.org/trunk@54383 git-svn-id: http://core.svn.wordpress.org/trunk@53942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent 9017d4b commit 4de88db

40 files changed

+583
-323
lines changed

‎wp-includes/assets/script-loader-packages.min.php

+1-1
Large diffs are not rendered by default.

‎wp-includes/assets/script-loader-packages.php

+1-1
Large diffs are not rendered by default.

‎wp-includes/blocks/blocks-json.php

+1-1
Large diffs are not rendered by default.

‎wp-includes/blocks/code/style-rtl.css

+3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@
7474
/**
7575
* Reset the WP Admin page styles for Gutenberg-like pages.
7676
*/
77+
.wp-block-code {
78+
box-sizing: border-box;
79+
}
7780
.wp-block-code code {
7881
display: block;
7982
font-family: inherit;

‎wp-includes/blocks/code/style-rtl.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-includes/blocks/code/style.css

+3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@
7474
/**
7575
* Reset the WP Admin page styles for Gutenberg-like pages.
7676
*/
77+
.wp-block-code {
78+
box-sizing: border-box;
79+
}
7780
.wp-block-code code {
7881
display: block;
7982
font-family: inherit;

‎wp-includes/blocks/code/style.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-includes/blocks/post-featured-image.php

+18-24
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,25 @@ function get_block_core_post_featured_image_overlay_element_markup( $attributes
8383
$has_custom_gradient = isset( $attributes['customGradient'] ) && $attributes['customGradient'];
8484
$has_solid_overlay = isset( $attributes['overlayColor'] ) && $attributes['overlayColor'];
8585
$has_custom_overlay = isset( $attributes['customOverlayColor'] ) && $attributes['customOverlayColor'];
86-
$class_names = array(
87-
'wp-block-post-featured-image__overlay',
88-
);
89-
$styles_properties = array();
86+
$class_names = array( 'wp-block-post-featured-image__overlay' );
87+
$styles = array();
9088

9189
if ( ! $has_dim_background ) {
9290
return '';
9391
}
9492

95-
// Generate required classes for the element.
93+
// Apply border classes and styles.
94+
$border_attributes = get_block_core_post_featured_image_border_attributes( $attributes );
95+
96+
if ( ! empty( $border_attributes['class'] ) ) {
97+
$class_names[] = $border_attributes['class'];
98+
}
99+
100+
if ( ! empty( $border_attributes['style'] ) ) {
101+
$styles[] = $border_attributes['style'];
102+
}
103+
104+
// Apply overlay and gradient classes.
96105
if ( $has_dim_background ) {
97106
$class_names[] = 'has-background-dim';
98107
$class_names[] = "has-background-dim-{$attributes['dimRatio']}";
@@ -110,35 +119,20 @@ function get_block_core_post_featured_image_overlay_element_markup( $attributes
110119
$class_names[] = "has-{$attributes['gradient']}-gradient-background";
111120
}
112121

113-
// Generate required CSS properties and their values.
114-
if ( ! empty( $attributes['style']['border']['radius'] ) ) {
115-
$styles_properties['border-radius'] = $attributes['style']['border']['radius'];
116-
}
117-
118-
if ( ! empty( $attributes['style']['border']['width'] ) ) {
119-
$styles_properties['border-width'] = $attributes['style']['border']['width'];
120-
}
121-
122+
// Apply background styles.
122123
if ( $has_custom_gradient ) {
123-
$styles_properties['background-image'] = $attributes['customGradient'];
124+
$styles[] = sprintf( 'background-image: %s;', $attributes['customGradient'] );
124125
}
125126

126127
if ( $has_custom_overlay ) {
127-
$styles_properties['background-color'] = $attributes['customOverlayColor'];
128-
}
129-
130-
$styles = '';
131-
132-
foreach ( $styles_properties as $style_attribute => $style_attribute_value ) {
133-
$styles .= "{$style_attribute}: $style_attribute_value; ";
128+
$styles[] = sprintf( 'background-color: %s;', $attributes['customOverlayColor'] );
134129
}
135130

136131
return sprintf(
137132
'<span class="%s" style="%s" aria-hidden="true"></span>',
138133
esc_attr( implode( ' ', $class_names ) ),
139-
esc_attr( trim( $styles ) )
134+
esc_attr( safecss_filter_attr( implode( ' ', $styles ) ) )
140135
);
141-
142136
}
143137

144138
/**

‎wp-includes/blocks/post-featured-image/block.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"color": true,
6363
"radius": true,
6464
"width": true,
65-
"__experimentalSelector": "img, .block-editor-media-placeholder",
65+
"__experimentalSelector": "img, .block-editor-media-placeholder, .wp-block-post-featured-image__overlay",
6666
"__experimentalSkipSerialization": true,
6767
"__experimentalDefaultControls": {
6868
"color": true,

‎wp-includes/blocks/post-featured-image/editor-rtl.css

+39-29
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@
7979
-webkit-backdrop-filter: none;
8080
backdrop-filter: none;
8181
}
82-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder,
83-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder {
82+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder,
83+
.wp-block-post-featured-image .components-placeholder {
8484
justify-content: center;
8585
align-items: center;
8686
padding: 0;
8787
min-height: 200px;
8888
}
89-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder .components-form-file-upload,
90-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder .components-form-file-upload {
89+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder .components-form-file-upload,
90+
.wp-block-post-featured-image .components-placeholder .components-form-file-upload {
9191
display: none;
9292
}
93-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder .components-button.components-button,
94-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder .components-button.components-button {
93+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder .components-button,
94+
.wp-block-post-featured-image .components-placeholder .components-button {
9595
padding: 0;
9696
display: flex;
9797
justify-content: center;
@@ -105,51 +105,61 @@
105105
border-style: solid;
106106
color: #fff;
107107
}
108-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder .components-button.components-button > svg,
109-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder .components-button.components-button > svg {
108+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder .components-button > svg,
109+
.wp-block-post-featured-image .components-placeholder .components-button > svg {
110110
color: inherit;
111111
}
112-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where(.has-border-color),
113-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where(.has-border-color) {
112+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where(.has-border-color),
113+
.wp-block-post-featured-image .components-placeholder:where(.has-border-color),
114+
.wp-block-post-featured-image img:where(.has-border-color) {
114115
border-style: solid;
115116
}
116-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-top-color"]),
117-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-top-color"]) {
117+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-top-color"]),
118+
.wp-block-post-featured-image .components-placeholder:where([style*="border-top-color"]),
119+
.wp-block-post-featured-image img:where([style*="border-top-color"]) {
118120
border-top-style: solid;
119121
}
120-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-right-color"]),
121-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-right-color"]) {
122+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-right-color"]),
123+
.wp-block-post-featured-image .components-placeholder:where([style*="border-right-color"]),
124+
.wp-block-post-featured-image img:where([style*="border-right-color"]) {
122125
border-left-style: solid;
123126
}
124-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-bottom-color"]),
125-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-bottom-color"]) {
127+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-bottom-color"]),
128+
.wp-block-post-featured-image .components-placeholder:where([style*="border-bottom-color"]),
129+
.wp-block-post-featured-image img:where([style*="border-bottom-color"]) {
126130
border-bottom-style: solid;
127131
}
128-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-left-color"]),
129-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-left-color"]) {
132+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-left-color"]),
133+
.wp-block-post-featured-image .components-placeholder:where([style*="border-left-color"]),
134+
.wp-block-post-featured-image img:where([style*="border-left-color"]) {
130135
border-right-style: solid;
131136
}
132-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-width"]),
133-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-width"]) {
137+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-width"]),
138+
.wp-block-post-featured-image .components-placeholder:where([style*="border-width"]),
139+
.wp-block-post-featured-image img:where([style*="border-width"]) {
134140
border-style: solid;
135141
}
136-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-top-width"]),
137-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-top-width"]) {
142+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-top-width"]),
143+
.wp-block-post-featured-image .components-placeholder:where([style*="border-top-width"]),
144+
.wp-block-post-featured-image img:where([style*="border-top-width"]) {
138145
border-top-style: solid;
139146
}
140-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-right-width"]),
141-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-right-width"]) {
147+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-right-width"]),
148+
.wp-block-post-featured-image .components-placeholder:where([style*="border-right-width"]),
149+
.wp-block-post-featured-image img:where([style*="border-right-width"]) {
142150
border-left-style: solid;
143151
}
144-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-bottom-width"]),
145-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-bottom-width"]) {
152+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-bottom-width"]),
153+
.wp-block-post-featured-image .components-placeholder:where([style*="border-bottom-width"]),
154+
.wp-block-post-featured-image img:where([style*="border-bottom-width"]) {
146155
border-bottom-style: solid;
147156
}
148-
.wp-block-post-featured-image.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-left-width"]),
149-
.wp-block-post-featured-image.wp-block-post-featured-image .components-placeholder:where([style*="border-left-width"]) {
157+
.wp-block-post-featured-image .wp-block-post-featured-image__placeholder:where([style*="border-left-width"]),
158+
.wp-block-post-featured-image .components-placeholder:where([style*="border-left-width"]),
159+
.wp-block-post-featured-image img:where([style*="border-left-width"]) {
150160
border-right-style: solid;
151161
}
152-
.wp-block-post-featured-image.wp-block-post-featured-image[style*=height] .components-placeholder {
162+
.wp-block-post-featured-image[style*=height] .components-placeholder {
153163
min-height: 48px;
154164
min-width: 48px;
155165
height: 100%;

‎wp-includes/blocks/post-featured-image/editor-rtl.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)