Skip to content

Commit 51a9fc0

Browse files
dd32dd32
authored
Merge branch 'WordPress:trunk' into trunk
2 parents 5be4231 + 1988bb7 commit 51a9fc0

17 files changed

Lines changed: 632 additions & 49 deletions

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://develop.svn.wordpress.org/trunk"
88
},
99
"gutenberg": {
10-
"sha": "e73c3c481db0650183f092af157f6e42efe9ee2d",
10+
"sha": "4997026b75c922d8a6f77a03d72ed7cad04c7073",
1111
"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
1212
},
1313
"engines": {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
'wp-theme',
6767
'wp-url'
6868
),
69-
'version' => '2be95e1c69e795bfc7c1'
69+
'version' => 'e534a0f04643c4175bf3'
7070
),
7171
'block-editor.js' => array(
7272
'dependencies' => array(
@@ -104,7 +104,7 @@
104104
'wp-url',
105105
'wp-warning'
106106
),
107-
'version' => '99803447584b3d7644e9'
107+
'version' => '77626afea4a1cac03204'
108108
),
109109
'block-library.js' => array(
110110
'dependencies' => array(
@@ -150,7 +150,7 @@
150150
'import' => 'dynamic'
151151
)
152152
),
153-
'version' => 'c9f222767e6c1a5ce0f0'
153+
'version' => 'd24e08348f91bcfce1b7'
154154
),
155155
'block-serialization-default-parser.js' => array(
156156
'dependencies' => array(
@@ -224,7 +224,7 @@
224224
'wp-theme',
225225
'wp-warning'
226226
),
227-
'version' => 'a5dafa2d4b6524d691ee'
227+
'version' => 'd54375c07776a218ee99'
228228
),
229229
'compose.js' => array(
230230
'dependencies' => array(
@@ -277,7 +277,7 @@
277277
'wp-url',
278278
'wp-warning'
279279
),
280-
'version' => 'f8cc2c428aaee6d1cb92'
280+
'version' => 'c7a571126b75599516cf'
281281
),
282282
'customize-widgets.js' => array(
283283
'dependencies' => array(
@@ -396,7 +396,7 @@
396396
'import' => 'static'
397397
)
398398
),
399-
'version' => '8473319428dab1c48631'
399+
'version' => '4aeb2f3aa372be39adb2'
400400
),
401401
'edit-site.js' => array(
402402
'dependencies' => array(
@@ -446,7 +446,7 @@
446446
'import' => 'static'
447447
)
448448
),
449-
'version' => 'a37c6fdd10740408f19d'
449+
'version' => 'c33d508cfc124b1b3e2d'
450450
),
451451
'edit-widgets.js' => array(
452452
'dependencies' => array(
@@ -487,7 +487,7 @@
487487
'import' => 'static'
488488
)
489489
),
490-
'version' => 'ecad0946a7d57d563d4d'
490+
'version' => 'b6608ebdd73ddae5a250'
491491
),
492492
'editor.js' => array(
493493
'dependencies' => array(
@@ -537,7 +537,7 @@
537537
'import' => 'static'
538538
)
539539
),
540-
'version' => '0a609157ffb795abc542'
540+
'version' => 'cf691bc72eeac5643913'
541541
),
542542
'element.js' => array(
543543
'dependencies' => array(
@@ -657,7 +657,7 @@
657657
'wp-url',
658658
'wp-warning'
659659
),
660-
'version' => 'cdee5bad0dbdf854a8de'
660+
'version' => '8addf2ae46aa60243073'
661661
),
662662
'notices.js' => array(
663663
'dependencies' => array(
@@ -794,7 +794,7 @@
794794
'wp-keycodes',
795795
'wp-private-apis'
796796
),
797-
'version' => '1a9947b38c18a34e1d2e'
797+
'version' => '1c4b61567c93d486f1dc'
798798
),
799799
'router.js' => array(
800800
'dependencies' => array(
@@ -883,7 +883,7 @@
883883
'import' => 'dynamic'
884884
)
885885
),
886-
'version' => '8f0937232c8009396479'
886+
'version' => 'a16fcecc49ab54f868c2'
887887
),
888888
'url.js' => array(
889889
'dependencies' => array(

‎src/wp-includes/assets/script-modules-packages.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
'import' => 'static'
8989
)
9090
),
91-
'version' => '0bebcdac79313f8ed604'
91+
'version' => 'fb8db6c2fefd8246fa86'
9292
),
9393
'block-library/query/view.js' => array(
9494
'dependencies' => array(
@@ -164,7 +164,7 @@
164164
'import' => 'static'
165165
)
166166
),
167-
'version' => '66dddf07eec0100be606'
167+
'version' => '4b0281842169241e3d0e'
168168
),
169169
'connectors/index.js' => array(
170170
'dependencies' => array(
@@ -211,7 +211,7 @@
211211
'import' => 'static'
212212
)
213213
),
214-
'version' => 'fb445bf351657f44f1d0'
214+
'version' => '2fe152df83cad8d59403'
215215
),
216216
'core-abilities/index.js' => array(
217217
'dependencies' => array(
@@ -342,7 +342,7 @@
342342
'dependencies' => array(
343343

344344
),
345-
'version' => 'd8cfb0be4d36afcd40f6'
345+
'version' => '4d3627c45251ceb4f9a2'
346346
),
347347
'vips/loader.js' => array(
348348
'dependencies' => array(
@@ -360,7 +360,7 @@
360360
'dependencies' => array(
361361

362362
),
363-
'version' => 'dfc83d3328327c911b78'
363+
'version' => '685442d334b2d3e70832'
364364
),
365365
'workflow/index.js' => array(
366366
'dependencies' => array(

‎src/wp-includes/blocks/navigation-link.php‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,66 @@ function block_core_navigation_link_build_css_colors( $context, $attributes, $is
8080
return $colors;
8181
}
8282

83+
/**
84+
* Build an array with CSS classes and inline styles defining the font sizes
85+
* which will be applied to the navigation markup in the front-end.
86+
*
87+
* This function is no longer used internally and is kept only for backward
88+
* compatibility with third-party code that may call it directly.
89+
*
90+
* @since 5.9.0
91+
* @deprecated 7.0.0
92+
*
93+
* @param array $context Navigation block context.
94+
* @return array Font size CSS classes and inline styles.
95+
*/
96+
function block_core_navigation_link_build_css_font_sizes( $context ) {
97+
_deprecated_function( __FUNCTION__, '7.0.0' );
98+
99+
// CSS classes.
100+
$font_sizes = array(
101+
'css_classes' => array(),
102+
'inline_styles' => '',
103+
);
104+
105+
$has_named_font_size = array_key_exists( 'fontSize', $context );
106+
$has_custom_font_size = isset( $context['style']['typography']['fontSize'] );
107+
108+
if ( $has_named_font_size ) {
109+
// Add the font size class.
110+
$font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] );
111+
} elseif ( $has_custom_font_size ) {
112+
// Add the custom font size inline style.
113+
$font_sizes['inline_styles'] = sprintf(
114+
'font-size: %s;',
115+
wp_get_typography_font_size_value(
116+
array(
117+
'size' => $context['style']['typography']['fontSize'],
118+
)
119+
)
120+
);
121+
}
122+
123+
return $font_sizes;
124+
}
125+
126+
/**
127+
* Returns the top-level submenu SVG chevron icon.
128+
*
129+
* @since 5.9.0
130+
* @deprecated 7.0.0 Use block_core_shared_navigation_render_submenu_icon() instead.
131+
*
132+
* @return string
133+
*/
134+
function block_core_navigation_link_render_submenu_icon() {
135+
_deprecated_function(
136+
__FUNCTION__,
137+
'7.0.0',
138+
'block_core_shared_navigation_render_submenu_icon()'
139+
);
140+
return block_core_shared_navigation_render_submenu_icon();
141+
}
142+
83143
/**
84144
* Decodes a url if it's encoded, returning the same url if not.
85145
*

0 commit comments

Comments
 (0)