diff --git a/packages/edit-site/src/components/global-styles/color-palette-panel.js b/packages/edit-site/src/components/global-styles/color-palette-panel.js index 0b1d482c0a1b3d..606eb996ccccd3 100644 --- a/packages/edit-site/src/components/global-styles/color-palette-panel.js +++ b/packages/edit-site/src/components/global-styles/color-palette-panel.js @@ -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 }; @@ -49,22 +52,37 @@ export default function ColorPalettePanel( { name } ) { const isMobileViewport = useViewportMatch( 'small', '<' ); const popoverProps = isMobileViewport ? mobilePopoverProps : undefined; + const [ randomizeThemeColors ] = useColorRandomizer(); + return ( - { !! themeColors && !! themeColors.length && ( - - ) } + + { !! themeColors && !! themeColors.length && ( + + ) } + { window.__experimentalEnableColorRandomizer && + themeColors?.length > 0 && ( + + ) } + { !! defaultColors && !! defaultColors.length && !! defaultPaletteEnabled && ( diff --git a/packages/edit-site/src/components/global-styles/palette.js b/packages/edit-site/src/components/global-styles/palette.js index 9b8c3f829d2426..ceb15ef3bb6976 100644 --- a/packages/edit-site/src/components/global-styles/palette.js +++ b/packages/edit-site/src/components/global-styles/palette.js @@ -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'; @@ -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'; @@ -38,8 +36,6 @@ function Palette( { name } ) { name ); - const [ randomizeThemeColors ] = useColorRandomizer(); - const colors = useMemo( () => [ ...( customColors || EMPTY_COLORS ), @@ -87,17 +83,6 @@ function Palette( { name } ) { - { window.__experimentalEnableColorRandomizer && - themeColors?.length > 0 && ( - - ) } ); }