Change from store name provided as a string to store definition (#27094)

* Change from store name provided as a string to store definition * Lint * lint - change import src Co-authored-by: grzegorz_marzencki <[email protected]>
WordPress · Nov 24, 2020 · c10f11a · c10f11a
1 parent e2ffa92
commit c10f11a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
@@ -19,6 +19,7 @@ import {
 	BlockControls,
 	useBlockProps,
 } from '@wordpress/block-editor';
+import { store as reusableBlocksStore } from '@wordpress/reusable-blocks';
 
 /**
  * Internal dependencies
@@ -51,7 +52,7 @@ export default function ReusableBlockEdit( {
 			isSaving: select( 'core' ).isSavingEntityRecord( ...recordArgs ),
 			canUserUpdate: select( 'core' ).canUser( 'update', 'blocks', ref ),
 			isEditing: select(
-				'core/reusable-blocks'
+				reusableBlocksStore
 			).__experimentalIsEditingReusableBlock( clientId ),
 			settings: select( 'core/block-editor' ).getSettings(),
 		} ),
@@ -60,7 +61,7 @@ export default function ReusableBlockEdit( {
 
 	const { editEntityRecord, saveEditedEntityRecord } = useDispatch( 'core' );
 	const { __experimentalSetEditingReusableBlock } = useDispatch(
-		'core/reusable-blocks'
+		reusableBlocksStore
 	);
 	const setIsEditing = useCallback(
 		( value ) => {
@@ -71,7 +72,7 @@ export default function ReusableBlockEdit( {
 
 	const {
 		__experimentalConvertBlockToStatic: convertBlockToStatic,
-	} = useDispatch( 'core/reusable-blocks' );
+	} = useDispatch( reusableBlocksStore );
 
 	const { createSuccessNotice, createErrorNotice } = useDispatch(
 		'core/notices'

diff --git a/packages/reusable-blocks/README.md b/packages/reusable-blocks/README.md
@@ -72,8 +72,10 @@ return (
 This package also provides convenient utilities for managing reusable blocks through redux actions:
 
 ```js
+import { store as reusableBlocksStore } from '@wordpress/reusable-blocks';
+
 function MyConvertToStaticButton( { clientId } ) {
-    const { __experimentalConvertBlockToStatic } = useDispatch( 'core/reusable-blocks' );
+    const { __experimentalConvertBlockToStatic } = useDispatch( reusableBlocksStore );
     return (
         <button onClick={() => __experimentalConvertBlockToStatic( clientId )} >
             Convert to static
@@ -82,7 +84,7 @@ function MyConvertToStaticButton( { clientId } ) {
 }
 
 function MyConvertToReusableButton( { clientId } ) {
-    const { __experimentalConvertBlocksToReusable } = useDispatch( 'core/reusable-blocks' );
+    const { __experimentalConvertBlocksToReusable } = useDispatch( reusableBlocksStore );
     return (
         <button onClick={() => __experimentalConvertBlocksToReusable( [ clientId ] )} >
             Convert to reusable
@@ -91,7 +93,7 @@ function MyConvertToReusableButton( { clientId } ) {
 }
 
 function MyDeleteReusableBlockButton( { id } ) {
-    const { __experimentalDeleteReusableBlock } = useDispatch( 'core/reusable-blocks' );
+    const { __experimentalDeleteReusableBlock } = useDispatch( reusableBlocksStore );
     return (
         <button onClick={() => __experimentalDeleteReusableBlock( id )} >
             Delete reusable block

diff --git a/packages/reusable-blocks/src/store/controls.js b/packages/reusable-blocks/src/store/controls.js
@@ -10,6 +10,11 @@ import {
 import { createRegistryControl } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 
+/**
+ * Internal dependencies
+ */
+import { store as reusableBlocksStore } from './index.js';
+
 /**
  * Convert a reusable block to a static block effect handler
  *
@@ -94,7 +99,7 @@ const controls = {
 					.dispatch( 'core/block-editor' )
 					.replaceBlocks( clientIds, newBlock );
 				registry
-					.dispatch( 'core/reusable-blocks' )
+					.dispatch( reusableBlocksStore )
 					.__experimentalSetEditingReusableBlock(
 						newBlock.clientId,
 						true