Skip to content

Sync packages for WP 6.1 Beta 3 #3402

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

Closed
ockham wants to merge 1 commit into from
Closed

Sync packages for WP 6.1 Beta 3 #3402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Sync packages for WP 6.1 Beta 3
  • Loading branch information
@ockham
ockham committed Oct 4, 2022
commit f607b464df7fc05a26906b5c20b943725c101441
741 changes: 371 additions & 370 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,60 +77,60 @@
},
"dependencies": {
"@wordpress/a11y": "3.17.1",
"@wordpress/annotations": "2.17.2",
"@wordpress/annotations": "2.17.3",
"@wordpress/api-fetch": "6.14.1",
"@wordpress/autop": "3.17.1",
"@wordpress/blob": "3.17.1",
"@wordpress/block-directory": "3.15.3",
"@wordpress/block-editor": "10.0.3",
"@wordpress/block-library": "7.14.3",
"@wordpress/block-directory": "3.15.4",
"@wordpress/block-editor": "10.0.4",
"@wordpress/block-library": "7.14.4",
"@wordpress/block-serialization-default-parser": "4.17.1",
"@wordpress/blocks": "11.16.3",
"@wordpress/components": "21.0.3",
"@wordpress/blocks": "11.16.4",
"@wordpress/components": "21.0.4",
"@wordpress/compose": "5.15.2",
"@wordpress/core-data": "5.0.3",
"@wordpress/customize-widgets": "3.14.3",
"@wordpress/data": "7.1.2",
"@wordpress/data-controls": "2.17.2",
"@wordpress/core-data": "5.0.4",
"@wordpress/customize-widgets": "3.14.4",
"@wordpress/data": "7.1.3",
"@wordpress/data-controls": "2.17.3",
"@wordpress/date": "4.17.1",
"@wordpress/deprecated": "3.17.1",
"@wordpress/dom": "3.17.2",
"@wordpress/dom-ready": "3.17.1",
"@wordpress/edit-post": "6.14.3",
"@wordpress/edit-site": "4.14.4",
"@wordpress/edit-widgets": "4.14.3",
"@wordpress/editor": "12.16.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/element": "4.15.1",
"@wordpress/escape-html": "2.17.1",
"@wordpress/format-library": "3.15.3",
"@wordpress/format-library": "3.15.4",
"@wordpress/hooks": "3.17.1",
"@wordpress/html-entities": "3.17.1",
"@wordpress/i18n": "4.17.1",
"@wordpress/icons": "9.8.1",
"@wordpress/interface": "4.16.3",
"@wordpress/interface": "4.16.4",
"@wordpress/is-shallow-equal": "4.17.1",
"@wordpress/keyboard-shortcuts": "3.15.2",
"@wordpress/keyboard-shortcuts": "3.15.3",
"@wordpress/keycodes": "3.17.1",
"@wordpress/list-reusable-blocks": "3.15.3",
"@wordpress/list-reusable-blocks": "3.15.4",
"@wordpress/media-utils": "4.8.1",
"@wordpress/notices": "3.17.2",
"@wordpress/nux": "5.15.3",
"@wordpress/notices": "3.17.3",
"@wordpress/nux": "5.15.4",
"@wordpress/plugins": "4.15.2",
"@wordpress/preferences": "2.9.3",
"@wordpress/preferences": "2.9.4",
"@wordpress/preferences-persistence": "1.9.1",
"@wordpress/primitives": "3.15.1",
"@wordpress/priority-queue": "2.17.2",
"@wordpress/redux-routine": "4.17.1",
"@wordpress/reusable-blocks": "3.15.3",
"@wordpress/rich-text": "5.15.2",
"@wordpress/server-side-render": "3.15.3",
"@wordpress/reusable-blocks": "3.15.4",
"@wordpress/rich-text": "5.15.3",
"@wordpress/server-side-render": "3.15.4",
"@wordpress/shortcode": "3.17.1",
"@wordpress/style-engine": "1.0.2",
"@wordpress/style-engine": "1.0.3",
"@wordpress/token-list": "2.17.1",
"@wordpress/url": "3.18.1",
"@wordpress/viewport": "4.15.2",
"@wordpress/viewport": "4.15.3",
"@wordpress/warning": "2.17.1",
"@wordpress/widgets": "2.15.3",
"@wordpress/widgets": "2.15.4",
"@wordpress/wordcount": "3.17.1",
"backbone": "1.4.1",
"clipboard": "2.0.10",
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/assets/script-loader-packages.min.php
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/wp-includes/blocks/blocks-json.php
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 18 additions & 24 deletions src/wp-includes/blocks/post-featured-image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,25 @@ function get_block_core_post_featured_image_overlay_element_markup( $attributes
$has_custom_gradient = isset( $attributes['customGradient'] ) && $attributes['customGradient'];
$has_solid_overlay = isset( $attributes['overlayColor'] ) && $attributes['overlayColor'];
$has_custom_overlay = isset( $attributes['customOverlayColor'] ) && $attributes['customOverlayColor'];
$class_names = array(
'wp-block-post-featured-image__overlay',
);
$styles_properties = array();
$class_names = array( 'wp-block-post-featured-image__overlay' );
$styles = array();

if ( ! $has_dim_background ) {
return '';
}

// Generate required classes for the element.
// Apply border classes and styles.
$border_attributes = get_block_core_post_featured_image_border_attributes( $attributes );

if ( ! empty( $border_attributes['class'] ) ) {
$class_names[] = $border_attributes['class'];
}

if ( ! empty( $border_attributes['style'] ) ) {
$styles[] = $border_attributes['style'];
}

// Apply overlay and gradient classes.
if ( $has_dim_background ) {
$class_names[] = 'has-background-dim';
$class_names[] = "has-background-dim-{$attributes['dimRatio']}";
Expand All @@ -110,35 +119,20 @@ function get_block_core_post_featured_image_overlay_element_markup( $attributes
$class_names[] = "has-{$attributes['gradient']}-gradient-background";
}

// Generate required CSS properties and their values.
if ( ! empty( $attributes['style']['border']['radius'] ) ) {
$styles_properties['border-radius'] = $attributes['style']['border']['radius'];
}

if ( ! empty( $attributes['style']['border']['width'] ) ) {
$styles_properties['border-width'] = $attributes['style']['border']['width'];
}

// Apply background styles.
if ( $has_custom_gradient ) {
$styles_properties['background-image'] = $attributes['customGradient'];
$styles[] = sprintf( 'background-image: %s;', $attributes['customGradient'] );
}

if ( $has_custom_overlay ) {
$styles_properties['background-color'] = $attributes['customOverlayColor'];
}

$styles = '';

foreach ( $styles_properties as $style_attribute => $style_attribute_value ) {
$styles .= "{$style_attribute}: $style_attribute_value; ";
$styles[] = sprintf( 'background-color: %s;', $attributes['customOverlayColor'] );
}

return sprintf(
'<span class="%s" style="%s" aria-hidden="true"></span>',
esc_attr( implode( ' ', $class_names ) ),
esc_attr( trim( $styles ) )
esc_attr( safecss_filter_attr( implode( ' ', $styles ) ) )
);

}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/blocks/post-featured-image/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"color": true,
"radius": true,
"width": true,
"__experimentalSelector": "img, .block-editor-media-placeholder",
"__experimentalSelector": "img, .block-editor-media-placeholder, .wp-block-post-featured-image__overlay",
"__experimentalSkipSerialization": true,
"__experimentalDefaultControls": {
"color": true,
Expand Down
1 change: 0 additions & 1 deletion src/wp-includes/blocks/quote/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
},
"supports": {
"anchor": true,
"__experimentalSlashInserter": true,
"__experimentalOnEnter": true,
"typography": {
"fontSize": true,
Expand Down