@dxos/plugin-navtree 0.7.1-staging.8709ba7 → 0.7.2-main.f1adc9f

package/src/util.ts

@@ -11,26 +11,9 @@ import {
   ACTION_GROUP_TYPE,
   isAction,
 } from '@dxos/app-graph';
-import { Path } from '@dxos/react-ui-mosaic';
-import { type MaybePromise, nonNullable } from '@dxos/util';
+import { nonNullable } from '@dxos/util';
 
-import { type NodeProperties, type NavTreeItem } from './types';
-
-export type NavTreeItemGraphNode = Node<
-  any,
-  Partial<
-    NodeProperties & {
-      persistenceClass: string;
-      persistenceKey: string;
-      acceptPersistenceClass: Set<string>;
-      acceptPersistenceKey: Set<string>;
-      onRearrangeChildren: (nextOrder: NavTreeItemGraphNode[]) => MaybePromise<void>;
-      onCopy: (activeNode: NavTreeItemGraphNode, index?: number) => MaybePromise<void>;
-      onTransferStart: (activeNode: NavTreeItemGraphNode, index?: number) => MaybePromise<void>;
-      onTransferEnd: (activeNode: NavTreeItemGraphNode, destinationParent: NavTreeItemGraphNode) => MaybePromise<void>;
-    }
-  >
->;
+import { type FlattenedActions, type NavTreeItemGraphNode } from './types';
 
 export const getParent = (
   graph: Graph,
@@ -98,16 +81,6 @@ export const sortActions = (actions: Action[]): Action[] =>
     return 1;
   });
 
-export const getTreeItemNode = (treeItems: NavTreeItem[], path?: string[]): NavTreeItem | undefined => {
-  if (!path) {
-    return undefined;
-  }
-
-  return treeItems.find((treeItem) => {
-    return treeItem.path && !treeItem.path.find((id, index) => path[index] !== id);
-  });
-};
-
 export const getChildren = (
   graph: Graph,
   node: NavTreeItemGraphNode,
@@ -124,8 +97,6 @@ export const getChildren = (
     .filter(nonNullable) as NavTreeItemGraphNode[];
 };
 
-type FlattenedActions = Required<Pick<NavTreeItem, 'actions' | 'groupedActions'>>;
-
 export const getActions = (graph: Graph, node: Node): FlattenedActions => {
   return graph.actions(node).reduce(
     (acc: FlattenedActions, arg) => {
@@ -155,66 +126,3 @@ export const expandChildren = (graph: Graph, node: Node) => {
 export const expandActions = (graph: Graph, node: Node) => {
   return Promise.all([graph.expand(node, 'outbound', ACTION_TYPE), graph.expand(node, 'outbound', ACTION_GROUP_TYPE)]);
 };
-
-function* navTreeItemVisitor({
-  graph,
-  node,
-  open,
-  getItem,
-  path = [],
-  filter,
-}: {
-  graph: Graph;
-  node: NavTreeItemGraphNode;
-  open: string[];
-  getItem: (node: NavTreeItemGraphNode, parent: readonly string[], filter?: NodeFilter) => NavTreeItem;
-  path?: readonly string[];
-  filter?: NodeFilter;
-}): Generator<NavTreeItem> {
-  const stack: NavTreeItem[] = [getItem(node, path, filter)];
-  while (stack.length > 0) {
-    const nextItem = stack.pop()!;
-    if (nextItem.path.length > 1) {
-      yield nextItem;
-    }
-    const { node, path } = nextItem;
-    const children = getChildren(graph, node, filter, path);
-    const actions = graph.actions(node);
-    if (path.length === 1 || open.includes(Path.create(...path))) {
-      for (let i = actions.length - 1; i >= 0; i--) {
-        if (actions[i].properties.disposition === 'item') {
-          stack.push(getItem(actions[i], path, filter));
-        }
-      }
-      for (let i = children.length - 1; i >= 0; i--) {
-        const child = children[i] as NavTreeItemGraphNode;
-        stack.push(getItem(child, path, filter));
-      }
-    }
-  }
-}
-
-/**
- * Get a reactive tree node from a graph node.
- */
-export const treeItemsFromRootNode = (
-  graph: Graph,
-  rootNode: NavTreeItemGraphNode,
-  open: string[],
-  getItem: (node: NavTreeItemGraphNode, parent: readonly string[]) => NavTreeItem,
-  path?: readonly string[],
-  filter?: NodeFilter,
-): NavTreeItem[] => {
-  return Array.from(navTreeItemVisitor({ graph, node: rootNode, open, getItem, path, filter }));
-};
-
-export const expandOpenGraphNodes = (graph: Graph, open: string[]) => {
-  return Promise.all(
-    open
-      .map((id) => {
-        const node = graph.findNode(Path.last(id));
-        return node && expandChildrenAndActions(graph, node as NavTreeItemGraphNode);
-      })
-      .filter(nonNullable),
-  );
-};

package/dist/types/src/testing/visitor.d.ts

@@ -1,18 +0,0 @@
-import { type Instruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
-import { type NodeArg } from '@dxos/app-graph';
-import { type NavTreeItem } from '../types';
-export declare const flattenTree: (tree: NodeArg<any>, open: string[]) => NavTreeItem[];
-export declare function visitor({ node, getItem, isOpen, }: {
-    node: NodeArg<any>;
-    getItem: (node: NodeArg<any>, parent?: readonly string[]) => NavTreeItem;
-    isOpen?: (node: NavTreeItem) => boolean;
-}): Generator<NavTreeItem>;
-export declare const getItem: (arg: NodeArg<any>, parent?: readonly string[]) => NavTreeItem;
-export declare const invalidateCache: (id: string) => void;
-export declare const updateState: ({ state, instruction, source, target, }: {
-    state: NodeArg<any>;
-    instruction: Instruction;
-    source: NavTreeItem;
-    target: NavTreeItem;
-}) => void;
-//# sourceMappingURL=visitor.d.ts.map

package/dist/types/src/testing/visitor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../../src/testing/visitor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,oDAAoD,CAAC;AAEtF,OAAO,EAA2B,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAIxE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,eAAO,MAAM,WAAW,SAAU,OAAO,CAAC,GAAG,CAAC,QAAQ,MAAM,EAAE,KAAG,WAAW,EAQ3E,CAAC;AAEF,wBAAiB,OAAO,CAAC,EACvB,IAAI,EACJ,OAAO,EACP,MAAM,GACP,EAAE;IACD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,KAAK,WAAW,CAAC;IACzE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC;CACzC,GAAG,SAAS,CAAC,WAAW,CAAC,CAgBzB;AAKD,eAAO,MAAM,OAAO,QAAS,OAAO,CAAC,GAAG,CAAC,WAAW,SAAS,MAAM,EAAE,KAAG,WA6BvE,CAAC;AAEF,eAAO,MAAM,eAAe,OAAQ,MAAM,SAEzC,CAAC;AAmBF,eAAO,MAAM,WAAW,4CAKrB;IACD,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC;CACrB,SAsCA,CAAC"}

package/src/testing/visitor.ts

@@ -1,152 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { type Instruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
-
-import { isActionLike, type Node, type NodeArg } from '@dxos/app-graph';
-import { log } from '@dxos/log';
-import { Path } from '@dxos/react-ui-mosaic';
-
-import { type NavTreeItem } from '../types';
-
-export const flattenTree = (tree: NodeArg<any>, open: string[]): NavTreeItem[] => {
-  return Array.from(
-    visitor({
-      node: tree,
-      getItem,
-      isOpen: ({ path }) => open.includes(Path.create(...path)),
-    }),
-  );
-};
-
-export function* visitor({
-  node,
-  getItem,
-  isOpen,
-}: {
-  node: NodeArg<any>;
-  getItem: (node: NodeArg<any>, parent?: readonly string[]) => NavTreeItem;
-  isOpen?: (node: NavTreeItem) => boolean;
-}): Generator<NavTreeItem> {
-  const stack: [NodeArg<any>, NavTreeItem][] = [[node, getItem(node)]];
-  while (stack.length > 0) {
-    const [node, item] = stack.pop()!;
-    if (item.path.length > 1) {
-      yield item;
-    }
-
-    const children = Array.from(node.nodes ?? []);
-    if (item.path.length === 1 || isOpen?.(item)) {
-      for (let i = children.length - 1; i >= 0; i--) {
-        const child = children[i];
-        stack.push([child, getItem(child, item.path)]);
-      }
-    }
-  }
-}
-
-// Ensures that the same item is not created multiple times, causing the tree to be re-rendered.
-const itemsCache: Record<string, NavTreeItem> = {};
-
-export const getItem = (arg: NodeArg<any>, parent?: readonly string[]): NavTreeItem => {
-  const cachedItem = itemsCache[arg.id];
-  if (cachedItem) {
-    return cachedItem;
-  }
-
-  const children = arg.nodes?.filter((node) => !isActionLike(node)) ?? [];
-  const actions = arg.nodes?.filter((node) => isActionLike(node)) ?? [];
-  const node: Node = {
-    id: arg.id,
-    type: arg.type,
-    properties: arg.properties ?? {},
-    data: arg.data ?? null,
-  };
-
-  const item = {
-    id: arg.id,
-    label: arg.properties!.label,
-    icon: arg.properties!.icon,
-    path: parent ? [...parent, arg.id] : [arg.id],
-    ...(children.length > 0 && {
-      parentOf: children.map(({ id }) => id),
-    }),
-    node,
-    actions,
-    groupedActions: {},
-  };
-  itemsCache[node.id] = item;
-  return item;
-};
-
-export const invalidateCache = (id: string) => {
-  delete itemsCache[id];
-};
-
-const removeItem = (tree: NodeArg<any>, source: NavTreeItem) => {
-  const parent = getNode(tree, source.path.slice(1, -1));
-  const index = parent.nodes!.findIndex(({ id }) => id === source.id);
-  const item = parent.nodes![index];
-  parent.nodes!.splice(index, 1);
-  return item;
-};
-
-const getNode = (tree: NodeArg<any>, path: string[]) => {
-  let node = tree;
-  for (const part of path) {
-    node = node.nodes!.find(({ id }) => id === part)!;
-  }
-  return node;
-};
-
-// TODO(wittjosiah): Reconcile with react-ui-list/Tree/testing.
-export const updateState = ({
-  state,
-  instruction,
-  source,
-  target,
-}: {
-  state: NodeArg<any>;
-  instruction: Instruction;
-  source: NavTreeItem;
-  target: NavTreeItem;
-}) => {
-  switch (instruction.type) {
-    case 'reorder-above': {
-      invalidateCache(source.id);
-      const item = removeItem(state, source);
-      const parent = getNode(state, target.path.slice(1, -1));
-      const index = parent.nodes!.findIndex(({ id }) => id === target.id);
-      invalidateCache(target.id);
-      parent.nodes!.splice(index, 0, item);
-      break;
-    }
-
-    case 'reorder-below': {
-      invalidateCache(source.id);
-      const item = removeItem(state, source);
-      const parent = getNode(state, target.path.slice(1, -1));
-      const index = parent.nodes!.findIndex(({ id }) => id === target.id);
-      invalidateCache(target.id);
-      parent.nodes!.splice(index + 1, 0, item);
-      break;
-    }
-
-    case 'make-child': {
-      invalidateCache(source.id);
-      const item = removeItem(state, source);
-      const parent = getNode(state, target.path.slice(1));
-      invalidateCache(target.id);
-      parent.nodes!.push(item);
-      break;
-    }
-
-    case 'instruction-blocked':
-      break;
-
-    default:
-      log.warn('Unsupported instruction', instruction);
-      break;
-  }
-};