Move duotone to duotone-filter

Automattic · Sep 1, 2020 · 117b7a0 · 117b7a0
1 parent 930da5c
commit 117b7a0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/blocks/duotone/editor.scss → blocks/duotone-filter/editor.scss b/blocks/duotone/editor.scss → blocks/duotone-filter/editor.scss
diff --git a/blocks/duotone/filter.svg → blocks/duotone-filter/filter.svg b/blocks/duotone/filter.svg → blocks/duotone-filter/filter.svg
diff --git a/blocks/duotone/index.php → blocks/duotone-filter/index.php b/blocks/duotone/index.php → blocks/duotone-filter/index.php
@@ -1,7 +1,7 @@
 <?php
 
 add_action( 'init', function() {
-	register_block_type( 'a8c/duotone', [
+	register_block_type( 'a8c/duotone-filter', [
 		'editor_script' => 'block-experiments',
 		'style' => 'block-experiments',
 		'editor_style' => 'block-experiments-editor',

diff --git a/blocks/duotone/src/index.js → blocks/duotone-filter/src/index.js b/blocks/duotone/src/index.js → blocks/duotone-filter/src/index.js
@@ -66,24 +66,26 @@ const withDuotoneEditorControls = createHigherOrderComponent(
 		const duotoneLight = parseColor( attributes.duotoneLight );
 
 		useEffect( () => {
-			setAttributes( { duotoneId: `a8c-duotone-${ instanceId }` } );
+			setAttributes( {
+				duotoneId: `a8c-duotone-filter-${ instanceId }`,
+			} );
 		}, [ instanceId ] );
 
 		return (
 			<>
 				<InspectorControls>
 					<PanelColorSettings
-						title={ __( 'Duotone', 'duotone' ) }
+						title={ __( 'Duotone', 'block-experiments' ) }
 						initialOpen
 						colorSettings={ [
 							{
-								label: __( 'Dark Color', 'duotone' ),
+								label: __( 'Dark Color', 'block-experiments' ),
 								value: attributes.duotoneDark,
 								onChange: ( duotoneDark ) =>
 									setAttributes( { duotoneDark } ),
 							},
 							{
-								label: __( 'Light Color', 'duotone' ),
+								label: __( 'Light Color', 'block-experiments' ),
 								value: attributes.duotoneLight,
 								onChange: ( duotoneLight ) =>
 									setAttributes( { duotoneLight } ),
@@ -151,17 +153,17 @@ function addDuotoneFilterStyle( props, block, attributes ) {
 export function registerBlock() {
 	addFilter(
 		'editor.BlockEdit',
-		'a8c/duotone/with-editor-controls',
+		'a8c/duotone-filter/with-editor-controls',
 		withDuotoneEditorControls
 	);
 	addFilter(
 		'blocks.registerBlockType',
-		'a8c/duotone/add-attributes',
+		'a8c/duotone-filter/add-attributes',
 		withDuotoneAttributes
 	);
 	addFilter(
 		'blocks.getSaveContent.extraProps',
-		'a8c/duotone/add-filter-style',
+		'a8c/duotone-filter/add-filter-style',
 		addDuotoneFilterStyle
 	);
 }
diff --git a/blocks/duotone/style.scss → blocks/duotone-filter/style.scss b/blocks/duotone/style.scss → blocks/duotone-filter/style.scss
diff --git a/editor.scss b/editor.scss
@@ -1,6 +1,6 @@
 // Import editor styles for blocks
 @import './blocks/bauhaus-centenary/editor.scss';
-@import './blocks/duotone/editor.scss';
+@import './blocks/duotone-filter/editor.scss';
 @import './blocks/event/editor.scss';
 @import './blocks/layout-grid/editor.scss';
 @import './blocks/motion-background/editor.scss';

diff --git a/src/index.js b/src/index.js
@@ -23,7 +23,7 @@ setCategories( [
  * Load all our blocks
  */
 import * as bauhausCentenaryBlock from '../blocks/bauhaus-centenary/src';
-import * as duotoneBlock from '../blocks/duotone/src';
+import * as duotoneFilter from '../blocks/duotone-filter/src';
 import * as eventBlock from '../blocks/event/src';
 import * as layoutGridBlock from '../blocks/layout-grid/src';
 import * as motionBackgroundBlock from '../blocks/motion-background/src';
@@ -32,7 +32,7 @@ import * as wavesBlock from '../blocks/waves/src';
 
 // Instantiate the blocks, adding them to our block category
 bauhausCentenaryBlock.registerBlock();
-duotoneBlock.registerBlock();
+duotoneFilter.registerBlock();
 eventBlock.registerBlock();
 layoutGridBlock.registerBlock();
 motionBackgroundBlock.registerBlock();

diff --git a/style.scss b/style.scss
@@ -1,6 +1,6 @@
 /* Import front end styles for blocks */
 @import './blocks/bauhaus-centenary/style.scss';
-@import './blocks/duotone/style.scss';
+@import './blocks/duotone-filter/style.scss';
 @import './blocks/event/style.scss';
 @import './blocks/layout-grid/style.scss';
 @import './blocks/motion-background/style.scss';