Skip to content

Commit 306d934

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. git-svn-id: https://develop.svn.wordpress.org/trunk@54383 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 7e25b96 commit 306d934

File tree

7 files changed

+419
-425
lines changed

7 files changed

+419
-425
lines changed

‎package-lock.json‎

Lines changed: 371 additions & 370 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -77,60 +77,60 @@
7777
},
7878
"dependencies": {
7979
"@wordpress/a11y": "3.17.1",
80-
"@wordpress/annotations": "2.17.2",
80+
"@wordpress/annotations": "2.17.3",
8181
"@wordpress/api-fetch": "6.14.1",
8282
"@wordpress/autop": "3.17.1",
8383
"@wordpress/blob": "3.17.1",
84-
"@wordpress/block-directory": "3.15.3",
85-
"@wordpress/block-editor": "10.0.3",
86-
"@wordpress/block-library": "7.14.3",
84+
"@wordpress/block-directory": "3.15.4",
85+
"@wordpress/block-editor": "10.0.4",
86+
"@wordpress/block-library": "7.14.4",
8787
"@wordpress/block-serialization-default-parser": "4.17.1",
88-
"@wordpress/blocks": "11.16.3",
89-
"@wordpress/components": "21.0.3",
88+
"@wordpress/blocks": "11.16.4",
89+
"@wordpress/components": "21.0.4",
9090
"@wordpress/compose": "5.15.2",
91-
"@wordpress/core-data": "5.0.3",
92-
"@wordpress/customize-widgets": "3.14.3",
93-
"@wordpress/data": "7.1.2",
94-
"@wordpress/data-controls": "2.17.2",
91+
"@wordpress/core-data": "5.0.4",
92+
"@wordpress/customize-widgets": "3.14.4",
93+
"@wordpress/data": "7.1.3",
94+
"@wordpress/data-controls": "2.17.3",
9595
"@wordpress/date": "4.17.1",
9696
"@wordpress/deprecated": "3.17.1",
9797
"@wordpress/dom": "3.17.2",
9898
"@wordpress/dom-ready": "3.17.1",
99-
"@wordpress/edit-post": "6.14.3",
100-
"@wordpress/edit-site": "4.14.4",
101-
"@wordpress/edit-widgets": "4.14.3",
102-
"@wordpress/editor": "12.16.3",
99+
"@wordpress/edit-post": "6.14.4",
100+
"@wordpress/edit-site": "4.14.5",
101+
"@wordpress/edit-widgets": "4.14.4",
102+
"@wordpress/editor": "12.16.4",
103103
"@wordpress/element": "4.15.1",
104104
"@wordpress/escape-html": "2.17.1",
105-
"@wordpress/format-library": "3.15.3",
105+
"@wordpress/format-library": "3.15.4",
106106
"@wordpress/hooks": "3.17.1",
107107
"@wordpress/html-entities": "3.17.1",
108108
"@wordpress/i18n": "4.17.1",
109109
"@wordpress/icons": "9.8.1",
110-
"@wordpress/interface": "4.16.3",
110+
"@wordpress/interface": "4.16.4",
111111
"@wordpress/is-shallow-equal": "4.17.1",
112-
"@wordpress/keyboard-shortcuts": "3.15.2",
112+
"@wordpress/keyboard-shortcuts": "3.15.3",
113113
"@wordpress/keycodes": "3.17.1",
114-
"@wordpress/list-reusable-blocks": "3.15.3",
114+
"@wordpress/list-reusable-blocks": "3.15.4",
115115
"@wordpress/media-utils": "4.8.1",
116-
"@wordpress/notices": "3.17.2",
117-
"@wordpress/nux": "5.15.3",
116+
"@wordpress/notices": "3.17.3",
117+
"@wordpress/nux": "5.15.4",
118118
"@wordpress/plugins": "4.15.2",
119-
"@wordpress/preferences": "2.9.3",
119+
"@wordpress/preferences": "2.9.4",
120120
"@wordpress/preferences-persistence": "1.9.1",
121121
"@wordpress/primitives": "3.15.1",
122122
"@wordpress/priority-queue": "2.17.2",
123123
"@wordpress/redux-routine": "4.17.1",
124-
"@wordpress/reusable-blocks": "3.15.3",
125-
"@wordpress/rich-text": "5.15.2",
126-
"@wordpress/server-side-render": "3.15.3",
124+
"@wordpress/reusable-blocks": "3.15.4",
125+
"@wordpress/rich-text": "5.15.3",
126+
"@wordpress/server-side-render": "3.15.4",
127127
"@wordpress/shortcode": "3.17.1",
128-
"@wordpress/style-engine": "1.0.2",
128+
"@wordpress/style-engine": "1.0.3",
129129
"@wordpress/token-list": "2.17.1",
130130
"@wordpress/url": "3.18.1",
131-
"@wordpress/viewport": "4.15.2",
131+
"@wordpress/viewport": "4.15.3",
132132
"@wordpress/warning": "2.17.1",
133-
"@wordpress/widgets": "2.15.3",
133+
"@wordpress/widgets": "2.15.4",
134134
"@wordpress/wordcount": "3.17.1",
135135
"backbone": "1.4.1",
136136
"clipboard": "2.0.10",

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 18 additions & 24 deletions
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
/**

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

Lines changed: 1 addition & 1 deletion
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,

‎src/wp-includes/blocks/quote/block.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
},
3030
"supports": {
3131
"anchor": true,
32-
"__experimentalSlashInserter": true,
3332
"__experimentalOnEnter": true,
3433
"typography": {
3534
"fontSize": true,

0 commit comments

Comments
 (0)