feat: Allow moving draft documents (#4652)

* feat: Allow moving draft documents

* Allow drag-n-drop move of draft documents

* fix: Allow moving draft without a collection

* fix: Allow moving draft without a collection
This commit is contained in:
Tom Moor
2023-01-06 19:31:06 -08:00
committed by GitHub
parent 9f825b9adf
commit e67ac1215a
8 changed files with 61 additions and 63 deletions

View File

@@ -105,8 +105,7 @@ function InnerDocumentLink(
const handleDisclosureClick = React.useCallback(
(ev) => {
ev.preventDefault();
ev.stopPropagation();
ev?.preventDefault();
setExpanded(!expanded);
},
[expanded]
@@ -150,14 +149,10 @@ function InnerDocumentLink(
collect: (monitor) => ({
isDragging: monitor.isDragging(),
}),
canDrag: () => {
return (
!isDraft &&
(policies.abilities(node.id).move ||
policies.abilities(node.id).archive ||
policies.abilities(node.id).delete)
);
},
canDrag: () =>
policies.abilities(node.id).move ||
policies.abilities(node.id).archive ||
policies.abilities(node.id).delete,
});
const hoverExpanding = React.useRef<ReturnType<typeof setTimeout>>();
@@ -174,19 +169,18 @@ function InnerDocumentLink(
// Drop to re-parent
const [{ isOverReparent, canDropToReparent }, dropToReparent] = useDrop({
accept: "document",
drop: (item: DragObject, monitor) => {
drop: async (item: DragObject, monitor) => {
if (monitor.didDrop()) {
return;
}
if (!collection) {
return;
}
documents.move(item.id, collection.id, node.id);
await documents.move(item.id, collection.id, node.id);
setExpanded(true);
},
canDrop: (_item, monitor) =>
!isDraft &&
!!pathToNode &&
!pathToNode.includes(monitor.getItem<DragObject>().id),
!!pathToNode && !pathToNode.includes(monitor.getItem<DragObject>().id),
hover: (_item, monitor) => {
// Enables expansion of document children when hovering over the document
// for more than half a second.