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.

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

[pull] trunk from WordPress:trunk #110

Merged
merged 14 commits into from
Dec 23, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Add reset button to ColorGradientSettingsDropdown (WordPress#67800)
* Add reset button to ColorGradientSettingsDropdown

* Toggle if it is open, to avoid multiple selectors being open.

* Always show reset button if hover is not supported.

* Respect clearable setting to display the reset button.

* Toggle if it is open, to avoid multiple selectors being open.

* Apply suggestions from code review

---------

Co-authored-by: juanfra <juanfra@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
3 people authored Dec 23, 2024
commit 27bb038623933c51d75d38da5a9c1a1e4be850f5
65 changes: 57 additions & 8 deletions packages/block-editor/src/components/colors-gradients/dropdown.js
Original file line number Diff line number Diff line change
@@ -15,6 +15,13 @@ import {
__experimentalHStack as HStack,
__experimentalToolsPanelItem as ToolsPanelItem,
} from '@wordpress/components';
import { useRef } from '@wordpress/element';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import { reset as resetIcon } from '@wordpress/icons';

/**
* Internal dependencies
@@ -76,7 +83,15 @@ const LabeledColorIndicator = ( { colorValue, label } ) => (
const renderToggle =
( settings ) =>
( { onToggle, isOpen } ) => {
const { colorValue, label } = settings;
const {
clearable,
colorValue,
gradientValue,
onColorChange,
onGradientChange,
label,
} = settings;
const colorButtonRef = useRef( undefined );

const toggleProps = {
onClick: onToggle,
@@ -85,15 +100,45 @@ const renderToggle =
{ 'is-open': isOpen }
),
'aria-expanded': isOpen,
ref: colorButtonRef,
};

const clearValue = () => {
if ( colorValue ) {
onColorChange();
} else if ( gradientValue ) {
onGradientChange();
}
};

const value = colorValue ?? gradientValue;

return (
<Button __next40pxDefaultSize { ...toggleProps }>
<LabeledColorIndicator
colorValue={ colorValue }
label={ label }
/>
</Button>
<>
<Button __next40pxDefaultSize { ...toggleProps }>
<LabeledColorIndicator
colorValue={ value }
label={ label }
/>
</Button>
{ clearable && value && (
<Button
__next40pxDefaultSize
label={ __( 'Reset' ) }
className="block-editor-panel-color-gradient-settings__reset"
size="small"
icon={ resetIcon }
onClick={ () => {
clearValue();
if ( isOpen ) {
onToggle();
}
// Return focus to parent button
colorButtonRef.current?.focus();
} }
/>
) }
</>
);
};

@@ -143,8 +188,12 @@ export default function ColorGradientSettingsDropdown( {
...setting,
};
const toggleSettings = {
colorValue: setting.gradientValue ?? setting.colorValue,
clearable: setting.clearable,
label: setting.label,
colorValue: setting.colorValue,
gradientValue: setting.gradientValue,
onColorChange: setting.onColorChange,
onGradientChange: setting.onGradientChange,
};

return (
Original file line number Diff line number Diff line change
@@ -140,4 +140,9 @@ $swatch-gap: 12px;
&:hover {
opacity: 1;
}

@media (hover: none) {
// Show reset button on devices that do not support hover.
opacity: 1;
}
}
Original file line number Diff line number Diff line change
@@ -250,6 +250,9 @@ function ColorPanelDropdown( {
icon={ resetIcon }
onClick={ () => {
resetValue();
if ( isOpen ) {
onToggle();
}
// Return focus to parent button
colorGradientDropdownButtonRef.current?.focus();
} }
Original file line number Diff line number Diff line change
@@ -392,7 +392,12 @@ function ShadowItem( { shadow, onChange, canRemove, onRemove } ) {
'aria-expanded': isOpen,
};
const removeButtonProps = {
onClick: onRemove,
onClick: () => {
if ( isOpen ) {
onToggle();
}
onRemove();
},
className: clsx(
'edit-site-global-styles__shadow-editor__remove-button',
{ 'is-open': isOpen }