Skip to content

Commit 4d602f3

Browse files
kaeizenkaeizen
authored
fix (Global Color Schemes): fix cache issue (#3466)
* fix gradient background * fix cache, add documentation link
1 parent a4c9bbd commit 4d602f3

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

‎src/plugins/global-settings/buttons-and-icons/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-buttons-and-
7777
<p className="components-base-control__help">
7878
{ __( 'Globally style buttons and icons across all our blocks.', i18n ) }
7979
&nbsp;
80-
<a href="https://docs.wpstackable.com/article/648-how-to-use-global-styles?utm_source=wp-global-settings&utm_campaign=learnmore&utm_medium=gutenberg" target="_docs">
80+
<a href="https://docs.wpstackable.com/article/648-how-to-use-global-spacing-borders?utm_source=wp-global-settings&utm_campaign=learnmore&utm_medium=gutenberg" target="_docs">
8181
{ __( 'Learn more about Global Styles', i18n ) }
8282
</a>
8383
</p>

‎src/plugins/global-settings/color-schemes/color-scheme-picker.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,11 @@ const ColorSchemePicker = props => {
9090
} = props
9191

9292
const {
93-
colorSchemes, cachedCss,
93+
colorSchemes,
9494
} = useSelect( select => {
95-
const { colorSchemes: _colorSchemes, cachedCss } = select( 'stackable/global-color-schemes' ).getSettings()
95+
const { colorSchemes: _colorSchemes } = select( 'stackable/global-color-schemes' ).getSettings()
9696
return {
9797
colorSchemes: cloneDeep( _colorSchemes ),
98-
cachedCss,
9998
}
10099
} )
101100

@@ -128,7 +127,7 @@ const ColorSchemePicker = props => {
128127

129128
// Add a custom color scheme
130129
const handleAddItem = ( event, scheme = null ) => {
131-
doAction( 'stackable.global-settings.global-color-schemes.custom-color-schemes.add-color-scheme', scheme, setItemInEdit, cachedCss, saveTimeout )
130+
doAction( 'stackable.global-settings.global-color-schemes.custom-color-schemes.add-color-scheme', scheme, setItemInEdit, saveTimeout )
132131
}
133132

134133
// For sorting custom color schemes
@@ -140,7 +139,7 @@ const ColorSchemePicker = props => {
140139
clearTimeout( saveTimeout )
141140

142141
// If the color scheme being edited is a custom color scheme, customUpdate will return true
143-
const customUpdate = applyFilters( 'stackable.global-settings.global-color-schemes.update-color-schemes', false, currentItem, cachedCss, saveTimeout )
142+
const customUpdate = applyFilters( 'stackable.global-settings.global-color-schemes.update-color-schemes', false, currentItem, saveTimeout )
144143

145144
if ( ! customUpdate ) {
146145
// Do this only when the color scheme being edited is the default/fixed color schemes (the first two color schemes)
@@ -152,14 +151,13 @@ const ColorSchemePicker = props => {
152151
const settings = new models.Settings( {
153152
stackable_global_color_schemes: updatedColorSchemes, // eslint-disable-line camelcase
154153
// Clear the cached CSS when the color scheme is updated
155-
...( cachedCss ? { stackable_global_color_scheme_generated_css: '' } : {} ), // eslint-disable-line camelcase
154+
stackable_global_color_scheme_generated_css: '', // eslint-disable-line camelcase
156155
} )
157156
settings.save()
158157
}, 300 )
159158

160159
// Update our store.
161160
dispatch( 'stackable/global-color-schemes' ).updateColorSchemes( updatedColorSchemes )
162-
dispatch( 'stackable/global-color-schemes' ).updateSettings( { cachedCss: '' } )
163161
}
164162
}
165163

@@ -263,7 +261,7 @@ const ColorSchemePicker = props => {
263261

264262
const onDeleteItem = item => {
265263
// If the color scheme to be deleted is a custom color scheme, customDelete will return true
266-
const customDelete = applyFilters( 'stackable.global-settings.global-color-schemes.delete-color-scheme', false, item, setItemInEdit, cachedCss, saveTimeout )
264+
const customDelete = applyFilters( 'stackable.global-settings.global-color-schemes.delete-color-scheme', false, item, setItemInEdit, saveTimeout )
267265

268266
if ( ! customDelete ) {
269267
// Do not delete if it is not a custom color scheme, reset it to the default value instead.
@@ -330,7 +328,7 @@ const ColorSchemePicker = props => {
330328
// 2. Heading Color, Text Color, Accent Color when it is in the hover state
331329
if ( property === 'backgroundColor' ) {
332330
if ( isGradient( itemInEdit?.colorScheme[ property ]?.desktop ) && currentHoverState !== 'normal' ) {
333-
return false
331+
return true
334332
}
335333

336334
return currentHoverState === 'parent-hover'

‎src/plugins/global-settings/color-schemes/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-color-scheme
5555
{ ! itemInEdit && <p className="components-base-control__help">
5656
{ __( 'Color schemes are applied to all blocks and sections of your entire website.', i18n ) }
5757
&nbsp;
58-
<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">
58+
<a href="https://docs.wpstackable.com/article/649-how-to-use-color-schemes?utm_source=wp-global-settings&utm_campaign=learnmore&utm_medium=gutenberg" target="_docs">
5959
{ __( 'Learn more about Global Color Schemes', i18n ) }
6060
</a>
6161
</p>

‎src/plugins/global-settings/color-schemes/store.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const DEFAULT_STATE = {
1818
baseColorScheme: '',
1919
backgroundModeColorScheme: '',
2020
containerModeColorScheme: '',
21-
cachedCss: '',
2221
}
2322

2423
const STORE_ACTIONS = {
@@ -76,7 +75,6 @@ domReady( () => {
7675
stackable_global_base_color_scheme: baseColorScheme,
7776
stackable_global_background_mode_color_scheme: backgroundModeColorScheme,
7877
stackable_global_container_mode_color_scheme: containerModeColorScheme,
79-
stackable_global_color_scheme_generated_css: cachedCss,
8078
} = response
8179

8280
const colorSchemes = Array.isArray( _colorSchemes ) && _colorSchemes.length > 0 ? _colorSchemes : [ {
@@ -115,7 +113,6 @@ domReady( () => {
115113
baseColorScheme,
116114
backgroundModeColorScheme,
117115
containerModeColorScheme,
118-
cachedCss,
119116
}
120117

121118
dispatch( 'stackable/global-color-schemes' ).updateSettings( settings )

‎src/plugins/global-settings/spacing-and-borders/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-spacing-and-
7878
<p className="components-base-control__help">
7979
{ __( 'Globally style spacings and borders across all our blocks.', i18n ) }
8080
&nbsp;
81-
<a href="https://docs.wpstackable.com/article/648-how-to-use-global-styles?utm_source=wp-global-settings&utm_campaign=learnmore&utm_medium=gutenberg" target="_docs">
81+
<a href="https://docs.wpstackable.com/article/648-how-to-use-global-spacing-borders?utm_source=wp-global-settings&utm_campaign=learnmore&utm_medium=gutenberg" target="_docs">
8282
{ __( 'Learn more about Global Styles', i18n ) }
8383
</a>
8484
</p>

0 commit comments

Comments
 (0)