Skip to content

Fix: apply by slug on all origins #36841

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
jorgefilipecosta merged 5 commits into from
Nov 26, 2021
Merged

Fix: apply by slug on all origins #36841

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49fb688
Fix: apply by slug on all origins
jorgefilipecosta Nov 24, 2021
7d75943
Update mechanism to inline styles to cover for themes not enqueuing them
oandregal Nov 25, 2021
b6626c6
Update useColorProps util
oandregal Nov 25, 2021
64e6367
Be safe
oandregal Nov 25, 2021
f6588c6
Fix crash on the site editor.
jorgefilipecosta Nov 26, 2021
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
Prev Previous commit
Next Next commit
Update useColorProps util
  • Loading branch information
@oandregal @jorgefilipecosta
oandregal authored and jorgefilipecosta committed Nov 26, 2021
commit b6626c6948eba7fd3ca35eda48a6a42776063454
29 changes: 25 additions & 4 deletions packages/block-editor/src/hooks/use-color-props.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
*/
import classnames from 'classnames';

/**
* WordPress dependencies
*/
import { useMemo } from '@wordpress/element';

/**
* Internal dependencies
*/
Expand All @@ -24,8 +29,6 @@ import useSetting from '../components/use-setting';
// block support is being skipped for a block but the color related CSS classes
// & styles still need to be generated so they can be applied to inner elements.

const EMPTY_ARRAY = [];

/**
* Provides the CSS class names and inline styles for a block's color support
* attributes.
Expand Down Expand Up @@ -84,8 +87,26 @@ export function getColorClassesAndStyles( attributes ) {
export function useColorProps( attributes ) {
const { backgroundColor, textColor, gradient } = attributes;

const colors = useSetting( 'color.palette' ) || EMPTY_ARRAY;
const gradients = useSetting( 'color.gradients' ) || EMPTY_ARRAY;
const {
palette: solidsPerOrigin,
gradients: gradientsPerOrigin,
} = useSetting( 'color' );
const colors = useMemo(
() => [
...( solidsPerOrigin.custom || [] ),
...( solidsPerOrigin.theme || [] ),
...solidsPerOrigin.default,
],
[ solidsPerOrigin ]
);
const gradients = useMemo(
() => [
...( gradientsPerOrigin.custom || [] ),
...( gradientsPerOrigin.theme || [] ),
...gradientsPerOrigin.default,
],
[ gradientsPerOrigin ]
);

const colorProps = getColorClassesAndStyles( attributes );

Expand Down