Enable global style for category list block #4965

Enable global style for category list block
woocommerce · Jan 4, 2022 · 5c04092 · 5c04092
1 parent dbc8e38
commit 5c04092
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/assets/js/atomic/blocks/product-elements/category-list/block.tsx b/assets/js/atomic/blocks/product-elements/category-list/block.tsx
@@ -16,6 +16,10 @@ import { HTMLAttributes } from 'react';
  */
 import './style.scss';
 import { Attributes } from './types';
+import {
+	useColorProps,
+	useTypographyProps,
+} from '../../../../utils/style-attributes-utils';
 
 type Props = Attributes & HTMLAttributes< HTMLDivElement >;
 
@@ -26,10 +30,14 @@ type Props = Attributes & HTMLAttributes< HTMLDivElement >;
  * @param {string} [props.className] CSS Class name for the component.
  * @return {*} The component.
  */
-const Block = ( { className }: Props ): JSX.Element | null => {
+const Block = ( props: Props ): JSX.Element | null => {
+	const { className } = props;
 	const { parentClassName } = useInnerBlockLayoutContext();
 	const { product } = useProductDataContext();
 
+	const colorProps = useColorProps( props );
+	const typographyProps = useTypographyProps( props );
+
 	if ( isEmpty( product.categories ) ) {
 		return null;
 	}
@@ -39,10 +47,12 @@ const Block = ( { className }: Props ): JSX.Element | null => {
 			className={ classnames(
 				className,
 				'wc-block-components-product-category-list',
+				colorProps.className,
 				{
 					[ `${ parentClassName }__product-category-list` ]: parentClassName,
 				}
 			) }
+			style={ { ...colorProps.style, ...typographyProps.style } }
 		>
 			{ __( 'Categories:', 'woo-gutenberg-products-block' ) }{ ' ' }
 			<ul>

diff --git a/assets/js/atomic/blocks/product-elements/category-list/edit.tsx b/assets/js/atomic/blocks/product-elements/category-list/edit.tsx
@@ -4,6 +4,7 @@
 import { __ } from '@wordpress/i18n';
 import { Disabled } from '@wordpress/components';
 import EditProductLink from '@woocommerce/editor-components/edit-product-link';
+import { useBlockProps } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -18,13 +19,15 @@ interface Props {
 }
 
 const Edit = ( { attributes }: Props ): JSX.Element => {
+	const blockProps = useBlockProps();
+
 	return (
-		<>
+		<div { ...blockProps }>
 			<EditProductLink />
 			<Disabled>
 				<Block { ...attributes } />
 			</Disabled>
-		</>
+		</div>
 	);
 };
 

diff --git a/assets/js/atomic/blocks/product-elements/category-list/index.ts b/assets/js/atomic/blocks/product-elements/category-list/index.ts
@@ -18,11 +18,22 @@ import {
 
 const blockConfig: BlockConfiguration = {
 	...sharedConfig,
+	apiVersion: 2,
 	title,
 	description,
 	icon: { src: icon },
 	attributes,
 	edit,
+	supports: {
+		color: {
+			text: true,
+			link: true,
+			background: false,
+		},
+		typography: {
+			fontSize: true,
+		},
+	},
 };
 
 registerExperimentalBlockType(