Skip to content

Global Styles: Move Randomize colors button to Edit Palette panel #70128

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 4 commits into from
May 21, 2025
Merged

Global Styles: Move Randomize colors button to Edit Palette panel #70128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ead19d7
Global Styles: Move 'Randomize colors' button to Edit Palette panel
himanshupathak95 May 15, 2025
69a283b
Global Styles: Reduce spacing between Custom palette and Randomize co…
himanshupathak95 May 19, 2025
7f8f5c3
Remove custom styles added
himanshupathak95 May 21, 2025
0a0eaaa
Wrap the Theme colors palette and randomize colors button in VStack
himanshupathak95 May 21, 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
40 changes: 29 additions & 11 deletions packages/edit-site/src/components/global-styles/color-palette-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@ import { useViewportMatch } from '@wordpress/compose';
import {
__experimentalPaletteEdit as PaletteEdit,
__experimentalVStack as VStack,
Button,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import { shuffle } from '@wordpress/icons';

/**
* Internal dependencies
*/
import { unlock } from '../../lock-unlock';
import ColorVariations from './variations/variations-color';
import { useColorRandomizer } from './hooks';

const { useGlobalSetting } = unlock( blockEditorPrivateApis );
const mobilePopoverProps = { placement: 'bottom-start', offset: 8 };
Expand Down Expand Up @@ -49,22 +52,37 @@ export default function ColorPalettePanel( { name } ) {
const isMobileViewport = useViewportMatch( 'small', '<' );
const popoverProps = isMobileViewport ? mobilePopoverProps : undefined;

const [ randomizeThemeColors ] = useColorRandomizer();

return (
<VStack
className="edit-site-global-styles-color-palette-panel"
spacing={ 8 }
>
{ !! themeColors && !! themeColors.length && (
<PaletteEdit
canReset={ themeColors !== baseThemeColors }
canOnlyChangeValues
colors={ themeColors }
onChange={ setThemeColors }
paletteLabel={ __( 'Theme' ) }
paletteLabelHeadingLevel={ 3 }
popoverProps={ popoverProps }
/>
) }
<VStack spacing={ 4 }>
{ !! themeColors && !! themeColors.length && (
<PaletteEdit
canReset={ themeColors !== baseThemeColors }
canOnlyChangeValues
colors={ themeColors }
onChange={ setThemeColors }
paletteLabel={ __( 'Theme' ) }
paletteLabelHeadingLevel={ 3 }
popoverProps={ popoverProps }
/>
) }
{ window.__experimentalEnableColorRandomizer &&
themeColors?.length > 0 && (
<Button
__next40pxDefaultSize
variant="secondary"
icon={ shuffle }
onClick={ randomizeThemeColors }
>
{ __( 'Randomize colors' ) }
</Button>
) }
</VStack>
{ !! defaultColors &&
!! defaultColors.length &&
!! defaultPaletteEnabled && (
Expand Down
17 changes: 1 addition & 16 deletions packages/edit-site/src/components/global-styles/palette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ import {
__experimentalZStack as ZStack,
__experimentalVStack as VStack,
ColorIndicator,
Button,
} from '@wordpress/components';
import { isRTL, __ } from '@wordpress/i18n';
import { Icon, shuffle, chevronLeft, chevronRight } from '@wordpress/icons';
import { Icon, chevronLeft, chevronRight } from '@wordpress/icons';
import { useMemo } from '@wordpress/element';
import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';

Expand All @@ -20,7 +19,6 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
*/
import Subtitle from './subtitle';
import { NavigationButtonAsItem } from './navigation-button';
import { useColorRandomizer } from './hooks';
import ColorIndicatorWrapper from './color-indicator-wrapper';
import { unlock } from '../../lock-unlock';

Expand All @@ -38,8 +36,6 @@ function Palette( { name } ) {
name
);

const [ randomizeThemeColors ] = useColorRandomizer();

const colors = useMemo(
() => [
...( customColors || EMPTY_COLORS ),
Expand Down Expand Up @@ -87,17 +83,6 @@ function Palette( { name } ) {
</HStack>
</NavigationButtonAsItem>
</ItemGroup>
{ window.__experimentalEnableColorRandomizer &&
themeColors?.length > 0 && (
<Button
__next40pxDefaultSize
variant="secondary"
icon={ shuffle }
onClick={ randomizeThemeColors }
>
{ __( 'Randomize colors' ) }
</Button>
) }
</VStack>
);
}
Expand Down
Loading