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

Fix duotone not showing in site editor style block level styles #55361

Merged
merged 8 commits into from
Oct 19, 2023
Merged

Fix duotone not showing in site editor style block level styles #55361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f56043
Hide filters style panel when empty
ajlende Oct 13, 2023
d1dde62
Fix when to show duotone controls
ajlende Oct 13, 2023
7f21624
Show duotone selector when theme supplies duotone filters
ajlende Oct 13, 2023
254f16a
Disable custom colors in the duotone panel
ajlende Oct 13, 2023
3331b88
Don't show when only customDuotone is enabled
ajlende Oct 13, 2023
be4ab99
Revert "Don't show when only customDuotone is enabled"
ajlende Oct 13, 2023
3c06c2a
Revert "Disable custom colors in the duotone panel"
ajlende Oct 13, 2023
b9bdc6e
disable
ajlende Oct 13, 2023
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
24 changes: 9 additions & 15 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 @@ -54,13 +54,15 @@ function useMultiOriginColorPresets(
}

export function useHasFiltersPanel( settings ) {
const hasDuotone = useHasDuotoneControl( settings );

return hasDuotone;
return useHasDuotoneControl( settings );
}

function useHasDuotoneControl( settings ) {
return settings.color.customDuotone || settings.color.defaultDuotone;
return (
settings.color.customDuotone ||
settings.color.defaultDuotone ||
settings.color.duotone.length > 0
);
}

function FiltersToolsPanel( {
Expand Down Expand Up @@ -148,11 +150,6 @@ export default function FiltersPanel( {
const hasDuotone = () => !! value?.filter?.duotone;
const resetDuotone = () => setDuotone( undefined );

const disableCustomColors = ! settings?.color?.custom;
const disableCustomDuotone =
! settings?.color?.customDuotone ||
( colorPalette?.length === 0 && disableCustomColors );

const resetAllFilter = useCallback( ( previousValue ) => {
return {
...previousValue,
Expand Down Expand Up @@ -210,12 +207,9 @@ export default function FiltersPanel( {
<DuotonePicker
colorPalette={ colorPalette }
duotonePalette={ duotonePalette }
disableCustomColors={
disableCustomColors
}
disableCustomDuotone={
disableCustomDuotone
}
// TODO: Re-enable both when custom colors are supported for block-level styles.
disableCustomColors
disableCustomDuotone
value={ duotone }
onChange={ setDuotone }
/>
Expand Down
8 changes: 1 addition & 7 deletions packages/edit-site/src/components/global-styles/screen-block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,13 +283,7 @@ function ScreenBlock( { name, variation } ) {
inheritedValue={ inheritedStyleWithLayout }
value={ styleWithLayout }
onChange={ setStyle }
settings={ {
...settings,
color: {
...settings.color,
customDuotone: false, //TO FIX: Custom duotone only works on the block level right now
},
} }
settings={ settings }
includeLayoutControls
/>
) }
Expand Down
Loading