Attribute Filter block: Enable global style (#5557)

* Product title: add support global style #4965 * add specific type * add custom save function * move hooks in a specific folder * fix crash on WP 5.8 * Featured Category block: Add support for global style #4965 Featured Category block: Add support for global style * fix border color * Attribute Filter block: enable global style #4965 Attribute Filter block: enable global style #4965 * fix eslint error * fix test * add comments about !important
woocommerce · Feb 2, 2022 · 92e72af · 92e72af
1 parent 207bc55
commit 92e72af
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 5 deletions.
diff --git a/assets/js/base/components/dropdown-selector/index.js b/assets/js/base/components/dropdown-selector/index.js
@@ -23,6 +23,7 @@ import './style.scss';
  * @param {Object} props Incoming props for the component.
  * @param {string} props.attributeLabel Label for the attributes.
  * @param {string} props.className CSS class used.
+ * @param {import('react').CSSProperties} props.style CSS style object used.
  * @param {Array} props.checked Which items are checked.
  * @param {string} props.inputLabel Label used for the input.
  * @param {boolean} props.isDisabled Whether the input is disabled or not.
@@ -34,6 +35,7 @@ import './style.scss';
 const DropdownSelector = ( {
 	attributeLabel = '',
 	className,
+	style = {},
 	checked = [],
 	inputLabel = '',
 	isDisabled = false,
@@ -105,6 +107,7 @@ const DropdownSelector = ( {
 						'has-checked': checked.length > 0,
 						'is-open': isOpen,
 					} ) }
+					style={ style }
 				>
 					{ /* eslint-disable-next-line jsx-a11y/label-has-for */ }
 					<label

diff --git a/assets/js/blocks/attribute-filter/block.js b/assets/js/blocks/attribute-filter/block.js
@@ -18,13 +18,15 @@ import FilterSubmitButton from '@woocommerce/base-components/filter-submit-butto
 import isShallowEqual from '@wordpress/is-shallow-equal';
 import { decodeEntities } from '@wordpress/html-entities';
 import { Notice } from '@wordpress/components';
+import classNames from 'classnames';
 
 /**
  * Internal dependencies
  */
 import { getAttributeFromID } from '../../utils/attributes';
 import { updateAttributeFilter } from '../../utils/attributes-query';
 import { previewAttributeObject, previewOptions } from './preview';
+import { useBorderProps } from '../../hooks/style-attributes';
 import './style.scss';
 
 /**
@@ -50,6 +52,8 @@ const AttributeFilterBlock = ( {
 			: []
 	);
 
+	const borderProps = useBorderProps( blockAttributes );
+
 	const [ queryState ] = useQueryStateByContext();
 	const [
 		productAttributesQuery,
@@ -381,7 +385,11 @@ const AttributeFilterBlock = ( {
 					<DropdownSelector
 						attributeLabel={ attributeObject.label }
 						checked={ checked }
-						className={ 'wc-block-attribute-filter-dropdown' }
+						className={ classNames(
+							'wc-block-attribute-filter-dropdown',
+							borderProps.className
+						) }
+						style={ { ...borderProps.style, borderStyle: 'none' } }
 						inputLabel={ blockAttributes.heading }
 						isLoading={ isLoading }
 						multiple={ multiple }

diff --git a/assets/js/blocks/attribute-filter/edit.js b/assets/js/blocks/attribute-filter/edit.js
@@ -3,7 +3,11 @@
  */
 import { __, sprintf, _n } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
-import { InspectorControls, BlockControls } from '@wordpress/block-editor';
+import {
+	InspectorControls,
+	BlockControls,
+	useBlockProps,
+} from '@wordpress/block-editor';
 import {
 	Placeholder,
 	Disabled,
@@ -47,6 +51,8 @@ const Edit = ( { attributes, setAttributes, debouncedSpeak } ) => {
 		! attributeId && ! isPreview
 	);
 
+	const blockProps = useBlockProps();
+
 	const getBlockControls = () => {
 		return (
 			<BlockControls>
@@ -379,7 +385,7 @@ const Edit = ( { attributes, setAttributes, debouncedSpeak } ) => {
 	return Object.keys( ATTRIBUTES ).length === 0 ? (
 		noAttributesPlaceholder()
 	) : (
-		<>
+		<div { ...blockProps }>
 			{ getBlockControls() }
 			{ getInspectorControls() }
 			{ isEditing ? (
@@ -404,7 +410,7 @@ const Edit = ( { attributes, setAttributes, debouncedSpeak } ) => {
 					</Disabled>
 				</div>
 			) }
-		</>
+		</div>
 	);
 };
 

diff --git a/assets/js/blocks/attribute-filter/editor.scss b/assets/js/blocks/attribute-filter/editor.scss
@@ -1,3 +1,10 @@
+.editor-styles-wrapper .wp-block-woocommerce-attribute-filter {
+	// We need to override it because by default the global styles applied the border-style: solid;
+	// Our goal is not to have a border on main wrapper DOM element
+	border-style: none !important;
+}
+
+
 .wc-block-attribute-filter {
 	.components-placeholder__instructions {
 		border-bottom: 1px solid #e0e2e6;
@@ -33,4 +40,10 @@
 		display: block;
 		margin-bottom: 1em;
 	}
+
+	.components-disabled {
+		border-radius: inherit;
+		border-color: inherit;
+	}
+
 }
diff --git a/assets/js/blocks/attribute-filter/index.js b/assets/js/blocks/attribute-filter/index.js
@@ -3,6 +3,8 @@
  */
 import { __ } from '@wordpress/i18n';
 import { registerBlockType } from '@wordpress/blocks';
+import { useBlockProps } from '@wordpress/block-editor';
+import { isFeaturePluginBuild } from '@woocommerce/block-settings';
 import { Icon, category } from '@wordpress/icons';
 import classNames from 'classnames';
 
@@ -12,6 +14,7 @@ import classNames from 'classnames';
 import edit from './edit.js';
 
 registerBlockType( 'woocommerce/attribute-filter', {
+	apiVersion: 2,
 	title: __( 'Filter Products by Attribute', 'woo-gutenberg-products-block' ),
 	icon: {
 		src: (
@@ -29,6 +32,17 @@ registerBlockType( 'woocommerce/attribute-filter', {
 	),
 	supports: {
 		html: false,
+		color: {
+			text: true,
+			background: false,
+		},
+		...( isFeaturePluginBuild() && {
+			__experimentalBorder: {
+				radius: true,
+				color: true,
+				width: false,
+			},
+		} ),
 	},
 	example: {
 		attributes: {
@@ -103,7 +117,9 @@ registerBlockType( 'woocommerce/attribute-filter', {
 		}
 		return (
 			<div
-				className={ classNames( 'is-loading', className ) }
+				{ ...useBlockProps.save( {
+					className: classNames( 'is-loading', className ),
+				} ) }
 				{ ...data }
 			>
 				<span

diff --git a/assets/js/blocks/attribute-filter/style.scss b/assets/js/blocks/attribute-filter/style.scss
@@ -1,9 +1,19 @@
+.wp-block-woocommerce-attribute-filter {
+	// We need to override it because by default the global styles applied the border-style: solid;
+	// Our goal is not to have a border on main wrapper DOM element
+	border-style: none !important;
+}
+
 .wc-block-attribute-filter {
 	margin-bottom: $gap-large;
+	border-radius: inherit;
+	border-color: inherit;
 
 	&.style-dropdown {
 		display: flex;
 		gap: $gap;
+		border-radius: inherit;
+		border-color: inherit;
 	}
 
 	.wc-block-attribute-filter-list {
@@ -26,6 +36,8 @@
 		flex-grow: 1;
 		max-width: unset;
 		width: 0;
+		border-radius: inherit;
+		border-color: inherit;
 	}
 
 	.is-single .wc-block-attribute-filter-list-count,
@@ -35,5 +47,7 @@
 
 	.wc-block-components-dropdown-selector__input-wrapper {
 		height: 100%;
+		border-radius: inherit;
+		border-color: inherit;
 	}
 }
diff --git a/assets/js/blocks/featured-category/style.scss b/assets/js/blocks/featured-category/style.scss
@@ -106,6 +106,7 @@
 		bottom: 0;
 		right: 0;
 		background-color: inherit;
+		border-radius: inherit;
 		opacity: 0.5;
 		z-index: 1;
 	}