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

Add all color palettes to select from editor panel #65148

Merged
merged 8 commits into from
Nov 22, 2024
Merged

Add all color palettes to select from editor panel #65148

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
fca97c9
Add all the colors in with-color-context so that they all are listed …
AKSHAT2802 Sep 9, 2024
70216ba
Merge branch 'trunk' into feat/display-all-color-palette-in-editor
AKSHAT2802 Nov 12, 2024
3690194
Remove default colour pallete
AKSHAT2802 Nov 12, 2024
df3c90b
Remove extra space
AKSHAT2802 Nov 12, 2024
6b02ee4
Update packages/block-editor/src/components/color-palette/with-color-…
AKSHAT2802 Nov 13, 2024
fa7ac85
Add default colours if enabled
AKSHAT2802 Nov 14, 2024
5d9668c
Update packages/block-editor/src/components/color-palette/with-color-…
AKSHAT2802 Nov 17, 2024
89a00a2
update test
richtabor Nov 21, 2024
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
32 changes: 25 additions & 7 deletions packages/block-editor/src/components/color-palette/with-color-context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,32 @@ import { useSettings } from '../use-settings';

export default createHigherOrderComponent( ( WrappedComponent ) => {
return ( props ) => {
const [ colorsFeature, enableCustomColors ] = useSettings(
'color.palette',
'color.custom'
// Get the default colors, theme colors, and custom colors
const [
defaultColors,
themeColors,
customColors,
enableCustomColors,
enableDefaultColors,
] = useSettings(
'color.palette.default',
'color.palette.theme',
'color.palette.custom',
'color.custom',
'color.defaultPalette'
);
const {
colors = colorsFeature,
disableCustomColors = ! enableCustomColors,
} = props;

const _colors = enableDefaultColors
? [
...( themeColors || [] ),
...( defaultColors || [] ),
...( customColors || [] ),
]
: [ ...( themeColors || [] ), ...( customColors || [] ) ];

const { colors = _colors, disableCustomColors = ! enableCustomColors } =
props;

const hasColorsToChoose =
( colors && colors.length > 0 ) || ! disableCustomColors;
return (
Expand Down
4 changes: 2 additions & 2 deletions packages/block-library/src/cover/test/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ describe( 'Cover block', () => {
describe( 'when colors are disabled', () => {
test( 'does not render overlay control', async () => {
await setup( undefined, true, disabledColorSettings );
await createAndSelectBlock();
await selectBlock( 'Block: Cover' );
await userEvent.click(
screen.getByRole( 'tab', { name: 'Styles' } )
);
Expand All @@ -350,7 +350,7 @@ describe( 'Cover block', () => {
} );
test( 'does not render opacity control', async () => {
await setup( undefined, true, disabledColorSettings );
await createAndSelectBlock();
await selectBlock( 'Block: Cover' );
await userEvent.click(
screen.getByRole( 'tab', { name: 'Styles' } )
);
Expand Down
Loading