Skip to content

Duotone Settings: Add reset button and improve toggle rendering in FiltersPanel #68672

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
t-hamano merged 6 commits into from
Feb 7, 2025
Merged

Duotone Settings: Add reset button and improve toggle rendering in FiltersPanel #68672

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ec75a0
Duotone Settings: Add reset button and improve toggle rendering in Fi…
yogeshbhutkar Jan 15, 2025
1c61404
refactor: revert usage of `clearable` prop
yogeshbhutkar Feb 3, 2025
300968c
refactor: hover on button to show `reset`
yogeshbhutkar Feb 3, 2025
d40a130
refactor: remove the usage of `ItemGroup` and add `css` for border
yogeshbhutkar Feb 3, 2025
81ef102
Merge branch 'trunk' into 68671-add-reset-button-duotone
yogeshbhutkar Feb 3, 2025
03515e8
refactor: update button label to 'Reset' and adjust border color in f…
yogeshbhutkar Feb 6, 2025
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
120 changes: 77 additions & 43 deletions packages/block-editor/src/components/global-styles/filters-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
__experimentalItemGroup as ItemGroup,
__experimentalItem as Item,
__experimentalHStack as HStack,
__experimentalZStack as ZStack,
__experimentalDropdownContentWrapper as DropdownContentWrapper,
Expand All @@ -21,9 +20,11 @@ import {
Dropdown,
Flex,
FlexItem,
Button,
} from '@wordpress/components';
import { __, _x } from '@wordpress/i18n';
import { useCallback, useMemo } from '@wordpress/element';
import { useCallback, useMemo, useRef } from '@wordpress/element';
import { reset as resetIcon } from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -117,6 +118,51 @@ const LabeledColorIndicator = ( { indicator, label } ) => (
</HStack>
);

const renderToggle =
( duotone, resetDuotone ) =>
( { onToggle, isOpen } ) => {
const duotoneButtonRef = useRef( undefined );

const toggleProps = {
onClick: onToggle,
className: clsx( { 'is-open': isOpen } ),
'aria-expanded': isOpen,
ref: duotoneButtonRef,
};

const removeButtonProps = {
onClick: () => {
if ( isOpen ) {
onToggle();
}
resetDuotone();
// Return focus to parent button.
duotoneButtonRef.current?.focus();
},
className: 'block-editor-panel-duotone-settings__reset',
label: __( 'Remove' ),
};

return (
<>
<Button __next40pxDefaultSize { ...toggleProps }>
<LabeledColorIndicator
indicator={ duotone }
label={ __( 'Duotone' ) }
/>
</Button>
{ duotone && (
<Button
__next40pxDefaultSize
size="small"
icon={ resetIcon }
{ ...removeButtonProps }
/>
) }
</>
);
};

export default function FiltersPanel( {
as: Wrapper = FiltersToolsPanel,
value,
Expand Down Expand Up @@ -179,48 +225,36 @@ export default function FiltersPanel( {
isShownByDefault={ defaultControls.duotone }
panelId={ panelId }
>
<Dropdown
popoverProps={ popoverProps }
className="block-editor-global-styles-filters-panel__dropdown"
renderToggle={ ( { onToggle, isOpen } ) => {
const toggleProps = {
onClick: onToggle,
className: clsx( { 'is-open': isOpen } ),
'aria-expanded': isOpen,
};

return (
<ItemGroup isBordered isSeparated>
<Item as="button" { ...toggleProps }>
<LabeledColorIndicator
indicator={ duotone }
label={ __( 'Duotone' ) }
<ItemGroup isBordered isSeparated>
<Dropdown
popoverProps={ popoverProps }
className="block-editor-global-styles-filters-panel__dropdown"
renderToggle={ renderToggle(
duotone,
resetDuotone
) }
renderContent={ () => (
<DropdownContentWrapper paddingSize="small">
<MenuGroup label={ __( 'Duotone' ) }>
<p>
{ __(
'Create a two-tone color effect without losing your original image.'
) }
</p>
<DuotonePicker
colorPalette={ colorPalette }
duotonePalette={ duotonePalette }
// TODO: Re-enable both when custom colors are supported for block-level styles.
disableCustomColors
disableCustomDuotone
value={ duotone }
onChange={ setDuotone }
/>
</Item>
</ItemGroup>
);
} }
renderContent={ () => (
<DropdownContentWrapper paddingSize="small">
<MenuGroup label={ __( 'Duotone' ) }>
<p>
{ __(
'Create a two-tone color effect without losing your original image.'
) }
</p>
<DuotonePicker
colorPalette={ colorPalette }
duotonePalette={ duotonePalette }
// TODO: Re-enable both when custom colors are supported for block-level styles.
disableCustomColors
disableCustomDuotone
value={ duotone }
onChange={ setDuotone }
/>
</MenuGroup>
</DropdownContentWrapper>
) }
/>
</MenuGroup>
</DropdownContentWrapper>
) }
/>
</ItemGroup>
</ToolsPanelItem>
) }
</Wrapper>
Expand Down
23 changes: 23 additions & 0 deletions packages/block-editor/src/components/global-styles/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
.block-editor-global-styles__shadow-dropdown {
display: block;
padding: 0;
position: relative;

button {
width: 100%;
Expand Down Expand Up @@ -77,3 +78,25 @@
/*rtl:ignore*/
direction: ltr;
}

.block-editor-panel-duotone-settings__reset {
position: absolute;
right: 0;
top: $grid-unit;
margin: auto $grid-unit auto;
opacity: 0;
@media not (prefers-reduced-motion) {
transition: opacity 0.1s ease-in-out;
}

.block-editor-global-styles-filters-panel__dropdown:hover &,
&:focus,
&:hover {
opacity: 1;
}

@media (hover: none) {
// Show reset button on devices that do not support hover.
opacity: 1;
}
}
Loading