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

Jump to bottom

fix the issue where block spacing control not shown #65371

Merged
merged 1 commit into from
Sep 18, 2024
Merged

fix the issue where block spacing control not shown #65371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 18 additions & 25 deletions packages/block-editor/src/components/spacing-sizes-control/test/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,41 +378,34 @@ describe( 'getInitialView', () => {
VIEWS.custom
);
} );
} );

describe( 'Single side view', () => {
it( 'should return single side when only single side supported', () => {
it( 'should return custom view even if only single side supported', () => {
expect( getInitialView( { top: '1em' }, [ 'top' ] ) ).toBe(
VIEWS.top
VIEWS.custom
);
expect( getInitialView( { right: '1em' }, [ 'right' ] ) ).toBe(
VIEWS.custom
);
expect( getInitialView( { bottom: '1em' }, [ 'bottom' ] ) ).toBe(
VIEWS.custom
);
expect( getInitialView( { left: '1em' }, [ 'left' ] ) ).toBe(
VIEWS.custom
);
} );
} );

describe( 'Single side view', () => {
it( 'should return single side when only single side supported and no value defined', () => {
expect( getInitialView( {}, [ 'top' ] ) ).toBe( VIEWS.top );
} );

it( 'should return single side when only single side supported and all values defined', () => {
it( 'should return single side when only single side supported and has only axial sides', () => {
expect(
getInitialView(
{ top: '1em', right: '2em', bottom: '1em', left: '2em' },
[ 'top' ]
)
getInitialView( { top: '1em' }, [ 'horizontal', 'vertical' ] )
).toBe( VIEWS.top );
} );

it( 'should return single side view when only one side is supported', () => {
expect( getInitialView( { top: '1em' }, [ 'top' ] ) ).toBe(
VIEWS.top
);
expect( getInitialView( { right: '1em' }, [ 'right' ] ) ).toBe(
VIEWS.right
);
expect( getInitialView( { bottom: '1em' }, [ 'bottom' ] ) ).toBe(
VIEWS.bottom
);
expect( getInitialView( { left: '1em' }, [ 'left' ] ) ).toBe(
VIEWS.left
);
expect(
getInitialView( { left: '4em' }, [ 'horizontal', 'vertical' ] )
).toBe( VIEWS.left );
} );
} );
} );
27 changes: 22 additions & 5 deletions packages/block-editor/src/components/spacing-sizes-control/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,11 +363,10 @@ export function getInitialView( values = {}, sides ) {
top === bottom && left === right && ( !! top || !! left );
const hasNoValuesAndBalancedSides =
! sideValues.length && hasBalancedSidesSupport( sides );

// Only single side supported and no value defined.
if ( sides?.length === 1 ) {
return sides[ 0 ];
}
const hasOnlyAxialSides =
sides?.includes( 'horizontal' ) &&
sides?.includes( 'vertical' ) &&
sides?.length === 2;

if (
hasAxisSupport( sides ) &&
Expand All @@ -376,6 +375,24 @@ export function getInitialView( values = {}, sides ) {
return VIEWS.axial;
}

// Only axial sides are supported and single value defined.
// - Ensure the side returned is the first side that has a value.
if ( hasOnlyAxialSides && sideValues.length === 1 ) {
let side;

Object.entries( values ).some( ( [ key, value ] ) => {
side = key;
return value !== undefined;
} );

return side;
}

// Only single side supported and no value defined.
if ( sides?.length === 1 && ! sideValues.length ) {
return sides[ 0 ];
}

// Default to the Custom (separated sides) view.
return VIEWS.custom;
}
Loading