mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-07-01 15:50:09 +00:00
Block Editor: Updates the WordPress packages with all the fixes targetted for WP 6.2 beta1.
Includes the following changes - Fix multi entities saved state in the post editor - Adds a global save button to the site editor - Shadow: move shadow to own panel - [Block Editor]: Lock __experimentalBlockInspectorAnimation setting - useBlockSync: change subscribed.current on unsubscribe - [Block Library - Gallery]: Minor code quality update - [Patterns]: Reorder pattern categories - Fix inline preview infinite render - Show a pointer/hint in the settings tab informing the user about the styles tab - I18N: update string concatenation method in read more block - LocalAutosaveNotice: use stable notice id to prevent double notices - Navigation: Remove the IS_GUTENBERG_PLUGIN check around block_core_navigation_parse_blocks_from_menu_items Props mamaduka, ntsekouras, kebbet. See #57471. git-svn-id: https://develop.svn.wordpress.org/trunk@55257 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -99,12 +99,13 @@ function block_core_gallery_render( $attributes, $content ) {
|
||||
}
|
||||
|
||||
// Set the CSS variable to the column value, and the `gap` property to the combined gap value.
|
||||
$gallery_styles = array();
|
||||
$gallery_styles[] = array(
|
||||
'selector' => ".wp-block-gallery.{$unique_gallery_classname}",
|
||||
'declarations' => array(
|
||||
'--wp--style--unstable-gallery-gap' => $gap_column,
|
||||
'gap' => $gap_value,
|
||||
$gallery_styles = array(
|
||||
array(
|
||||
'selector' => ".wp-block-gallery.{$unique_gallery_classname}",
|
||||
'declarations' => array(
|
||||
'--wp--style--unstable-gallery-gap' => $gap_column,
|
||||
'gap' => $gap_value,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
|
||||
@@ -371,35 +371,3 @@ function register_block_core_navigation_link() {
|
||||
);
|
||||
}
|
||||
add_action( 'init', 'register_block_core_navigation_link' );
|
||||
|
||||
/**
|
||||
* Enables animation of the block inspector for the Navigation Link block.
|
||||
*
|
||||
* See:
|
||||
* - https://github.com/WordPress/gutenberg/pull/46342
|
||||
* - https://github.com/WordPress/gutenberg/issues/45884
|
||||
*
|
||||
* @param array $settings Default editor settings.
|
||||
* @return array Filtered editor settings.
|
||||
*/
|
||||
function block_core_navigation_link_enable_inspector_animation( $settings ) {
|
||||
$current_animation_settings = _wp_array_get(
|
||||
$settings,
|
||||
array( '__experimentalBlockInspectorAnimation' ),
|
||||
array()
|
||||
);
|
||||
|
||||
$settings['__experimentalBlockInspectorAnimation'] = array_merge(
|
||||
$current_animation_settings,
|
||||
array(
|
||||
'core/navigation-link' =>
|
||||
array(
|
||||
'enterDirection' => 'rightToLeft',
|
||||
),
|
||||
)
|
||||
);
|
||||
|
||||
return $settings;
|
||||
}
|
||||
|
||||
add_filter( 'block_editor_settings_all', 'block_core_navigation_link_enable_inspector_animation' );
|
||||
|
||||
@@ -289,35 +289,3 @@ function register_block_core_navigation_submenu() {
|
||||
);
|
||||
}
|
||||
add_action( 'init', 'register_block_core_navigation_submenu' );
|
||||
|
||||
/**
|
||||
* Enables animation of the block inspector for the Navigation Submenu block.
|
||||
*
|
||||
* See:
|
||||
* - https://github.com/WordPress/gutenberg/pull/46342
|
||||
* - https://github.com/WordPress/gutenberg/issues/45884
|
||||
*
|
||||
* @param array $settings Default editor settings.
|
||||
* @return array Filtered editor settings.
|
||||
*/
|
||||
function block_core_navigation_submenu_enable_inspector_animation( $settings ) {
|
||||
$current_animation_settings = _wp_array_get(
|
||||
$settings,
|
||||
array( '__experimentalBlockInspectorAnimation' ),
|
||||
array()
|
||||
);
|
||||
|
||||
$settings['__experimentalBlockInspectorAnimation'] = array_merge(
|
||||
$current_animation_settings,
|
||||
array(
|
||||
'core/navigation-submenu' =>
|
||||
array(
|
||||
'enterDirection' => 'rightToLeft',
|
||||
),
|
||||
)
|
||||
);
|
||||
|
||||
return $settings;
|
||||
}
|
||||
|
||||
add_filter( 'block_editor_settings_all', 'block_core_navigation_submenu_enable_inspector_animation' );
|
||||
|
||||
@@ -65,58 +65,58 @@ if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
|
||||
|
||||
return $menu_items_by_parent_id;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Turns menu item data into a nested array of parsed blocks
|
||||
*
|
||||
* @param array $menu_items An array of menu items that represent
|
||||
* an individual level of a menu.
|
||||
* @param array $menu_items_by_parent_id An array keyed by the id of the
|
||||
* parent menu where each element is an
|
||||
* array of menu items that belong to
|
||||
* that parent.
|
||||
* @return array An array of parsed block data.
|
||||
*/
|
||||
function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_items_by_parent_id ) {
|
||||
if ( empty( $menu_items ) ) {
|
||||
return array();
|
||||
}
|
||||
|
||||
$blocks = array();
|
||||
|
||||
foreach ( $menu_items as $menu_item ) {
|
||||
$class_name = ! empty( $menu_item->classes ) ? implode( ' ', (array) $menu_item->classes ) : null;
|
||||
$id = ( null !== $menu_item->object_id && 'custom' !== $menu_item->object ) ? $menu_item->object_id : null;
|
||||
$opens_in_new_tab = null !== $menu_item->target && '_blank' === $menu_item->target;
|
||||
$rel = ( null !== $menu_item->xfn && '' !== $menu_item->xfn ) ? $menu_item->xfn : null;
|
||||
$kind = null !== $menu_item->type ? str_replace( '_', '-', $menu_item->type ) : 'custom';
|
||||
|
||||
$block = array(
|
||||
'blockName' => isset( $menu_items_by_parent_id[ $menu_item->ID ] ) ? 'core/navigation-submenu' : 'core/navigation-link',
|
||||
'attrs' => array(
|
||||
'className' => $class_name,
|
||||
'description' => $menu_item->description,
|
||||
'id' => $id,
|
||||
'kind' => $kind,
|
||||
'label' => $menu_item->title,
|
||||
'opensInNewTab' => $opens_in_new_tab,
|
||||
'rel' => $rel,
|
||||
'title' => $menu_item->attr_title,
|
||||
'type' => $menu_item->object,
|
||||
'url' => $menu_item->url,
|
||||
),
|
||||
);
|
||||
|
||||
$block['innerBlocks'] = isset( $menu_items_by_parent_id[ $menu_item->ID ] )
|
||||
? block_core_navigation_parse_blocks_from_menu_items( $menu_items_by_parent_id[ $menu_item->ID ], $menu_items_by_parent_id )
|
||||
: array();
|
||||
$block['innerContent'] = array_map( 'serialize_block', $block['innerBlocks'] );
|
||||
|
||||
$blocks[] = $block;
|
||||
}
|
||||
|
||||
return $blocks;
|
||||
/**
|
||||
* Turns menu item data into a nested array of parsed blocks
|
||||
*
|
||||
* @param array $menu_items An array of menu items that represent
|
||||
* an individual level of a menu.
|
||||
* @param array $menu_items_by_parent_id An array keyed by the id of the
|
||||
* parent menu where each element is an
|
||||
* array of menu items that belong to
|
||||
* that parent.
|
||||
* @return array An array of parsed block data.
|
||||
*/
|
||||
function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_items_by_parent_id ) {
|
||||
if ( empty( $menu_items ) ) {
|
||||
return array();
|
||||
}
|
||||
|
||||
$blocks = array();
|
||||
|
||||
foreach ( $menu_items as $menu_item ) {
|
||||
$class_name = ! empty( $menu_item->classes ) ? implode( ' ', (array) $menu_item->classes ) : null;
|
||||
$id = ( null !== $menu_item->object_id && 'custom' !== $menu_item->object ) ? $menu_item->object_id : null;
|
||||
$opens_in_new_tab = null !== $menu_item->target && '_blank' === $menu_item->target;
|
||||
$rel = ( null !== $menu_item->xfn && '' !== $menu_item->xfn ) ? $menu_item->xfn : null;
|
||||
$kind = null !== $menu_item->type ? str_replace( '_', '-', $menu_item->type ) : 'custom';
|
||||
|
||||
$block = array(
|
||||
'blockName' => isset( $menu_items_by_parent_id[ $menu_item->ID ] ) ? 'core/navigation-submenu' : 'core/navigation-link',
|
||||
'attrs' => array(
|
||||
'className' => $class_name,
|
||||
'description' => $menu_item->description,
|
||||
'id' => $id,
|
||||
'kind' => $kind,
|
||||
'label' => $menu_item->title,
|
||||
'opensInNewTab' => $opens_in_new_tab,
|
||||
'rel' => $rel,
|
||||
'title' => $menu_item->attr_title,
|
||||
'type' => $menu_item->object,
|
||||
'url' => $menu_item->url,
|
||||
),
|
||||
);
|
||||
|
||||
$block['innerBlocks'] = isset( $menu_items_by_parent_id[ $menu_item->ID ] )
|
||||
? block_core_navigation_parse_blocks_from_menu_items( $menu_items_by_parent_id[ $menu_item->ID ], $menu_items_by_parent_id )
|
||||
: array();
|
||||
$block['innerContent'] = array_map( 'serialize_block', $block['innerBlocks'] );
|
||||
|
||||
$blocks[] = $block;
|
||||
}
|
||||
|
||||
return $blocks;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -874,35 +874,3 @@ function block_core_navigation_typographic_presets_backcompatibility( $parsed_bl
|
||||
}
|
||||
|
||||
add_filter( 'render_block_data', 'block_core_navigation_typographic_presets_backcompatibility' );
|
||||
|
||||
/**
|
||||
* Enables animation of the block inspector for the Navigation block.
|
||||
*
|
||||
* See:
|
||||
* - https://github.com/WordPress/gutenberg/pull/46342
|
||||
* - https://github.com/WordPress/gutenberg/issues/45884
|
||||
*
|
||||
* @param array $settings Default editor settings.
|
||||
* @return array Filtered editor settings.
|
||||
*/
|
||||
function block_core_navigation_enable_inspector_animation( $settings ) {
|
||||
$current_animation_settings = _wp_array_get(
|
||||
$settings,
|
||||
array( '__experimentalBlockInspectorAnimation' ),
|
||||
array()
|
||||
);
|
||||
|
||||
$settings['__experimentalBlockInspectorAnimation'] = array_merge(
|
||||
$current_animation_settings,
|
||||
array(
|
||||
'core/navigation' =>
|
||||
array(
|
||||
'enterDirection' => 'leftToRight',
|
||||
),
|
||||
)
|
||||
);
|
||||
|
||||
return $settings;
|
||||
}
|
||||
|
||||
add_filter( 'block_editor_settings_all', 'block_core_navigation_enable_inspector_animation' );
|
||||
|
||||
@@ -18,12 +18,19 @@ function render_block_core_read_more( $attributes, $content, $block ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$post_ID = $block->context['postId'];
|
||||
$post_title = get_the_title( $post_ID );
|
||||
$post_ID = $block->context['postId'];
|
||||
$post_title = get_the_title( $post_ID );
|
||||
if ( '' === $post_title ) {
|
||||
$post_title = sprintf(
|
||||
/* translators: %s is post ID to describe the link for screen readers. */
|
||||
__( 'untitled post %s' ),
|
||||
$post_ID
|
||||
);
|
||||
}
|
||||
$screen_reader_text = sprintf(
|
||||
/* translators: %s is either the post title or post ID to describe the link for screen readers. */
|
||||
__( ': %s' ),
|
||||
'' !== $post_title ? $post_title : __( 'untitled post ' ) . $post_ID
|
||||
$post_title
|
||||
);
|
||||
$justify_class_name = empty( $attributes['justifyContent'] ) ? '' : "is-justified-{$attributes['justifyContent']}";
|
||||
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $justify_class_name ) );
|
||||
|
||||
Reference in New Issue
Block a user