Skip to content

Border panel: Update the value of the ColorPicker when color is cleared #37048

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

Merged
stacimc merged 2 commits into from
Dec 7, 2021
Merged

Border panel: Update the value of the ColorPicker when color is cleared #37048

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f4efda
Update the value of the ColorPicker when color is cleared
stacimc Dec 1, 2021
c7861b3
Update dependency array
stacimc Dec 2, 2021
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
19 changes: 17 additions & 2 deletions packages/block-editor/src/hooks/border-color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import classnames from 'classnames';
import { addFilter } from '@wordpress/hooks';
import { __ } from '@wordpress/i18n';
import { createHigherOrderComponent } from '@wordpress/compose';
import { useState } from '@wordpress/element';
import { useEffect, useState } from '@wordpress/element';

/**
* Internal dependencies
Expand Down Expand Up @@ -56,15 +56,30 @@ export function BorderColorEdit( props ) {
( colors, origin ) => colors.concat( origin.colors ),
[]
);
const { color: customBorderColor } = style?.border || {};
const [ colorValue, setColorValue ] = useState(
() =>
getColorObjectByAttributeValues(
availableColors,
borderColor,
style?.border?.color
customBorderColor
)?.color
);

// Detect changes in the color attributes and update the colorValue to keep the
// UI in sync. This is necessary for situations when border controls interact with
// eachother: eg, setting the border width to zero causes the color and style
// selections to be cleared.
useEffect( () => {
setColorValue(
getColorObjectByAttributeValues(
availableColors,
borderColor,
customBorderColor
)?.color
);
}, [ borderColor, customBorderColor, availableColors ] );

const onChangeColor = ( value ) => {
setColorValue( value );

Expand Down