diff --git a/docs/explanations/architecture/entities.md b/docs/explanations/architecture/entities.md index 368d0a73f87b65..1e037ed5b2824f 100644 --- a/docs/explanations/architecture/entities.md +++ b/docs/explanations/architecture/entities.md @@ -24,7 +24,7 @@ Once the entity is loaded, you can edit it. For example, the following code sets The package also exposes a set of actions to manipulate the fetched entity records. -To fetch an entity record, you can call `editEntityRecord`, which takes the entity type, the entity ID and the new entity record as parameters. The following example sets the title of the post with ID 1 to "Hello World". +To edit an entity record, you can call `editEntityRecord`, which takes the entity type, the entity ID and the new entity record as parameters. The following example sets the title of the post with ID 1 to "Hello World". ````js wp.data.dispatch( 'core' ).editEntityRecord( 'postType', 'post', 1, { title: 'Hello World' } ); @@ -42,13 +42,13 @@ Since the WordPress editors allow multiple entity records to be edited at the sa And to be able to perform both undo and redo operations propertly, each modification in the list of edits contains the following information: - - Entity kind and name: Each entity in core-data is identified by a tuple kind, name. This corresponds to the identifier of the modified entity. + - Entity kind and name: Each entity in core-data is identified by the pair _(kind, name)_. This corresponds to the identifier of the modified entity. - Entity Record ID: The ID of the modified record. - Property: The name of the modified property. - From: The previous value of the property (needed to apply the undo operation). - To: The new value of the property (needed to apply the redo operation). -For example, let's say a user edits the title of a post, followed by a modification to the post slug, and then a modification of the title of a reusable block used with the post for instance. The following information is stored in the undo/redo stack: +For example, let's say a user edits the title of a post, followed by a modification to the post slug, and then a modification of the title of a reusable block used with the post. The following information is stored in the undo/redo stack: - `[ { kind: 'postType', name: 'post', id: 1, property: 'title', from: '', to: 'Hello World' } ]` - `[ { kind: 'postType', name: 'post', id: 1, property: 'slug', from: 'Previous slug', to: 'This is the slug of the hello world post' } ]` @@ -60,4 +60,4 @@ The store also keep tracks of a "pointer" to the current "undo/redo" step. By de The undo/redo core behavior also supports what we call "transient modifications". These are modifications that are not stored in the undo/redo stack right away. For instance, when a user starts typing in a text field, the value of the field is modified in the store, but this modification is not stored in the undo/redo stack until after the user moves to the next word or after a few milliseconds. This is done to avoid creating a new undo/redo step for each character typed by the user. -So by default, `core-data` store considers all modifications to properties that are marked as "transient" (like the `blocks` property in the post entity) as transient modifications. It keeps these modifications outside the undo/redo stack in what is called a "cache" of modifications and these modifications are only stored in the undo/redo stack when we explicitely call `__unstableCreateUndoLevel` or when the next non transient modification is performed. +So by default, `core-data` store considers all modifications to properties that are marked as "transient" (like the `blocks` property in the post entity) as transient modifications. It keeps these modifications outside the undo/redo stack in what is called a "cache" of modifications and these modifications are only stored in the undo/redo stack when we explicitely call `__unstableCreateUndoLevel` or when the next non-transient modification is performed. diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index 559417fa5dff76..6ef6b738210bbb 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -676,7 +676,7 @@ Displays a paginated navigation to next/previous set of posts, when applicable. - **Category:** theme - **Parent:** core/query - **Supports:** align, anchor, color (background, gradients, link, text), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ -- **Attributes:** paginationArrow +- **Attributes:** paginationArrow, showLabel ## Next Page diff --git a/docs/reference-guides/data/data-core-notices.md b/docs/reference-guides/data/data-core-notices.md index c5e3bc017a9146..e11e6f226169f9 100644 --- a/docs/reference-guides/data/data-core-notices.md +++ b/docs/reference-guides/data/data-core-notices.md @@ -261,6 +261,53 @@ _Returns_ - `Object`: Action object. +### removeAllNotices + +Removes all notices from a given context. Defaults to the default context. + +_Usage_ + +```js +import { __ } from '@wordpress/i18n'; +import { useDispatch, useSelect } from '@wordpress/data'; +import { store as noticesStore } from '@wordpress/notices'; +import { Button } from '@wordpress/components'; + +export const ExampleComponent = () => { + const notices = useSelect( ( select ) => + select( noticesStore ).getNotices() + ); + const { removeNotices } = useDispatch( noticesStore ); + return ( + <> + + + + + ); +}; +``` + +_Parameters_ + +- _noticeType_ `string`: The context to remove all notices from. +- _context_ `string`: The context to remove all notices from. + +_Returns_ + +- `Object`: Action object. + ### removeNotice Returns an action object used in signalling that a notice is to be removed. @@ -309,4 +356,49 @@ _Returns_ - `Object`: Action object. +### removeNotices + +Returns an action object used in signalling that several notices are to be removed. + +_Usage_ + +```js +import { __ } from '@wordpress/i18n'; +import { useDispatch, useSelect } from '@wordpress/data'; +import { store as noticesStore } from '@wordpress/notices'; +import { Button } from '@wordpress/components'; + +const ExampleComponent = () => { + const notices = useSelect( ( select ) => + select( noticesStore ).getNotices() + ); + const { removeNotices } = useDispatch( noticesStore ); + return ( + <> + + + + ); +}; +``` + +_Parameters_ + +- _ids_ `string[]`: List of unique notice identifiers. +- _context_ `[string]`: Optional context (grouping) in which the notices are intended to appear. Defaults to default context. + +_Returns_ + +- `Object`: Action object. + diff --git a/lib/compat/wordpress-6.2/script-loader.php b/lib/compat/wordpress-6.2/script-loader.php index 6ed69244726d33..55a890f54f3017 100644 --- a/lib/compat/wordpress-6.2/script-loader.php +++ b/lib/compat/wordpress-6.2/script-loader.php @@ -64,89 +64,10 @@ static function () use ( $style ) { ); } -/** - * Sets the content assets for the block editor. - * - * Note for core merge: see inline comment on what's been updated. - */ -function gutenberg_resolve_assets_override() { - global $pagenow; - - $script_handles = array( - 'wp-polyfill', - ); - // Note for core merge: only 'wp-edit-blocks' should be in this array. - $style_handles = array( - 'wp-edit-blocks', - ); - - if ( current_theme_supports( 'wp-block-styles' ) ) { - $style_handles[] = 'wp-block-library-theme'; - } - - if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) { - $style_handles[] = 'wp-widgets'; - $style_handles[] = 'wp-edit-widgets'; - } - - $block_registry = WP_Block_Type_Registry::get_instance(); - - foreach ( $block_registry->get_all_registered() as $block_type ) { - // In older WordPress versions, like 6.0, these properties are not defined. - if ( isset( $block_type->style_handles ) && is_array( $block_type->style_handles ) ) { - $style_handles = array_merge( $style_handles, $block_type->style_handles ); - } - - if ( isset( $block_type->editor_style_handles ) && is_array( $block_type->editor_style_handles ) ) { - $style_handles = array_merge( $style_handles, $block_type->editor_style_handles ); - } - - if ( isset( $block_type->script_handles ) && is_array( $block_type->script_handles ) ) { - $script_handles = array_merge( $script_handles, $block_type->script_handles ); - } - } - - $style_handles = array_unique( $style_handles ); - $done = wp_styles()->done; - - ob_start(); - - // We do not need reset styles for the iframed editor. - wp_styles()->done = array( 'wp-reset-editor-styles' ); - wp_styles()->do_items( $style_handles ); - wp_styles()->done = $done; - - $styles = ob_get_clean(); - - $script_handles = array_unique( $script_handles ); - $done = wp_scripts()->done; - - ob_start(); - - wp_scripts()->done = array(); - wp_scripts()->do_items( $script_handles ); - wp_scripts()->done = $done; - - $scripts = ob_get_clean(); - - // Generate font @font-face styles. - if ( function_exists( 'wp_print_fonts' ) ) { - ob_start(); - wp_print_fonts( true ); - $styles .= ob_get_clean(); - } - - return array( - 'styles' => $styles, - 'scripts' => $scripts, - ); -} - add_filter( 'block_editor_settings_all', function( $settings ) { // We must override what core is passing now. - $settings['__unstableResolvedAssets'] = gutenberg_resolve_assets_override(); $settings['__unstableIsBlockBasedTheme'] = wp_is_block_theme(); return $settings; }, diff --git a/lib/compat/wordpress-6.3/script-loader.php b/lib/compat/wordpress-6.3/script-loader.php index 8b00e10d09b660..b1445d102df4e3 100644 --- a/lib/compat/wordpress-6.3/script-loader.php +++ b/lib/compat/wordpress-6.3/script-loader.php @@ -80,6 +80,5 @@ function( $settings ) { // We must override what core is passing now. $settings['__unstableResolvedAssets'] = _gutenberg_get_iframed_editor_assets(); return $settings; - }, - 100 + } ); diff --git a/lib/experimental/interactivity-api/blocks.php b/lib/experimental/interactivity-api/blocks.php index 3ad6d13d660fb1..5071f8d239093c 100644 --- a/lib/experimental/interactivity-api/blocks.php +++ b/lib/experimental/interactivity-api/blocks.php @@ -35,18 +35,18 @@ function gutenberg_block_core_file_add_directives_to_content( $block_content, $b * * * * @param string $block_content Markup of the navigation block. + * @param array $block Block object. * * @return string Navigation block markup with the proper directives */ -function gutenberg_block_core_navigation_add_directives_to_markup( $block_content ) { +function gutenberg_block_core_navigation_add_directives_to_markup( $block_content, $block ) { $w = new WP_HTML_Tag_Processor( $block_content ); // Add directives to the `