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

Fix padding and margin visualizer accuracy #49422

Merged
merged 3 commits into from
Mar 30, 2023
Merged

Fix padding and margin visualizer accuracy #49422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33eca62
Fix padding visualizer accuracy
talldan Mar 29, 2023
ab2c84d
First attempt to use computed values
talldan Mar 29, 2023
cb0f4c0
Simplify padding visualizer to instead listen to padding attribute ch…
talldan Mar 29, 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
57 changes: 31 additions & 26 deletions packages/block-editor/src/hooks/margin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,48 @@
/**
* WordPress dependencies
*/
import { useMemo, useRef, useState, useEffect } from '@wordpress/element';
import { useState, useRef, useEffect } from '@wordpress/element';
import isShallowEqual from '@wordpress/is-shallow-equal';

/**
* Internal dependencies
*/
import BlockPopover from '../components/block-popover';
import { getSpacingPresetCssVar } from '../components/spacing-sizes-control/utils';
import { __unstableUseBlockElement as useBlockElement } from '../components/block-list/use-block-props/use-block-refs';

function getComputedCSS( element, property ) {
return element.ownerDocument.defaultView
.getComputedStyle( element )
.getPropertyValue( property );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this function transforms the value to pixels or something?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like it. cool.

}

export function MarginVisualizer( { clientId, attributes, forceShow } ) {
const blockElement = useBlockElement( clientId );
const [ style, setStyle ] = useState();

const margin = attributes?.style?.spacing?.margin;

const style = useMemo( () => {
const marginTop = margin?.top
? getSpacingPresetCssVar( margin?.top )
: 0;
const marginRight = margin?.right
? getSpacingPresetCssVar( margin?.right )
: 0;
const marginBottom = margin?.bottom
? getSpacingPresetCssVar( margin?.bottom )
: 0;
const marginLeft = margin?.left
? getSpacingPresetCssVar( margin?.left )
: 0;
useEffect( () => {
if ( ! blockElement ) {
return;
}

return {
borderTopWidth: marginTop,
borderRightWidth: marginRight,
borderBottomWidth: marginBottom,
borderLeftWidth: marginLeft,
top: marginTop ? `calc(${ marginTop } * -1)` : 0,
right: marginRight ? `calc(${ marginRight } * -1)` : 0,
bottom: marginBottom ? `calc(${ marginBottom } * -1)` : 0,
left: marginLeft ? `calc(${ marginLeft } * -1)` : 0,
};
}, [ margin ] );
const top = getComputedCSS( blockElement, 'margin-top' );
const right = getComputedCSS( blockElement, 'margin-right' );
const bottom = getComputedCSS( blockElement, 'margin-bottom' );
const left = getComputedCSS( blockElement, 'margin-left' );

setStyle( {
borderTopWidth: top,
borderRightWidth: right,
borderBottomWidth: bottom,
borderLeftWidth: left,
top: top ? `-${ top }` : 0,
right: right ? `-${ right }` : 0,
bottom: bottom ? `-${ bottom }` : 0,
left: left ? `-${ left }` : 0,
} );
}, [ blockElement, margin ] );

const [ isActive, setIsActive ] = useState( false );
const valueRef = useRef( margin );
Expand Down
42 changes: 24 additions & 18 deletions packages/block-editor/src/hooks/padding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,39 @@
/**
* WordPress dependencies
*/
import { useState, useRef, useEffect, useMemo } from '@wordpress/element';
import { useState, useRef, useEffect } from '@wordpress/element';
import isShallowEqual from '@wordpress/is-shallow-equal';

/**
* Internal dependencies
*/
import BlockPopover from '../components/block-popover';
import { getSpacingPresetCssVar } from '../components/spacing-sizes-control/utils';
import { __unstableUseBlockElement as useBlockElement } from '../components/block-list/use-block-props/use-block-refs';

function getComputedCSS( element, property ) {
return element.ownerDocument.defaultView
.getComputedStyle( element )
.getPropertyValue( property );
}

export function PaddingVisualizer( { clientId, attributes, forceShow } ) {
const blockElement = useBlockElement( clientId );
const [ style, setStyle ] = useState();

const padding = attributes?.style?.spacing?.padding;
const style = useMemo( () => {
return {
borderTopWidth: padding?.top
? getSpacingPresetCssVar( padding?.top )
: 0,
borderRightWidth: padding?.right
? getSpacingPresetCssVar( padding?.right )
: 0,
borderBottomWidth: padding?.bottom
? getSpacingPresetCssVar( padding?.bottom )
: 0,
borderLeftWidth: padding?.left
? getSpacingPresetCssVar( padding?.left )
: 0,
};
}, [ padding ] );

useEffect( () => {
if ( ! blockElement ) {
return;
}

setStyle( {
borderTopWidth: getComputedCSS( blockElement, 'padding-top' ),
borderRightWidth: getComputedCSS( blockElement, 'padding-right' ),
borderBottomWidth: getComputedCSS( blockElement, 'padding-bottom' ),
borderLeftWidth: getComputedCSS( blockElement, 'padding-left' ),
} );
}, [ blockElement, padding ] );

const [ isActive, setIsActive ] = useState( false );
const valueRef = useRef( padding );
Expand Down