-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Border panel: Update to display multiple palette origins #36753
Merged
aaronrobertshaw
merged 3 commits into
trunk
from
update/border-color-to-display-multiple-palette-origins
Nov 29, 2021
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
packages/block-editor/src/components/colors-gradients/use-common-single-multiple-selects.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import useSetting from '../use-setting'; | ||
|
|
||
| export default function useCommonSingleMultipleSelects() { | ||
| return { | ||
| disableCustomColors: ! useSetting( 'color.custom' ), | ||
| disableCustomGradients: ! useSetting( 'color.customGradient' ), | ||
| }; | ||
| } |
107 changes: 107 additions & 0 deletions
107
.../block-editor/src/components/colors-gradients/use-multiple-origin-colors-and-gradients.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { useMemo } from '@wordpress/element'; | ||
| import { _x } from '@wordpress/i18n'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import useSetting from '../use-setting'; | ||
| import useCommonSingleMultipleSelects from './use-common-single-multiple-selects'; | ||
|
|
||
| /** | ||
| * Retrieves color and gradient related settings. | ||
| * | ||
| * The arrays for colors and gradients are made up of color palettes from each | ||
| * origin i.e. "Core", "Theme", and "User". | ||
| * | ||
| * @return {Object} Color and gradient related settings. | ||
| */ | ||
| export default function useMultipleOriginColorsAndGradients() { | ||
| const colorGradientSettings = useCommonSingleMultipleSelects(); | ||
| const customColors = useSetting( 'color.palette.custom' ); | ||
| const themeColors = useSetting( 'color.palette.theme' ); | ||
| const defaultColors = useSetting( 'color.palette.default' ); | ||
| const shouldDisplayDefaultColors = useSetting( 'color.defaultPalette' ); | ||
|
|
||
| colorGradientSettings.colors = useMemo( () => { | ||
| const result = []; | ||
| if ( themeColors && themeColors.length ) { | ||
| result.push( { | ||
| name: _x( | ||
| 'Theme', | ||
| 'Indicates this palette comes from the theme.' | ||
| ), | ||
| colors: themeColors, | ||
| } ); | ||
| } | ||
| if ( | ||
| shouldDisplayDefaultColors && | ||
| defaultColors && | ||
| defaultColors.length | ||
| ) { | ||
| result.push( { | ||
| name: _x( | ||
| 'Default', | ||
| 'Indicates this palette comes from WordPress.' | ||
| ), | ||
| colors: defaultColors, | ||
| } ); | ||
| } | ||
| if ( customColors && customColors.length ) { | ||
| result.push( { | ||
| name: _x( | ||
| 'Custom', | ||
| 'Indicates this palette comes from the theme.' | ||
| ), | ||
| colors: customColors, | ||
| } ); | ||
| } | ||
| return result; | ||
| }, [ defaultColors, themeColors, customColors ] ); | ||
|
|
||
| const customGradients = useSetting( 'color.gradients.custom' ); | ||
| const themeGradients = useSetting( 'color.gradients.theme' ); | ||
| const defaultGradients = useSetting( 'color.gradients.default' ); | ||
| const shouldDisplayDefaultGradients = useSetting( | ||
| 'color.defaultGradients' | ||
| ); | ||
| colorGradientSettings.gradients = useMemo( () => { | ||
| const result = []; | ||
| if ( themeGradients && themeGradients.length ) { | ||
| result.push( { | ||
| name: _x( | ||
| 'Theme', | ||
| 'Indicates this palette comes from the theme.' | ||
| ), | ||
| gradients: themeGradients, | ||
| } ); | ||
| } | ||
| if ( | ||
| shouldDisplayDefaultGradients && | ||
| defaultGradients && | ||
| defaultGradients.length | ||
| ) { | ||
| result.push( { | ||
| name: _x( | ||
| 'Default', | ||
| 'Indicates this palette comes from WordPress.' | ||
| ), | ||
| gradients: defaultGradients, | ||
| } ); | ||
| } | ||
| if ( customGradients && customGradients.length ) { | ||
| result.push( { | ||
| name: _x( | ||
| 'Custom', | ||
| 'Indicates this palette is created by the user.' | ||
| ), | ||
| gradients: customGradients, | ||
| } ); | ||
| } | ||
| return result; | ||
| }, [ customGradients, themeGradients, defaultGradients ] ); | ||
|
|
||
| return colorGradientSettings; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this
clearableprop was only added to #33743 because the control could be reset via theToolsPanelmenu. Given this PR is for before that lands perhaps it should be omitted here.It's only a small thing. I don't feel strongly either way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't feel strongly about it either. For consistency with the color panel, it'd make sense to omit it? In manual testing, you can select a theme or default color and then deselect it by clicking the circle to effectively clear the color setting, so I don't think it's a big issue if we leave it in, though.