Feat: improve sidebar tree usability
This commit is contained in:
MangoPig
+229
-5
@@ -12,13 +12,13 @@
|
||||
}
|
||||
|
||||
.sheet {
|
||||
min-height: 100dvh;
|
||||
height: 100dvh;
|
||||
display: grid;
|
||||
grid-template-rows: auto minmax(0, 1fr);
|
||||
background:
|
||||
linear-gradient(180deg, color-mix(in srgb, var(--color-surface) 84%, transparent) 0%, transparent 8rem),
|
||||
color-mix(in srgb, var(--color-canvas) 97%, black 3%);
|
||||
overflow: clip;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.sheetHeader {
|
||||
@@ -98,15 +98,21 @@
|
||||
|
||||
.sheetBody {
|
||||
min-height: 0;
|
||||
display: grid;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: var(--space-5);
|
||||
padding: var(--space-5) var(--space-5) calc(var(--space-12) + var(--space-10) + env(safe-area-inset-bottom, 0px));
|
||||
overflow: auto;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
overscroll-behavior: contain;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
|
||||
.sectionBlock {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.treeList,
|
||||
@@ -185,6 +191,224 @@
|
||||
}
|
||||
|
||||
.treeListNested > .treeListItem > .treeRow {
|
||||
min-height: calc(var(--control-size-lg) + var(--space-1));
|
||||
min-height: calc(var(--control-size-lg) + var(--space-1));
|
||||
}
|
||||
|
||||
.dialogLayer {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
z-index: calc(var(--z-modal, 30) + 2);
|
||||
padding: var(--space-5);
|
||||
}
|
||||
|
||||
.dialogBackdrop {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
border: 0;
|
||||
background: color-mix(in srgb, black 56%, transparent);
|
||||
}
|
||||
|
||||
.dialogCard {
|
||||
position: relative;
|
||||
width: min(100%, 28rem);
|
||||
display: grid;
|
||||
gap: var(--space-4);
|
||||
padding: var(--space-4);
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
border-radius: var(--radius-xl);
|
||||
background: color-mix(in srgb, var(--color-surface) 94%, var(--color-canvas) 6%);
|
||||
box-shadow: var(--shadow-strong);
|
||||
}
|
||||
|
||||
.dialogCopy {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
|
||||
.dialogTitle {
|
||||
@include text-title;
|
||||
color: var(--color-text);
|
||||
font-weight: var(--font-weight-semibold);
|
||||
}
|
||||
|
||||
.dialogMessage {
|
||||
@include text-body;
|
||||
margin: 0;
|
||||
color: var(--color-text-subtle);
|
||||
}
|
||||
|
||||
.dialogInput {
|
||||
width: 100%;
|
||||
min-height: var(--control-size-lg);
|
||||
padding: 0 var(--space-3);
|
||||
border: 1px solid color-mix(in srgb, var(--color-border-strong, var(--color-border)) 82%, transparent);
|
||||
border-radius: var(--radius-lg);
|
||||
background: color-mix(in srgb, var(--color-canvas) 92%, var(--color-surface) 8%);
|
||||
color: var(--color-text);
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
.moveSheetLayer {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
display: block;
|
||||
z-index: calc(var(--z-modal, 30) + 2);
|
||||
}
|
||||
|
||||
.moveSheet {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
max-height: calc(100dvh - (var(--space-12) * 2));
|
||||
display: grid;
|
||||
gap: var(--space-3);
|
||||
padding: var(--space-3) var(--space-3) calc(var(--space-4) + env(safe-area-inset-bottom, 0px));
|
||||
border-top: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
border-radius: var(--radius-xl) var(--radius-xl) 0 0;
|
||||
background: var(--color-surface);
|
||||
box-shadow: var(--shadow-strong);
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.moveSheetHandle {
|
||||
width: var(--space-10);
|
||||
height: var(--space-1);
|
||||
margin: 0 auto;
|
||||
border-radius: var(--radius-pill);
|
||||
background: color-mix(in srgb, var(--color-text-muted) 24%, transparent);
|
||||
}
|
||||
|
||||
.moveSheetHeader {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
padding-bottom: var(--space-3);
|
||||
border-bottom: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
}
|
||||
|
||||
.moveSheetHeaderCopy {
|
||||
display: grid;
|
||||
gap: calc(var(--space-1) / 2);
|
||||
}
|
||||
|
||||
.moveSheetEyebrow {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.06em;
|
||||
}
|
||||
|
||||
.moveSheetTitle {
|
||||
@include text-title;
|
||||
color: var(--color-text);
|
||||
font-weight: var(--font-weight-semibold);
|
||||
}
|
||||
|
||||
.moveSheetMessage {
|
||||
@include text-body;
|
||||
margin: 0;
|
||||
color: var(--color-text-subtle);
|
||||
}
|
||||
|
||||
.moveSection {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
|
||||
.moveSectionLabel {
|
||||
@include text-caption;
|
||||
padding-inline: var(--space-1);
|
||||
color: var(--color-text-muted);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.06em;
|
||||
}
|
||||
|
||||
.moveDestinationList {
|
||||
display: grid;
|
||||
overflow: hidden;
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
border-radius: var(--radius-lg);
|
||||
background: color-mix(in srgb, var(--color-surface) 88%, var(--color-surface-elevated, var(--color-surface)) 12%);
|
||||
max-height: min(20rem, 45vh);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.moveDestinationButton {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-3);
|
||||
min-height: calc(var(--control-size-lg) + var(--space-2));
|
||||
padding: 0 var(--space-3);
|
||||
padding-left: calc(var(--space-3) + (var(--move-depth, 0) * var(--space-4)));
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: var(--color-text);
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.moveDestinationButton:active {
|
||||
background: color-mix(in srgb, var(--color-text) 6%, transparent);
|
||||
}
|
||||
|
||||
.moveDestinationButton + .moveDestinationButton {
|
||||
border-top: 1px solid color-mix(in srgb, var(--color-border) 92%, transparent);
|
||||
}
|
||||
|
||||
.moveDestinationLabel {
|
||||
@include text-label;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.moveDestinationMeta {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.moveSheetFooter {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding-top: var(--space-2);
|
||||
border-top: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
}
|
||||
|
||||
.dialogActions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
|
||||
.dialogSecondaryButton,
|
||||
.dialogPrimaryButton {
|
||||
min-height: var(--control-size-md);
|
||||
padding: 0 var(--space-3);
|
||||
border-radius: 999px;
|
||||
font: inherit;
|
||||
font-weight: var(--font-weight-semibold);
|
||||
}
|
||||
|
||||
.dialogSecondaryButton {
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||
color: var(--color-text-subtle);
|
||||
}
|
||||
|
||||
.dialogPrimaryButton {
|
||||
border: 1px solid color-mix(in srgb, var(--color-border-strong, var(--color-border)) 82%, transparent);
|
||||
background: color-mix(in srgb, var(--color-text) 10%, var(--color-surface) 90%);
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.dialogDangerButton {
|
||||
border-color: color-mix(in srgb, var(--color-danger-border, var(--color-border-strong, var(--color-border))) 82%, transparent);
|
||||
background: color-mix(in srgb, var(--color-danger-text, #b42318) 12%, var(--color-surface) 88%);
|
||||
color: var(--color-danger-text, #b42318);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { For, Show, createSignal, type JSX } from "solid-js";
|
||||
import { Portal } from "solid-js/web";
|
||||
import { ChevronRight, Plus, X } from "../../../lib/icons";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { createLongPressGesture } from "../createLongPressGesture";
|
||||
@@ -6,14 +7,17 @@ import {
|
||||
createWorkspaceStaticTarget,
|
||||
createWorkspaceSurfaceTarget,
|
||||
createWorkspaceTreeTarget,
|
||||
getWorkspaceItemTypeDefinition,
|
||||
getWorkspaceNodeIcon,
|
||||
workspaceStaticItems,
|
||||
type SidebarItem,
|
||||
type WorkspaceContextMenuAction,
|
||||
type WorkspaceContextMenuTarget,
|
||||
type WorkspaceItemTypeId,
|
||||
type WorkspaceStaticItem,
|
||||
type WorkspaceTreeNode,
|
||||
} from "../data/shell.data";
|
||||
import { useWorkspaceTreeData } from "../shared/useWorkspaceTreeData";
|
||||
import { WorkspaceMobileActionSheet } from "../WorkspaceMobileActionSheet/WorkspaceMobileActionSheet";
|
||||
import styles from "./MobileWorkspaceBrowser.module.scss";
|
||||
|
||||
@@ -22,6 +26,89 @@ type MobileWorkspaceBrowserProps = {
|
||||
onClose: VoidFunction;
|
||||
};
|
||||
|
||||
type MobileWorkspaceDialogState =
|
||||
| {
|
||||
kind: "text";
|
||||
title: string;
|
||||
message: string;
|
||||
confirmLabel: string;
|
||||
initialValue: string;
|
||||
onConfirm: (value: string) => void;
|
||||
}
|
||||
| {
|
||||
kind: "confirm";
|
||||
title: string;
|
||||
message: string;
|
||||
confirmLabel: string;
|
||||
tone?: "danger";
|
||||
onConfirm: () => void;
|
||||
};
|
||||
|
||||
type MobileMoveTargetState = {
|
||||
kind: "folder" | "item";
|
||||
id: string;
|
||||
label: string;
|
||||
};
|
||||
|
||||
type MobileMoveDestination = {
|
||||
id: string | null;
|
||||
label: string;
|
||||
depth: number;
|
||||
meta?: string;
|
||||
};
|
||||
|
||||
const collectMoveDestinations = (
|
||||
nodes: readonly WorkspaceTreeNode[],
|
||||
movingTarget: MobileMoveTargetState,
|
||||
depth = 0,
|
||||
ancestorBlocked = false,
|
||||
): MobileMoveDestination[] => {
|
||||
const destinations: MobileMoveDestination[] = [];
|
||||
|
||||
for (const node of nodes) {
|
||||
if (node.kind !== "folder") {
|
||||
continue;
|
||||
}
|
||||
|
||||
const isBlockedFolder = movingTarget.kind === "folder" && node.id === movingTarget.id;
|
||||
if (!ancestorBlocked && !isBlockedFolder) {
|
||||
destinations.push({
|
||||
id: node.id,
|
||||
label: node.label,
|
||||
depth,
|
||||
meta: "Folder",
|
||||
});
|
||||
}
|
||||
|
||||
destinations.push(
|
||||
...collectMoveDestinations(node.children ?? [], movingTarget, depth + 1, ancestorBlocked || isBlockedFolder),
|
||||
);
|
||||
}
|
||||
|
||||
return destinations;
|
||||
};
|
||||
|
||||
const findTreeNodeById = (nodes: readonly WorkspaceTreeNode[], nodeId: string): WorkspaceTreeNode | null => {
|
||||
for (const node of nodes) {
|
||||
if (node.id === nodeId) {
|
||||
return node;
|
||||
}
|
||||
|
||||
if (node.kind !== "folder") {
|
||||
continue;
|
||||
}
|
||||
|
||||
const nestedMatch = findTreeNodeById(node.children ?? [], nodeId);
|
||||
if (nestedMatch) {
|
||||
return nestedMatch;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
const isDangerDialogState = (state: MobileWorkspaceDialogState): boolean => state.kind === "confirm" && state.tone === "danger";
|
||||
|
||||
const TreeRow = (props: { node: WorkspaceTreeNode; depth?: number }): JSX.Element => {
|
||||
const depth = props.depth ?? 0;
|
||||
const Icon = getWorkspaceNodeIcon(props.node);
|
||||
@@ -76,6 +163,7 @@ const StaticRow = (props: { item: SidebarItem }): JSX.Element => {
|
||||
</button>
|
||||
);
|
||||
};
|
||||
|
||||
const WorkspaceStaticRow = (props: {
|
||||
item: WorkspaceStaticItem;
|
||||
onOpenActionSheet: (target: WorkspaceContextMenuTarget) => void;
|
||||
@@ -149,21 +237,240 @@ const WorkspaceTreeBranch = (props: {
|
||||
export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.Element => {
|
||||
const appShellData = useAppShellData();
|
||||
const [actionSheetTarget, setActionSheetTarget] = createSignal<WorkspaceContextMenuTarget | null>(null);
|
||||
const sectionNodes = () => appShellData.workspaceTree().filter((node) => (node.children?.length ?? 0) > 0);
|
||||
const looseNodes = () => appShellData.workspaceTree().filter((node) => (node.children?.length ?? 0) === 0);
|
||||
const [dialogState, setDialogState] = createSignal<MobileWorkspaceDialogState | null>(null);
|
||||
const [dialogValue, setDialogValue] = createSignal("");
|
||||
const [moveTarget, setMoveTarget] = createSignal<MobileMoveTargetState | null>(null);
|
||||
const { workspaceTreeNodes, createFolder, renameFolder, deleteFolder, moveFolder, createItem, deleteItem, moveItem } = useWorkspaceTreeData({
|
||||
activeProjectId: () => appShellData.activeProject().id,
|
||||
fallbackWorkspaceTree: () => appShellData.workspaceTree(),
|
||||
});
|
||||
const workspaceTarget = () => createWorkspaceSurfaceTarget(appShellData.activeProject());
|
||||
|
||||
const moveDestinations = () => {
|
||||
const target = moveTarget();
|
||||
if (!target) {
|
||||
return [] as MobileMoveDestination[];
|
||||
}
|
||||
|
||||
return [
|
||||
{ id: null, label: "Items root", depth: 0, meta: "Root" },
|
||||
...collectMoveDestinations(workspaceTreeNodes(), target),
|
||||
];
|
||||
};
|
||||
|
||||
const resolveCreateItemType = (actionId: string): WorkspaceItemTypeId | null => {
|
||||
switch (actionId) {
|
||||
case "create-doc":
|
||||
return "core.doc";
|
||||
case "create-board":
|
||||
return "core.board.kanban";
|
||||
case "create-list-board":
|
||||
return "core.board.list";
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
const createPersistedItem = (itemType: WorkspaceItemTypeId, parentId: string | null): void => {
|
||||
const definition = getWorkspaceItemTypeDefinition(itemType);
|
||||
void createItem(definition.defaultCreateLabel, itemType, parentId);
|
||||
};
|
||||
|
||||
const openActionSheet = (target: WorkspaceContextMenuTarget): void => {
|
||||
setActionSheetTarget(target);
|
||||
};
|
||||
|
||||
const closeActionSheet = (): void => {
|
||||
setActionSheetTarget(null);
|
||||
};
|
||||
|
||||
const closeMoveSheet = (): void => {
|
||||
setMoveTarget(null);
|
||||
};
|
||||
|
||||
const openWorkspaceActionSheet = (): void => {
|
||||
openActionSheet(workspaceTarget());
|
||||
};
|
||||
|
||||
const handleActionSelect = (_action: WorkspaceContextMenuAction, _target: WorkspaceContextMenuTarget): void => {
|
||||
// Mobile first pass only establishes the action-sheet IA and long-press behavior.
|
||||
const closeDialog = (): void => {
|
||||
setDialogState(null);
|
||||
setDialogValue("");
|
||||
};
|
||||
|
||||
const openMoveSheet = (target: MobileMoveTargetState): void => {
|
||||
setMoveTarget(target);
|
||||
};
|
||||
|
||||
const openTextDialog = (config: Omit<Extract<MobileWorkspaceDialogState, { kind: "text" }>, "kind">): void => {
|
||||
setDialogValue(config.initialValue);
|
||||
setDialogState({ kind: "text", ...config });
|
||||
};
|
||||
|
||||
const openConfirmDialog = (config: Omit<Extract<MobileWorkspaceDialogState, { kind: "confirm" }>, "kind">): void => {
|
||||
setDialogValue("");
|
||||
setDialogState({ kind: "confirm", ...config });
|
||||
};
|
||||
|
||||
const submitDialog = (): void => {
|
||||
const state = dialogState();
|
||||
if (!state) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (state.kind === "text") {
|
||||
const value = dialogValue().trim();
|
||||
if (!value) {
|
||||
return;
|
||||
}
|
||||
|
||||
closeDialog();
|
||||
state.onConfirm(value);
|
||||
return;
|
||||
}
|
||||
|
||||
closeDialog();
|
||||
state.onConfirm();
|
||||
};
|
||||
|
||||
const handleMoveDestinationSelect = (destinationId: string | null): void => {
|
||||
const target = moveTarget();
|
||||
if (!target) {
|
||||
return;
|
||||
}
|
||||
|
||||
const destinationNode = destinationId ? findTreeNodeById(workspaceTreeNodes(), destinationId) : null;
|
||||
const targetIndex = destinationNode?.kind === "folder"
|
||||
? destinationNode.children?.length ?? 0
|
||||
: destinationId
|
||||
? 0
|
||||
: workspaceTreeNodes().length;
|
||||
|
||||
closeMoveSheet();
|
||||
|
||||
if (target.kind === "folder") {
|
||||
void moveFolder(target.id, destinationId, targetIndex);
|
||||
return;
|
||||
}
|
||||
|
||||
void moveItem(target.id, destinationId, targetIndex);
|
||||
};
|
||||
|
||||
const handleActionSelect = (action: WorkspaceContextMenuAction, target: WorkspaceContextMenuTarget): void => {
|
||||
const createItemType = resolveCreateItemType(action.id);
|
||||
if (createItemType) {
|
||||
switch (target.kind) {
|
||||
case "workspace":
|
||||
case "home":
|
||||
createPersistedItem(createItemType, null);
|
||||
return;
|
||||
case "folder":
|
||||
createPersistedItem(createItemType, target.id);
|
||||
return;
|
||||
case "settings":
|
||||
case "item":
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
switch (action.id) {
|
||||
case "new-folder": {
|
||||
if (target.kind === "settings" || target.kind === "item") {
|
||||
return;
|
||||
}
|
||||
|
||||
openTextDialog({
|
||||
title: "New folder",
|
||||
message: target.kind === "folder" ? `Create a folder inside "${target.label}".` : "Create a folder at the root of Items.",
|
||||
confirmLabel: "Create",
|
||||
initialValue: "Untitled folder",
|
||||
onConfirm: (name) => {
|
||||
void createFolder(name, target.kind === "folder" ? target.id : null);
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
case "rename-folder": {
|
||||
if (target.kind !== "folder") {
|
||||
return;
|
||||
}
|
||||
|
||||
openTextDialog({
|
||||
title: "Rename folder",
|
||||
message: `Update the name for "${target.label}".`,
|
||||
confirmLabel: "Save",
|
||||
initialValue: target.label,
|
||||
onConfirm: (name) => {
|
||||
if (name === target.label) {
|
||||
return;
|
||||
}
|
||||
void renameFolder(target.id, name);
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
case "move-folder": {
|
||||
if (target.kind !== "folder") {
|
||||
return;
|
||||
}
|
||||
|
||||
openMoveSheet({
|
||||
kind: "folder",
|
||||
id: target.id,
|
||||
label: target.label,
|
||||
});
|
||||
return;
|
||||
}
|
||||
case "delete-folder": {
|
||||
if (target.kind !== "folder") {
|
||||
return;
|
||||
}
|
||||
|
||||
openConfirmDialog({
|
||||
title: "Delete folder?",
|
||||
message: `"${target.label}" and everything inside it will be removed.`,
|
||||
confirmLabel: "Delete",
|
||||
tone: "danger",
|
||||
onConfirm: () => {
|
||||
void deleteFolder(target.id);
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
case "move-doc":
|
||||
case "move-board":
|
||||
case "move-list-board": {
|
||||
if (target.kind !== "item") {
|
||||
return;
|
||||
}
|
||||
|
||||
openMoveSheet({
|
||||
kind: "item",
|
||||
id: target.id,
|
||||
label: target.label,
|
||||
});
|
||||
return;
|
||||
}
|
||||
case "delete-doc":
|
||||
case "delete-board":
|
||||
case "delete-list-board": {
|
||||
if (target.kind !== "item") {
|
||||
return;
|
||||
}
|
||||
|
||||
openConfirmDialog({
|
||||
title: "Delete item?",
|
||||
message: `"${target.label}" will be removed from the project tree.`,
|
||||
confirmLabel: "Delete",
|
||||
tone: "danger",
|
||||
onConfirm: () => {
|
||||
void deleteItem(target.id);
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
default:
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const workspaceLongPress = createLongPressGesture({
|
||||
@@ -212,35 +519,119 @@ export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.
|
||||
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="workspace">
|
||||
<span class={styles.sectionLabel}>Workspace</span>
|
||||
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="workspace">
|
||||
<For each={workspaceStaticItems}>
|
||||
{(item): JSX.Element => <WorkspaceStaticRow item={item} onOpenActionSheet={openActionSheet} />}
|
||||
</For>
|
||||
<For each={workspaceStaticItems}>
|
||||
{(item): JSX.Element => <WorkspaceStaticRow item={item} onOpenActionSheet={openActionSheet} />}
|
||||
</For>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="items">
|
||||
<span class={styles.sectionLabel}>Items</span>
|
||||
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="items">
|
||||
<WorkspaceTreeBranch nodes={sectionNodes()} onOpenActionSheet={openActionSheet} />
|
||||
<WorkspaceTreeBranch nodes={workspaceTreeNodes()} onOpenActionSheet={openActionSheet} />
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<Show when={looseNodes().length > 0}>
|
||||
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="more">
|
||||
<span class={styles.sectionLabel}>More</span>
|
||||
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="more">
|
||||
<WorkspaceTreeBranch nodes={looseNodes()} onOpenActionSheet={openActionSheet} />
|
||||
</ul>
|
||||
</section>
|
||||
</Show>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<WorkspaceMobileActionSheet
|
||||
target={actionSheetTarget()}
|
||||
onClose={closeActionSheet}
|
||||
onSelect={handleActionSelect}
|
||||
/>
|
||||
<WorkspaceMobileActionSheet target={actionSheetTarget()} onClose={closeActionSheet} onSelect={handleActionSelect} />
|
||||
|
||||
<Show when={moveTarget()}>
|
||||
{(state): JSX.Element => (
|
||||
<Portal>
|
||||
<div class={styles.moveSheetLayer} data-ui="mobile-workspace-move-sheet">
|
||||
<button class={styles.dialogBackdrop} type="button" aria-label="Close move sheet" onClick={closeMoveSheet} />
|
||||
<section class={styles.moveSheet} aria-label={`Move ${state().label}`}>
|
||||
<div class={styles.moveSheetHandle} aria-hidden="true" />
|
||||
<div class={styles.moveSheetHeader}>
|
||||
<div class={styles.moveSheetHeaderCopy}>
|
||||
<span class={styles.moveSheetEyebrow}>Move {state().kind}</span>
|
||||
<strong class={styles.moveSheetTitle}>{state().label}</strong>
|
||||
<p class={styles.moveSheetMessage}>Choose a new location in the project tree.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class={styles.moveSection}>
|
||||
<span class={styles.moveSectionLabel}>Destination</span>
|
||||
<div class={styles.moveDestinationList}>
|
||||
<For each={moveDestinations()}>
|
||||
{(destination): JSX.Element => (
|
||||
<button
|
||||
type="button"
|
||||
class={styles.moveDestinationButton}
|
||||
style={{ "--move-depth": `${destination.depth}` }}
|
||||
onClick={(): void => handleMoveDestinationSelect(destination.id)}
|
||||
>
|
||||
<span class={styles.moveDestinationLabel}>{destination.label}</span>
|
||||
<Show when={destination.meta}>
|
||||
<span class={styles.moveDestinationMeta}>{destination.meta}</span>
|
||||
</Show>
|
||||
</button>
|
||||
)}
|
||||
</For>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class={styles.moveSheetFooter}>
|
||||
<button class={styles.dialogSecondaryButton} type="button" onClick={closeMoveSheet}>
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</Portal>
|
||||
)}
|
||||
</Show>
|
||||
|
||||
<Show when={dialogState()}>
|
||||
{(state): JSX.Element => (
|
||||
<Portal>
|
||||
<div class={styles.dialogLayer} data-ui="mobile-workspace-dialog">
|
||||
<button class={styles.dialogBackdrop} type="button" aria-label="Close dialog" onClick={closeDialog} />
|
||||
<section class={styles.dialogCard} aria-label={state().title}>
|
||||
<div class={styles.dialogCopy}>
|
||||
<strong class={styles.dialogTitle}>{state().title}</strong>
|
||||
<p class={styles.dialogMessage}>{state().message}</p>
|
||||
</div>
|
||||
|
||||
<Show when={state().kind === "text"}>
|
||||
<input
|
||||
class={styles.dialogInput}
|
||||
type="text"
|
||||
value={dialogValue()}
|
||||
onInput={(event): void => {
|
||||
setDialogValue(event.currentTarget.value);
|
||||
}}
|
||||
onKeyDown={(event): void => {
|
||||
if (event.key === "Enter") {
|
||||
event.preventDefault();
|
||||
submitDialog();
|
||||
}
|
||||
}}
|
||||
autofocus
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<div class={styles.dialogActions}>
|
||||
<button class={styles.dialogSecondaryButton} type="button" onClick={closeDialog}>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
classList={{
|
||||
[styles.dialogPrimaryButton]: true,
|
||||
[styles.dialogDangerButton]: isDangerDialogState(state()),
|
||||
}}
|
||||
type="button"
|
||||
onClick={submitDialog}
|
||||
>
|
||||
{state().confirmLabel}
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</Portal>
|
||||
)}
|
||||
</Show>
|
||||
</div>
|
||||
</Show>
|
||||
);
|
||||
|
||||
+10
@@ -70,6 +70,15 @@ export const createProjectContextMenuController = () => {
|
||||
setMenuState({ target, x: event.clientX, y: event.clientY });
|
||||
};
|
||||
|
||||
const openMenuFromElement = (element: HTMLElement, target: ProjectMenuTarget): void => {
|
||||
const rect = element.getBoundingClientRect();
|
||||
setMenuState({
|
||||
target,
|
||||
x: rect.left + rect.width / 2,
|
||||
y: rect.top + rect.height / 2,
|
||||
});
|
||||
};
|
||||
|
||||
createEffect(() => {
|
||||
if (!menuState() || typeof window === "undefined") {
|
||||
return;
|
||||
@@ -112,6 +121,7 @@ export const createProjectContextMenuController = () => {
|
||||
return {
|
||||
menuState,
|
||||
openMenu,
|
||||
openMenuFromElement,
|
||||
closeMenu,
|
||||
setMenuRef: (element: HTMLDivElement): void => {
|
||||
menuRef = element;
|
||||
|
||||
@@ -315,6 +315,26 @@
|
||||
@include treeNav.item-meta;
|
||||
}
|
||||
|
||||
.dragGhostLayer {
|
||||
@include treeNav.drag-ghost-layer;
|
||||
}
|
||||
|
||||
.dragGhost {
|
||||
@include treeNav.drag-ghost;
|
||||
}
|
||||
|
||||
.dragGhostCopy {
|
||||
@include treeNav.drag-ghost-copy;
|
||||
}
|
||||
|
||||
.dragGhostTitle {
|
||||
@include treeNav.drag-ghost-title;
|
||||
}
|
||||
|
||||
.dragGhostMeta {
|
||||
@include treeNav.drag-ghost-meta;
|
||||
}
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.rootCompact .scrim,
|
||||
.rootCompact .drawer {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
// Path: Frontend/src/components/shell/ProjectSelector/ProjectSelector.tsx
|
||||
|
||||
import { For, Show, createEffect, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
||||
import { ChevronDown, ChevronRight, Folder, LayoutGrid, ListCollapse, UnfoldVertical } from "../../../lib/icons";
|
||||
import { Portal } from "solid-js/web";
|
||||
import { ChevronDown, ChevronRight, Folder, LayoutGrid, ListCollapse, Plus, UnfoldVertical } from "../../../lib/icons";
|
||||
import { ProjectContextMenu } from "../ProjectContextMenu/ProjectContextMenu";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { resolveAPIBase } from "../../../lib/api";
|
||||
@@ -85,6 +86,11 @@ type ProjectDragState = {
|
||||
dropTarget: ProjectDragTarget | null;
|
||||
};
|
||||
|
||||
type DragGhostPosition = {
|
||||
x: number;
|
||||
y: number;
|
||||
};
|
||||
|
||||
const LONG_PRESS_MS = 320;
|
||||
|
||||
const getProjectTreeNodeId = (node: ProjectTreeNode): string =>
|
||||
@@ -378,6 +384,7 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||
const [pendingFolderRename, setPendingFolderRename] = createSignal<PendingProjectFolderRename | null>(null);
|
||||
const [pendingFolderRenameName, setPendingFolderRenameName] = createSignal("");
|
||||
const [dragState, setDragState] = createSignal<ProjectDragState | null>(null);
|
||||
const [dragGhostPosition, setDragGhostPosition] = createSignal<DragGhostPosition>({ x: 0, y: 0 });
|
||||
const [suppressNextTreeClick, setSuppressNextTreeClick] = createSignal(false);
|
||||
let rootRef: HTMLDivElement | undefined;
|
||||
let triggerRef: HTMLButtonElement | undefined;
|
||||
@@ -395,6 +402,28 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||
}
|
||||
};
|
||||
|
||||
const updateDragGhostPosition = (x: number, y: number): void => {
|
||||
setDragGhostPosition({ x: x + 18, y: y + 18 });
|
||||
};
|
||||
|
||||
const draggedNode = (): ProjectTreeNode | null => {
|
||||
const currentDragState = dragState();
|
||||
if (!currentDragState) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return findTreeNodeLocation(projectTreeNodes(), currentDragState.draggedNodeId, projectTreeAdapter)?.node ?? null;
|
||||
};
|
||||
|
||||
const draggedNodeMeta = (): string => {
|
||||
const node = draggedNode();
|
||||
if (!node) {
|
||||
return "";
|
||||
}
|
||||
|
||||
return node.kind === "folder" ? "Folder" : "Project";
|
||||
};
|
||||
|
||||
const suppressTreeClickTemporarily = (): void => {
|
||||
setSuppressNextTreeClick(true);
|
||||
|
||||
@@ -653,22 +682,32 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||
triggerRef?.focus();
|
||||
};
|
||||
|
||||
const handlePointerMove = (event: PointerEvent): void => {
|
||||
if (!dragState()) {
|
||||
return;
|
||||
}
|
||||
|
||||
updateDragGhostPosition(event.clientX, event.clientY);
|
||||
};
|
||||
|
||||
document.addEventListener("pointerdown", handlePointerDown);
|
||||
window.addEventListener("pointerup", handlePointerUp);
|
||||
window.addEventListener("pointercancel", handlePointerUp);
|
||||
window.addEventListener("pointermove", handlePointerMove);
|
||||
window.addEventListener("keydown", handleEscape);
|
||||
|
||||
onCleanup(() => {
|
||||
clearLongPressTimer();
|
||||
if (suppressClickTimer !== undefined) {
|
||||
window.clearTimeout(suppressClickTimer);
|
||||
}
|
||||
document.removeEventListener("pointerdown", handlePointerDown);
|
||||
window.removeEventListener("pointerup", handlePointerUp);
|
||||
window.removeEventListener("pointercancel", handlePointerUp);
|
||||
window.removeEventListener("keydown", handleEscape);
|
||||
onCleanup(() => {
|
||||
clearLongPressTimer();
|
||||
if (suppressClickTimer !== undefined) {
|
||||
window.clearTimeout(suppressClickTimer);
|
||||
}
|
||||
document.removeEventListener("pointerdown", handlePointerDown);
|
||||
window.removeEventListener("pointerup", handlePointerUp);
|
||||
window.removeEventListener("pointercancel", handlePointerUp);
|
||||
window.removeEventListener("pointermove", handlePointerMove);
|
||||
window.removeEventListener("keydown", handleEscape);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
const toggleOpen = (): void => {
|
||||
if (!props.isOpen) {
|
||||
@@ -941,6 +980,10 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||
contextMenu.openMenu(event, createProjectSurfaceTarget("Projects"));
|
||||
};
|
||||
|
||||
const openRootCreateMenu = (element: HTMLElement): void => {
|
||||
contextMenu.openMenuFromElement(element, createProjectSurfaceTarget("Projects"));
|
||||
};
|
||||
|
||||
const treeControlLabel = (): string =>
|
||||
areAllFoldersCollapsed() ? "Expand all folders" : "Collapse all folders";
|
||||
|
||||
@@ -949,6 +992,7 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||
return;
|
||||
}
|
||||
|
||||
updateDragGhostPosition(event.clientX, event.clientY);
|
||||
clearLongPressTimer();
|
||||
longPressTimer = window.setTimeout(() => {
|
||||
suppressTreeClickTemporarily();
|
||||
@@ -1062,6 +1106,18 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||
</Show>
|
||||
|
||||
<div class={styles.treeControls}>
|
||||
<button
|
||||
type="button"
|
||||
class={styles.treeControlButton}
|
||||
onClick={(event): void => {
|
||||
event.stopPropagation();
|
||||
openRootCreateMenu(event.currentTarget);
|
||||
}}
|
||||
aria-label="Create in Projects"
|
||||
title="Create"
|
||||
>
|
||||
<Plus size={16} strokeWidth={2.25} />
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class={styles.treeControlButton}
|
||||
@@ -1129,6 +1185,32 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||
onClose={contextMenu.closeMenu}
|
||||
onSelect={handleContextActionSelect}
|
||||
/>
|
||||
|
||||
<Show when={draggedNode()} keyed>
|
||||
{(node): JSX.Element => {
|
||||
const GhostIcon = node.kind === "folder" ? Folder : LayoutGrid;
|
||||
|
||||
return (
|
||||
<Portal>
|
||||
<div class={styles.dragGhostLayer} aria-hidden="true">
|
||||
<div
|
||||
class={styles.dragGhost}
|
||||
style={{
|
||||
"--drag-ghost-x": `${dragGhostPosition().x}px`,
|
||||
"--drag-ghost-y": `${dragGhostPosition().y}px`,
|
||||
}}
|
||||
>
|
||||
<GhostIcon class={styles.icon} size={18} strokeWidth={2} />
|
||||
<div class={styles.dragGhostCopy}>
|
||||
<div class={styles.dragGhostTitle}>{node.kind === "folder" ? node.label : node.item.name}</div>
|
||||
<div class={styles.dragGhostMeta}>{draggedNodeMeta()}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Portal>
|
||||
);
|
||||
}}
|
||||
</Show>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -124,6 +124,53 @@
|
||||
padding: 0 var(--space-3);
|
||||
}
|
||||
|
||||
.treeSectionHeader {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-2);
|
||||
margin-top: var(--space-3);
|
||||
margin-bottom: var(--space-2);
|
||||
padding-right: var(--space-1);
|
||||
}
|
||||
|
||||
.treeSectionHeader .treeSectionLabel {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.treeControls {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-1);
|
||||
justify-content: flex-end;
|
||||
padding-right: var(--space-2);
|
||||
}
|
||||
|
||||
.treeControlButton {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: calc(var(--control-size-md) - var(--space-1));
|
||||
height: calc(var(--control-size-md) - var(--space-1));
|
||||
padding: 0;
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 46%, transparent);
|
||||
border-radius: var(--radius-pill);
|
||||
background: color-mix(in srgb, var(--color-surface) 95%, transparent);
|
||||
color: var(--color-text-muted);
|
||||
transition:
|
||||
border-color 160ms var(--easing-standard),
|
||||
background 160ms var(--easing-standard),
|
||||
color 160ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.treeControlButton:hover,
|
||||
.treeControlButton:focus-visible {
|
||||
border-color: color-mix(in srgb, var(--color-border-strong) 56%, transparent);
|
||||
background: var(--color-surface-hover);
|
||||
color: var(--color-text);
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.treeList {
|
||||
@include treeNav.tree-list;
|
||||
}
|
||||
@@ -214,6 +261,26 @@
|
||||
@include treeNav.item-meta;
|
||||
}
|
||||
|
||||
.dragGhostLayer {
|
||||
@include treeNav.drag-ghost-layer;
|
||||
}
|
||||
|
||||
.dragGhost {
|
||||
@include treeNav.drag-ghost;
|
||||
}
|
||||
|
||||
.dragGhostCopy {
|
||||
@include treeNav.drag-ghost-copy;
|
||||
}
|
||||
|
||||
.dragGhostTitle {
|
||||
@include treeNav.drag-ghost-title;
|
||||
}
|
||||
|
||||
.dragGhostMeta {
|
||||
@include treeNav.drag-ghost-meta;
|
||||
}
|
||||
|
||||
.sidebarCollapsed {
|
||||
gap: var(--space-3);
|
||||
padding: var(--space-3) var(--space-2);
|
||||
@@ -247,6 +314,7 @@
|
||||
|
||||
.sidebarCollapsed .label,
|
||||
.sidebarCollapsed .itemMeta,
|
||||
.sidebarCollapsed .treeSectionHeader,
|
||||
.sidebarCollapsed .treeSectionLabel,
|
||||
.sidebarCollapsed .treeList {
|
||||
display: none;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// Path: Frontend/src/components/shell/WorkspaceSidebar/WorkspaceSidebar.tsx
|
||||
|
||||
import { For, Show, createEffect, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
||||
import { resolveAPIBase } from "../../../lib/api";
|
||||
import { ChevronLeft, ChevronRight, Folder, ListCollapse, UnfoldVertical } from "../../../lib/icons";
|
||||
import { Portal } from "solid-js/web";
|
||||
import { ChevronLeft, ChevronRight, Folder, ListCollapse, Plus, UnfoldVertical } from "../../../lib/icons";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { ProjectSelector } from "../ProjectSelector/ProjectSelector";
|
||||
import {
|
||||
@@ -21,13 +21,16 @@ import {
|
||||
createWorkspaceSurfaceTarget,
|
||||
createWorkspaceTreeTarget,
|
||||
getWorkspaceNodeIcon,
|
||||
getWorkspaceItemTypeDefinition,
|
||||
workspaceSidebarHeaderActions,
|
||||
workspaceStaticItems,
|
||||
type WorkspaceContextMenuAction,
|
||||
type WorkspaceContextMenuTarget,
|
||||
type WorkspaceItemTypeId,
|
||||
type WorkspaceStaticItem,
|
||||
type WorkspaceTreeNode,
|
||||
} from "../data/shell.data";
|
||||
import { useWorkspaceTreeData } from "../shared/useWorkspaceTreeData";
|
||||
import { WorkspaceContextMenu } from "../WorkspaceContextMenu/WorkspaceContextMenu";
|
||||
import { createWorkspaceContextMenuController } from "../WorkspaceContextMenu/createWorkspaceContextMenuController";
|
||||
import styles from "./WorkspaceSidebar.module.scss";
|
||||
@@ -50,23 +53,9 @@ type WorkspaceDragState = {
|
||||
dropTarget: WorkspaceDragTarget | null;
|
||||
};
|
||||
|
||||
type PersistedWorkspaceFolderRecord = {
|
||||
id: string;
|
||||
path: string;
|
||||
label: string;
|
||||
children?: PersistedWorkspaceFolderRecord[];
|
||||
};
|
||||
|
||||
type WorkspaceFoldersResponse = {
|
||||
data?: {
|
||||
folders?: PersistedWorkspaceFolderRecord[];
|
||||
renamedFolder?: PersistedWorkspaceFolderRecord;
|
||||
movedFolder?: PersistedWorkspaceFolderRecord;
|
||||
previousFolderId?: string;
|
||||
previousFolderPath?: string;
|
||||
};
|
||||
error?: string;
|
||||
message?: string;
|
||||
type DragGhostPosition = {
|
||||
x: number;
|
||||
y: number;
|
||||
};
|
||||
|
||||
type PendingWorkspaceFolderRename = {
|
||||
@@ -78,21 +67,6 @@ const LONG_PRESS_MS = 320;
|
||||
|
||||
const getWorkspaceTreeNodeId = (node: WorkspaceTreeNode): string => node.id;
|
||||
|
||||
const buildPersistedWorkspaceFolderNodes = (
|
||||
folders: readonly PersistedWorkspaceFolderRecord[],
|
||||
): WorkspaceTreeNode[] =>
|
||||
folders.map((folder) => ({
|
||||
id: folder.id,
|
||||
path: folder.path,
|
||||
label: folder.label,
|
||||
kind: "folder",
|
||||
icon: Folder,
|
||||
children: buildPersistedWorkspaceFolderNodes(folder.children ?? []),
|
||||
}));
|
||||
|
||||
const readPersistedWorkspaceFolders = (body: WorkspaceFoldersResponse): PersistedWorkspaceFolderRecord[] =>
|
||||
Array.isArray(body.data?.folders) ? body.data.folders : [];
|
||||
|
||||
const countWorkspaceFolderSiblingsBeforeIndex = (
|
||||
siblings: readonly WorkspaceTreeNode[],
|
||||
index: number,
|
||||
@@ -378,17 +352,31 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
const appShellData = useAppShellData();
|
||||
const activeProject = () => appShellData.activeProject();
|
||||
const [isProjectDrawerOpen, setIsProjectDrawerOpen] = createSignal(false);
|
||||
const [workspaceTreeNodes, setWorkspaceTreeNodes] = createSignal<readonly WorkspaceTreeNode[]>(appShellData.workspaceTree());
|
||||
const [persistedFolders, setPersistedFolders] = createSignal<readonly PersistedWorkspaceFolderRecord[]>([]);
|
||||
const [collapsedFolderIds, setCollapsedFolderIds] = createSignal<readonly string[]>([]);
|
||||
const [pendingFolderDraft, setPendingFolderDraft] = createSignal<PendingWorkspaceFolderDraft | null>(null);
|
||||
const [pendingFolderName, setPendingFolderName] = createSignal("");
|
||||
const [pendingFolderRename, setPendingFolderRename] = createSignal<PendingWorkspaceFolderRename | null>(null);
|
||||
const [pendingFolderRenameName, setPendingFolderRenameName] = createSignal("");
|
||||
const [dragState, setDragState] = createSignal<WorkspaceDragState | null>(null);
|
||||
const [dragGhostPosition, setDragGhostPosition] = createSignal<DragGhostPosition>({ x: 0, y: 0 });
|
||||
const [suppressNextTreeClick, setSuppressNextTreeClick] = createSignal(false);
|
||||
let lastSelectedProjectId: string | null = null;
|
||||
let latestPersistedFoldersRequest = 0;
|
||||
const {
|
||||
workspaceTreeNodes,
|
||||
setWorkspaceTreeNodes,
|
||||
resolveFolderPath,
|
||||
resolveItemPath,
|
||||
createFolder,
|
||||
renameFolder,
|
||||
deleteFolder,
|
||||
moveFolder,
|
||||
createItem,
|
||||
deleteItem,
|
||||
moveItem,
|
||||
} = useWorkspaceTreeData({
|
||||
activeProjectId: () => activeProject()?.id ?? "",
|
||||
fallbackWorkspaceTree: () => appShellData.workspaceTree(),
|
||||
});
|
||||
const contextMenu = createWorkspaceContextMenuController();
|
||||
let longPressTimer: number | undefined;
|
||||
let suppressClickTimer: number | undefined;
|
||||
@@ -430,54 +418,32 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
setPendingFolderRenameName("");
|
||||
setDragState(null);
|
||||
};
|
||||
const syncWorkspaceTree = (): void => {
|
||||
const nextTree = activeProject()?.id
|
||||
? buildPersistedWorkspaceFolderNodes(persistedFolders())
|
||||
: appShellData.workspaceTree();
|
||||
const availableFolderIds = new Set(collectBranchNodeIds(nextTree, workspaceTreeAdapter));
|
||||
|
||||
setWorkspaceTreeNodes(nextTree);
|
||||
const syncCollapsedFolderIds = (): void => {
|
||||
const availableFolderIds = new Set(collectBranchNodeIds(workspaceTreeNodes(), workspaceTreeAdapter));
|
||||
setCollapsedFolderIds((current) => current.filter((id) => availableFolderIds.has(id)));
|
||||
};
|
||||
const loadPersistedFolders = async (projectId: string): Promise<void> => {
|
||||
const requestId = latestPersistedFoldersRequest + 1;
|
||||
latestPersistedFoldersRequest = requestId;
|
||||
|
||||
if (!projectId) {
|
||||
setPersistedFolders([]);
|
||||
return;
|
||||
const updateDragGhostPosition = (x: number, y: number): void => {
|
||||
setDragGhostPosition({ x: x + 18, y: y + 18 });
|
||||
};
|
||||
const draggedNode = (): WorkspaceTreeNode | null => {
|
||||
const currentDragState = dragState();
|
||||
if (!currentDragState) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!isUuidString(projectId)) {
|
||||
setPersistedFolders([]);
|
||||
return;
|
||||
return findTreeNodeLocation(workspaceTreeNodes(), currentDragState.draggedNodeId, workspaceTreeAdapter)?.node ?? null;
|
||||
};
|
||||
const draggedNodeMeta = (): string => {
|
||||
const node = draggedNode();
|
||||
if (!node) {
|
||||
return "";
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/folders`, {
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
},
|
||||
});
|
||||
const body = (await response.json()) as WorkspaceFoldersResponse;
|
||||
|
||||
if (requestId !== latestPersistedFoldersRequest) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(body.message || "Failed to load project tree folders.");
|
||||
}
|
||||
|
||||
setPersistedFolders(readPersistedWorkspaceFolders(body));
|
||||
} catch (error) {
|
||||
if (requestId !== latestPersistedFoldersRequest) {
|
||||
return;
|
||||
}
|
||||
|
||||
console.error(error);
|
||||
setPersistedFolders([]);
|
||||
if (node.kind === "folder") {
|
||||
return "Folder";
|
||||
}
|
||||
|
||||
return getWorkspaceItemTypeDefinition(node.itemType).label;
|
||||
};
|
||||
const clearLongPressTimer = (): void => {
|
||||
if (longPressTimer !== undefined) {
|
||||
@@ -499,7 +465,7 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
};
|
||||
|
||||
createEffect(() => {
|
||||
syncWorkspaceTree();
|
||||
syncCollapsedFolderIds();
|
||||
});
|
||||
|
||||
createEffect(() => {
|
||||
@@ -518,11 +484,15 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
resetWorkspaceTreeInteractionState();
|
||||
});
|
||||
|
||||
createEffect(() => {
|
||||
void loadPersistedFolders(activeProject()?.id ?? "");
|
||||
});
|
||||
|
||||
onMount(() => {
|
||||
const handlePointerMove = (event: PointerEvent): void => {
|
||||
if (!dragState()) {
|
||||
return;
|
||||
}
|
||||
|
||||
updateDragGhostPosition(event.clientX, event.clientY);
|
||||
};
|
||||
|
||||
const handlePointerUp = (): void => {
|
||||
clearLongPressTimer();
|
||||
|
||||
@@ -541,13 +511,11 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
const currentNodes = workspaceTreeNodes();
|
||||
const draggedLocation = findTreeNodeLocation(currentNodes, nextDragState.draggedNodeId, workspaceTreeAdapter);
|
||||
const canPersistMove = isUuidString(activeProject()?.id ?? "");
|
||||
const draggedFolderPath = draggedLocation?.node.kind === "folder" ? draggedLocation.node.path ?? null : null;
|
||||
const previewNodes = moveTreeNode(currentNodes, nextDragState.draggedNodeId, nextDragState.dropTarget as WorkspaceDragTarget, workspaceTreeAdapter);
|
||||
const previewLocation = findTreeNodeLocation(previewNodes, nextDragState.draggedNodeId, workspaceTreeAdapter);
|
||||
const persistedParentLocation = previewLocation?.parentId
|
||||
? findTreeNodeLocation(previewNodes, previewLocation.parentId, workspaceTreeAdapter)
|
||||
: null;
|
||||
const persistedParentFolderPath = persistedParentLocation?.node.kind === "folder" ? persistedParentLocation.node.path ?? null : null;
|
||||
const previewSiblings = previewLocation?.parentId
|
||||
? persistedParentLocation?.node.kind === "folder"
|
||||
? persistedParentLocation.node.children ?? []
|
||||
@@ -563,16 +531,24 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
if (
|
||||
canPersistMove &&
|
||||
draggedLocation?.node.kind === "folder" &&
|
||||
draggedFolderPath &&
|
||||
(!previewLocation?.parentId || persistedParentLocation?.node.kind === "folder")
|
||||
) {
|
||||
void movePersistedFolder(
|
||||
draggedFolderPath,
|
||||
persistedParentFolderPath,
|
||||
void moveFolder(
|
||||
draggedLocation.node.id,
|
||||
persistedParentLocation?.node.kind === "folder" ? persistedParentLocation.node.id : null,
|
||||
targetIndex,
|
||||
);
|
||||
} else if (
|
||||
canPersistMove &&
|
||||
draggedLocation?.node.kind === "item" &&
|
||||
resolveItemPath(draggedLocation.node.id) &&
|
||||
(!previewLocation?.parentId || persistedParentLocation?.node.kind === "folder")
|
||||
) {
|
||||
void moveItem(
|
||||
draggedLocation.node.id,
|
||||
persistedParentLocation?.node.kind === "folder" ? persistedParentLocation.node.id : null,
|
||||
previewLocation?.index ?? 0,
|
||||
);
|
||||
} else {
|
||||
setWorkspaceTreeNodes((current) =>
|
||||
moveTreeNode(current, nextDragState.draggedNodeId, nextDragState.dropTarget as WorkspaceDragTarget, workspaceTreeAdapter),
|
||||
@@ -596,18 +572,20 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
|
||||
window.addEventListener("pointerup", handlePointerUp);
|
||||
window.addEventListener("pointercancel", handlePointerUp);
|
||||
window.addEventListener("pointermove", handlePointerMove);
|
||||
window.addEventListener("keydown", handleEscape);
|
||||
|
||||
onCleanup(() => {
|
||||
clearLongPressTimer();
|
||||
if (suppressClickTimer !== undefined) {
|
||||
window.clearTimeout(suppressClickTimer);
|
||||
}
|
||||
window.removeEventListener("pointerup", handlePointerUp);
|
||||
window.removeEventListener("pointercancel", handlePointerUp);
|
||||
window.removeEventListener("keydown", handleEscape);
|
||||
onCleanup(() => {
|
||||
clearLongPressTimer();
|
||||
if (suppressClickTimer !== undefined) {
|
||||
window.clearTimeout(suppressClickTimer);
|
||||
}
|
||||
window.removeEventListener("pointerup", handlePointerUp);
|
||||
window.removeEventListener("pointercancel", handlePointerUp);
|
||||
window.removeEventListener("pointermove", handlePointerMove);
|
||||
window.removeEventListener("keydown", handleEscape);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
const beginFolderDraft = (parentId: string | null, depth: number): void => {
|
||||
if (parentId) {
|
||||
@@ -627,11 +605,6 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
setPendingFolderRenameName(label);
|
||||
};
|
||||
|
||||
const resolveFolderPath = (folderId: string): string | null => {
|
||||
const location = findTreeNodeLocation(workspaceTreeNodes(), folderId, workspaceTreeAdapter);
|
||||
return location?.node.kind === "folder" ? location.node.path ?? null : null;
|
||||
};
|
||||
|
||||
const submitPendingFolder = async (): Promise<void> => {
|
||||
const name = pendingFolderName().trim();
|
||||
const draft = pendingFolderDraft();
|
||||
@@ -658,104 +631,17 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/folders`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
name,
|
||||
parentFolderId: parentFolderPath,
|
||||
}),
|
||||
});
|
||||
|
||||
const body = (await response.json()) as WorkspaceFoldersResponse;
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(body.message || "Failed to create project tree folder.");
|
||||
}
|
||||
|
||||
setPersistedFolders(readPersistedWorkspaceFolders(body));
|
||||
const created = await createFolder(name, draft.parentId);
|
||||
if (created) {
|
||||
setPendingFolderDraft(null);
|
||||
setPendingFolderName("");
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
const deletePersistedFolder = async (folderId: string): Promise<void> => {
|
||||
const projectId = activeProject()?.id ?? "";
|
||||
const folderPath = resolveFolderPath(folderId);
|
||||
if (!folderId || !projectId || !isUuidString(projectId)) {
|
||||
return;
|
||||
}
|
||||
if (!folderPath) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${resolveAPIBase()}/projects/${projectId}/tree/folders?folderId=${encodeURIComponent(folderPath)}`,
|
||||
{
|
||||
method: "DELETE",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
const body = (await response.json()) as WorkspaceFoldersResponse;
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(body.message || "Failed to delete project tree folder.");
|
||||
}
|
||||
|
||||
setPersistedFolders(readPersistedWorkspaceFolders(body));
|
||||
const deleted = await deleteFolder(folderId);
|
||||
if (deleted) {
|
||||
setCollapsedFolderIds((current) => current.filter((id) => id !== folderId));
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
const movePersistedFolder = async (
|
||||
folderPath: string,
|
||||
parentFolderPath: string | null,
|
||||
folderStableId: string,
|
||||
parentStableId: string | null,
|
||||
targetIndex: number,
|
||||
): Promise<void> => {
|
||||
const projectId = activeProject()?.id ?? "";
|
||||
if (!folderPath || !folderStableId || !projectId || !isUuidString(projectId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/folders/move`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
folderId: folderPath,
|
||||
folderNodeId: folderStableId,
|
||||
parentFolderId: parentFolderPath,
|
||||
parentNodeId: parentStableId,
|
||||
targetIndex,
|
||||
}),
|
||||
});
|
||||
|
||||
const body = (await response.json()) as WorkspaceFoldersResponse;
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(body.message || "Failed to move project tree folder.");
|
||||
}
|
||||
|
||||
setPersistedFolders(readPersistedWorkspaceFolders(body));
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -785,30 +671,10 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/folders`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
folderId: folderPath,
|
||||
name,
|
||||
}),
|
||||
});
|
||||
|
||||
const body = (await response.json()) as WorkspaceFoldersResponse;
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(body.message || "Failed to rename project tree folder.");
|
||||
}
|
||||
|
||||
setPersistedFolders(readPersistedWorkspaceFolders(body));
|
||||
const renamed = await renameFolder(draft.folderId, name);
|
||||
if (renamed) {
|
||||
setPendingFolderRename(null);
|
||||
setPendingFolderRenameName("");
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -833,11 +699,34 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
}
|
||||
};
|
||||
|
||||
const openWorkspaceCreateMenu = (element: HTMLElement): void => {
|
||||
contextMenu.openMenuFromElement(element, sidebarContextMenuTarget);
|
||||
};
|
||||
|
||||
const resolveCreateItemType = (actionId: string): WorkspaceItemTypeId | null => {
|
||||
switch (actionId) {
|
||||
case "create-doc":
|
||||
return "core.doc";
|
||||
case "create-board":
|
||||
return "core.board.kanban";
|
||||
case "create-list-board":
|
||||
return "core.board.list";
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
const createPersistedItem = async (itemType: WorkspaceItemTypeId, parentId: string | null): Promise<void> => {
|
||||
const definition = getWorkspaceItemTypeDefinition(itemType);
|
||||
await createItem(definition.defaultCreateLabel, itemType, parentId);
|
||||
};
|
||||
|
||||
const handleNodePointerDown = (event: PointerEvent, nodeId: string): void => {
|
||||
if (event.button !== 0 || pendingFolderDraft()) {
|
||||
return;
|
||||
}
|
||||
|
||||
updateDragGhostPosition(event.clientX, event.clientY);
|
||||
clearLongPressTimer();
|
||||
longPressTimer = window.setTimeout(() => {
|
||||
suppressTreeClickTemporarily();
|
||||
@@ -875,6 +764,22 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
};
|
||||
|
||||
const handleContextActionSelect = (action: WorkspaceContextMenuAction, target: WorkspaceContextMenuTarget): void => {
|
||||
const createItemType = resolveCreateItemType(action.id);
|
||||
if (createItemType) {
|
||||
switch (target.kind) {
|
||||
case "workspace":
|
||||
case "home":
|
||||
void createPersistedItem(createItemType, null);
|
||||
return;
|
||||
case "folder":
|
||||
void createPersistedItem(createItemType, target.id);
|
||||
return;
|
||||
case "settings":
|
||||
case "item":
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
switch (action.id) {
|
||||
case "new-folder":
|
||||
switch (target.kind) {
|
||||
@@ -900,6 +805,13 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
beginFolderRename(target.id, target.label, findTreeNodeDepth(workspaceTreeNodes(), target.id, workspaceTreeAdapter) ?? 0);
|
||||
}
|
||||
return;
|
||||
case "delete-doc":
|
||||
case "delete-board":
|
||||
case "delete-list-board":
|
||||
if (target.kind === "item") {
|
||||
void deleteItem(target.id);
|
||||
}
|
||||
return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
@@ -1012,7 +924,23 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
</ul>
|
||||
|
||||
<Show when={!props.collapsed}>
|
||||
<div class={styles.treeSectionLabel}>Items</div>
|
||||
<div class={styles.treeSectionHeader}>
|
||||
<div class={styles.treeSectionLabel}>Items</div>
|
||||
<div class={styles.treeControls}>
|
||||
<button
|
||||
type="button"
|
||||
class={styles.treeControlButton}
|
||||
onClick={(event): void => {
|
||||
event.stopPropagation();
|
||||
openWorkspaceCreateMenu(event.currentTarget);
|
||||
}}
|
||||
aria-label="Create in Items"
|
||||
title="Create"
|
||||
>
|
||||
<Plus size={16} strokeWidth={2.25} />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
<div data-slot="workspace-tree-root">
|
||||
@@ -1058,6 +986,32 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||
onClose={contextMenu.closeMenu}
|
||||
onSelect={handleContextActionSelect}
|
||||
/>
|
||||
|
||||
<Show when={draggedNode()} keyed>
|
||||
{(node): JSX.Element => {
|
||||
const GhostIcon = getWorkspaceNodeIcon(node);
|
||||
|
||||
return (
|
||||
<Portal>
|
||||
<div class={styles.dragGhostLayer} aria-hidden="true">
|
||||
<div
|
||||
class={styles.dragGhost}
|
||||
style={{
|
||||
"--drag-ghost-x": `${dragGhostPosition().x}px`,
|
||||
"--drag-ghost-y": `${dragGhostPosition().y}px`,
|
||||
}}
|
||||
>
|
||||
<GhostIcon class={styles.icon} size={18} strokeWidth={2} />
|
||||
<div class={styles.dragGhostCopy}>
|
||||
<div class={styles.dragGhostTitle}>{node.label}</div>
|
||||
<div class={styles.dragGhostMeta}>{draggedNodeMeta()}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Portal>
|
||||
);
|
||||
}}
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -140,6 +140,7 @@ export type WorkspaceFolderNode = {
|
||||
|
||||
export type WorkspaceItemNode = {
|
||||
id: string;
|
||||
path?: string;
|
||||
label: string;
|
||||
kind: "item";
|
||||
itemType: WorkspaceItemTypeId;
|
||||
@@ -559,6 +560,7 @@ export const getWorkspaceContextMenuSections = (
|
||||
id: "organize",
|
||||
label: undefined,
|
||||
items: [
|
||||
{ id: "move-folder", label: "Move…", shortcut: { modifiers: ["meta"], key: "m" } },
|
||||
{ id: "delete-folder", label: "Delete", shortcut: { modifiers: ["meta"], key: "delete" }, tone: "danger" },
|
||||
],
|
||||
},
|
||||
@@ -580,6 +582,7 @@ export const getWorkspaceContextMenuSections = (
|
||||
id: "organize",
|
||||
label: undefined,
|
||||
items: [
|
||||
{ id: `move-${actionPrefix}`, label: "Move…", shortcut: { modifiers: ["meta"], key: "m" } },
|
||||
{ id: `delete-${actionPrefix}`, label: "Delete", shortcut: { modifiers: ["meta"], key: "delete" }, tone: "danger" },
|
||||
],
|
||||
},
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
display: grid;
|
||||
position: relative;
|
||||
isolation: isolate;
|
||||
cursor: grab;
|
||||
grid-template-columns: auto auto minmax(0, 1fr) auto;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
@@ -71,7 +72,12 @@
|
||||
transition:
|
||||
color 160ms var(--easing-standard),
|
||||
box-shadow 160ms var(--easing-standard),
|
||||
transform 180ms var(--easing-standard);
|
||||
transform 180ms var(--easing-standard),
|
||||
opacity 160ms var(--easing-standard);
|
||||
|
||||
&:active {
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
@@ -108,48 +114,61 @@
|
||||
}
|
||||
|
||||
@mixin item-dragging {
|
||||
opacity: 0.45;
|
||||
transform: scale(0.985);
|
||||
box-shadow: none;
|
||||
cursor: grabbing;
|
||||
opacity: 0.88;
|
||||
transform: translateX(2px) scale(0.992);
|
||||
color: var(--color-text);
|
||||
|
||||
&::after {
|
||||
border-color: color-mix(in srgb, var(--color-accent-strong) 24%, var(--color-border));
|
||||
background: color-mix(in srgb, var(--color-surface) 90%, var(--color-accent-soft) 10%);
|
||||
box-shadow:
|
||||
0 10px 24px color-mix(in srgb, black 10%, transparent),
|
||||
inset 0 1px 0 color-mix(in srgb, white 6%, transparent);
|
||||
}
|
||||
}
|
||||
|
||||
@mixin item-drop-boundary($edge) {
|
||||
&::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||
right: var(--space-3);
|
||||
#{$edge}: calc(-1 * ((8px - 3px) / 2));
|
||||
height: 8px;
|
||||
border-radius: 999px;
|
||||
background:
|
||||
radial-gradient(circle, color-mix(in srgb, var(--color-accent-strong) 92%, white 8%) 0 3px, transparent 4px)
|
||||
left center / 8px 8px no-repeat,
|
||||
linear-gradient(
|
||||
to right,
|
||||
color-mix(in srgb, var(--color-accent-strong) 88%, white 12%),
|
||||
color-mix(in srgb, var(--color-accent-strong) 72%, transparent)
|
||||
)
|
||||
center / 100% 3px no-repeat;
|
||||
pointer-events: none;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
@mixin item-drop-before {
|
||||
&::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||
right: var(--space-3);
|
||||
top: calc((var(--space-1) * -0.5) - 1px);
|
||||
height: 2px;
|
||||
border-radius: 999px;
|
||||
background: color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
||||
pointer-events: none;
|
||||
z-index: 2;
|
||||
}
|
||||
@include item-drop-boundary(top);
|
||||
}
|
||||
|
||||
@mixin item-drop-after {
|
||||
&::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||
right: var(--space-3);
|
||||
bottom: calc((var(--space-1) * -0.5) - 1px);
|
||||
height: 2px;
|
||||
border-radius: 999px;
|
||||
background: color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
||||
pointer-events: none;
|
||||
z-index: 2;
|
||||
}
|
||||
@include item-drop-boundary(bottom);
|
||||
}
|
||||
|
||||
@mixin item-drop-inside {
|
||||
color: var(--color-text);
|
||||
|
||||
&::after {
|
||||
border-color: color-mix(in srgb, var(--color-accent-strong) 55%, transparent);
|
||||
background: color-mix(in srgb, var(--color-accent-soft) 36%, var(--color-surface));
|
||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
||||
border-color: color-mix(in srgb, var(--color-accent-strong) 72%, transparent);
|
||||
background: color-mix(in srgb, var(--color-accent-soft) 48%, var(--color-surface));
|
||||
box-shadow:
|
||||
0 0 0 1px color-mix(in srgb, var(--color-accent-strong) 18%, transparent),
|
||||
inset 0 1px 0 color-mix(in srgb, white 4%, transparent),
|
||||
inset 4px 0 0 color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -186,3 +205,71 @@
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
@mixin drag-ghost-layer {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
pointer-events: none;
|
||||
z-index: 60;
|
||||
}
|
||||
|
||||
@mixin drag-ghost {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
min-height: calc(var(--control-size-lg) - var(--space-2));
|
||||
max-width: min(24rem, calc(100vw - (var(--space-6) * 2)));
|
||||
padding: var(--space-2) var(--space-3);
|
||||
border-radius: var(--radius-lg);
|
||||
border: 1px solid color-mix(in srgb, var(--color-accent-strong) 18%, var(--color-border));
|
||||
background: color-mix(in srgb, var(--color-surface) 92%, var(--color-accent-soft) 8%);
|
||||
box-shadow:
|
||||
0 18px 38px color-mix(in srgb, black 16%, transparent),
|
||||
0 6px 14px color-mix(in srgb, black 8%, transparent),
|
||||
inset 0 1px 0 color-mix(in srgb, white 8%, transparent);
|
||||
color: var(--color-text);
|
||||
transform: translate3d(var(--drag-ghost-x, 0), var(--drag-ghost-y, 0), 0);
|
||||
will-change: transform;
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
border-radius: inherit;
|
||||
background: linear-gradient(
|
||||
180deg,
|
||||
color-mix(in srgb, white 10%, transparent),
|
||||
transparent 42%
|
||||
);
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
> * {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@mixin drag-ghost-copy {
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
gap: 0.1rem;
|
||||
}
|
||||
|
||||
@mixin drag-ghost-title {
|
||||
@include text-label;
|
||||
min-width: 0;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
@mixin drag-ghost-meta {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,393 @@
|
||||
import { createEffect, createSignal, type Accessor, type Setter } from "solid-js";
|
||||
import { resolveAPIBase } from "../../../lib/api";
|
||||
import { Folder } from "../../../lib/icons";
|
||||
import type { WorkspaceItemTypeId, WorkspaceTreeNode } from "../data/shell.data";
|
||||
import { isUuidString } from "./navTreeDnd";
|
||||
|
||||
type PersistedWorkspaceTreeNodeRecord = {
|
||||
id: string;
|
||||
path: string;
|
||||
label: string;
|
||||
kind: "folder" | "item";
|
||||
itemType?: string;
|
||||
children?: PersistedWorkspaceTreeNodeRecord[];
|
||||
};
|
||||
|
||||
type WorkspaceTreeResponse = {
|
||||
data?: {
|
||||
nodes?: PersistedWorkspaceTreeNodeRecord[];
|
||||
};
|
||||
error?: string;
|
||||
message?: string;
|
||||
};
|
||||
|
||||
type WorkspaceMutationResponse = {
|
||||
error?: string;
|
||||
message?: string;
|
||||
};
|
||||
|
||||
const buildPersistedWorkspaceTreeNodes = (
|
||||
nodes: readonly PersistedWorkspaceTreeNodeRecord[],
|
||||
): WorkspaceTreeNode[] =>
|
||||
nodes.map((node) =>
|
||||
node.kind === "folder"
|
||||
? {
|
||||
id: node.id,
|
||||
path: node.path,
|
||||
label: node.label,
|
||||
kind: "folder",
|
||||
icon: Folder,
|
||||
children: buildPersistedWorkspaceTreeNodes(node.children ?? []),
|
||||
}
|
||||
: {
|
||||
id: node.id,
|
||||
path: node.path,
|
||||
label: node.label,
|
||||
kind: "item",
|
||||
itemType: node.itemType ?? "core.board.kanban",
|
||||
}
|
||||
);
|
||||
|
||||
const readPersistedWorkspaceTreeNodes = (body: WorkspaceTreeResponse): PersistedWorkspaceTreeNodeRecord[] =>
|
||||
Array.isArray(body.data?.nodes) ? body.data.nodes : [];
|
||||
|
||||
const findNodeById = (nodes: readonly WorkspaceTreeNode[], nodeId: string): WorkspaceTreeNode | null => {
|
||||
for (const node of nodes) {
|
||||
if (node.id === nodeId) {
|
||||
return node;
|
||||
}
|
||||
|
||||
if (node.kind !== "folder") {
|
||||
continue;
|
||||
}
|
||||
|
||||
const nestedMatch = findNodeById(node.children ?? [], nodeId);
|
||||
if (nestedMatch) {
|
||||
return nestedMatch;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
type UseWorkspaceTreeDataOptions = {
|
||||
activeProjectId: Accessor<string>;
|
||||
fallbackWorkspaceTree: Accessor<readonly WorkspaceTreeNode[]>;
|
||||
};
|
||||
|
||||
type UseWorkspaceTreeDataResult = {
|
||||
workspaceTreeNodes: Accessor<readonly WorkspaceTreeNode[]>;
|
||||
setWorkspaceTreeNodes: Setter<readonly WorkspaceTreeNode[]>;
|
||||
resolveFolderPath: (folderId: string) => string | null;
|
||||
resolveItemPath: (itemId: string) => string | null;
|
||||
createFolder: (name: string, parentId: string | null) => Promise<boolean>;
|
||||
renameFolder: (folderId: string, name: string) => Promise<boolean>;
|
||||
deleteFolder: (folderId: string) => Promise<boolean>;
|
||||
moveFolder: (folderId: string, parentId: string | null, targetIndex: number) => Promise<boolean>;
|
||||
createItem: (name: string, itemType: WorkspaceItemTypeId, parentId: string | null) => Promise<boolean>;
|
||||
deleteItem: (itemId: string) => Promise<boolean>;
|
||||
moveItem: (itemId: string, parentId: string | null, targetIndex: number) => Promise<boolean>;
|
||||
};
|
||||
|
||||
export const useWorkspaceTreeData = (
|
||||
options: UseWorkspaceTreeDataOptions,
|
||||
): UseWorkspaceTreeDataResult => {
|
||||
const [persistedNodes, setPersistedNodes] = createSignal<readonly PersistedWorkspaceTreeNodeRecord[]>([]);
|
||||
const [workspaceTreeNodes, setWorkspaceTreeNodes] = createSignal<readonly WorkspaceTreeNode[]>(
|
||||
options.fallbackWorkspaceTree(),
|
||||
);
|
||||
let latestPersistedTreeRequest = 0;
|
||||
|
||||
const syncWorkspaceTree = (): void => {
|
||||
const nextTree = options.activeProjectId()
|
||||
? buildPersistedWorkspaceTreeNodes(persistedNodes())
|
||||
: options.fallbackWorkspaceTree();
|
||||
|
||||
setWorkspaceTreeNodes(nextTree);
|
||||
};
|
||||
|
||||
const loadPersistedTree = async (projectId: string): Promise<boolean> => {
|
||||
const requestId = latestPersistedTreeRequest + 1;
|
||||
latestPersistedTreeRequest = requestId;
|
||||
|
||||
if (!projectId || !isUuidString(projectId)) {
|
||||
setPersistedNodes([]);
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree`, {
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
},
|
||||
});
|
||||
const body = (await response.json()) as WorkspaceTreeResponse;
|
||||
|
||||
if (requestId !== latestPersistedTreeRequest) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(body.message || "Failed to load project tree.");
|
||||
}
|
||||
|
||||
setPersistedNodes(readPersistedWorkspaceTreeNodes(body));
|
||||
return true;
|
||||
} catch (error) {
|
||||
if (requestId !== latestPersistedTreeRequest) {
|
||||
return false;
|
||||
}
|
||||
|
||||
console.error(error);
|
||||
setPersistedNodes([]);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const resolveFolderPath = (folderId: string): string | null => {
|
||||
const node = findNodeById(workspaceTreeNodes(), folderId);
|
||||
return node?.kind === "folder" ? node.path ?? null : null;
|
||||
};
|
||||
|
||||
const resolveItemPath = (itemId: string): string | null => {
|
||||
const node = findNodeById(workspaceTreeNodes(), itemId);
|
||||
return node?.kind === "item" ? node.path ?? null : null;
|
||||
};
|
||||
|
||||
const refreshAfterMutation = async (projectId: string, response: Response): Promise<boolean> => {
|
||||
const body = (await response.json()) as WorkspaceMutationResponse;
|
||||
if (!response.ok) {
|
||||
throw new Error(body.message || "Failed to persist project tree mutation.");
|
||||
}
|
||||
|
||||
return loadPersistedTree(projectId);
|
||||
};
|
||||
|
||||
const createFolder = async (name: string, parentId: string | null): Promise<boolean> => {
|
||||
const projectId = options.activeProjectId();
|
||||
if (!projectId || !isUuidString(projectId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const parentFolderPath = parentId ? resolveFolderPath(parentId) : null;
|
||||
if (parentId && !parentFolderPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/folders`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
name,
|
||||
parentFolderId: parentFolderPath,
|
||||
}),
|
||||
});
|
||||
|
||||
return refreshAfterMutation(projectId, response);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const renameFolder = async (folderId: string, name: string): Promise<boolean> => {
|
||||
const projectId = options.activeProjectId();
|
||||
const folderPath = resolveFolderPath(folderId);
|
||||
if (!projectId || !isUuidString(projectId) || !folderPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/folders`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
folderId: folderPath,
|
||||
name,
|
||||
}),
|
||||
});
|
||||
|
||||
return refreshAfterMutation(projectId, response);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const deleteFolder = async (folderId: string): Promise<boolean> => {
|
||||
const projectId = options.activeProjectId();
|
||||
const folderPath = resolveFolderPath(folderId);
|
||||
if (!projectId || !isUuidString(projectId) || !folderPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${resolveAPIBase()}/projects/${projectId}/tree/folders?folderId=${encodeURIComponent(folderPath)}`,
|
||||
{
|
||||
method: "DELETE",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
return refreshAfterMutation(projectId, response);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const moveFolder = async (folderId: string, parentId: string | null, targetIndex: number): Promise<boolean> => {
|
||||
const projectId = options.activeProjectId();
|
||||
const folderPath = resolveFolderPath(folderId);
|
||||
const parentFolderPath = parentId ? resolveFolderPath(parentId) : null;
|
||||
if (!projectId || !isUuidString(projectId) || !folderPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/folders/move`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
folderId: folderPath,
|
||||
folderNodeId: folderId,
|
||||
parentFolderId: parentFolderPath,
|
||||
parentNodeId: parentId,
|
||||
targetIndex,
|
||||
}),
|
||||
});
|
||||
|
||||
return refreshAfterMutation(projectId, response);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const createItem = async (
|
||||
name: string,
|
||||
itemType: WorkspaceItemTypeId,
|
||||
parentId: string | null,
|
||||
): Promise<boolean> => {
|
||||
const projectId = options.activeProjectId();
|
||||
if (!projectId || !isUuidString(projectId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const parentFolderPath = parentId ? resolveFolderPath(parentId) : null;
|
||||
if (parentId && !parentFolderPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/items`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
name,
|
||||
itemType,
|
||||
parentFolderId: parentFolderPath,
|
||||
}),
|
||||
});
|
||||
|
||||
return refreshAfterMutation(projectId, response);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const deleteItem = async (itemId: string): Promise<boolean> => {
|
||||
const projectId = options.activeProjectId();
|
||||
const itemPath = resolveItemPath(itemId);
|
||||
if (!projectId || !isUuidString(projectId) || !itemPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${resolveAPIBase()}/projects/${projectId}/tree/items?itemId=${encodeURIComponent(itemPath)}`,
|
||||
{
|
||||
method: "DELETE",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
return refreshAfterMutation(projectId, response);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const moveItem = async (itemId: string, parentId: string | null, targetIndex: number): Promise<boolean> => {
|
||||
const projectId = options.activeProjectId();
|
||||
const itemPath = resolveItemPath(itemId);
|
||||
const parentFolderPath = parentId ? resolveFolderPath(parentId) : null;
|
||||
if (!projectId || !isUuidString(projectId) || !itemPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/projects/${projectId}/tree/items/move`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
itemId: itemPath,
|
||||
itemNodeId: itemId,
|
||||
parentFolderId: parentFolderPath,
|
||||
parentNodeId: parentId,
|
||||
targetIndex,
|
||||
}),
|
||||
});
|
||||
|
||||
return refreshAfterMutation(projectId, response);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
createEffect(() => {
|
||||
syncWorkspaceTree();
|
||||
});
|
||||
|
||||
createEffect(() => {
|
||||
void loadPersistedTree(options.activeProjectId());
|
||||
});
|
||||
|
||||
return {
|
||||
workspaceTreeNodes,
|
||||
setWorkspaceTreeNodes,
|
||||
resolveFolderPath,
|
||||
resolveItemPath,
|
||||
createFolder,
|
||||
renameFolder,
|
||||
deleteFolder,
|
||||
moveFolder,
|
||||
createItem,
|
||||
deleteItem,
|
||||
moveItem,
|
||||
};
|
||||
};
|
||||
Reference in New Issue
Block a user