Skip to content
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

Use variation as a prop instead of variationProp in the global styles UI #47455

Merged
merged 2 commits into from
Jan 30, 2023
Merged

Use variation as a prop instead of variationProp in the global styles UI #47455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
601a866
Use variation as a prop instead of variationProp in the global styles UI
youknowriad Jan 26, 2023
d67a95b
Fix variation preview
youknowriad Jan 27, 2023
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
12 changes: 5 additions & 7 deletions packages/edit-site/src/components/global-styles/border-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,16 @@ function applyAllFallbackStyles( border ) {
return applyFallbackStyle( border );
}

export default function BorderPanel( { name, variationPath = '' } ) {
export default function BorderPanel( { name, variation = '' } ) {
const prefix = variation ? `variations.${ variation }.` : '';
// To better reflect if the user has customized a value we need to
// ensure the style value being checked is from the `user` origin.
const [ userBorderStyles ] = useGlobalStyle(
`${ variationPath }border`,
`${ prefix }border`,
name,
'user'
);
const [ border, setBorder ] = useGlobalStyle(
`${ variationPath }border`,
name
);
const [ border, setBorder ] = useGlobalStyle( `${ prefix }border`, name );
const colors = useColorsPerOrigin( name );

const showBorderColor = useHasBorderColorControl( name );
Expand All @@ -116,7 +114,7 @@ export default function BorderPanel( { name, variationPath = '' } ) {
// Border radius.
const showBorderRadius = useHasBorderRadiusControl( name );
const [ borderRadiusValues, setBorderRadius ] = useGlobalStyle(
`${ variationPath }border.radius`,
`${ prefix }border.radius`,
name
);
const hasBorderRadius = () => {
Expand Down
34 changes: 19 additions & 15 deletions packages/edit-site/src/components/global-styles/dimensions-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,10 @@ function useWideSizeProps( name ) {
}

// Props for managing `spacing.padding`.
function usePaddingProps( name, variationPath = '' ) {
function usePaddingProps( name, variation = '' ) {
const prefix = variation ? `variations.${ variation }.` : '';
const [ rawPadding, setRawPadding ] = useGlobalStyle(
variationPath + 'spacing.padding',
prefix + 'spacing.padding',
name
);
const paddingValues = splitStyleValue( rawPadding );
Expand All @@ -220,7 +221,7 @@ function usePaddingProps( name, variationPath = '' ) {
};
const resetPaddingValue = () => setPaddingValues( {} );
const [ userSetPaddingValue ] = useGlobalStyle(
variationPath + 'spacing.padding',
prefix + 'spacing.padding',
name,
'user'
);
Expand All @@ -238,9 +239,10 @@ function usePaddingProps( name, variationPath = '' ) {
}

// Props for managing `spacing.margin`.
function useMarginProps( name, variationPath = '' ) {
function useMarginProps( name, variation = '' ) {
const prefix = variation ? `variations.${ variation }.` : '';
const [ rawMargin, setRawMargin ] = useGlobalStyle(
variationPath + 'spacing.margin',
prefix + 'spacing.margin',
name
);
const marginValues = splitStyleValue( rawMargin );
Expand Down Expand Up @@ -268,9 +270,10 @@ function useMarginProps( name, variationPath = '' ) {
}

// Props for managing `spacing.blockGap`.
function useBlockGapProps( name, variationPath = '' ) {
function useBlockGapProps( name, variation = '' ) {
const prefix = variation ? `variations.${ variation }.` : '';
const [ gapValue, setGapValue ] = useGlobalStyle(
variationPath + 'spacing.blockGap',
prefix + 'spacing.blockGap',
name
);
const gapValues = splitGapValue( gapValue );
Expand All @@ -279,7 +282,7 @@ function useBlockGapProps( name, variationPath = '' ) {
gapSides && gapSides.some( ( side ) => AXIAL_SIDES.includes( side ) );
const resetGapValue = () => setGapValue( undefined );
const [ userSetGapValue ] = useGlobalStyle(
variationPath + 'spacing.blockGap',
prefix + 'spacing.blockGap',
name,
'user'
);
Expand Down Expand Up @@ -311,9 +314,10 @@ function useBlockGapProps( name, variationPath = '' ) {
}

// Props for managing `dimensions.minHeight`.
function useMinHeightProps( name, variationPath = '' ) {
function useMinHeightProps( name, variation = '' ) {
const prefix = variation ? `variations.${ variation }.` : '';
const [ minHeightValue, setMinHeightValue ] = useGlobalStyle(
variationPath + 'dimensions.minHeight',
prefix + 'dimensions.minHeight',
name
);
const resetMinHeightValue = () => setMinHeightValue( undefined );
Expand All @@ -326,7 +330,7 @@ function useMinHeightProps( name, variationPath = '' ) {
};
}

export default function DimensionsPanel( { name, variationPath = '' } ) {
export default function DimensionsPanel( { name, variation = '' } ) {
const showContentSizeControl = useHasContentSize( name );
const showWideSizeControl = useHasWideSize( name );
const showPaddingControl = useHasPadding( name );
Expand Down Expand Up @@ -368,7 +372,7 @@ export default function DimensionsPanel( { name, variationPath = '' } ) {
setPaddingValues,
resetPaddingValue,
hasPaddingValue,
} = usePaddingProps( name, variationPath );
} = usePaddingProps( name, variation );

// Props for managing `spacing.margin`.
const {
Expand All @@ -378,7 +382,7 @@ export default function DimensionsPanel( { name, variationPath = '' } ) {
setMarginValues,
resetMarginValue,
hasMarginValue,
} = useMarginProps( name, variationPath );
} = useMarginProps( name, variation );

// Props for managing `spacing.blockGap`.
const {
Expand All @@ -390,15 +394,15 @@ export default function DimensionsPanel( { name, variationPath = '' } ) {
setGapValues,
resetGapValue,
hasGapValue,
} = useBlockGapProps( name, variationPath );
} = useBlockGapProps( name, variation );

// Props for managing `dimensions.minHeight`.
const {
minHeightValue,
setMinHeightValue,
resetMinHeightValue,
hasMinHeightValue,
} = useMinHeightProps( name, variationPath );
} = useMinHeightProps( name, variation );

const resetAll = () => {
resetPaddingValue();
Expand Down
11 changes: 6 additions & 5 deletions packages/edit-site/src/components/global-styles/screen-background-color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import { unlock } from '../../experiments';

const { useGlobalSetting, useGlobalStyle } = unlock( blockEditorExperiments );

function ScreenBackgroundColor( { name, variationPath = '' } ) {
function ScreenBackgroundColor( { name, variation = '' } ) {
const prefix = variation ? `variations.${ variation }.` : '';
const supports = getSupportedGlobalStylesPanels( name );
const [ areCustomSolidsEnabled ] = useGlobalSetting( 'color.custom', name );
const [ areCustomGradientsEnabled ] = useGlobalSetting(
Expand All @@ -48,20 +49,20 @@ function ScreenBackgroundColor( { name, variationPath = '' } ) {
supports.includes( 'background' ) &&
( gradientsPerOrigin.length > 0 || areCustomGradientsEnabled );
const [ backgroundColor, setBackgroundColor ] = useGlobalStyle(
variationPath + 'color.background',
prefix + 'color.background',
name
);
const [ userBackgroundColor ] = useGlobalStyle(
variationPath + 'color.background',
prefix + 'color.background',
name,
'user'
);
const [ gradient, setGradient ] = useGlobalStyle(
variationPath + 'color.gradient',
prefix + 'color.gradient',
name
);
const [ userGradient ] = useGlobalStyle(
variationPath + 'color.gradient',
prefix + 'color.gradient',
name,
'user'
);
Expand Down
8 changes: 4 additions & 4 deletions packages/edit-site/src/components/global-styles/screen-border.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import { __ } from '@wordpress/i18n';
import ScreenHeader from './header';
import BorderPanel, { useHasBorderPanel } from './border-panel';
import BlockPreviewPanel from './block-preview-panel';
import { getVariationClassNameFromPath } from './utils';
import { getVariationClassName } from './utils';

function ScreenBorder( { name, variationPath = '' } ) {
function ScreenBorder( { name, variation = '' } ) {
const hasBorderPanel = useHasBorderPanel( name );
const variationClassName = getVariationClassNameFromPath( variationPath );
const variationClassName = getVariationClassName( variation );
return (
<>
<ScreenHeader title={ __( 'Border' ) } />
<BlockPreviewPanel name={ name } variation={ variationClassName } />
{ hasBorderPanel && (
<BorderPanel name={ name } variationPath={ variationPath } />
<BorderPanel name={ name } variation={ variation } />
) }
</>
);
Expand Down
5 changes: 3 additions & 2 deletions packages/edit-site/src/components/global-styles/screen-button-color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import { unlock } from '../../experiments';

const { useGlobalSetting, useGlobalStyle } = unlock( blockEditorExperiments );

function ScreenButtonColor( { name, variationPath = '' } ) {
function ScreenButtonColor( { name, variation = '' } ) {
const prefix = variation ? `variations.${ variation }.` : '';
const supports = getSupportedGlobalStylesPanels( name );
const colorsPerOrigin = useColorsPerOrigin( name );
const [ areCustomSolidsEnabled ] = useGlobalSetting( 'color.custom', name );
Expand All @@ -31,7 +32,7 @@ function ScreenButtonColor( { name, variationPath = '' } ) {
( colorsPerOrigin.length > 0 || areCustomSolidsEnabled );

const [ buttonTextColor, setButtonTextColor ] = useGlobalStyle(
variationPath + 'elements.button.color.text',
prefix + 'elements.button.color.text',
name
);
const [ userButtonTextColor ] = useGlobalStyle(
Expand Down
Loading