Skip to content

Commit 56a3123

Browse files
committed
prep build 09/03
2 parents d8ec9e2 + f7fd368 commit 56a3123

File tree

419 files changed

+4263
-2027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+4263
-2027
lines changed

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ module.exports = {
330330
'SelectControl',
331331
'TextControl',
332332
'ToggleGroupControl',
333+
'UnitControl',
333334
].map( ( componentName ) => ( {
334335
// Falsy `__next40pxDefaultSize` without a non-default `size` prop.
335336
selector: `JSXOpeningElement[name.name="${ componentName }"]:not(:has(JSXAttribute[name.name="__next40pxDefaultSize"][value.expression.value!=false])):not(:has(JSXAttribute[name.name="size"][value.value!="default"]))`,
@@ -345,7 +346,7 @@ module.exports = {
345346
'FormFileUpload should have the `__next40pxDefaultSize` prop to opt-in to the new default size.',
346347
},
347348
// Temporary rules until all existing components have the `__next40pxDefaultSize` prop.
348-
...[ 'Button', 'UnitControl' ].map( ( componentName ) => ( {
349+
...[ 'Button' ].map( ( componentName ) => ( {
349350
// Not strict. Allows pre-existing __next40pxDefaultSize={ false } usage until they are all manually updated.
350351
selector: `JSXOpeningElement[name.name="${ componentName }"]:not(:has(JSXAttribute[name.name="__next40pxDefaultSize"])):not(:has(JSXAttribute[name.name="size"]))`,
351352
message:

backport-changelog/6.7/7258.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/7258
2+
3+
* https://github.com/WordPress/gutenberg/pull/64570

lib/compat/wordpress-6.7/block-bindings.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,18 @@ function gutenberg_add_server_block_bindings_sources_to_editor_settings( $editor
3838
}
3939

4040
add_filter( 'block_editor_settings_all', 'gutenberg_add_server_block_bindings_sources_to_editor_settings', 10 );
41+
42+
/**
43+
* Initialize `canUpdateBlockBindings` editor setting if it doesn't exist. By default, it is `true` only for admin users.
44+
*
45+
* @param array $settings The block editor settings from the `block_editor_settings_all` filter.
46+
* @return array The editor settings including `canUpdateBlockBindings`.
47+
*/
48+
function gutenberg_add_can_update_block_bindings_editor_setting( $editor_settings ) {
49+
if ( empty( $editor_settings['canUpdateBlockBindings'] ) ) {
50+
$editor_settings['canUpdateBlockBindings'] = current_user_can( 'manage_options' );
51+
}
52+
return $editor_settings;
53+
}
54+
55+
add_filter( 'block_editor_settings_all', 'gutenberg_add_can_update_block_bindings_editor_setting', 10 );

lib/experimental/editor-settings.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,15 @@ function gutenberg_enable_experiments() {
2828
if ( gutenberg_is_experiment_enabled( 'gutenberg-full-page-client-side-navigation' ) ) {
2929
wp_add_inline_script( 'wp-block-library', 'window.__experimentalFullPageClientSideNavigation = true', 'before' );
3030
}
31-
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-zoomed-out-patterns-tab', $gutenberg_experiments ) ) {
32-
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableZoomedOutPatternsTab = true', 'before' );
33-
}
3431
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-quick-edit-dataviews', $gutenberg_experiments ) ) {
3532
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalQuickEditDataViews = true', 'before' );
3633
}
37-
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-bindings-ui', $gutenberg_experiments ) ) {
38-
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalBlockBindingsUI = true', 'before' );
39-
}
4034
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-media-processing', $gutenberg_experiments ) ) {
4135
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalMediaProcessing = true', 'before' );
4236
}
37+
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-zoom-out-experiment', $gutenberg_experiments ) ) {
38+
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableZoomOutExperiment = true', 'before' );
39+
}
4340
}
4441

4542
add_action( 'admin_init', 'gutenberg_enable_experiments' );

lib/experiments-page.php

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,6 @@ function gutenberg_initialize_experiments_settings() {
139139
)
140140
);
141141

142-
add_settings_field(
143-
'gutenberg-zoomed-out-patterns-tab',
144-
__( 'Enable zoomed out view when patterns are browsed in the inserter', 'gutenberg' ),
145-
'gutenberg_display_experiment_field',
146-
'gutenberg-experiments',
147-
'gutenberg_experiments_section',
148-
array(
149-
'label' => __( 'Enable zoomed out view when selecting a pattern category in the main inserter.', 'gutenberg' ),
150-
'id' => 'gutenberg-zoomed-out-patterns-tab',
151-
)
152-
);
153-
154142
add_settings_field(
155143
'gutenberg-new-posts-dashboard',
156144
__( 'Redesigned posts dashboard', 'gutenberg' ),
@@ -176,29 +164,28 @@ function gutenberg_initialize_experiments_settings() {
176164
);
177165

178166
add_settings_field(
179-
'gutenberg-block-bindings-ui',
180-
__( 'UI to create block bindings', 'gutenberg' ),
167+
'gutenberg-media-processing',
168+
__( 'Client-side media processing', 'gutenberg' ),
181169
'gutenberg_display_experiment_field',
182170
'gutenberg-experiments',
183171
'gutenberg_experiments_section',
184172
array(
185-
'label' => __( 'Add UI to create and update block bindings in block inspector controls.', 'gutenberg' ),
186-
'id' => 'gutenberg-block-bindings-ui',
173+
'label' => __( 'Enable client-side media processing.', 'gutenberg' ),
174+
'id' => 'gutenberg-media-processing',
187175
)
188176
);
189177

190178
add_settings_field(
191-
'gutenberg-media-processing',
192-
__( 'Client-side media processing', 'gutenberg' ),
179+
'gutenberg-zoom-out-experiment',
180+
__( 'Zoom out experiments', 'gutenberg' ),
193181
'gutenberg_display_experiment_field',
194182
'gutenberg-experiments',
195183
'gutenberg_experiments_section',
196184
array(
197-
'label' => __( 'Enable client-side media processing.', 'gutenberg' ),
198-
'id' => 'gutenberg-media-processing',
185+
'label' => __( 'Enable zoom out experiments; shows zoom out in the device preview and other zoom out experiments.', 'gutenberg' ),
186+
'id' => 'gutenberg-zoom-out-experiment',
199187
)
200188
);
201-
202189
register_setting(
203190
'gutenberg-experiments',
204191
'gutenberg-experiments'

0 commit comments

Comments
 (0)