diff --git a/lib/experimental/content-guidelines/load.php b/lib/experimental/content-guidelines/load.php index 10447caf00c1a4..460652573c8853 100644 --- a/lib/experimental/content-guidelines/load.php +++ b/lib/experimental/content-guidelines/load.php @@ -18,8 +18,8 @@ function gutenberg_register_content_guidelines_settings_submenu() { __( 'Guidelines', 'gutenberg' ), __( 'Guidelines', 'gutenberg' ), 'manage_options', - 'content-guidelines-wp-admin', - 'gutenberg_content_guidelines_wp_admin_render_page' + 'guidelines-wp-admin', + 'gutenberg_guidelines_wp_admin_render_page' ); } @@ -35,7 +35,7 @@ function gutenberg_content_guidelines_enqueue_block_registry_scripts( $hook_suff return; } - if ( 'settings_page_content-guidelines-wp-admin' !== $hook_suffix ) { + if ( 'settings_page_guidelines-wp-admin' !== $hook_suffix ) { return; } diff --git a/package-lock.json b/package-lock.json index 6aa3b039a7e128..aaccaec466c396 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63000,8 +63000,7 @@ "@wordpress/element": "file:../../packages/element", "@wordpress/i18n": "file:../../packages/i18n", "@wordpress/icons": "file:../../packages/icons", - "@wordpress/notices": "file:../../packages/notices", - "@wordpress/ui": "file:../../packages/ui" + "@wordpress/notices": "file:../../packages/notices" } }, "routes/font-list": { diff --git a/package.json b/package.json index ca70f2b050a03d..12c54f9ef19084 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "font-library", "options-connectors", - "content-guidelines" + "guidelines" ] }, "config": { diff --git a/routes/content-guidelines/components/actions-section.tsx b/routes/content-guidelines/components/actions-section.tsx index c37723e233878d..be94d037ad0c34 100644 --- a/routes/content-guidelines/components/actions-section.tsx +++ b/routes/content-guidelines/components/actions-section.tsx @@ -1,3 +1,5 @@ +/* @jsx createElement */ + /** * WordPress dependencies */ @@ -5,6 +7,7 @@ import { Button, Card, Modal, + Notice, useNavigator, __experimentalText as Text, __experimentalHeading as Heading, @@ -12,10 +15,7 @@ import { __experimentalHStack as HStack, } from '@wordpress/components'; import { __, sprintf } from '@wordpress/i18n'; -import { useRef, useState } from '@wordpress/element'; -// TODO: Revert to the `Notice` in `@wordpress/components` for now. -// eslint-disable-next-line @wordpress/use-recommended-components -import { Notice } from '@wordpress/ui'; +import { createElement, useRef, useState } from '@wordpress/element'; /** * Internal dependencies @@ -146,15 +146,13 @@ export default function ActionsSection() { style={ { display: 'none' } } /> { error && ( - setError( null ) } + isDismissible > - - { error } - - setError( null ) } /> - + { error } + ) } { /* diff --git a/routes/content-guidelines/components/block-guideline-modal.tsx b/routes/content-guidelines/components/block-guideline-modal.tsx index 057c70342c1e03..4aa20fe6d25d26 100644 --- a/routes/content-guidelines/components/block-guideline-modal.tsx +++ b/routes/content-guidelines/components/block-guideline-modal.tsx @@ -7,15 +7,13 @@ import { Button, ComboboxControl, Modal, + Notice, TextControl, TextareaControl, __experimentalHStack as HStack, __experimentalVStack as VStack, } from '@wordpress/components'; import { __, sprintf } from '@wordpress/i18n'; -// TODO: Revert to the `Notice` in `@wordpress/components` for now. -// eslint-disable-next-line @wordpress/use-recommended-components -import { Notice } from '@wordpress/ui'; import { createElement, useMemo, useState } from '@wordpress/element'; import { useDispatch, useSelect } from '@wordpress/data'; import { @@ -174,15 +172,13 @@ export default function BlockGuidelineModal( { rows={ 6 } /> { error && ( - - - { sprintf( - /* translators: %s: Error message. */ - __( 'Error: %s' ), - error - ) } - - + setError( null ) }> + { sprintf( + /* translators: %s: Error message. */ + __( 'Error: %s' ), + error + ) } + ) } { error && ( - - - { sprintf( - /* translators: %s: Error message. */ - __( 'Error: %s' ), - error - ) } - - + setError( null ) }> + { sprintf( + /* translators: %s: Error message. */ + __( 'Error: %s' ), + error + ) } + ) } { rows.length > 0 && ( { error && ( - - - { sprintf( - /* translators: %s: Error message. */ - __( 'Error saving guidelines: %s' ), - error - ) } - - + setError( null ) }> + { sprintf( + /* translators: %s: Error message. */ + __( 'Error saving guidelines: %s' ), + error + ) } + ) }