From 4ceca4e722c0afa078b5998585b1df209baf344a Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Wed, 5 Jul 2023 09:42:40 +1200 Subject: [PATCH 1/7] update menus --- docs/reference-guides/core-blocks.md | 2 +- .../components/inserter/reusable-blocks-tab.js | 4 ++-- .../src/components/inserter/tabs.js | 2 +- packages/block-library/src/block/block.json | 2 +- packages/edit-post/src/plugins/index.js | 2 +- .../components/page-patterns/patterns-list.js | 4 ++-- .../reusable-block-convert-button.js | 18 +++++++++++------- .../reusable-blocks-manage-button.js | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index a4e307c94df87e..2115a30557f3c2 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -36,7 +36,7 @@ Add a user’s avatar. ([Source](https://github.com/WordPress/gutenberg/tree/tru - **Supports:** align, color (~~background~~, ~~text~~), spacing (margin, padding), ~~alignWide~~, ~~html~~ - **Attributes:** isLink, linkTarget, size, userId -## Pattern +## Pattern/Reusable block Create and save content to reuse across your site. Update the block, and the changes apply everywhere it’s used. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/block)) diff --git a/packages/block-editor/src/components/inserter/reusable-blocks-tab.js b/packages/block-editor/src/components/inserter/reusable-blocks-tab.js index c16d5f1a78e543..f07053938ace9a 100644 --- a/packages/block-editor/src/components/inserter/reusable-blocks-tab.js +++ b/packages/block-editor/src/components/inserter/reusable-blocks-tab.js @@ -29,12 +29,12 @@ function ReusableBlocksList( { onHover, onInsert, rootClientId } ) { } return ( - + ); diff --git a/packages/block-editor/src/components/inserter/tabs.js b/packages/block-editor/src/components/inserter/tabs.js index 1ff8b529707a4b..4cffb75c2a17e3 100644 --- a/packages/block-editor/src/components/inserter/tabs.js +++ b/packages/block-editor/src/components/inserter/tabs.js @@ -19,7 +19,7 @@ const patternsTab = { const reusableBlocksTab = { name: 'reusable', /* translators: Locally created Patterns tab title in the block inserter. */ - title: __( 'Synced patterns' ), + title: __( 'Synced patterns/Reusable blocks' ), icon: reusableBlockIcon, }; const mediaTab = { diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json index 5846e7ead0c9b6..c27d0776891f3d 100644 --- a/packages/block-library/src/block/block.json +++ b/packages/block-library/src/block/block.json @@ -2,7 +2,7 @@ "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 3, "name": "core/block", - "title": "Pattern", + "title": "Pattern/Reusable block", "category": "reusable", "description": "Create and save content to reuse across your site. Update the block, and the changes apply everywhere it’s used.", "textdomain": "default", diff --git a/packages/edit-post/src/plugins/index.js b/packages/edit-post/src/plugins/index.js index e3bd1b2dd72bda..11881998503cad 100644 --- a/packages/edit-post/src/plugins/index.js +++ b/packages/edit-post/src/plugins/index.js @@ -28,7 +28,7 @@ registerPlugin( 'edit-post', { post_type: 'wp_block', } ) } > - { __( 'Manage Patterns' ) } + { __( 'Manage Patterns/Reusable blocks' ) } { __( - 'Patterns that are kept in sync across your site' + 'Patterns/Reusable blocks that are kept in sync across your site' ) } diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js index d051e366412817..6ec5b9cd952abd 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js @@ -97,7 +97,7 @@ export default function ReusableBlockConvertButton( { ); createSuccessNotice( syncType === 'fully' - ? __( 'Synced Pattern created.' ) + ? __( 'Synced Pattern/Reusable block created.' ) : __( 'Unsynced Pattern created.' ), { type: 'snackbar', @@ -160,12 +160,16 @@ export default function ReusableBlockConvertButton( { /> { setSyncType( diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js index 6f339058885111..a387eb42eed87e 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js @@ -53,7 +53,7 @@ function ReusableBlocksManageButton( { clientId } ) { - { __( 'Manage Patterns' ) } + { __( 'Manage Patterns/Reusable blocks' ) } { canRemove && ( convertBlockToStatic( clientId ) }> From 602909e5ff4aae1572f18380f78c0dc9f64b2c1c Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Wed, 5 Jul 2023 09:45:02 +1200 Subject: [PATCH 2/7] Update text --- docs/reference-guides/core-blocks.md | 2 +- packages/block-library/src/block/block.json | 2 +- .../src/components/page-patterns/patterns-list.js | 4 ++-- .../reusable-block-convert-button.js | 8 +++++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index 2115a30557f3c2..a4e307c94df87e 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -36,7 +36,7 @@ Add a user’s avatar. ([Source](https://github.com/WordPress/gutenberg/tree/tru - **Supports:** align, color (~~background~~, ~~text~~), spacing (margin, padding), ~~alignWide~~, ~~html~~ - **Attributes:** isLink, linkTarget, size, userId -## Pattern/Reusable block +## Pattern Create and save content to reuse across your site. Update the block, and the changes apply everywhere it’s used. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/block)) diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json index c27d0776891f3d..5846e7ead0c9b6 100644 --- a/packages/block-library/src/block/block.json +++ b/packages/block-library/src/block/block.json @@ -2,7 +2,7 @@ "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 3, "name": "core/block", - "title": "Pattern/Reusable block", + "title": "Pattern", "category": "reusable", "description": "Create and save content to reuse across your site. Update the block, and the changes apply everywhere it’s used.", "textdomain": "default", diff --git a/packages/edit-site/src/components/page-patterns/patterns-list.js b/packages/edit-site/src/components/page-patterns/patterns-list.js index 8b08d253925ccb..87b830c6180cca 100644 --- a/packages/edit-site/src/components/page-patterns/patterns-list.js +++ b/packages/edit-site/src/components/page-patterns/patterns-list.js @@ -81,14 +81,14 @@ export default function PatternsList( { categoryId, type } ) { { __( - 'Patterns/Reusable blocks that are kept in sync across your site' + 'Patterns that are kept in sync across your site' ) } diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js index 6ec5b9cd952abd..a3472900911edf 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js @@ -97,7 +97,7 @@ export default function ReusableBlockConvertButton( { ); createSuccessNotice( syncType === 'fully' - ? __( 'Synced Pattern/Reusable block created.' ) + ? __( 'Synced Pattern created.' ) : __( 'Unsynced Pattern created.' ), { type: 'snackbar', @@ -160,11 +160,13 @@ export default function ReusableBlockConvertButton( { /> Date: Thu, 22 Jun 2023 12:41:18 +1200 Subject: [PATCH 3/7] Update toggle help text --- .../reusable-block-convert-button.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js index a3472900911edf..5f675cfdb26009 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js @@ -163,15 +163,9 @@ export default function ReusableBlockConvertButton( { label={ __( 'Synced (formerly Reusable block)' ) } - help={ - syncType === 'fully' - ? __( - 'Editing the pattern will update it anywhere it is used.' - ) - : __( - 'Each instance of the pattern can be updated independently.' - ) - } + help={ __( + 'Editing the pattern will update it anywhere it is used.' + ) } checked={ syncType === 'fully' } onChange={ () => { setSyncType( From 3045b1071c3648fd1ef3dfda07fb39686f1d83af Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Fri, 23 Jun 2023 15:51:44 +1200 Subject: [PATCH 4/7] Add a dismissible hint about the rename instead of changing menu labeling --- packages/block-editor/README.md | 4 ++ packages/block-editor/src/components/index.js | 5 ++ .../inserter/reusable-block-rename-hint.js | 50 +++++++++++++++++++ .../inserter/reusable-blocks-tab.js | 6 ++- .../src/components/inserter/style.scss | 24 +++++++++ .../src/components/inserter/tabs.js | 2 +- packages/edit-post/src/plugins/index.js | 2 +- .../reusable-block-convert-button.js | 6 +-- .../reusable-blocks-manage-button.js | 2 +- 9 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 packages/block-editor/src/components/inserter/reusable-block-rename-hint.js diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md index 2c42b42afc4424..937bfea2f49656 100644 --- a/packages/block-editor/README.md +++ b/packages/block-editor/README.md @@ -680,6 +680,10 @@ _Related_ Private @wordpress/block-editor APIs. +### ReusableBlocksRenameHint + +Undocumented declaration. + ### RichText _Related_ diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js index 5876eb4ec01e9e..db93f112a366d3 100644 --- a/packages/block-editor/src/components/index.js +++ b/packages/block-editor/src/components/index.js @@ -165,3 +165,8 @@ export { default as __experimentalInspectorPopoverHeader } from './inspector-pop export { default as BlockEditorProvider } from './provider'; export { default as useSetting } from './use-setting'; + +/* + * The following rename hint component can be removed in 6.4. + */ +export { default as ReusableBlocksRenameHint } from './inserter/reusable-block-rename-hint'; diff --git a/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js b/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js new file mode 100644 index 00000000000000..e75bdea82e3583 --- /dev/null +++ b/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js @@ -0,0 +1,50 @@ +/** + * WordPress dependencies + */ +import { Button } from '@wordpress/components'; +import { useDispatch, useSelect } from '@wordpress/data'; +import { focus } from '@wordpress/dom'; +import { useRef } from '@wordpress/element'; +import { __ } from '@wordpress/i18n'; +import { close } from '@wordpress/icons'; +import { store as preferencesStore } from '@wordpress/preferences'; + +const PREFERENCE_NAME = 'isResuableBlocksrRenameHintVisible'; + +export default function ReusableBlocksRenameHint() { + const isReusableBlocksRenameHint = useSelect( + ( select ) => + select( preferencesStore ).get( 'core', PREFERENCE_NAME ) ?? true, + [] + ); + + const ref = useRef(); + + const { set: setPreference } = useDispatch( preferencesStore ); + if ( ! isReusableBlocksRenameHint ) { + return null; + } + + return ( +
+
+ { __( 'Reusable blocks are now called "patterns".' ) } +
+
+ ); +} diff --git a/packages/block-editor/src/components/inserter/reusable-blocks-tab.js b/packages/block-editor/src/components/inserter/reusable-blocks-tab.js index f07053938ace9a..e069895ce9fa8d 100644 --- a/packages/block-editor/src/components/inserter/reusable-blocks-tab.js +++ b/packages/block-editor/src/components/inserter/reusable-blocks-tab.js @@ -13,6 +13,7 @@ import BlockTypesList from '../block-types-list'; import InserterPanel from './panel'; import InserterNoResults from './no-results'; import useBlockTypesState from './hooks/use-block-types-state'; +import ReusableBlocksRenameHint from './reusable-block-rename-hint'; function ReusableBlocksList( { onHover, onInsert, rootClientId } ) { const [ items, , , onSelectItem ] = useBlockTypesState( @@ -29,12 +30,12 @@ function ReusableBlocksList( { onHover, onInsert, rootClientId } ) { } return ( - + ); @@ -54,6 +55,7 @@ function ReusableBlocksList( { onHover, onInsert, rootClientId } ) { export function ReusableBlocksTab( { rootClientId, onInsert, onHover } ) { return ( <> + - { __( 'Manage Patterns/Reusable blocks' ) } + { __( 'Manage Patterns' ) } { __( 'Create pattern' ) } + { isModalOpen && ( - { __( 'Manage Patterns/Reusable blocks' ) } + { __( 'Manage Patterns' ) } { canRemove && ( convertBlockToStatic( clientId ) }> From 34461d481e38500ab0390921bccae18e0f2f2757 Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Wed, 5 Jul 2023 13:15:16 +1200 Subject: [PATCH 5/7] try renaming menu instead of using notice --- .../src/components/inserter/reusable-block-rename-hint.js | 4 +++- packages/block-editor/src/components/inserter/style.scss | 3 ++- .../reusable-block-convert-button.js | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js b/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js index e75bdea82e3583..2ebf5f72ab26b3 100644 --- a/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js +++ b/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js @@ -28,7 +28,9 @@ export default function ReusableBlocksRenameHint() { return (
- { __( 'Reusable blocks are now called "patterns".' ) } + { __( + 'Reusable blocks are now called "patterns". A "synced" pattern will behave in exactly the same way as a reusable block.' + ) }