@k2b/ui 0.16.0 → 0.18.0

package/dist/ssr/layout/AppWorkspace.js

@@ -31,19 +31,18 @@ var _tmpl$ = ["<button type=\"button\" class=\"k2b-app-workspace__resize\" role=
   _tmpl$20 = ["<span class=\"k2b-app-workspace__sidebar-item-meta\"", ">", "</span>"],
   _tmpl$21 = ["<a", " class=\"k2b-app-workspace__sidebar-item-action\"", ">", "</a>"],
   _tmpl$22 = ["<button type=\"button\" class=\"k2b-app-workspace__sidebar-item-action\"", ">", "</button>"],
-  _tmpl$23 = ["<span class=\"k2b-app-workspace__sidebar-item-icon\"", " aria-hidden=\"true\"><i", "></i></span>"],
-  _tmpl$24 = ["<span class=\"k2b-app-workspace__sidebar-item-label\"><span class=\"k2b-app-workspace__sidebar-item-label-text\">", "</span></span>"],
-  _tmpl$25 = ["<span class=\"", "\"", ">", "</span>"],
-  _tmpl$26 = ["<span class=\"k2b-app-workspace__nav-tree-toggle\" data-k2b-nav-tree-toggle aria-hidden=\"true\"><i class=\"", "\"></i></span>"],
-  _tmpl$27 = ["<div class=\"k2b-app-workspace__nav-tree-group\" role=\"group\">", "</div>"],
-  _tmpl$28 = ["<div class=\"k2b-app-workspace__nav-tree-node\" role=\"treeitem\"", ">", "", "</div>"],
-  _tmpl$29 = ["<div class=\"", "\" role=\"tree\"", ">", "</div>"],
-  _tmpl$30 = ["<div class=\"k2b-app-workspace__sidebar-icon-grid\"", ">", "</div>"],
-  _tmpl$31 = ["<i", " aria-hidden=\"true\"></i>"],
-  _tmpl$32 = ["<div class=\"", "\" data-k2b-app-workspace", " style=\"", "\">", "</div>"],
-  _tmpl$33 = ["<div class=\"", "\">", "</div>"];
+  _tmpl$23 = ["<span class=\"k2b-app-workspace__sidebar-item-label\"><span class=\"k2b-app-workspace__sidebar-item-label-text\">", "</span></span>"],
+  _tmpl$24 = ["<span class=\"", "\"", ">", "</span>"],
+  _tmpl$25 = ["<span class=\"k2b-app-workspace__nav-tree-toggle\" data-k2b-nav-tree-toggle aria-hidden=\"true\"><i class=\"", "\"></i></span>"],
+  _tmpl$26 = ["<div class=\"k2b-app-workspace__nav-tree-group\" role=\"group\">", "</div>"],
+  _tmpl$27 = ["<div class=\"k2b-app-workspace__nav-tree-node\" role=\"treeitem\"", " style=\"", "\">", "", "</div>"],
+  _tmpl$28 = ["<div class=\"", "\" role=\"tree\"", ">", "</div>"],
+  _tmpl$29 = ["<div class=\"k2b-app-workspace__sidebar-icon-grid\"", ">", "</div>"],
+  _tmpl$30 = ["<i", " aria-hidden=\"true\"></i>"],
+  _tmpl$31 = ["<div class=\"", "\" data-k2b-app-workspace", " style=\"", "\">", "</div>"],
+  _tmpl$32 = ["<div class=\"", "\">", "</div>"];
 import { Link } from "@k2b/ssr/nav";
-import { children, createContext, createMemo, createSignal, createUniqueId, For, mergeProps, onCleanup, onMount, Show, useContext } from "solid-js";
+import { children, createContext, createEffect, createMemo, createSignal, createUniqueId, For, mergeProps, onCleanup, onMount, Show, useContext } from "solid-js";
 import { useUiMessages } from "../intl/messages";
 import { APP_WORKSPACE_SIDEBAR_HIDE_EVENT, installAppWorkspaceController } from "./app-workspace-controller";
 import { APP_WORKSPACE_DETAIL_DEFAULT, APP_WORKSPACE_DETAIL_MAX, APP_WORKSPACE_DETAIL_MIN, APP_WORKSPACE_DRAWER_DEFAULT, APP_WORKSPACE_DRAWER_MAX, APP_WORKSPACE_DRAWER_MIN, APP_WORKSPACE_PANE_DEFAULT, APP_WORKSPACE_PANE_MAX, APP_WORKSPACE_PANE_MIN, APP_WORKSPACE_SIDEBAR_COLLAPSED, APP_WORKSPACE_SIDEBAR_DEFAULT, APP_WORKSPACE_SIDEBAR_MAX, APP_WORKSPACE_SIDEBAR_MIN, appWorkspaceLayoutStyle, appWorkspacePanelVariable } from "./app-workspace-state";
@@ -72,8 +71,12 @@ const sidebarChildSlot = value => Boolean(value && typeof value === "object" &&
 const sidebarItemSlot = value => Boolean(value && typeof value === "object" && "kind" in value && [SIDEBAR_ITEM_ICON, SIDEBAR_ITEM_LABEL, SIDEBAR_ITEM_META, SIDEBAR_ITEM_ACTION].includes(value.kind));
 const navTreeItemSlot = value => Boolean(value && typeof value === "object" && "kind" in value && value.kind === NAV_TREE_ITEM);
 function ResizeHandle(props) {
-  return _$ssr(_tmpl$, _$ssrAttribute("aria-label", _$escape(props.label ?? (props.kind === "sidebar" ? "Resize navigation" : props.kind === "pane" ? "Resize workspace pane" : props.kind === "detail" ? "Resize detail panel" : "Resize bottom drawer"), true), false) + _$ssrAttribute("aria-controls", _$escape(props.controls, true), false) + _$ssrAttribute("aria-orientation", props.kind === "drawer" ? "horizontal" : "vertical", false) + _$ssrAttribute("aria-valuemin", _$escape(props.minSize, true), false) + _$ssrAttribute("aria-valuemax", _$escape(props.maxSize, true), false) + _$ssrAttribute("aria-valuenow", _$escape(props.defaultSize, true), false) + _$ssrAttribute("data-app-workspace-resize", _$escape(props.kind, true), false) + _$ssrAttribute("data-workspace-panel-id", _$escape(props.panelId, true), false) + _$ssrAttribute("data-workspace-resize-edge", _$escape(props.edge, true), false) + _$ssrAttribute("data-workspace-resize-shadow", props.shadow ? "true" : _$escape(undefined, true), false) + _$ssrAttribute("data-workspace-default-size", _$escape(props.defaultSize, true), false) + _$ssrAttribute("data-workspace-min-size", _$escape(props.minSize, true), false) + _$ssrAttribute("data-workspace-max-size", _$escape(props.maxSize, true), false), _$ssrStyle(props.style));
+  const messages = useUiMessages();
+  return _$ssr(_tmpl$, _$ssrAttribute("aria-label", _$escape(props.label ?? (props.kind === "sidebar" ? messages().resizeNavigation : props.kind === "pane" ? messages().resizeWorkspacePane : props.kind === "detail" ? messages().resizeDetailPanel : messages().resizeBottomDrawer), true), false) + _$ssrAttribute("aria-controls", _$escape(props.controls, true), false) + _$ssrAttribute("aria-orientation", props.kind === "drawer" ? "horizontal" : "vertical", false) + _$ssrAttribute("aria-valuemin", _$escape(props.minSize, true), false) + _$ssrAttribute("aria-valuemax", _$escape(props.maxSize, true), false) + _$ssrAttribute("aria-valuenow", _$escape(props.defaultSize, true), false) + _$ssrAttribute("data-app-workspace-resize", _$escape(props.kind, true), false) + _$ssrAttribute("data-workspace-panel-id", _$escape(props.panelId, true), false) + _$ssrAttribute("data-workspace-resize-edge", _$escape(props.edge, true), false) + _$ssrAttribute("data-workspace-resize-shadow", props.shadow ? "true" : _$escape(undefined, true), false) + _$ssrAttribute("data-workspace-default-size", _$escape(props.defaultSize, true), false) + _$ssrAttribute("data-workspace-min-size", _$escape(props.minSize, true), false) + _$ssrAttribute("data-workspace-max-size", _$escape(props.maxSize, true), false), _$ssrStyle(props.style));
 }
+
+/** One requested place for an item among its unchanged siblings. */
+
 const modeAttrs = mode => mode && mode !== "always" ? {
   "data-sidebar-mode": mode
 } : {};
@@ -85,6 +88,13 @@ const scrollAttrs = key => key ? {
   "data-scroll-preserve": key
 } : {};
 const iconClass = (icon, fallback = "ti-circle") => icon?.startsWith("ti ") ? icon : `ti ${icon || fallback}`;
+/** A named icon is an image screen readers announce; any other icon is decoration. */
+const iconAccessibility = label => label ? {
+  role: "img",
+  "aria-label": label
+} : {
+  "aria-hidden": true
+};
 function AppWorkspaceMainPane(props) {
   return {
     kind: MAIN_PANE,
@@ -770,6 +780,27 @@ const AppWorkspaceNavTreeItem = props => ({
   kind: NAV_TREE_ITEM,
   ...props
 });
+const NAV_TREE_DRAG_TYPE = "application/x-k2b-nav-tree-item";
+const callDragHandler = (handler, event) => {
+  if (typeof handler === "function") handler(event);else handler?.[0](handler[1], event);
+};
+
+/**
+ * The move that puts the sibling at `from` into the gap before `slot`
+ * (`siblings.length` is the gap after the last one), or `null` when its place
+ * would not change or it would pass an item that is not movable.
+ */
+const navTreeMove = (siblings, from, slot, parentId) => {
+  if (from < 0 || slot < 0 || slot > siblings.length || slot === from || slot === from + 1) return null;
+  const passed = slot < from ? siblings.slice(slot, from) : siblings.slice(from + 1, slot);
+  if (passed.some(sibling => !sibling.movable)) return null;
+  return {
+    id: siblings[from].id,
+    parentId,
+    beforeId: siblings[slot]?.id ?? null,
+    afterId: siblings[slot - 1]?.id ?? null
+  };
+};
 const AppWorkspaceNavTree = props => {
   let root;
   const resolved = children(() => props.children);
@@ -814,16 +845,48 @@ const AppWorkspaceNavTree = props => {
     });
   };
 
+  // Reordering: the dragged item and the gap the pointer marks. The application renders the new
+  // order; the item moved by keyboard takes focus back when its row mounts or changes place.
+  const [dragged, setDragged] = createSignal(null);
+  const [dropTarget, setDropTarget] = createSignal(null);
+  let claimedDragOver = null;
+  let refocusId = null;
+  const endDrag = () => {
+    setDragged(null);
+    setDropTarget(null);
+  };
+  const requestMove = (move, keepFocus) => {
+    if (!move || !props.onMove) return;
+    refocusId = keepFocus ? move.id : null;
+    props.onMove(move);
+  };
+
   // Items arrive through an accessor so a changed nested list reconciles rows by identity instead of rebuilding the list.
-  const renderItems = (value, depth, parentId) => _$createComponent(For, {
+  const renderItems = (siblings, depth, parentId) => _$createComponent(For, {
     get each() {
-      return navTreeItems(value());
+      return siblings();
     },
-    children: item => {
+    children: (item, place) => {
       const nested = createMemo(() => navTreeItems(item.children));
       const hasChildren = () => nested().length > 0;
       const selected = () => props.selectedId === item.id;
+      const siblingIndex = id => siblings().findIndex(sibling => sibling.id === id);
+      const movable = () => Boolean(props.onMove && item.movable && !item.disabled);
       let treeItem;
+      const ownRow = () => treeItem?.firstElementChild;
+
+      // A new row for the moved item, or the same row at its new place: moving a focused row drops its focus.
+      createEffect(() => {
+        place();
+        if (refocusId !== item.id) return;
+        queueMicrotask(() => {
+          if (refocusId !== item.id || !treeItem?.isConnected) return;
+          const active = treeItem.ownerDocument.activeElement;
+          if (!active || active === treeItem.ownerDocument.body) treeItem.focus({
+            preventScroll: true
+          });
+        });
+      });
       const activate = event => {
         if (item.disabled) return;
         treeItem?.focus({
@@ -856,6 +919,13 @@ const AppWorkspaceNavTree = props => {
       };
       const onKeyDown = event => {
         if (event.target !== event.currentTarget) return;
+        if (event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey && (event.key === "ArrowUp" || event.key === "ArrowDown")) {
+          if (!movable()) return;
+          event.preventDefault();
+          const from = siblingIndex(item.id);
+          requestMove(navTreeMove(siblings(), from, event.key === "ArrowUp" ? from - 1 : from + 2, parentId ?? null), true);
+          return;
+        }
         if (event.altKey || event.ctrlKey || event.metaKey) return;
         const items = treeItemElements();
         const index = items.indexOf(event.currentTarget);
@@ -909,21 +979,26 @@ const AppWorkspaceNavTree = props => {
           return rowIcon();
         },
         get children() {
-          return _$ssr(_tmpl$23, _$ssrAttribute("data-k2b-nav-tree-toggle", usesIconDisclosure() ? "" : _$escape(undefined, true), false), _$ssrAttribute("class", _$escape(iconClass(rowIcon()), true), false));
+          return _$ssrElement("span", _$mergeProps({
+            "class": "k2b-app-workspace__sidebar-item-icon",
+            get ["data-k2b-nav-tree-toggle"]() {
+              return usesIconDisclosure() ? "" : undefined;
+            }
+          }, () => iconAccessibility(item.iconLabel)), _$ssr(_tmpl$19, _$ssrAttribute("class", _$escape(iconClass(rowIcon()), true), false)), false);
         }
-      }), _$ssr(_tmpl$24, _$escape(item.label)), _$createComponent(Show, {
+      }), _$ssr(_tmpl$23, _$escape(item.label)), _$createComponent(Show, {
         get when() {
           return item.meta !== undefined;
         },
         get children() {
-          return _$ssr(_tmpl$25, `k2b-app-workspace__sidebar-item-meta ${hasChildren() ? "" : "k2b-app-workspace__nav-tree-leaf-meta"}`, _$ssrAttribute("data-visibility", item.metaVisibility === "hover" ? "hover" : _$escape(undefined, true), false), _$escape(item.meta));
+          return _$ssr(_tmpl$24, `k2b-app-workspace__sidebar-item-meta ${hasChildren() ? "" : "k2b-app-workspace__nav-tree-leaf-meta"}`, _$ssrAttribute("data-visibility", item.metaVisibility === "hover" ? "hover" : _$escape(undefined, true), false), _$escape(item.meta));
         }
       }), _$createComponent(Show, {
         get when() {
           return _$memo(() => !!hasChildren())() && !usesIconDisclosure();
         },
         get children() {
-          return _$ssr(_tmpl$26, `ti ${isExpanded(item.id) ? "ti-chevron-down" : "ti-chevron-right"}`);
+          return _$ssr(_tmpl$25, `ti ${isExpanded(item.id) ? "ti-chevron-down" : "ti-chevron-right"}`);
         }
       })];
       const row = () => _$createComponent(AppWorkspaceSidebarRow, {
@@ -978,17 +1053,88 @@ const AppWorkspaceNavTree = props => {
         },
         children: rowContent
       });
-      return _$ssr(_tmpl$28, _$ssrAttribute("aria-level", _$escape(depth, true) + 1, false) + _$ssrAttribute("aria-selected", _$escape(selected(), true), false) + _$ssrAttribute("aria-expanded", hasChildren() ? _$escape(isExpanded(item.id), true) : _$escape(undefined, true), false) + _$ssrAttribute("aria-disabled", item.disabled ? "true" : _$escape(undefined, true), false) + _$ssrAttribute("tabindex", item.disabled ? -1 : tabStopId() === item.id ? 0 : -1, false) + _$ssrAttribute("data-k2b-nav-tree-id", _$escape(item.id, true), false) + _$ssrAttribute("data-k2b-nav-tree-parent-id", _$escape(parentId, true), false), _$escape(row()), _$escape(_$createComponent(Show, {
+
+      // A gap is offered only next to a sibling's own row, never over its sub-items.
+      const dropMove = event => {
+        const drag = dragged();
+        const row = ownRow();
+        if (!drag || !event.dataTransfer?.types.includes(NAV_TREE_DRAG_TYPE)) return null;
+        if (drag.parentId !== (parentId ?? null) || drag.id === item.id || !row?.contains(event.target)) return null;
+        const rect = row.getBoundingClientRect();
+        const side = event.clientY < rect.top + rect.height / 2 ? "before" : "after";
+        const slot = siblingIndex(item.id) + (side === "after" ? 1 : 0);
+        const move = navTreeMove(siblings(), siblingIndex(drag.id), slot, parentId ?? null);
+        return move ? {
+          side,
+          move
+        } : null;
+      };
+      const onDragStart = event => {
+        const row = ownRow();
+        if (!movable() || !row?.contains(event.target)) return;
+        event.stopPropagation();
+        setDragged({
+          id: item.id,
+          parentId: parentId ?? null
+        });
+        if (!event.dataTransfer) return;
+        event.dataTransfer.effectAllowed = "move";
+        event.dataTransfer.setData(NAV_TREE_DRAG_TYPE, item.id);
+        const rect = row.getBoundingClientRect();
+        event.dataTransfer.setDragImage(row, event.clientX - rect.left, event.clientY - rect.top);
+      };
+      const onDragOver = event => {
+        callDragHandler(item.onDragOver, event);
+        const target = dropMove(event);
+        if (!target) return;
+        event.preventDefault();
+        if (event.dataTransfer) event.dataTransfer.dropEffect = "move";
+        claimedDragOver = event;
+        setDropTarget({
+          id: item.id,
+          side: target.side
+        });
+      };
+      const onDrop = event => {
+        callDragHandler(item.onDrop, event);
+        const target = dropMove(event);
+        if (!target) return;
+        event.preventDefault();
+        event.stopPropagation();
+        endDrag();
+        requestMove(target.move, false);
+      };
+      return _$ssr(_tmpl$27, _$ssrAttribute("aria-level", _$escape(depth, true) + 1, false) + _$ssrAttribute("aria-setsize", _$escape(siblings().length, true), false) + _$ssrAttribute("aria-posinset", _$escape(place(), true) + 1, false) + _$ssrAttribute("aria-selected", _$escape(selected(), true), false) + _$ssrAttribute("aria-expanded", hasChildren() ? _$escape(isExpanded(item.id), true) : _$escape(undefined, true), false) + _$ssrAttribute("aria-disabled", item.disabled ? "true" : _$escape(undefined, true), false) + _$ssrAttribute("tabindex", item.disabled ? -1 : tabStopId() === item.id ? 0 : -1, false) + _$ssrAttribute("draggable", movable() ? _$escape(true, true) : _$escape(undefined, true), false) + _$ssrAttribute("data-k2b-nav-tree-id", _$escape(item.id, true), false) + _$ssrAttribute("data-k2b-nav-tree-parent-id", _$escape(parentId, true), false) + _$ssrAttribute("data-k2b-nav-tree-dragging", dragged()?.id === item.id ? "" : _$escape(undefined, true), false) + _$ssrAttribute("data-k2b-nav-tree-drop", dropTarget()?.id === item.id ? _$escape(dropTarget().side, true) : _$escape(undefined, true), false), _$ssrStyleProperty("--k2b-nav-tree-depth:", _$escape(String(props.indented === false ? 0 : depth), true)), _$escape(row()), _$escape(_$createComponent(Show, {
         get when() {
           return _$memo(() => !!hasChildren())() && isExpanded(item.id);
         },
         get children() {
-          return _$ssr(_tmpl$27, _$escape(renderItems(nested, depth + 1, item.id)));
+          return _$ssr(_tmpl$26, _$escape(renderItems(nested, depth + 1, item.id)));
         }
       })));
     }
   });
-  return _$ssr(_tmpl$29, `k2b-app-workspace__nav-tree ${_$escape(props.class ?? "", true)}`, _$ssrAttribute("aria-label", _$escape(props.ariaLabel, true), false), _$escape(renderItems(roots, 0)));
+
+  // Any other click or focus is the person's choice; only the moved item itself keeps its claim.
+  const forgetRefocus = event => {
+    if (event.type === "pointerdown" || event.target?.dataset?.k2bNavTreeId !== refocusId) refocusId = null;
+  };
+  // A row replaced during a drag never receives its dragend; the next pointer movement means the drag is over.
+  const forgetDrag = () => {
+    if (dragged()) endDrag();
+  };
+  onMount(() => {
+    const doc = root?.ownerDocument;
+    doc?.addEventListener("pointerdown", forgetRefocus, true);
+    doc?.addEventListener("focusin", forgetRefocus, true);
+    doc?.addEventListener("pointermove", forgetDrag, true);
+    onCleanup(() => {
+      doc?.removeEventListener("pointerdown", forgetRefocus, true);
+      doc?.removeEventListener("focusin", forgetRefocus, true);
+      doc?.removeEventListener("pointermove", forgetDrag, true);
+    });
+  });
+  return _$ssr(_tmpl$28, `k2b-app-workspace__nav-tree ${_$escape(props.class ?? "", true)}`, _$ssrAttribute("aria-label", _$escape(props.ariaLabel, true), false), _$escape(renderItems(roots, 0)));
 };
 AppWorkspaceNavTree.Item = AppWorkspaceNavTreeItem;
 const AppWorkspaceSidebarIconGrid = props => _$ssrElement("section", _$mergeProps({
@@ -1000,9 +1146,9 @@ const AppWorkspaceSidebarIconGrid = props => _$ssrElement("section", _$mergeProp
     return props.title;
   },
   children: title => _$ssr(_tmpl$12, _$escape(title()))
-})), _$ssr(_tmpl$30, _$ssrAttribute("data-columns", _$escape(props.columns ?? 2, true), false), _$escape(props.children))], false);
+})), _$ssr(_tmpl$29, _$ssrAttribute("data-columns", _$escape(props.columns ?? 2, true), false), _$escape(props.children))], false);
 const AppWorkspaceSidebarIconAction = props => {
-  const content = _$ssr(_tmpl$31, _$ssrAttribute("class", _$escape(iconClass(props.icon), true), false));
+  const content = _$ssr(_tmpl$30, _$ssrAttribute("class", _$escape(iconClass(props.icon), true), false));
   const attrs = () => ({
     class: `k2b-app-workspace__sidebar-icon-action ${props.active ? "is-active" : ""}`,
     title: props.label,
@@ -1068,7 +1214,7 @@ const AppWorkspace = props => {
       return props.resizable !== false;
     },
     get children() {
-      return _$ssr(_tmpl$32, `k2b-app-workspace ${_$escape(props.class ?? "", true)}`, _$ssrAttribute("data-mobile-surface", _$escape(props.mobileSurface, true), false) + _$ssrAttribute("data-sidebar-collapsed", initialLayoutState()?.sidebarCollapsed === undefined ? _$escape(undefined, true) : _$escape(String(initialLayoutState()?.sidebarCollapsed), true), false) + _$ssrAttribute("data-workspace-resizable", props.resizable === false ? "false" : "true", false), _$ssrStyle(appWorkspaceLayoutStyle(initialLayoutState())), _$escape(props.children));
+      return _$ssr(_tmpl$31, `k2b-app-workspace ${_$escape(props.class ?? "", true)}`, _$ssrAttribute("data-mobile-surface", _$escape(props.mobileSurface, true), false) + _$ssrAttribute("data-sidebar-collapsed", initialLayoutState()?.sidebarCollapsed === undefined ? _$escape(undefined, true) : _$escape(String(initialLayoutState()?.sidebarCollapsed), true), false) + _$ssrAttribute("data-workspace-resizable", props.resizable === false ? "false" : "true", false), _$ssrStyle(appWorkspaceLayoutStyle(initialLayoutState())), _$escape(props.children));
     }
   });
 };
@@ -1080,7 +1226,7 @@ AppWorkspace.LayoutStateProvider = props => _$createComponent(LayoutStateContext
     return props.children;
   }
 });
-AppWorkspace.Content = props => _$ssr(_tmpl$33, `k2b-app-workspace__content ${_$escape(props.class ?? "", true)}`, _$escape(props.children));
+AppWorkspace.Content = props => _$ssr(_tmpl$32, `k2b-app-workspace__content ${_$escape(props.class ?? "", true)}`, _$escape(props.children));
 AppWorkspace.Main = AppWorkspaceMain;
 AppWorkspace.MainPane = AppWorkspaceMainPane;
 AppWorkspace.Detail = AppWorkspaceDetail;