mirror of
https://github.com/WordPress/WordPress.git
synced 2024-11-04 09:49:37 +01:00
1044eb572a
Updated WordPress packages necessary for releasing WordPress 6.1 Beta 1: - @wordpress/a11y@3.17.1 - @wordpress/annotations@2.17.2 - @wordpress/api-fetch@6.14.1 - @wordpress/autop@3.17.1 - @wordpress/babel-plugin-import-jsx-pragma@4.0.1 - @wordpress/babel-plugin-makepot@5.1.1 - @wordpress/babel-preset-default@7.1.1 - @wordpress/base-styles@4.8.1 - @wordpress/blob@3.17.1 - @wordpress/block-directory@3.15.2 - @wordpress/block-editor@10.0.2 - @wordpress/block-library@7.14.2 - @wordpress/block-serialization-default-parser@4.17.1 - @wordpress/block-serialization-spec-parser@4.17.1 - @wordpress/blocks@11.16.2 - @wordpress/browserslist-config@5.0.1 - @wordpress/components@21.0.2 - @wordpress/compose@5.15.2 - @wordpress/core-data@5.0.2 - @wordpress/create-block-tutorial-template@2.5.1 - @wordpress/create-block@4.1.1 - @wordpress/custom-templated-path-webpack-plugin@2.1.3 - @wordpress/customize-widgets@3.14.2 - @wordpress/data-controls@2.17.2 - @wordpress/data@7.1.2 - @wordpress/date@4.17.1 - @wordpress/dependency-extraction-webpack-plugin@4.0.2 - @wordpress/deprecated@3.17.1 - @wordpress/docgen@1.26.1 - @wordpress/dom-ready@3.17.1 - @wordpress/dom@3.17.2 - @wordpress/e2e-test-utils@8.1.1 - @wordpress/e2e-tests@5.1.2 - @wordpress/edit-post@6.14.2 - @wordpress/edit-site@4.14.2 - @wordpress/edit-widgets@4.14.2 - @wordpress/editor@12.16.2 - @wordpress/element@4.15.1 - @wordpress/env@5.2.1 - @wordpress/escape-html@2.17.1 - @wordpress/eslint-plugin@13.1.1 - @wordpress/format-library@3.15.2 - @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.2 - @wordpress/is-shallow-equal@4.17.1 - @wordpress/jest-console@6.0.1 - @wordpress/jest-preset-default@9.0.1 - @wordpress/jest-puppeteer-axe@5.0.1 - @wordpress/keyboard-shortcuts@3.15.2 - @wordpress/keycodes@3.17.1 - @wordpress/lazy-import@1.4.3 - @wordpress/library-export-default-webpack-plugin@2.3.3 - @wordpress/list-reusable-blocks@3.15.2 - @wordpress/media-utils@4.8.1 - @wordpress/notices@3.17.2 - @wordpress/npm-package-json-lint-config@4.2.1 - @wordpress/nux@5.15.2 - @wordpress/plugins@4.15.2 - @wordpress/postcss-plugins-preset@4.1.1 - @wordpress/postcss-themes@5.0.1 - @wordpress/preferences-persistence@1.9.1 - @wordpress/preferences@2.9.2 - @wordpress/prettier-config@2.0.1 - @wordpress/primitives@3.15.1 - @wordpress/priority-queue@2.17.2 - @wordpress/project-management-automation@1.16.1 - @wordpress/react-i18n@3.15.1 - @wordpress/readable-js-assets-webpack-plugin@2.0.1 - @wordpress/redux-routine@4.17.1 - @wordpress/reusable-blocks@3.15.2 - @wordpress/rich-text@5.15.2 - @wordpress/scripts@24.1.2 - @wordpress/server-side-render@3.15.2 - @wordpress/shortcode@3.17.1 - @wordpress/style-engine@1.0.1 - @wordpress/stylelint-config@21.0.1 - @wordpress/token-list@2.17.1 - @wordpress/url@3.18.1 - @wordpress/viewport@4.15.2 - @wordpress/warning@2.17.1 - @wordpress/widgets@2.15.2 - @wordpress/wordcount@3.17.1 Props bernhard-reiter, cbravobernal, czapla, oandregal, isabel_brison, andrewserong, mciampini. See #56467. Built from https://develop.svn.wordpress.org/trunk@54257 git-svn-id: http://core.svn.wordpress.org/trunk@53816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
123 lines
4.6 KiB
PHP
123 lines
4.6 KiB
PHP
<?php
|
|
/**
|
|
* Server-side rendering of the `core/gallery` block.
|
|
*
|
|
* @package WordPress
|
|
*/
|
|
|
|
/**
|
|
* Handles backwards compatibility for Gallery Blocks,
|
|
* whose images feature a `data-id` attribute.
|
|
*
|
|
* Now that the Gallery Block contains inner Image Blocks,
|
|
* we add a custom `data-id` attribute before rendering the gallery
|
|
* so that the Image Block can pick it up in its render_callback.
|
|
*
|
|
* @param array $parsed_block The block being rendered.
|
|
* @return array The migrated block object.
|
|
*/
|
|
function block_core_gallery_data_id_backcompatibility( $parsed_block ) {
|
|
if ( 'core/gallery' === $parsed_block['blockName'] ) {
|
|
foreach ( $parsed_block['innerBlocks'] as $key => $inner_block ) {
|
|
if ( 'core/image' === $inner_block['blockName'] ) {
|
|
if ( ! isset( $parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] ) && isset( $inner_block['attrs']['id'] ) ) {
|
|
$parsed_block['innerBlocks'][ $key ]['attrs']['data-id'] = esc_attr( $inner_block['attrs']['id'] );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return $parsed_block;
|
|
}
|
|
|
|
add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' );
|
|
|
|
/**
|
|
* Adds a style tag for the --wp--style--unstable-gallery-gap var.
|
|
*
|
|
* The Gallery block needs to recalculate Image block width based on
|
|
* the current gap setting in order to maintain the number of flex columns
|
|
* so a css var is added to allow this.
|
|
*
|
|
* @param array $attributes Attributes of the block being rendered.
|
|
* @param string $content Content of the block being rendered.
|
|
* @return string The content of the block being rendered.
|
|
*/
|
|
function block_core_gallery_render( $attributes, $content ) {
|
|
$gap = _wp_array_get( $attributes, array( 'style', 'spacing', 'blockGap' ) );
|
|
// Skip if gap value contains unsupported characters.
|
|
// Regex for CSS value borrowed from `safecss_filter_attr`, and used here
|
|
// because we only want to match against the value, not the CSS attribute.
|
|
if ( is_array( $gap ) ) {
|
|
foreach ( $gap as $key => $value ) {
|
|
// Make sure $value is a string to avoid PHP 8.1 deprecation error in preg_match() when the value is null.
|
|
$value = is_string( $value ) ? $value : '';
|
|
$value = $value && preg_match( '%[\\\(&=}]|/\*%', $value ) ? null : $value;
|
|
|
|
// Get spacing CSS variable from preset value if provided.
|
|
if ( is_string( $value ) && str_contains( $value, 'var:preset|spacing|' ) ) {
|
|
$index_to_splice = strrpos( $value, '|' ) + 1;
|
|
$slug = _wp_to_kebab_case( substr( $value, $index_to_splice ) );
|
|
$value = "var(--wp--preset--spacing--$slug)";
|
|
}
|
|
|
|
$gap[ $key ] = $value;
|
|
}
|
|
} else {
|
|
// Make sure $gap is a string to avoid PHP 8.1 deprecation error in preg_match() when the value is null.
|
|
$gap = is_string( $gap ) ? $gap : '';
|
|
$gap = $gap && preg_match( '%[\\\(&=}]|/\*%', $gap ) ? null : $gap;
|
|
|
|
// Get spacing CSS variable from preset value if provided.
|
|
if ( is_string( $gap ) && str_contains( $gap, 'var:preset|spacing|' ) ) {
|
|
$index_to_splice = strrpos( $gap, '|' ) + 1;
|
|
$slug = _wp_to_kebab_case( substr( $gap, $index_to_splice ) );
|
|
$gap = "var(--wp--preset--spacing--$slug)";
|
|
}
|
|
}
|
|
|
|
$class = wp_unique_id( 'wp-block-gallery-' );
|
|
$content = preg_replace(
|
|
'/' . preg_quote( 'class="', '/' ) . '/',
|
|
'class="' . $class . ' ',
|
|
$content,
|
|
1
|
|
);
|
|
|
|
// --gallery-block--gutter-size is deprecated. --wp--style--gallery-gap-default should be used by themes that want to set a default
|
|
// gap on the gallery.
|
|
$fallback_gap = 'var( --wp--style--gallery-gap-default, var( --gallery-block--gutter-size, var( --wp--style--block-gap, 0.5em ) ) )';
|
|
$gap_value = $gap ? $gap : $fallback_gap;
|
|
$gap_column = $gap_value;
|
|
|
|
if ( is_array( $gap_value ) ) {
|
|
$gap_row = isset( $gap_value['top'] ) ? $gap_value['top'] : $fallback_gap;
|
|
$gap_column = isset( $gap_value['left'] ) ? $gap_value['left'] : $fallback_gap;
|
|
$gap_value = $gap_row === $gap_column ? $gap_row : $gap_row . ' ' . $gap_column;
|
|
}
|
|
|
|
// The unstable gallery gap calculation requires a real value (such as `0px`) and not `0`.
|
|
if ( '0' === $gap_column ) {
|
|
$gap_column = '0px';
|
|
}
|
|
|
|
// Set the CSS variable to the column value, and the `gap` property to the combined gap value.
|
|
$style = '.wp-block-gallery.' . $class . '{ --wp--style--unstable-gallery-gap: ' . $gap_column . '; gap: ' . $gap_value . '}';
|
|
|
|
wp_enqueue_block_support_styles( $style, 11 );
|
|
return $content;
|
|
}
|
|
/**
|
|
* Registers the `core/gallery` block on server.
|
|
*/
|
|
function register_block_core_gallery() {
|
|
register_block_type_from_metadata(
|
|
__DIR__ . '/gallery',
|
|
array(
|
|
'render_callback' => 'block_core_gallery_render',
|
|
)
|
|
);
|
|
}
|
|
|
|
add_action( 'init', 'register_block_core_gallery' );
|