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": "5426109cdaf45828ef28ff8527d7d38e7e75fe74",
"sha": "7295bd91a3c2b64bb11dde0a12313210d9d16a12",
"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
},
"engines": {
Expand Down
44 changes: 22 additions & 22 deletions src/wp-includes/assets/script-loader-packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'wp-i18n',
'wp-rich-text'
),
'version' => '4b07d06c67c3b5ea590c'
'version' => 'a97786de6f13be9c6637'
),
'api-fetch.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -69,7 +69,6 @@
'react-dom',
'react-jsx-runtime',
'wp-a11y',
'wp-api-fetch',
'wp-blob',
'wp-block-serialization-default-parser',
'wp-blocks',
Expand Down Expand Up @@ -100,7 +99,7 @@
'wp-url',
'wp-warning'
),
'version' => 'bba5c1885d3a53871248'
'version' => '16b3af93a787b1379042'
),
'block-library.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -142,7 +141,7 @@
'import' => 'dynamic'
)
),
'version' => '3510fa05eaf8c889edb7'
'version' => '9a3a13b2420931623d63'
),
'block-serialization-default-parser.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -175,7 +174,7 @@
'wp-shortcode',
'wp-warning'
),
'version' => '27318ac6d6f72eaf78ee'
'version' => '6ed3c03f430c8984d1e1'
),
'commands.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -215,7 +214,7 @@
'wp-rich-text',
'wp-warning'
),
'version' => 'dd1b4bbe0c8bd976151c'
'version' => '97a7ddd1e1d999da982b'
),
'compose.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -267,7 +266,7 @@
'wp-url',
'wp-warning'
),
'version' => '96a75292a48d3fca7f42'
'version' => '98b022156a52c57830b3'
),
'customize-widgets.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -305,7 +304,7 @@
'wp-private-apis',
'wp-redux-routine'
),
'version' => '827870cbde5326e4e88e'
'version' => '180953b1a59424bb6718'
),
'data-controls.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -382,7 +381,7 @@
'import' => 'static'
)
),
'version' => '012ef18791dcc2fc8895'
'version' => '571c6840c1f95e154700'
),
'edit-site.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -431,7 +430,7 @@
'import' => 'static'
)
),
'version' => 'e24eb77015e7b89ec57d'
'version' => 'a886b2b87319828b24e3'
),
'edit-widgets.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -522,7 +521,7 @@
'import' => 'static'
)
),
'version' => '12f43831b63cbf5fd5e2'
'version' => '823ed6e13dfb89c3f89d'
),
'element.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -578,7 +577,7 @@
'dependencies' => array(
'wp-hooks'
),
'version' => '781d11515ad3d91786ec'
'version' => '125448662852c5e18937'
),
'is-shallow-equal.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -611,7 +610,7 @@
'wp-element',
'wp-i18n'
),
'version' => 'd42cff283dbd5effd14c'
'version' => 'a44da9be02cdfef6e44d'
),
'media-utils.js' => array(
'dependencies' => array(
Expand All @@ -631,13 +630,14 @@
'wp-i18n',
'wp-keycodes',
'wp-notices',
'wp-preferences',
'wp-primitives',
'wp-private-apis',
'wp-theme',
'wp-url',
'wp-warning'
),
'version' => '02ec6a05ea6e6308bbef'
'version' => '9750aae5171fb20e5c17'
),
'notices.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -776,7 +776,7 @@
'wp-keycodes',
'wp-private-apis'
),
'version' => '262898c1e2003840b59f'
'version' => '1b3e411a54ef29d2bf7a'
),
'router.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -820,15 +820,15 @@
'wp-hooks',
'wp-private-apis'
),
'version' => 'e0666bb035ab660755be'
'version' => '5ff90a11bbb5def86790'
),
'theme.js' => array(
'dependencies' => array(
'react-jsx-runtime',
'wp-element',
'wp-private-apis'
),
'version' => '544f395a4bf1be7a7f82'
'version' => 'abeb8783107aed891810'
),
'token-list.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -859,21 +859,21 @@
'import' => 'dynamic'
)
),
'version' => 'd359c2cccf866d7082d2'
'version' => 'e03397e1062511119cc5'
),
'url.js' => array(
'dependencies' => array(

),
'version' => 'bb0f766c3d2efe497871'
'version' => '9dd5f16a5ce37bf4ba2c'
),
'viewport.js' => array(
'dependencies' => array(
'react-jsx-runtime',
'wp-compose',
'wp-data'
'wp-data',
'wp-element'
),
'version' => '8614025b8075d220d78f'
'version' => '97845df4d1a7269c5c2b'
),
'warning.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 @@ -46,7 +46,7 @@
'import' => 'static'
)
),
'version' => '7d4d261d10dca47ebecb'
'version' => 'a9114a756e418400594c'
),
'block-library/form/view.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -166,7 +166,7 @@
'import' => 'static'
)
),
'version' => '91e28c26a7994ed4332c'
'version' => '570068c474110f2ff13f'
),
'connectors/index.js' => array(
'dependencies' => array(
Expand All @@ -177,7 +177,7 @@
'wp-i18n',
'wp-private-apis'
),
'version' => 'e973aa806299e3d70144'
'version' => '274797868955a828dfdc'
),
'core-abilities/index.js' => array(
'dependencies' => array(
Expand Down Expand Up @@ -273,7 +273,7 @@
'wp-private-apis',
'wp-style-engine'
),
'version' => '65892b41e8d17dc72ead'
'version' => 'fe96a6ab10a4550153ab'
),
'route/index.js' => array(
'dependencies' => array(
Expand All @@ -300,7 +300,7 @@
'dependencies' => array(

),
'version' => '21ff0ef0ab8315e42da9'
'version' => '34c388850fff0c80f78a'
),
'workflow/index.js' => array(
'dependencies' => array(
Expand Down
10 changes: 5 additions & 5 deletions src/wp-includes/blocks/blocks-json.php
Original file line number Diff line number Diff line change
Expand Up @@ -6995,10 +6995,6 @@
'default' => array(

)
),
'isSearchFieldHidden' => array(
'type' => 'boolean',
'default' => false
)
),
'supports' => array(
Expand Down Expand Up @@ -7049,7 +7045,11 @@
'html' => false
),
'editorStyle' => 'wp-block-search-editor',
'style' => 'wp-block-search'
'style' => 'wp-block-search',
'selectors' => array(
'color' => '.wp-block-search .wp-block-search__button, .wp-block-search.wp-block-search__no-button .wp-block-search__input',
'border' => '.wp-block-search.wp-block-search__button-outside .wp-block-search__input, .wp-block-search.wp-block-search__button-outside .wp-block-search__button, .wp-block-search.wp-block-search__no-button .wp-block-search__input, .wp-block-search.wp-block-search__button-only .wp-block-search__input, .wp-block-search.wp-block-search__button-only .wp-block-search__button, .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper'
)
),
'separator' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
Expand Down
8 changes: 4 additions & 4 deletions src/wp-includes/blocks/image.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ function block_core_image_render_lightbox( $block_content, $block, $block_instan
array(
'defaultAriaLabel' => __( 'Enlarged image' ),
'closeButtonText' => esc_html__( 'Close' ),
'prevButtonText' => esc_html__( 'Previous' ),
'nextButtonText' => esc_html__( 'Next' ),
'prevButtonText' => esc_html_x( 'Previous', 'previous image in lightbox' ),
'nextButtonText' => esc_html_x( 'Next', 'next image in lightbox' ),
)
);

Expand Down Expand Up @@ -323,8 +323,8 @@ class="lightbox-trigger"
function block_core_image_print_lightbox_overlay() {
$dialog_label = esc_attr__( 'Enlarged images' );
$close_button_text = esc_attr__( 'Close' );
$prev_button_text = esc_attr__( 'Previous' );
$next_button_text = esc_attr__( 'Next' );
$prev_button_text = esc_attr_x( 'Previous', 'previous image in lightbox' );
$next_button_text = esc_attr_x( 'Next', 'next image in lightbox' );
$close_button_icon = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="20" height="20" aria-hidden="true" focusable="false"><path d="m13.06 12 6.47-6.47-1.06-1.06L12 10.94 5.53 4.47 4.47 5.53 10.94 12l-6.47 6.47 1.06 1.06L12 13.06l6.47 6.47 1.06-1.06L13.06 12Z"></path></svg>';
$prev_button_icon = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="28" height="28" aria-hidden="true" focusable="false"><path d="M14.6 7l-1.2-1L8 12l5.4 6 1.2-1-4.6-5z"></path></svg>';
$next_button_icon = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="28" height="28" aria-hidden="true" focusable="false"><path d="M10.6 6L9.4 7l4.6 5-4.6 5 1.2 1 5.4-6z"></path></svg>';
Expand Down
26 changes: 23 additions & 3 deletions src/wp-includes/blocks/search.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ function render_block_core_search( $attributes ) {
if ( ! empty( $typography_classes ) ) {
$input_classes[] = $typography_classes;
}
if ( ! $show_button && ! empty( $color_classes ) ) {
$input_classes[] = $color_classes;
}
if ( $input->next_tag() ) {
$input->add_class( implode( ' ', $input_classes ) );
$input->set_attribute( 'id', $input_id );
Expand Down Expand Up @@ -430,20 +433,37 @@ function styles_for_block_core_search( $attributes ) {
}
}

$use_input_for_colors = ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'];

// Add color styles.
$has_text_color = ! empty( $attributes['style']['color']['text'] );
if ( $has_text_color ) {
$button_styles[] = sprintf( 'color: %s;', $attributes['style']['color']['text'] );
$text_color_style = sprintf( 'color: %s;', $attributes['style']['color']['text'] );
if ( $use_input_for_colors ) {
$input_styles[] = $text_color_style;
} else {
$button_styles[] = $text_color_style;
}
}

$has_background_color = ! empty( $attributes['style']['color']['background'] );
if ( $has_background_color ) {
$button_styles[] = sprintf( 'background-color: %s;', $attributes['style']['color']['background'] );
$background_color_style = sprintf( 'background-color: %s;', $attributes['style']['color']['background'] );
if ( $use_input_for_colors ) {
$input_styles[] = $background_color_style;
} else {
$button_styles[] = $background_color_style;
}
}

$has_custom_gradient = ! empty( $attributes['style']['color']['gradient'] );
if ( $has_custom_gradient ) {
$button_styles[] = sprintf( 'background: %s;', $attributes['style']['color']['gradient'] );
$custom_gradient_style = sprintf( 'background: %s;', $attributes['style']['color']['gradient'] );
if ( $use_input_for_colors ) {
$input_styles[] = $custom_gradient_style;
} else {
$button_styles[] = $custom_gradient_style;
}
}

// Get typography styles to be shared across inner elements.
Expand Down
10 changes: 5 additions & 5 deletions src/wp-includes/blocks/search/block.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
"query": {
"type": "object",
"default": {}
},
"isSearchFieldHidden": {
"type": "boolean",
"default": false
}
},
"supports": {
Expand Down Expand Up @@ -92,5 +88,9 @@
"html": false
},
"editorStyle": "wp-block-search-editor",
"style": "wp-block-search"
"style": "wp-block-search",
"selectors": {
"color": ".wp-block-search .wp-block-search__button, .wp-block-search.wp-block-search__no-button .wp-block-search__input",
"border": ".wp-block-search.wp-block-search__button-outside .wp-block-search__input, .wp-block-search.wp-block-search__button-outside .wp-block-search__button, .wp-block-search.wp-block-search__no-button .wp-block-search__input, .wp-block-search.wp-block-search__button-only .wp-block-search__input, .wp-block-search.wp-block-search__button-only .wp-block-search__button, .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper"
}
}
2 changes: 1 addition & 1 deletion src/wp-includes/build/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
*/

return array(
'version' => '22.9.0',
'version' => '23.0.0',
'build_url' => includes_url( 'build/' ),
);
Loading
Loading