Skip to content

Improve notebook cell drag and drop #920

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

Merged
epatters merged 4 commits into from
Dec 19, 2025
Merged

Improve notebook cell drag and drop #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2160666
FIX: Notebook cell drag and drop fiddly-ness
kasbah Dec 18, 2025
a1f46b9
ENH: Use notebook cell as drag and drop preview
kasbah Dec 19, 2025
fe3cd8b
ENH: Allow drag-n-dropping cell back where it was
kasbah Dec 19, 2025
f8f88f4
REFACTOR: Simplify drag-n-drop indicator logic
kasbah Dec 19, 2025
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
4 changes: 4 additions & 0 deletions packages/frontend/src/notebook/notebook_cell.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
justify-content: space-between;
}

.cell-dragging {
opacity: 0.4;
}

.cell-gutter {
position: absolute;
top: 50%;
Expand Down
53 changes: 40 additions & 13 deletions packages/frontend/src/notebook/notebook_cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
draggable,
dropTargetForElements,
} from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
import { preventUnhandled } from "@atlaskit/pragmatic-drag-and-drop/prevent-unhandled";
import { attachClosestEdge } from "@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge";
import type { DocHandle, Prop } from "@automerge/automerge-repo";
import Popover from "@corvu/popover";
Expand Down Expand Up @@ -150,6 +151,7 @@ export function NotebookCell(props: {

const [closestEdge, setClosestEdge] = createSignal<ClosestEdge>(null);
const [dropTarget, setDropTarget] = createSignal(false);
const [isDragging, setIsDragging] = createSignal(false);

const isActiveDropTarget = () => props.currentDropTarget === props.cellId;
createEffect(() => {
Expand All @@ -164,14 +166,37 @@ export function NotebookCell(props: {
draggable({
element: handleRef,
getInitialData: () => createCellDragData(props.cellId, props.index),
onGenerateDragPreview({ nativeSetDragImage }) {
if (nativeSetDragImage) {
// Clone the cell content for the drag preview
const cellContent = rootRef.querySelector(".cell-content");
if (cellContent) {
const preview = cellContent.cloneNode(true) as HTMLElement;
preview.style.width = `${cellContent.clientWidth}px`;
preview.style.opacity = "0.8";
preview.style.pointerEvents = "none";
document.body.appendChild(preview);
nativeSetDragImage(preview, 0, 0);

setTimeout(() => {
preview.remove();
}, 0);
}
}
},
onDragStart() {
setIsDragging(true);
preventUnhandled.start();
},
onDrop() {
setIsDragging(false);
preventUnhandled.stop();
},
}),
dropTargetForElements({
element: rootRef,
canDrop({ source }) {
// TODO: Reject if cell belongs to a different notebook.
if (source.data.cellId === props.cellId) {
return false;
}
return isCellDragData(source.data);
},
getData({ input }) {
Expand All @@ -185,15 +210,11 @@ export function NotebookCell(props: {
onDragEnter(args) {
const sourceIndex = args.source.data.index as number;
const targetIndex = args.self.data.index as number;
if (sourceIndex === targetIndex) {
setClosestEdge(null);
setDropTarget(false);
} else {
props.setCurrentDropTarget(props.cellId);
const edge = sourceIndex < targetIndex ? "bottom" : "top";
setClosestEdge(edge);
setDropTarget(true);
}

props.setCurrentDropTarget(props.cellId);
const edge = sourceIndex < targetIndex ? "bottom" : "top";
setClosestEdge(edge);
setDropTarget(true);
},
onDrop() {
setDropTarget(false);
Expand All @@ -205,7 +226,13 @@ export function NotebookCell(props: {
});

return (
<div class="cell" onMouseEnter={showGutter} onMouseLeave={hideGutter} ref={rootRef}>
<div
class="cell"
classList={{ "cell-dragging": isDragging() }}
onMouseEnter={showGutter}
onMouseLeave={hideGutter}
ref={rootRef}
>
<div class="cell-gutter">
<IconButton
onClick={props.actions.createBelow}
Expand Down
15 changes: 12 additions & 3 deletions packages/frontend/src/notebook/notebook_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
import type { Cell, Notebook } from "catlog-wasm";
import {
type CellActions,
type CellDragData,
type FormalCellEditorProps,
isCellDragData,
NotebookCell,
Expand Down Expand Up @@ -190,16 +191,24 @@ export function NotebookEditor<T>(props: {
);
},
onDrop({ location, source }) {
const target = location.current.dropTargets[0];
if (!(target && isCellDragData(source.data) && isCellDragData(target.data))) {
const target =
location.current.dropTargets[0] ??
(currentDropTarget() ? { data: { cellId: currentDropTarget() } } : null);
if (!(target && isCellDragData(source.data))) {
setCurrentDropTarget(null);
return;
}
const [sourceId, targetId] = [source.data.cellId, target.data.cellId];
const targetData = target.data as CellDragData;
if (!targetData.cellId) {
setCurrentDropTarget(null);
return;
}
const [sourceId, targetId] = [source.data.cellId, targetData.cellId];
const nb = props.notebook;
const sourceIndex = nb.cellOrder.indexOf(sourceId);
const targetIndex = nb.cellOrder.indexOf(targetId);
if (sourceIndex < 0 || targetIndex < 0) {
setCurrentDropTarget(null);
return;
}
const finalIndex = getReorderDestinationIndex({
Expand Down