Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://develop.svn.wordpress.org/trunk"
},
"gutenberg": {
"sha": "3166ad3c587b4091f77b0e16affeed5762e193f1",
"sha": "5426109cdaf45828ef28ff8527d7d38e7e75fe74",
"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
},
"engines": {
Expand Down
37 changes: 19 additions & 18 deletions src/wp-includes/assets/script-loader-packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
'wp-url',
'wp-warning'
),
'version' => '3a14d64019e67a581568'
'version' => 'bba5c1885d3a53871248'
),
'block-library.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -142,7 +142,7 @@
'import' => 'dynamic'
)
),
'version' => '5449ab60eb22aaa1f668'
'version' => '3510fa05eaf8c889edb7'
),
'block-serialization-default-parser.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -175,7 +175,7 @@
'wp-shortcode',
'wp-warning'
),
'version' => '901495b507ad42be941e'
'version' => '27318ac6d6f72eaf78ee'
),
'commands.js' => array(
'dependencies' => array(
Expand All @@ -187,10 +187,11 @@
'wp-element',
'wp-i18n',
'wp-keyboard-shortcuts',
'wp-preferences',
'wp-primitives',
'wp-private-apis'
),
'version' => 'e3d8bba53f4ffea4fcd2'
'version' => '8b8663311faa33540c1b'
),
'components.js' => array(
'dependencies' => array(
Expand All @@ -214,7 +215,7 @@
'wp-rich-text',
'wp-warning'
),
'version' => '5415b6194c44da6987ba'
'version' => 'dd1b4bbe0c8bd976151c'
),
'compose.js' => array(
'dependencies' => array(
Expand All @@ -228,7 +229,7 @@
'wp-priority-queue',
'wp-undo-manager'
),
'version' => '81a6b4dad8bafab56102'
'version' => '2b5a9d090a41c1120be7'
),
'core-commands.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -266,7 +267,7 @@
'wp-url',
'wp-warning'
),
'version' => '2723b9b8cef3a26eac5e'
'version' => '96a75292a48d3fca7f42'
),
'customize-widgets.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -319,7 +320,7 @@
'moment',
'wp-deprecated'
),
'version' => 'c9f8e7dd3232716f34e9'
'version' => '2faaf49020b2074de156'
),
'deprecated.js' => array(
'dependencies' => array(
Expand All @@ -331,7 +332,7 @@
'dependencies' => array(
'wp-deprecated'
),
'version' => '66a6cf58e0c4cd128af0'
'version' => '1acdd4ebd6969685a9d3'
),
'dom-ready.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -430,7 +431,7 @@
'import' => 'static'
)
),
'version' => 'beef8ec9558e9f14f5f5'
'version' => 'e24eb77015e7b89ec57d'
),
'edit-widgets.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -521,15 +522,15 @@
'import' => 'static'
)
),
'version' => 'b90a3f5c0a9b0a2fe692'
'version' => '12f43831b63cbf5fd5e2'
),
'element.js' => array(
'dependencies' => array(
'react',
'react-dom',
'wp-escape-html'
),
'version' => '9d8168aa5622eac7f17a'
'version' => '204b9776501c644953b6'
),
'escape-html.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -636,15 +637,15 @@
'wp-url',
'wp-warning'
),
'version' => '63b8c642509adc7afa30'
'version' => '02ec6a05ea6e6308bbef'
),
'notices.js' => array(
'dependencies' => array(
'react-jsx-runtime',
'wp-components',
'wp-data'
),
'version' => '503ec5a02578aed590d7'
'version' => '9182f940c250945fb2d4'
),
'nux.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -730,7 +731,7 @@
'dependencies' => array(

),
'version' => 'ecfdb1e08ae3f6ce27d1'
'version' => 'd33c33dda9790dfcae63'
),
'react-i18n.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -811,23 +812,23 @@
'dependencies' => array(

),
'version' => 'a59233ad9478f1a5b0c4'
'version' => 'c9d9033f75b117821889'
),
'sync.js' => array(
'dependencies' => array(
'wp-api-fetch',
'wp-hooks',
'wp-private-apis'
),
'version' => '25e87dccd85c405f28c7'
'version' => 'e0666bb035ab660755be'
),
'theme.js' => array(
'dependencies' => array(
'react-jsx-runtime',
'wp-element',
'wp-private-apis'
),
'version' => 'd707d5b6847d96124e02'
'version' => '544f395a4bf1be7a7f82'
),
'token-list.js' => array(
'dependencies' => array(
Expand Down
10 changes: 5 additions & 5 deletions src/wp-includes/assets/script-modules-packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
'import' => 'static'
)
),
'version' => 'ef4ac69a586a1281a620'
'version' => '91e28c26a7994ed4332c'
),
'connectors/index.js' => array(
'dependencies' => array(
Expand All @@ -177,7 +177,7 @@
'wp-i18n',
'wp-private-apis'
),
'version' => '70a0f074705f10920f9a'
'version' => 'e973aa806299e3d70144'
),
'core-abilities/index.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -273,7 +273,7 @@
'wp-private-apis',
'wp-style-engine'
),
'version' => '184e1479cff9c6206281'
'version' => '65892b41e8d17dc72ead'
),
'route/index.js' => array(
'dependencies' => array(
Expand All @@ -300,7 +300,7 @@
'dependencies' => array(

),
'version' => '61b86a5f5540ba666280'
'version' => '21ff0ef0ab8315e42da9'
),
'workflow/index.js' => array(
'dependencies' => array(
Expand All @@ -321,6 +321,6 @@
'import' => 'static'
)
),
'version' => '13556bc597bbf2a8d620'
'version' => '8d5b553b2fcab74a6606'
)
);
5 changes: 4 additions & 1 deletion src/wp-includes/blocks/blocks-json.php
Original file line number Diff line number Diff line change
Expand Up @@ -2875,8 +2875,10 @@
'background' => array(
'backgroundImage' => true,
'backgroundSize' => true,
'gradient' => true,
'__experimentalDefaultControls' => array(
'backgroundImage' => true
'backgroundImage' => true,
'gradient' => true
)
),
'color' => array(
Expand Down Expand Up @@ -3721,6 +3723,7 @@
),
'supports' => array(
'anchor' => true,
'html' => false,
'className' => false,
'splitting' => true,
'__experimentalBorder' => array(
Expand Down
4 changes: 3 additions & 1 deletion src/wp-includes/blocks/group/block.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
"background": {
"backgroundImage": true,
"backgroundSize": true,
"gradient": true,
"__experimentalDefaultControls": {
"backgroundImage": true
"backgroundImage": true,
"gradient": true
}
},
"color": {
Expand Down
47 changes: 14 additions & 33 deletions src/wp-includes/blocks/home-link.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* @package WordPress
*/

require_once __DIR__ . '/navigation-link/shared/build-css-font-sizes.php';

/**
* Build an array with CSS classes and inline styles defining the colors
* which will be applied to the home link markup in the front-end.
Expand Down Expand Up @@ -59,36 +61,6 @@ function block_core_home_link_build_css_colors( $context ) {
return $colors;
}

/**
* Build an array with CSS classes and inline styles defining the font sizes
* which will be applied to the home link markup in the front-end.
*
* @since 6.0.0
*
* @param array $context Home link block context.
* @return array Font size CSS classes and inline styles.
*/
function block_core_home_link_build_css_font_sizes( $context ) {
// CSS classes.
$font_sizes = array(
'css_classes' => array(),
'inline_styles' => '',
);

$has_named_font_size = array_key_exists( 'fontSize', $context );
$has_custom_font_size = isset( $context['style']['typography']['fontSize'] );

if ( $has_named_font_size ) {
// Add the font size class.
$font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] );
} elseif ( $has_custom_font_size ) {
// Add the custom font size inline style.
$font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] );
}

return $font_sizes;
}

/**
* Builds an array with classes and style for the li wrapper
*
Expand All @@ -98,12 +70,21 @@ function block_core_home_link_build_css_font_sizes( $context ) {
* @return string The li wrapper attributes.
*/
function block_core_home_link_build_li_wrapper_attributes( $context ) {
$colors = block_core_home_link_build_css_colors( $context );
$font_sizes = block_core_home_link_build_css_font_sizes( $context );
$classes = array_merge(
$colors = block_core_home_link_build_css_colors( $context );
// The build system prefixes this function with "gutenberg_" to avoid
// collisions with the core version. Until this function is backported to
// core, we need to guard it's use and only call the prefixed name in
// the plugin.
if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
$font_sizes = gutenberg_block_core_shared_navigation_build_css_font_sizes( $context );
} else {
$font_sizes = block_core_shared_navigation_build_css_font_sizes( $context );
}
$classes = array_merge(
$colors['css_classes'],
$font_sizes['css_classes']
);

$style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] );
$classes[] = 'wp-block-navigation-item';

Expand Down
1 change: 1 addition & 0 deletions src/wp-includes/blocks/list-item/block.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
},
"supports": {
"anchor": true,
"html": false,
"className": false,
"splitting": true,
"__experimentalBorder": {
Expand Down
13 changes: 13 additions & 0 deletions src/wp-includes/blocks/loginout.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@ function render_block_core_loginout( $attributes ) {

// Get the form.
$contents = wp_login_form( array( 'echo' => false ) );

if ( wp_is_block_theme() ) {
$processor = new WP_HTML_Tag_Processor( $contents );

while ( $processor->next_tag( 'input' ) ) {
if ( 'submit' === $processor->get_attribute( 'type' ) && 'wp-submit' === $processor->get_attribute( 'name' ) ) {
$processor->add_class( 'wp-block-button__link' );
$processor->add_class( wp_theme_get_element_class_name( 'button' ) );
$contents = $processor->get_updated_html();
break;
}
}
}
}

$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
Expand Down
Loading
Loading