Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
84 changes: 84 additions & 0 deletions src/routes/site-overview/_style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -509,3 +509,87 @@ $cnl-site-overview-canvas: #e9eef2;
.cnl-site-overview__selected-detail {
color: var(--wpds-color-foreground-content-neutral-weak);
}

// ---------------------------------------------------------------------------
// Moving pages: dragged onto each other.
// ---------------------------------------------------------------------------

.cnl-site-overview__viewport {

.cnl-site-overview-card.is-draggable,
.cnl-site-overview-card.is-draggable .cnl-site-overview-card__select {
cursor: grab;
}

&.is-dragging-page {
user-select: none;

&,
.cnl-site-overview-card,
.cnl-site-overview-card__select {
cursor: grabbing;
}
}
}

.cnl-site-overview-card {

&.is-dragged {
opacity: 0.4;
}

// Under this page.
&.is-drop-under,
&.is-drop-top {
border-color: $cnl-site-overview-accent;
box-shadow:
0 0 0 cnl-site-overview-screen-px(3px) $cnl-site-overview-accent,
$cnl-rest-shadow;
}

// Beside this page: a bar in the gap on that side.
&.is-drop-before::before,
&.is-drop-after::after {
content: "";
position: absolute;
top: 0;
bottom: 0;
width: cnl-site-overview-screen-px(4px);
border-radius: 2px;
background: $cnl-site-overview-accent;
}

&.is-drop-before::before {
inset-inline-start: -22px;
}

&.is-drop-after::after {
inset-inline-end: -22px;
}
}

// What dropping here will do, following the pointer.
.cnl-site-overview__drag-label {
position: fixed;
z-index: 100000;
display: flex;
flex-direction: column;
gap: 2px;
padding: 6px 10px;
border-radius: var(--wpds-border-radius-md);
background: var(--wpds-color-background-interactive-neutral-strong);
color: #fff;
font-size: 12px;
line-height: 1.4;
white-space: nowrap;
pointer-events: none;
translate: 14px 14px;
}

.cnl-site-overview__drag-title {
font-weight: 600;
}

.cnl-site-overview__drag-action {
opacity: 0.8;
}
200 changes: 200 additions & 0 deletions src/routes/site-overview/arrange.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
/**
* Rearranging the Site overview: pages dragged onto each other, and into the
* main menu. Kept free of React so it can be tested on its own.
*/

/**
* Internal dependencies
*/
import { getPageMoveChanges } from '../content/pages/page-tree';

// How far into a card, from either side, a drop puts the page beside it
// rather than under it.
export const SIDE_DROP_FRACTION = 0.25;

const pageNodeId = ( pageId ) => `page-${ pageId }`;

/**
* The overview with the pages where their unsaved changes put them: each
* hand-made page under its new parent and in its new place among the pages
* beside it.
*
* Pages the overview leaves out, like the homepage's own page, still count
* as parents: a page under one hangs from the nearest page that is drawn, or
* from the homepage.
*
* @param {Object} siteOverview Site overview from the REST API.
* @param {Object[]} tree Pages as a tree, from `buildPageTree`.
* @return {Object} Site overview.
*/
export function applyPageTree( siteOverview, tree ) {
if ( ! siteOverview || ! tree?.length ) {
return siteOverview;
}

const pageNodes = new Map(
siteOverview.nodes
.filter( ( node ) => node.kind === 'page' )
.map( ( node ) => [ node.id, node ] )
);
const orderedNodes = [];
const pageEdges = [];

const visit = ( items, drawnParent ) =>
items.forEach( ( item ) => {
const id = pageNodeId( item.page.id );

if ( ! pageNodes.has( id ) ) {
visit( item.children, drawnParent );
return;
}

orderedNodes.push( pageNodes.get( id ) );
pageNodes.delete( id );
pageEdges.push( { from: drawnParent, kind: 'child', to: id } );
visit( item.children, id );
} );

visit( tree, 'home' );

const placed = new Set( orderedNodes.map( ( node ) => node.id ) );

return {
...siteOverview,
edges: [
...pageEdges,
...siteOverview.edges.filter( ( edge ) => ! placed.has( edge.to ) ),
],
nodes: [
...siteOverview.nodes.filter( ( node ) => node.kind !== 'page' ),
...orderedNodes,
// Pages the tree doesn't know, left where the server put them.
...pageNodes.values(),
],
};
}

function findInTree( items, pageId, parent = 0 ) {
for ( let index = 0; index < items.length; index++ ) {
const item = items[ index ];

if ( Number( item.page.id ) === pageId ) {
return { index, item, parent, siblings: items };
}

const found = findInTree(
item.children,
pageId,
Number( item.page.id )
);

if ( found ) {
return found;
}
}

return null;
}

function containsPage( item, pageId ) {
return item.children.some(
( child ) =>
Number( child.page.id ) === pageId || containsPage( child, pageId )
);
}

/**
* Where a drop on a card puts a page, from how far across the card it lands.
*
* @param {number} fraction How far across the card, 0 to 1.
* @return {string} `before`, `under` or `after`.
*/
export function getDropPosition( fraction ) {
if ( fraction < SIDE_DROP_FRACTION ) {
return 'before';
}

if ( fraction > 1 - SIDE_DROP_FRACTION ) {
return 'after';
}

return 'under';
}

/**
* Whether one page can be dropped on another: not on itself, nor on a page
* under it.
*
* @param {Object[]} tree Pages as a tree.
* @param {number} pageId Page being dragged.
* @param {number} targetId Page it would be dropped on.
* @return {boolean} Whether it can.
*/
export function canDropOnPage( tree, pageId, targetId ) {
if ( pageId === targetId ) {
return false;
}

const dragged = findInTree( tree, pageId );

return Boolean( dragged ) && ! containsPage( dragged.item, targetId );
}

/**
* The page changes a drop makes.
*
* @param {Object[]} tree Pages as a tree.
* @param {number} pageId Page being dropped.
* @param {Object} drop `{ position, targetId }`, where
* `position` is `before`, `after`,
* `under`, or `top` for the top
* level, at the end.
* @param {Object} [options]
* @param {number} [options.frontPageId] The homepage's page.
* @return {Object[]} `{ id, parent, menu_order }` for each page that changes.
*/
export function getDropChanges( tree, pageId, drop, { frontPageId = 0 } = {} ) {
if ( drop.position === 'top' ) {
return getPageMoveChanges(
tree,
pageId,
{ index: tree.length, parent: 0 },
{ frontPageId }
);
}

if ( ! canDropOnPage( tree, pageId, drop.targetId ) ) {
return [];
}

const target = findInTree( tree, drop.targetId );

if ( drop.position === 'under' ) {
return getPageMoveChanges(
tree,
pageId,
{
index: target.item.children.filter(
( child ) => Number( child.page.id ) !== pageId
).length,
parent: drop.targetId,
},
{ frontPageId }
);
}

// Its place among the target's siblings once it has left them.
const index = target.siblings
.filter( ( item ) => Number( item.page.id ) !== pageId )
.findIndex( ( item ) => Number( item.page.id ) === drop.targetId );

return getPageMoveChanges(
tree,
pageId,
{
index: index + ( drop.position === 'after' ? 1 : 0 ),
parent: target.parent,
},
{ frontPageId }
);
}
56 changes: 50 additions & 6 deletions src/routes/site-overview/canvas.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
MemoizedStackSheets,
} from './lanes';
import { ZoomControls } from './zoom-controls';
import usePageMoves from './use-page-moves';
import { SelectedPage } from './selected-page';
import {
Notice,
Expand Down Expand Up @@ -96,6 +97,14 @@ export default function Canvas() {
const didFitRef = useRef( false );
const boundsRef = useRef( null );
const hasSize = size.width > 0 && size.height > 0;
// The click that ends dragging a page shouldn't select one.
const onDragEnd = useCallback( () => {
suppressClickRef.current = true;
setTimeout( () => {
suppressClickRef.current = false;
} );
}, [] );
const pageMoves = usePageMoves( { onDragEnd, siteOverview } );

viewRef.current = view;
sizeRef.current = size;
Expand Down Expand Up @@ -131,8 +140,11 @@ export default function Canvas() {
}, [ invalidateSiteOverview ] );

const layout = useMemo(
() => ( siteOverview ? layoutSiteOverview( siteOverview ) : null ),
[ siteOverview ]
() =>
pageMoves.overview
? layoutSiteOverview( pageMoves.overview )
: null,
[ pageMoves.overview ]
);
boundsRef.current = layout?.bounds || null;
const scaleLimits =
Expand Down Expand Up @@ -527,9 +539,13 @@ export default function Canvas() {
<div
aria-describedby="cnl-site-overview-help"
aria-label={ __( 'Site overview canvas' ) }
className={ `cnl-site-overview__viewport${
isPanning ? ' is-panning' : ''
}` }
className={ [
'cnl-site-overview__viewport',
isPanning && 'is-panning',
pageMoves.drag && 'is-dragging-page',
]
.filter( Boolean )
.join( ' ' ) }
onClick={ onBackgroundClick }
onClickCapture={ onClickCapture }
onKeyDown={ onKeyDown }
Expand Down Expand Up @@ -575,12 +591,21 @@ export default function Canvas() {
) ) }
{ layout.nodes.map( ( node ) => (
<MemoizedSiteOverviewCard
dropPosition={
pageMoves.drag?.drop?.nodeId === node.id
? pageMoves.drag.drop.position
: undefined
}
group={ groupsByName.get( node.group ) }
isActive={ node.id === hoveredId }
isDragged={
pageMoves.drag?.nodeId === node.id
}
isRelated={ relatedIds.has( node.id ) }
isSelected={ node.id === selectedId }
key={ node.id }
node={ node }
onDragStart={ pageMoves.onCardPointerDown }
onFocusCard={ onFocusCard }
onHover={ setHoveredId }
onOpen={ onOpen }
Expand Down Expand Up @@ -630,10 +655,29 @@ export default function Canvas() {
id="cnl-site-overview-help"
>
{ __(
'Drag or scroll to move around. Pinch, or hold Ctrl or ⌘ and scroll, to zoom. Click a page for details, or double-click it to edit it.'
'Drag the background or scroll to move around. Pinch, or hold Ctrl or ⌘ and scroll, to zoom. Click a page for details, or double-click it to edit it. Drag a page onto another to put it under it, or onto its edge to put it beside it.'
) }
</p>
</div>
{ pageMoves.drag && (
<div
aria-hidden
className="cnl-site-overview__drag-label"
style={ {
left: pageMoves.drag.x,
top: pageMoves.drag.y,
} }
>
<span className="cnl-site-overview__drag-title">
{ pageMoves.drag.title }
</span>
{ pageMoves.drag.label && (
<span className="cnl-site-overview__drag-action">
{ pageMoves.drag.label }
</span>
) }
</div>
) }
{ selectedNode && hasSize && (
<SelectedPage
group={ groupsByName.get( selectedNode.group ) }
Expand Down
Loading