[FEATURE] Add an icon block

Change Details
--------------
Adds an icon block to the iconography package

packages/iconography/includes/IconographyService.php

@@ -29,13 +29,25 @@ public function __construct( private ConfigurationParser $configuration_parser )
 	 * Init Hooks
 	 */
 	public function init(): void {
+		add_action( 'init', array( $this, 'register_block' ) );
 		add_action( 'wp_enqueue_scripts', array( $this, 'register_assets' ) );
 		add_action( 'wp_footer', array( $this, 'enqueue_assets' ), 1, 0 );
 		add_action( 'enqueue_block_assets', array( $this, 'register_assets' ), 1, 0 );
 		add_action( 'enqueue_block_assets', array( $this, 'enqueue_editor_scripts' ) );
 		add_action( 'enqueue_block_assets', array( $this, 'enqueue_all_assets' ) );
 	}
 
+	/**
+	 * Register the block
+	 *
+	 * @return void
+	 */
+	public function register_block(): void {
+		register_block_type_from_metadata(
+			plugin_dir_path( __DIR__ ) . 'build/block'
+		);
+	}
+
 	/**
 	 * Register all assets in WP
 	 *

packages/iconography/src/block/Attributes.type.ts

@@ -1,7 +1,7 @@
 import type { WPFormat } from '@wordpress/rich-text/build-types/register-format-type';
 
 export type Attributes = Partial< {
-	className: WPFormat[ 'className' ];
-	tagName: WPFormat[ 'tagName' ];
+	iconClass: WPFormat[ 'className' ];
+	iconTag: WPFormat[ 'tagName' ];
 	iconContent: string;
 } >;

packages/iconography/src/block/Edit.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { IconToolbarButton } from '../IconToolbarButton';
+/* WordPress Dependencies */
 import {
 	BlockControls,
 	InspectorControls,
@@ -9,14 +9,25 @@ import {
 import { store as RichTextStore } from '@wordpress/rich-text';
 import { useSelect } from '@wordpress/data';
 import { useState } from '@wordpress/element';
-import { Button, Panel, PanelBody } from '@wordpress/components';
+import {
+	Button,
+	Panel,
+	PanelBody,
+	ToolbarButton,
+	Icon,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { replace } from '@wordpress/icons';
+
+/* Internal deps */
+import { IconModal } from '../IconModal';
+import './style.scss';
 
 /* Types */
 import type { Attributes } from './Attributes.type';
 import type { BlockEditProps } from '@wordpress/blocks';
 import type { RichTextValue } from '@wordpress/rich-text';
 import type { WPFormat } from '@wordpress/rich-text/build-types/register-format-type';
-import { IconModal } from '../IconModal';
 
 export const Edit = ( {
 	attributes,
@@ -42,35 +53,46 @@ export const Edit = ( {
 
 		setAttributes( {
 			iconContent: value.text,
-			tagName: format.tagName,
-			className: format.className,
+			iconTag: format.tagName,
+			iconClass: format.className,
 		} );
 	};
 
 	const TagName =
-		( attributes.tagName as keyof HTMLElementTagNameMap ) ?? 'span';
+		( attributes.iconTag as keyof HTMLElementTagNameMap ) ?? 'span';
+
+	const buttonText = attributes.iconContent
+		? __( 'Change Icon', 'boxuk' )
+		: __( 'Select Icon', 'boxuk' );
 
 	const ShowModalButton = () => (
 		<Button
-			variant={ 'primary' }
+			variant={ 'secondary' }
 			onClick={ () => setShowIconModal( ! showIconModal ) }
-		>
-			Select Icon
-		</Button>
+			text={ buttonText }
+			icon={ <Icon icon={ replace } /> }
+		/>
 	);
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="list">
 				<Panel>
 					<PanelBody>
 						<ShowModalButton />
 					</PanelBody>
 				</Panel>
 			</InspectorControls>
+			<BlockControls group="inline">
+				<ToolbarButton
+					icon={ <Icon icon={ replace } /> }
+					onClick={ () => setShowIconModal( ! showIconModal ) }
+					title={ buttonText }
+				/>
+			</BlockControls>
 			<div { ...blockProps }>
 				{ attributes.iconContent && (
-					<TagName className={ attributes.className ?? '' }>
+					<TagName className={ attributes.iconClass ?? '' }>
 						{ attributes.iconContent }
 					</TagName>
 				) }

packages/iconography/src/block/Save.tsx

@@ -1,18 +1,19 @@
 import React from 'react';
 
+/* WordPress Dependencies */
 import { useBlockProps } from '@wordpress/block-editor';
 
 /* Types */
 import type { Attributes } from './Attributes.type';
 import type { BlockSaveProps } from '@wordpress/blocks';
 
 export const Save = ( { attributes }: BlockSaveProps< Attributes > ) => {
-	const { className, tagName, iconContent } = attributes;
-	const TagName = ( tagName as keyof HTMLElementTagNameMap ) ?? 'span';
+	const { iconClass, iconTag, iconContent } = attributes;
+	const TagName = ( iconTag as keyof HTMLElementTagNameMap ) ?? 'span';
 
 	return (
 		<div { ...useBlockProps.save() }>
-			<TagName className={ className ?? '' }>{ iconContent }</TagName>
+			<TagName className={ iconClass ?? '' }>{ iconContent }</TagName>
 		</div>
 	);
 };

packages/iconography/src/block/block.json

@@ -8,51 +8,67 @@
 	"icon": "star-filled",
 	"keywords": [ "icon", "emoji", "symbol" ],
 	"textdomain": "boxuk",
+	"style": "file:./style-index.css",
+	"editorScript": "file:./index.ts",
 	"supports": {
-		"align": [ "wide", "full" ],
-		"alignWide": true,
+		"anchor": false,
+		"align": [],
+		"alignWide": false,
+		"ariaLabel": true,
+		"background": {
+			"backgroundImage": false,
+			"backgroundSize": false
+		},
+		"className": true,
 		"color": {
 			"background": true,
 			"text": true
 		},
-		"background": { "backgroundImage": true, "backgroundSize": true },
-		"anchor": false,
-		"ariaLabel": true,
-		"className": true,
 		"customClassName": true,
-		"dimensions": { "aspectRatio": false, "minHeight": true },
-		"filter": { "duotone": false },
+		"dimensions": {
+			"aspectRatio": false,
+			"minHeight": false
+		},
+		"filter": {
+			"duotone": false
+		},
 		"html": false,
 		"inserter": true,
 		"interactivity": false,
-		"layout": true,
 		"lock": true,
 		"multiple": true,
 		"position": {
 			"sticky": false
 		},
 		"renaming": true,
 		"reusable": true,
-		"shadow": false,
+		"shadow": true,
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"blockGrap": false
 		},
 		"typography": {
 			"fontSize": true,
-			"lineHeight": true,
+			"lineHeight": false,
 			"textAlign": true
 		}
 	},
 	"attributes": {
-		"className": {
+		"iconClass": {
 			"type": "string"
 		},
-		"tagName": {
+		"iconTag": {
 			"type": "string"
 		},
 		"iconContent": {
 			"type": "string"
+		},
+		"style": {
+			"type": "object",
+			"default": {
+				"textAlign": "center"
+			}
 		}
 	},
 	"example": {}

packages/iconography/src/block/index.ts

@@ -0,0 +1,14 @@
+/* WordPress Dependencies */
+import { registerBlockType } from '@wordpress/blocks';
+
+/* Internal deps */
+import metadata from './block.json';
+import { Edit } from './Edit';
+import { Save } from './Save';
+import { ReactComponent as AddReactionOutlined } from '../AddReactionOutlined.svg';
+
+registerBlockType( metadata, {
+	icon: AddReactionOutlined,
+	edit: Edit,
+	save: Save,
+} );

packages/iconography/src/block/style.scss

@@ -0,0 +1,3 @@
+.wp-block-boxuk-icon {
+    text-align: center;
+}