Skip to content

Commit e6294bd

Browse files
committed
minor fix for global colors
fix spacing, do not render components if panel is not open
1 parent e697773 commit e6294bd

File tree

2 files changed

+36
-30
lines changed

2 files changed

+36
-30
lines changed

src/plugins/global-settings/colors/color-picker.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ const ColorPickers = props => {
125125

126126
updateColors( updatedColors )
127127
setIsSorting( false )
128-
}
128+
}
129129

130-
const ItemPreview = ( { item } ) => {
130+
const ItemPreview = ( { item } ) => {
131131
return <ColorIndicator
132132
className="stk-color-indicator block-editor-panel-color-gradient-settings__color-indicator"
133133
colorValue={ item.color }
134134
/>
135-
}
135+
}
136136

137-
const ItemPicker = ( { item, onChange } ) => {
137+
const ItemPicker = ( { item, onChange } ) => {
138138
return <div className="stk-color-palette-control__popover-content">
139139
<ColorPicker
140140
onChange={ value => onChange( {
@@ -145,7 +145,7 @@ const ColorPickers = props => {
145145
enableAlpha={ true }
146146
/>
147147
</div>
148-
}
148+
}
149149

150150
return (
151151
<SortablePicker

src/plugins/global-settings/colors/index.js

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import rgba from 'color-rgba'
1717
* WordPress dependencies
1818
*/
1919
import { addFilter, applyFilters } from '@wordpress/hooks'
20-
import { Fragment } from '@wordpress/element'
20+
import { Fragment, useState } from '@wordpress/element'
2121
import { __ } from '@wordpress/i18n'
2222
import { dispatch, useSelect } from '@wordpress/data'
2323
import { models } from '@wordpress/api'
@@ -75,6 +75,8 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-colors', out
7575
hideSiteEditorColors,
7676
} = useSelect( select => select( 'stackable/global-colors' ).getSettings() )
7777

78+
const [ isOpen, setIsOpen ] = useState( false )
79+
7880
const onChangeHideThemeColors = value => {
7981
dispatch( 'stackable/global-colors' ).updateSettings( {
8082
hideThemeColors: value,
@@ -109,35 +111,39 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-colors', out
109111
{ output }
110112
<PanelAdvancedSettings
111113
title={ __( 'Global Color Palette', i18n ) }
114+
onToggle={ isOpen => setIsOpen( isOpen ) }
112115
>
113-
<p className="components-base-control__help">
114-
{ __( 'Change your color palette for all your blocks across your site.', i18n ) }
116+
{ isOpen && <>
117+
<p className="components-base-control__help">
118+
{ __( 'Change your color palette for all your blocks across your site.', i18n ) }
115119
&nbsp;
116-
<a href="https://docs.wpstackable.com/article/362-how-to-use-global-colors?utm_source=wp-global-settings&utm_campaign=learnmore&utm_medium=gutenberg" target="_docs">
117-
{ __( 'Learn more about Global Colors', i18n ) }
118-
</a>
119-
</p>
120-
<ColorPicker label={ __( 'Global Colors', i18n ) } />
121-
{ /* <ColorPicker
120+
<a href="https://docs.wpstackable.com/article/362-how-to-use-global-colors?utm_source=wp-global-settings&utm_campaign=learnmore&utm_medium=gutenberg" target="_docs">
121+
{ __( 'Learn more about Global Colors', i18n ) }
122+
</a>
123+
</p>
124+
<ColorPicker label={ __( 'Global Colors', i18n ) } />
125+
{ /* <ColorPicker
122126
label={ __( 'Global Gradients', i18n ) }
123127
onReset={ () => onChangeUseStackableColorsOnly( false ) }
124128
/> */ }
125-
{ ColorToggleControls }
126-
<ToggleControl
127-
label={ __( 'Show Theme Colors', i18n ) }
128-
checked={ ! hideThemeColors }
129-
onChange={ value => onChangeHideThemeColors( ! value ) }
130-
/>
131-
<ToggleControl
132-
label={ __( 'Show Default Colors', i18n ) }
133-
checked={ ! hideDefaultColors }
134-
onChange={ value => onChangeHideDefaultColors( ! value ) }
135-
/>
136-
<ToggleControl
137-
label={ __( 'Show Site Editor Custom Colors', i18n ) }
138-
checked={ ! hideSiteEditorColors }
139-
onChange={ value => onChangeHideSiteEditorColors( ! value ) }
140-
/>
129+
{ ColorToggleControls }
130+
<ToggleControl
131+
label={ __( 'Show Theme Colors', i18n ) }
132+
checked={ ! hideThemeColors }
133+
onChange={ value => onChangeHideThemeColors( ! value ) }
134+
/>
135+
<ToggleControl
136+
label={ __( 'Show Default Colors', i18n ) }
137+
checked={ ! hideDefaultColors }
138+
onChange={ value => onChangeHideDefaultColors( ! value ) }
139+
/>
140+
<ToggleControl
141+
label={ __( 'Show Site Editor Custom Colors', i18n ) }
142+
checked={ ! hideSiteEditorColors }
143+
onChange={ value => onChangeHideSiteEditorColors( ! value ) }
144+
/>
145+
</> }
146+
141147
</PanelAdvancedSettings>
142148
</Fragment>
143149
)

0 commit comments

Comments
 (0)