Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Block editor: hooks: share block settings #56852

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Block editor: hooks: share block settings #56852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions packages/block-editor/src/hooks/border.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ import { useSelect } from '@wordpress/data';
import { getColorClassName } from '../components/colors';
import InspectorControls from '../components/inspector-controls';
import useMultipleOriginColorsAndGradients from '../components/colors-gradients/use-multiple-origin-colors-and-gradients';
import {
cleanEmptyObject,
shouldSkipSerialization,
useBlockSettings,
} from './utils';
import { cleanEmptyObject, shouldSkipSerialization } from './utils';
import {
useHasBorderPanel,
BorderPanel as StylesBorderPanel,
Expand Down Expand Up @@ -137,8 +133,7 @@ function BordersInspectorControl( { children, resetAllFilter } ) {
);
}

function BorderPanelPure( { clientId, name, setAttributes } ) {
const settings = useBlockSettings( name );
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if __unstableParentLayout was forgotten here or intentionally omitted.

function BorderPanelPure( { clientId, name, setAttributes, settings } ) {
const isEnabled = useHasBorderPanel( settings );
function selector( select ) {
const { style, borderColor } =
Expand Down
4 changes: 1 addition & 3 deletions packages/block-editor/src/hooks/color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
cleanEmptyObject,
transformStyles,
shouldSkipSerialization,
useBlockSettings,
} from './utils';
import { useSettings } from '../components/use-settings';
import InspectorControls from '../components/inspector-controls';
Expand Down Expand Up @@ -291,8 +290,7 @@ function ColorInspectorControl( { children, resetAllFilter } ) {
);
}

function ColorEditPure( { clientId, name, setAttributes } ) {
const settings = useBlockSettings( name );
function ColorEditPure( { clientId, name, setAttributes, settings } ) {
const isEnabled = useHasColorPanel( settings );
function selector( select ) {
const { style, textColor, backgroundColor, gradient } =
Expand Down
10 changes: 2 additions & 8 deletions packages/block-editor/src/hooks/dimensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { PaddingVisualizer } from './padding';
import { store as blockEditorStore } from '../store';
import { unlock } from '../lock-unlock';

import { cleanEmptyObject, useBlockSettings } from './utils';
import { cleanEmptyObject } from './utils';

export const DIMENSIONS_SUPPORT_KEY = 'dimensions';
export const SPACING_SUPPORT_KEY = 'spacing';
Expand Down Expand Up @@ -66,13 +66,7 @@ function DimensionsInspectorControl( { children, resetAllFilter } ) {
);
}

function DimensionsPanelPure( {
clientId,
name,
setAttributes,
__unstableParentLayout,
} ) {
const settings = useBlockSettings( name, __unstableParentLayout );
function DimensionsPanelPure( { clientId, name, setAttributes, settings } ) {
const isEnabled = useHasDimensionsPanel( settings );
const value = useSelect(
( select ) =>
Expand Down
61 changes: 30 additions & 31 deletions packages/block-editor/src/hooks/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ import {
DimensionsPanel,
} from './dimensions';
import useDisplayBlockControls from '../components/use-display-block-controls';
import { shouldSkipSerialization, useStyleOverride } from './utils';
import {
shouldSkipSerialization,
useStyleOverride,
useBlockSettings,
} from './utils';
import { scopeSelector } from '../components/global-styles/utils';
import { useBlockEditingMode } from '../components/block-editing-mode';

Expand Down Expand Up @@ -345,6 +349,30 @@ export function addEditProps( settings ) {
return settings;
}

function BlockStyleControls( {
clientId,
name,
setAttributes,
__unstableParentLayout,
} ) {
const settings = useBlockSettings( name, __unstableParentLayout );
const passedProps = {
clientId,
name,
setAttributes,
settings,
};
return (
<>
<ColorEdit { ...passedProps } />
<BackgroundImagePanel { ...passedProps } />
<TypographyPanel { ...passedProps } />
<BorderPanel { ...passedProps } />
<DimensionsPanel { ...passedProps } />
</>
);
}

/**
* Override the default edit UI to include new inspector controls for
* all the custom styles configs.
Expand All @@ -361,40 +389,11 @@ export const withBlockStyleControls = createHigherOrderComponent(

const shouldDisplayControls = useDisplayBlockControls();
const blockEditingMode = useBlockEditingMode();
const { clientId, name, setAttributes, __unstableParentLayout } = props;

return (
<>
{ shouldDisplayControls && blockEditingMode === 'default' && (
<>
<ColorEdit
clientId={ clientId }
name={ name }
setAttributes={ setAttributes }
/>
<BackgroundImagePanel
clientId={ clientId }
name={ name }
setAttributes={ setAttributes }
/>
<TypographyPanel
clientId={ clientId }
name={ name }
setAttributes={ setAttributes }
__unstableParentLayout={ __unstableParentLayout }
/>
<BorderPanel
clientId={ clientId }
name={ name }
setAttributes={ setAttributes }
/>
<DimensionsPanel
clientId={ clientId }
name={ name }
setAttributes={ setAttributes }
__unstableParentLayout={ __unstableParentLayout }
/>
</>
<BlockStyleControls { ...props } />
) }
<BlockEdit key="edit" { ...props } />
</>
Expand Down
10 changes: 2 additions & 8 deletions packages/block-editor/src/hooks/typography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import { LINE_HEIGHT_SUPPORT_KEY } from './line-height';
import { FONT_FAMILY_SUPPORT_KEY } from './font-family';
import { FONT_SIZE_SUPPORT_KEY } from './font-size';
import { cleanEmptyObject, useBlockSettings } from './utils';
import { cleanEmptyObject } from './utils';
import { store as blockEditorStore } from '../store';

function omit( object, keys ) {
Expand Down Expand Up @@ -109,19 +109,13 @@ function TypographyInspectorControl( { children, resetAllFilter } ) {
);
}

function TypographyPanelPure( {
clientId,
name,
setAttributes,
__unstableParentLayout,
} ) {
function TypographyPanelPure( { clientId, name, setAttributes, settings } ) {
function selector( select ) {
const { style, fontFamily, fontSize } =
select( blockEditorStore ).getBlockAttributes( clientId ) || {};
return { style, fontFamily, fontSize };
}
const { style, fontFamily, fontSize } = useSelect( selector, [ clientId ] );
const settings = useBlockSettings( name, __unstableParentLayout );
const isEnabled = useHasTypographyPanel( settings );
const value = useMemo(
() => attributesToStyle( { style, fontFamily, fontSize } ),
Expand Down
Loading