@dxos/react-ui-list 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

package/src/components/Tree/Tree.stories.tsx

@@ -2,24 +2,24 @@
 // Copyright 2024 DXOS.org
 //
 
-import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { type Instruction, extractInstruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
-import { Atom, RegistryContext, useAtomValue } from '@effect-atom/atom-react';
+import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
+import { Atom, RegistryContext } from '@effect-atom/atom-react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { Icon } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
 import { withRegistry } from '@dxos/storybook-utils';
 
 import { Path } from '../../util';
-
 import { type TestItem, createTree, updateState } from './testing';
 import { Tree } from './Tree';
+import { type TreeModel } from './TreeContext';
 import { type TreeData } from './TreeItem';
 
-faker.seed(1234);
+random.seed(1234);
 
 const tree = createTree() as TestItem;
 
@@ -27,27 +27,111 @@ const DefaultStory = ({ draggable }: { draggable?: boolean }) => {
   const registry = useContext(RegistryContext);
   const stateAtomsRef = useRef(new Map<string, Atom.Writable<{ open: boolean; current: boolean }>>());
 
-  const getOrCreateStateAtom = useCallback((path: string) => {
-    let atom = stateAtomsRef.current.get(path);
+  const getOrCreateStateAtom = useCallback((pathKey: string) => {
+    let atom = stateAtomsRef.current.get(pathKey);
     if (!atom) {
       atom = Atom.make({ open: false, current: false }).pipe(Atom.keepAlive);
-      stateAtomsRef.current.set(path, atom);
+      stateAtomsRef.current.set(pathKey, atom);
     }
     return atom;
   }, []);
 
-  const useItemState = useCallback(
-    (_path: string[]) => {
-      const path = useMemo(() => Path.create(..._path), [_path.join('~')]);
-      const atom = getOrCreateStateAtom(path);
-      return useAtomValue(atom);
-    },
+  // Build a lookup map of all items by ID.
+  const itemMap = useMemo(() => {
+    const map = new Map<string, TestItem>();
+    const walk = (item: TestItem) => {
+      map.set(item.id, item);
+      item.items?.forEach(walk);
+    };
+    walk(tree);
+    return map;
+  }, []);
+
+  // Build a child IDs map keyed by parent ID.
+  const childIdsMap = useMemo(() => {
+    const map = new Map<string, string[]>();
+    const walk = (item: TestItem) => {
+      if (item.items) {
+        map.set(
+          item.id,
+          item.items.map((child) => child.id),
+        );
+        item.items.forEach(walk);
+      }
+    };
+    // Root children.
+    map.set(
+      tree.id,
+      (tree.items ?? []).map((child) => child.id),
+    );
+    walk(tree);
+    return map;
+  }, []);
+
+  const childIdsFamily = useMemo(
+    () => Atom.family((id: string) => Atom.make(() => childIdsMap.get(id) ?? []).pipe(Atom.keepAlive)),
+    [childIdsMap],
+  );
+
+  const itemFamily = useMemo(
+    () => Atom.family((id: string) => Atom.make(() => itemMap.get(id)).pipe(Atom.keepAlive)),
+    [itemMap],
+  );
+
+  const itemPropsFamily = useMemo(
+    () =>
+      Atom.family((pathKey: string) => {
+        const id = pathKey.split('~').pop()!;
+        return Atom.make(() => {
+          const parent = itemMap.get(id);
+          if (!parent) {
+            return { id, label: id };
+          }
+          return {
+            id: parent.id,
+            label: parent.name,
+            icon: parent.icon,
+            ...((parent.items?.length ?? 0) > 0 && {
+              parentOf: parent.items!.map(({ id }) => id),
+            }),
+          };
+        }).pipe(Atom.keepAlive);
+      }),
+    [itemMap],
+  );
+
+  const itemOpenFamily = useMemo(
+    () =>
+      Atom.family((pathKey: string) => {
+        const stateAtom = getOrCreateStateAtom(pathKey);
+        return Atom.make((get) => get(stateAtom).open).pipe(Atom.keepAlive);
+      }),
     [getOrCreateStateAtom],
   );
 
+  const itemCurrentFamily = useMemo(
+    () =>
+      Atom.family((pathKey: string) => {
+        const stateAtom = getOrCreateStateAtom(pathKey);
+        return Atom.make((get) => get(stateAtom).current).pipe(Atom.keepAlive);
+      }),
+    [getOrCreateStateAtom],
+  );
+
+  const model: TreeModel<TestItem> = useMemo(
+    () => ({
+      childIds: (parentId?: string) => childIdsFamily(parentId ?? tree.id),
+      item: (id: string) => itemFamily(id),
+      itemProps: (path: string[]) => itemPropsFamily(path.join('~')),
+      itemOpen: (path: string[]) => itemOpenFamily(Path.create(...path)),
+      itemCurrent: (path: string[]) => itemCurrentFamily(Path.create(...path)),
+    }),
+    [childIdsFamily, itemFamily, itemPropsFamily, itemOpenFamily, itemCurrentFamily],
+  );
+
   const handleOpenChange = useCallback(
-    ({ path: _path, open }: { path: string[]; open: boolean }) => {
-      const path = Path.create(..._path);
+    ({ path: pathProp, open }: { path: string[]; open: boolean }) => {
+      const path = Path.create(...pathProp);
       const atom = getOrCreateStateAtom(path);
       const prev = registry.get(atom);
       registry.set(atom, { ...prev, open });
@@ -56,8 +140,8 @@ const DefaultStory = ({ draggable }: { draggable?: boolean }) => {
   );
 
   const handleSelect = useCallback(
-    ({ path: _path, current }: { path: string[]; current: boolean }) => {
-      const path = Path.create(..._path);
+    ({ path: pathProp, current }: { path: string[]; current: boolean }) => {
+      const path = Path.create(...pathProp);
       const atom = getOrCreateStateAtom(path);
       const prev = registry.get(atom);
       registry.set(atom, { ...prev, current });
@@ -89,22 +173,13 @@ const DefaultStory = ({ draggable }: { draggable?: boolean }) => {
 
   return (
     <Tree
+      model={model}
       id={tree.id}
+      rootId={tree.id}
       draggable={draggable}
-      useItems={(parent?: TestItem) => parent?.items ?? tree.items}
-      getProps={(parent: TestItem) => ({
-        id: parent.id,
-        label: parent.name,
-        icon: parent.icon,
-        ...((parent.items?.length ?? 0) > 0 && {
-          parentOf: parent.items!.map(({ id }) => id),
-        }),
-      })}
-      useIsOpen={(_path: string[]) => useItemState(_path).open}
-      useIsCurrent={(_path: string[]) => useItemState(_path).current}
       renderColumns={() => (
         <div className='flex items-center'>
-          <Icon icon='ph--placeholder--regular' size={5} />
+          <Icon icon='ph--placeholder--regular' />
         </div>
       )}
       onOpenChange={handleOpenChange}
@@ -116,7 +191,7 @@ const DefaultStory = ({ draggable }: { draggable?: boolean }) => {
 const meta = {
   title: 'ui/react-ui-list/Tree',
 
-  decorators: [withTheme, withRegistry],
+  decorators: [withTheme(), withRegistry],
   component: Tree,
   render: DefaultStory,
 } satisfies Meta<typeof Tree<TestItem>>;

package/src/components/Tree/Tree.tsx

@@ -1,20 +1,20 @@
 //
 // Copyright 2024 DXOS.org
-//
 
+import { useAtomValue } from '@effect-atom/atom-react';
 import React, { useMemo } from 'react';
 
 import { Treegrid, type TreegridRootProps } from '@dxos/react-ui';
 
-import { type TreeContextType, TreeProvider } from './TreeContext';
-import { TreeItem, type TreeItemProps } from './TreeItem';
+import { type TreeModel, TreeProvider } from './TreeContext';
+import { TreeItemById, type TreeItemByIdProps, type TreeItemProps } from './TreeItem';
 
-export type TreeProps<T extends { id: string } = any, O = any> = {
-  root?: T;
+export type TreeProps<T extends { id: string } = any> = {
+  model: TreeModel<T>;
+  rootId?: string;
   path?: string[];
   id: string;
-} & TreeContextType<T, O> &
-  Partial<Pick<TreegridRootProps, 'gridTemplateColumns' | 'classNames'>> &
+} & Partial<Pick<TreegridRootProps, 'gridTemplateColumns' | 'classNames'>> &
   Pick<
     TreeItemProps<T>,
     | 'draggable'
@@ -24,17 +24,15 @@ export type TreeProps<T extends { id: string } = any, O = any> = {
     | 'canSelect'
     | 'onOpenChange'
     | 'onSelect'
+    | 'onItemHover'
     | 'levelOffset'
   >;
 
-export const Tree = <T extends { id: string } = any, O = any>({
-  root,
+export const Tree = <T extends { id: string } = any>({
+  model,
+  rootId,
   path,
   id,
-  useItems,
-  getProps,
-  useIsOpen,
-  useIsCurrent,
   draggable = false,
   gridTemplateColumns = '[tree-row-start] 1fr min-content [tree-row-end]',
   classNames,
@@ -45,37 +43,29 @@ export const Tree = <T extends { id: string } = any, O = any>({
   canSelect,
   onOpenChange,
   onSelect,
-}: TreeProps<T, O>) => {
-  const context = useMemo(
-    () => ({
-      useItems,
-      getProps,
-      useIsOpen,
-      useIsCurrent,
-    }),
-    [useItems, getProps, useIsOpen, useIsCurrent],
-  );
-  const items = useItems(root);
+  onItemHover,
+}: TreeProps<T>) => {
+  const childIds = useAtomValue(model.childIds(rootId));
   const treePath = useMemo(() => (path ? [...path, id] : [id]), [id, path]);
 
+  const childProps: Omit<TreeItemByIdProps, 'id' | 'last'> = {
+    path: treePath,
+    levelOffset,
+    draggable,
+    renderColumns,
+    blockInstruction,
+    canDrop,
+    canSelect,
+    onOpenChange,
+    onSelect,
+    onItemHover,
+  };
+
   return (
     <Treegrid.Root gridTemplateColumns={gridTemplateColumns} classNames={classNames}>
-      <TreeProvider value={context}>
-        {items.map((item, index) => (
-          <TreeItem
-            key={item.id}
-            item={item}
-            last={index === items.length - 1}
-            path={treePath}
-            levelOffset={levelOffset}
-            draggable={draggable}
-            renderColumns={renderColumns}
-            blockInstruction={blockInstruction}
-            canDrop={canDrop}
-            canSelect={canSelect}
-            onOpenChange={onOpenChange}
-            onSelect={onSelect}
-          />
+      <TreeProvider value={model}>
+        {childIds.map((childId, index) => (
+          <TreeItemById key={childId} id={childId} last={index === childIds.length - 1} {...childProps} />
         ))}
       </TreeProvider>
     </Treegrid.Root>

package/src/components/Tree/TreeContext.tsx

@@ -2,6 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
+import { type Atom } from '@effect-atom/atom-react';
 import { createContext, useContext } from 'react';
 
 import { raise } from '@dxos/debug';
@@ -11,6 +12,10 @@ export type TreeItemDataProps = {
   id: string;
   label: Label;
   parentOf?: string[];
+  /** When `false`, the item cannot be dragged (overrides tree-level `draggable`). */
+  draggable?: boolean;
+  /** When `false`, the item does not participate as a drop target. */
+  droppable?: boolean;
   className?: string;
   headingClassName?: string;
   icon?: string;
@@ -19,16 +24,20 @@ export type TreeItemDataProps = {
   testId?: string;
 };
 
-export type TreeContextType<T = any, O = any> = {
-  useItems: (parent?: T, options?: O) => T[];
-  getProps: (item: T, parent: string[]) => TreeItemDataProps;
-  /** Hook that subscribes to and returns the open state for a tree item. */
-  useIsOpen: (path: string[], item: T) => boolean;
-  /** Hook that subscribes to and returns the current state for a tree item. */
-  useIsCurrent: (path: string[], item: T) => boolean;
-};
+export interface TreeModel<T extends { id: string } = any> {
+  /** Atom family: resolve item by ID (content). */
+  item: (id: string) => Atom.Atom<T | undefined>;
+  /** Atom family: open state keyed by path. */
+  itemOpen: (path: string[]) => Atom.Atom<boolean>;
+  /** Atom family: current (selected) state keyed by path. */
+  itemCurrent: (path: string[]) => Atom.Atom<boolean>;
+  /** Atom family: display props for an item at a given path (path includes item's own ID at end). */
+  itemProps: (path: string[]) => Atom.Atom<TreeItemDataProps>;
+  /** Atom family: outbound child IDs for a parent ID (topology). Undefined = root. */
+  childIds: (parentId?: string) => Atom.Atom<string[]>;
+}
 
-const TreeContext = createContext<null | TreeContextType>(null);
+const TreeContext = createContext<TreeModel | null>(null);
 
 export const TreeProvider = TreeContext.Provider;