add specific type

woocommerce · Jan 4, 2022 · 5e477db · 5e477db
1 parent e9d7c30
commit 5e477db
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/assets/js/atomic/blocks/product-elements/title/index.ts b/assets/js/atomic/blocks/product-elements/title/index.ts
@@ -28,12 +28,11 @@ const blockConfig: BlockConfiguration = {
 		typography: {
 			fontSize: true,
 			lineHeight: true,
-			...( isFeaturePluginBuild() &
-				{
-					__experimentalFontWeight: true,
-					__experimentalTextTransform: true,
-					__experimentalFontFamily: true,
-				} ),
+			...( isFeaturePluginBuild() && {
+				__experimentalFontWeight: true,
+				__experimentalTextTransform: true,
+				__experimentalFontFamily: true,
+			} ),
 		},
 		color: {
 			text: false,

diff --git a/assets/js/utils/style-attributes-utils.ts b/assets/js/utils/style-attributes-utils.ts
@@ -10,6 +10,14 @@ import { __experimentalUseColorProps } from '@wordpress/block-editor';
 import { isFeaturePluginBuild } from '../settings/blocks/feature-flags';
 import { isString, isObject } from '../types/type-guards';
 
+type WithClass = {
+	className: string;
+};
+
+type WithStyle = {
+	style: Record< string, unknown >;
+};
+
 const parseStyle = ( style: unknown ): Record< string, unknown > => {
 	if ( isString( style ) ) {
 		return JSON.parse( style ) || {};
@@ -53,11 +61,7 @@ const parseSpacingStyle = (
 	}, {} );
 };
 
-export const useSpacingProps = (
-	attributes: unknown
-): {
-	style: Record< string, unknown >;
-} => {
+export const useSpacingProps = ( attributes: unknown ): WithStyle => {
 	const style = isObject( attributes ) ? parseStyle( attributes.style ) : {};
 	const spacingStyles = isObject( style.spacing ) ? style.spacing : {};
 
@@ -66,11 +70,7 @@ export const useSpacingProps = (
 	};
 };
 
-export const useTypographyProps = (
-	attributes: unknown
-): {
-	style: Record< string, unknown >;
-} => {
+export const useTypographyProps = ( attributes: unknown ): WithStyle => {
 	const attributesObject = isObject( attributes ) ? attributes : {};
 	const style = parseStyle( attributesObject.style );
 	const typography = isObject( style.typography )
@@ -88,12 +88,7 @@ export const useTypographyProps = (
 	};
 };
 
-export const useColorProps = (
-	attributes: unknown
-): {
-	className: string;
-	style: Record< string, unknown >;
-} => {
+export const useColorProps = ( attributes: unknown ): WithStyle & WithClass => {
 	if ( ! isFeaturePluginBuild() ) {
 		return {
 			className: '',