From 2853fb3271ed74df1f9a555e291aa86f9176fd01 Mon Sep 17 00:00:00 2001 From: ramon Date: Tue, 25 Jun 2024 13:15:56 +1000 Subject: [PATCH] Feedback suggestions from review: add overrides to dep array in Editor Styles rename hook --- packages/block-editor/src/components/editor-styles/index.js | 2 +- packages/block-editor/src/hooks/block-style-variation.js | 2 +- packages/block-editor/src/hooks/index.js | 2 +- packages/block-editor/src/private-apis.js | 4 ++-- packages/edit-site/src/components/revisions/index.js | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/block-editor/src/components/editor-styles/index.js b/packages/block-editor/src/components/editor-styles/index.js index 05fac78588e4f0..00a15d2bcfa48d 100644 --- a/packages/block-editor/src/components/editor-styles/index.js +++ b/packages/block-editor/src/components/editor-styles/index.js @@ -113,7 +113,7 @@ function EditorStyles( { styles, scope, overrides } ) { .map( ( style ) => style.assets ) .join( '' ), ]; - }, [ styles, styleOverrides, scope ] ); + }, [ styles, styleOverrides, overrides, scope ] ); return ( <> diff --git a/packages/block-editor/src/hooks/block-style-variation.js b/packages/block-editor/src/hooks/block-style-variation.js index 3ffa903a8a3d8f..9050409ec85bd7 100644 --- a/packages/block-editor/src/hooks/block-style-variation.js +++ b/packages/block-editor/src/hooks/block-style-variation.js @@ -68,7 +68,7 @@ function getVariationNameFromClass( className, registeredStyles = [] ) { * @param {Object} config A global styles object, containing settings and styles. * @return {Array} An array of new block variation overrides. */ -export function useUpdateBlockVariationOverridesWithConfig( config ) { +export function useUpdateBlockStyleVariationOverridesWithConfig( config ) { const overrides = useSelect( ( select ) => unlock( select( blockEditorStore ) ).getStyleOverrides(), [] diff --git a/packages/block-editor/src/hooks/index.js b/packages/block-editor/src/hooks/index.js index 8f18918a1cd2bd..f831249881200d 100644 --- a/packages/block-editor/src/hooks/index.js +++ b/packages/block-editor/src/hooks/index.js @@ -88,4 +88,4 @@ export { getTypographyClassesAndStyles } from './use-typography-props'; export { getGapCSSValue } from './gap'; export { useCachedTruthy } from './use-cached-truthy'; export { useZoomOut } from './use-zoom-out'; -export { useUpdateBlockVariationOverridesWithConfig } from './block-style-variation'; +export { useUpdateBlockStyleVariationOverridesWithConfig } from './block-style-variation'; diff --git a/packages/block-editor/src/private-apis.js b/packages/block-editor/src/private-apis.js index fbb8c8d66d55d3..0e5f18a5005b2f 100644 --- a/packages/block-editor/src/private-apis.js +++ b/packages/block-editor/src/private-apis.js @@ -23,7 +23,7 @@ import { BlockRemovalWarningModal } from './components/block-removal-warning-mod import { useLayoutClasses, useLayoutStyles, - useUpdateBlockVariationOverridesWithConfig, + useUpdateBlockStyleVariationOverridesWithConfig, } from './hooks'; import DimensionsTool from './components/dimensions-tool'; import ResolutionTool from './components/resolution-tool'; @@ -92,5 +92,5 @@ lock( privateApis, { PrivatePublishDateTimePicker, useSpacingSizes, useBlockDisplayTitle, - useUpdateBlockVariationOverridesWithConfig, + useUpdateBlockStyleVariationOverridesWithConfig, } ); diff --git a/packages/edit-site/src/components/revisions/index.js b/packages/edit-site/src/components/revisions/index.js index cb210c09e4af43..aee6136df58888 100644 --- a/packages/edit-site/src/components/revisions/index.js +++ b/packages/edit-site/src/components/revisions/index.js @@ -25,7 +25,7 @@ const { ExperimentalBlockEditorProvider, GlobalStylesContext, useGlobalStylesOutputWithConfig, - useUpdateBlockVariationOverridesWithConfig, + useUpdateBlockStyleVariationOverridesWithConfig, } = unlock( blockEditorPrivateApis ); const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis ); @@ -35,7 +35,7 @@ function isObjectEmpty( object ) { function RevisionStyles( { styles, config } ) { const mergedOverrides = - useUpdateBlockVariationOverridesWithConfig( config ); + useUpdateBlockStyleVariationOverridesWithConfig( config ); return ; }