Skip to content

Border Controls: Display color indicator and check selected color #34467

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
Mamaduka merged 3 commits into from
Sep 8, 2021
Merged

Border Controls: Display color indicator and check selected color #34467

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38b20e3
Fix border panel color indicator
stacimc Aug 31, 2021
9addeb9
Pass color value rather than slug as prop, to fix preset color preview
stacimc Sep 1, 2021
187e383
Lazily initialize state
stacimc Sep 7, 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
12 changes: 11 additions & 1 deletion 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,6 +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';

/**
* Internal dependencies
Expand Down Expand Up @@ -48,8 +49,17 @@ export function BorderColorEdit( props ) {
const colors = useSetting( 'color.palette' ) || EMPTY_ARRAY;
const disableCustomColors = ! useSetting( 'color.custom' );
const disableCustomGradients = ! useSetting( 'color.customGradient' );
const [ colorValue, setColorValue ] = useState(
getColorObjectByAttributeValues(
colors,
borderColor,
style?.border?.color
)?.color
);

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

const colorObject = getColorObjectByColorValue( colors, value );
const newStyle = {
...style,
Expand All @@ -71,7 +81,7 @@ export function BorderColorEdit( props ) {
return (
<ColorGradientControl
label={ __( 'Color' ) }
value={ borderColor || style?.border?.color }
colorValue={ colorValue }
colors={ colors }
gradients={ undefined }
disableCustomColors={ disableCustomColors }
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-site/src/components/sidebar/border-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default function BorderPanel( {
{ hasBorderColor && (
<ColorGradientControl
label={ __( 'Color' ) }
value={ borderColor }
colorValue={ borderColor }
colors={ colors }
gradients={ undefined }
disableCustomColors={ disableCustomColors }
Expand Down