Use hasPaddingSupport from padding hook

WordPress · Apr 19, 2021 · 786f915 · 786f915
1 parent 33e322b
commit 786f915
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/block-editor/src/hooks/padding.js b/packages/block-editor/src/hooks/padding.js
@@ -20,10 +20,10 @@ import { useCustomUnits } from '../components/unit-control';
  * @param  {string|Object} blockType Block name or Block Type object.
  * @return {boolean}                 Whether there is support.
  */
-const hasPaddingSupport = ( blockType ) => {
+export function hasPaddingSupport( blockType ) {
 	const support = getBlockSupport( blockType, SPACING_SUPPORT_KEY );
 	return !! ( true === support || support?.padding );
-};
+}
 
 /**
  * Custom hook that checks if padding settings have been disabled.

diff --git a/packages/block-editor/src/hooks/spacing.js b/packages/block-editor/src/hooks/spacing.js
@@ -7,7 +7,11 @@ import { Platform } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { PaddingEdit, useIsPaddingDisabled } from './padding';
+import {
+	PaddingEdit,
+	hasPaddingSupport,
+	useIsPaddingDisabled,
+} from './padding';
 import SpacingPanelControl from '../components/spacing-panel-control';
 
 export const SPACING_SUPPORT_KEY = 'spacing';
@@ -44,9 +48,7 @@ export function hasSpacingSupport( blockName ) {
 		return false;
 	}
 
-	const support = getBlockSupport( blockName, SPACING_SUPPORT_KEY );
-
-	return !! ( true === support || support?.padding );
+	return hasPaddingSupport( blockName );
 }
 
 /**