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

Prevent reordering of header and footer template parts when zoomed out #60054

Merged
merged 4 commits into from
Mar 25, 2024
Merged

Prevent reordering of header and footer template parts when zoomed out #60054

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae9dd16
don't show movers in zoom out for template parts, try to remove mover…
draganescu Mar 20, 2024
bca7a8b
fix bug because of typo in function name
draganescu Mar 20, 2024
f50d47d
don't hide the movers, disable them
draganescu Mar 22, 2024
2e1930a
rename props to be more generic
draganescu Mar 22, 2024
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
5 changes: 4 additions & 1 deletion packages/block-editor/src/components/block-mover/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const BlockMoverButton = forwardRef(
? clientIds
: [ clientIds ];
const blocksCount = normalizedClientIds.length;
const { disabled } = props;

const {
blockType,
Expand Down Expand Up @@ -98,7 +99,9 @@ const BlockMoverButton = forwardRef(

return {
blockType: block ? getBlockType( block.name ) : null,
isDisabled: direction === 'up' ? isFirstBlock : isLastBlock,
isDisabled:
disabled ||
( direction === 'up' ? isFirstBlock : isLastBlock ),
rootClientId: blockRootClientId,
firstIndex: firstBlockIndex,
isFirst: isFirstBlock,
Expand Down
9 changes: 8 additions & 1 deletion packages/block-editor/src/components/block-mover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ import BlockDraggable from '../block-draggable';
import { BlockMoverUpButton, BlockMoverDownButton } from './button';
import { store as blockEditorStore } from '../../store';

function BlockMover( { clientIds, hideDragHandle } ) {
function BlockMover( {
clientIds,
hideDragHandle,
isPrevBlockTemplatePart,
isNextBlockTemplatePart,
} ) {
const { canMove, rootClientId, isFirst, isLast, orientation } = useSelect(
( select ) => {
const {
Expand Down Expand Up @@ -83,6 +88,7 @@ function BlockMover( { clientIds, hideDragHandle } ) {
<ToolbarItem>
{ ( itemProps ) => (
<BlockMoverUpButton
disabled={ isPrevBlockTemplatePart }
clientIds={ clientIds }
{ ...itemProps }
/>
Expand All @@ -91,6 +97,7 @@ function BlockMover( { clientIds, hideDragHandle } ) {
<ToolbarItem>
{ ( itemProps ) => (
<BlockMoverDownButton
disabled={ isNextBlockTemplatePart }
clientIds={ clientIds }
{ ...itemProps }
/>
Expand Down
44 changes: 41 additions & 3 deletions packages/block-editor/src/components/block-tools/block-selection-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ function BlockSelectionButton( { clientId, rootClientId } ) {
hasBlockMovingClientId,
getBlockListSettings,
__unstableGetEditorMode,
getNextBlockClientId,
getPreviousBlockClientId,
} = select( blockEditorStore );
const { getActiveBlockVariation, getBlockType } =
select( blocksStore );
Expand All @@ -69,6 +71,26 @@ function BlockSelectionButton( { clientId, rootClientId } ) {
const orientation =
getBlockListSettings( rootClientId )?.orientation;
const match = getActiveBlockVariation( name, attributes );
const isBlockTemplatePart =
blockType?.name === 'core/template-part';

let isNextBlockTemplatePart = false;
const nextClientId = getNextBlockClientId();
if ( nextClientId ) {
const { name: nextName } = getBlock( nextClientId );
const nextBlockType = getBlockType( nextName );
isNextBlockTemplatePart =
nextBlockType?.name === 'core/template-part';
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should check if it's a header / footer template area too. This would stop us moving all blocks either side of any template part.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The area check was my initial idea but it's so weirdly saved as a piece of info. Then I realised all template parts should be stuck in place in composer mode.

}

let isPrevBlockTemplatePart = false;
const prevClientId = getPreviousBlockClientId();
if ( prevClientId ) {
const { name: prevName } = getBlock( prevClientId );
const prevBlockType = getBlockType( prevName );
isPrevBlockTemplatePart =
prevBlockType?.name === 'core/template-part';
}

return {
blockMovingMode: hasBlockMovingClientId(),
Expand All @@ -80,11 +102,22 @@ function BlockSelectionButton( { clientId, rootClientId } ) {
index + 1,
orientation
),
isBlockTemplatePart,
isNextBlockTemplatePart,
isPrevBlockTemplatePart,
};
},
[ clientId, rootClientId ]
);
const { label, icon, blockMovingMode, editorMode } = selected;
const {
label,
icon,
blockMovingMode,
editorMode,
isBlockTemplatePart,
isNextBlockTemplatePart,
isPrevBlockTemplatePart,
} = selected;
const { setNavigationMode, removeBlock } = useDispatch( blockEditorStore );
const ref = useRef();

Expand Down Expand Up @@ -252,8 +285,13 @@ function BlockSelectionButton( { clientId, rootClientId } ) {
<BlockIcon icon={ icon } showColors />
</FlexItem>
<FlexItem>
{ editorMode === 'zoom-out' && (
<BlockMover clientIds={ [ clientId ] } hideDragHandle />
{ editorMode === 'zoom-out' && ! isBlockTemplatePart && (
<BlockMover
clientIds={ [ clientId ] }
hideDragHandle
isPrevBlockTemplatePart={ isPrevBlockTemplatePart }
isNextBlockTemplatePart={ isNextBlockTemplatePart }
/>
) }
{ editorMode === 'navigation' && (
<BlockDraggable clientIds={ [ clientId ] }>
Expand Down
Loading