Skip to content

Experiment: try Theme JSON API to control block orientation #33044

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

Closed
getdave wants to merge 4 commits into from
Closed

Experiment: try Theme JSON API to control block orientation #33044

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
678d0ef
Experiment with useSetting to control orientation
getdave Jun 28, 2021
f29565f
Use predefined orientation settings
getdave Jun 29, 2021
af24321
Allow for conditional default orientation
getdave Jun 29, 2021
02fee65
Use constants because I can’t type or spell
getdave Jun 29, 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
41 changes: 38 additions & 3 deletions packages/block-library/src/navigation/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
BlockControls,
useBlockProps,
store as blockEditorStore,
useSetting,
} from '@wordpress/block-editor';
import { useDispatch, withSelect, withDispatch } from '@wordpress/data';
import { PanelBody, ToggleControl, ToolbarGroup } from '@wordpress/components';
Expand Down Expand Up @@ -43,6 +44,9 @@ const LAYOUT = {
alignments: [],
};

const ORIENTATION_VERTICAL = 'vertical';
const ORIENTATION_HORIZONTAL = 'horizontal';

function Navigation( {
selectedBlockHasDescendants,
attributes,
Expand All @@ -63,12 +67,43 @@ function Navigation( {
false
);

const orientationSettings = useSetting( 'layout.orientations' ) || {};

const allowedOrientations = Object.entries( orientationSettings ).reduce(
( allowed, curr ) => {
if ( true === curr[ 1 ] ) {
allowed.push( curr[ 0 ] );
}
return allowed;
},
[]
);

let defaultOrientation;

if ( allowedOrientations.includes( ORIENTATION_VERTICAL ) ) {
defaultOrientation = ORIENTATION_VERTICAL;
} else if (
! allowedOrientations.includes( ORIENTATION_VERTICAL ) &&
allowedOrientations.includes( ORIENTATION_HORIZONTAL )
) {
defaultOrientation = ORIENTATION_HORIZONTAL;
} else {
defaultOrientation = ORIENTATION_VERTICAL;
}

const possibleOrientation = attributes.orientation || defaultOrientation;

const blockOrientation = allowedOrientations.includes( possibleOrientation )
? possibleOrientation
: defaultOrientation;

const { selectBlock } = useDispatch( blockEditorStore );

const blockProps = useBlockProps( {
className: classnames( className, {
[ `items-justified-${ attributes.itemsJustification }` ]: attributes.itemsJustification,
'is-vertical': attributes.orientation === 'vertical',
'is-vertical': blockOrientation === ORIENTATION_VERTICAL,
'is-responsive': attributes.isResponsive,
} ),
} );
Expand All @@ -85,7 +120,7 @@ function Navigation( {
},
{
allowedBlocks: ALLOWED_BLOCKS,
orientation: attributes.orientation || 'horizontal',
orientation: blockOrientation,
renderAppender:
( isImmediateParentOfSelectedBlock &&
! selectedBlockHasDescendants ) ||
Expand Down Expand Up @@ -120,7 +155,7 @@ function Navigation( {
}

const justifyAllowedControls =
attributes.orientation === 'vertical'
blockOrientation === ORIENTATION_VERTICAL
? [ 'left', 'center', 'right' ]
: [ 'left', 'center', 'right', 'space-between' ];

Expand Down