fix crash on WP 5.8

woocommerce · Jan 7, 2022 · 18642e6 · 18642e6
1 parent 4bcdc58
commit 18642e6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/assets/js/atomic/blocks/product-elements/title/index.ts b/assets/js/atomic/blocks/product-elements/title/index.ts
@@ -16,6 +16,7 @@ import {
 	BLOCK_DESCRIPTION as description,
 } from './constants';
 import { Save } from './save';
+import { hasSpacingStyleSupport } from '../../../../utils/global-style';
 
 const blockConfig: BlockConfiguration = {
 	...sharedConfig,
@@ -36,15 +37,16 @@ const blockConfig: BlockConfiguration = {
 				__experimentalFontFamily: true,
 			},
 		} ),
-		...( isFeaturePluginBuild() && {
-			color: {
-				text: true,
-				background: true,
-				link: false,
-				gradients: true,
-				__experimentalSkipSerialization: true,
-			},
-		} ),
+		...( isFeaturePluginBuild() &&
+			hasSpacingStyleSupport() && {
+				color: {
+					text: true,
+					background: true,
+					link: false,
+					gradients: true,
+					__experimentalSkipSerialization: true,
+				},
+			} ),
 		...( isFeaturePluginBuild() && {
 			spacing: {
 				margin: true,

diff --git a/assets/js/hooks/style-attributes.ts b/assets/js/hooks/style-attributes.ts
@@ -12,6 +12,7 @@ import {
  */
 import { isFeaturePluginBuild } from '../settings/blocks/feature-flags';
 import { isString, isObject } from '../types/type-guards';
+import { hasSpacingStyleSupport } from '../utils/global-style';
 
 type WithClass = {
 	className: string;
@@ -34,7 +35,7 @@ const parseStyle = ( style: unknown ): Record< string, unknown > => {
 };
 
 export const useSpacingProps = ( attributes: unknown ): WithStyle => {
-	if ( ! isFeaturePluginBuild() ) {
+	if ( ! isFeaturePluginBuild() || ! hasSpacingStyleSupport() ) {
 		return {
 			style: {},
 		};

diff --git a/assets/js/utils/global-style.js b/assets/js/utils/global-style.js
@@ -0,0 +1,8 @@
+/* eslint-disable @wordpress/no-unsafe-wp-apis */
+/**
+ * External dependencies
+ */
+import { __experimentalGetSpacingClassesAndStyles } from '@wordpress/block-editor';
+
+export const hasSpacingStyleSupport = () =>
+	typeof __experimentalGetSpacingClassesAndStyles === 'function';