@dxos/react-ui-mosaic 0.3.3-main.88f4df1 → 0.3.3-main.971c74a

package/src/views/Stack/Columns.stories.tsx

@@ -36,7 +36,7 @@ export default {
   },
 };
 
-export const Adopt = {
+export const Transfer = {
   args: {
     Component: SimpleCard,
     debug: true,

package/src/views/Stack/testing.tsx

@@ -26,7 +26,7 @@ export const DemoStack = ({
   types,
   count = 8,
   direction = 'vertical',
-  operation = 'adopt',
+  operation = 'transfer',
   debug,
 }: DemoStackProps) => {
   const [items, setItems] = useState<MosaicDataItem[]>(() => {

package/src/views/Tree/Tree.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useMemo } from 'react';
 
 import { Card, Tree as TreeComponent, TreeItem as TreeItemComponent } from '@dxos/react-ui';
 import { dropRing, mx } from '@dxos/react-ui-theme';
@@ -15,7 +15,7 @@ import {
   useContainer,
   useMosaic,
   Path,
-  useSortedItems,
+  useItemsWithPreview,
   type MosaicCompareDataItem,
 } from '../../mosaic';
 
@@ -55,13 +55,16 @@ export const Tree = ({ id, Component = TreeItem, onOver, onDrop, items = [], deb
 };
 
 const TreeRoot = ({ items }: { items: TreeData[] }) => {
-  const { id, Component } = useContainer();
-  const sortedItems = useSortedItems(items);
+  const { id, Component, compare } = useContainer();
+  const sortedItems = useMemo(() => {
+    return compare ? [...items].sort(compare) : items;
+  }, [items, compare]);
+  const itemsWithPreview = useItemsWithPreview({ items: sortedItems, path: id, strategy: 'layout-stable' });
 
   return (
     <TreeComponent.Root classNames='flex flex-col'>
-      <Mosaic.SortableContext id={id} items={sortedItems} direction='vertical'>
-        {sortedItems.map((item, index) => (
+      <Mosaic.SortableContext id={id} items={itemsWithPreview} direction='vertical'>
+        {itemsWithPreview.map((item, index) => (
           <TreeItemComponent.Root key={item.id} collapsible defaultOpen>
             <Mosaic.SortableTile item={item} path={id} position={index} Component={Component!} />
           </TreeItemComponent.Root>
@@ -101,13 +104,16 @@ const TreeItem: MosaicTileComponent<TreeData> = forwardRef(
 
 const TreeBranch = ({ path, items }: { path: string; items: TreeData[] }) => {
   const { operation, overItem } = useMosaic();
-  const { Component } = useContainer();
-  const sortedItems = useSortedItems(items);
+  const { Component, compare } = useContainer();
+  const sortedItems = useMemo(() => {
+    return compare ? [...items].sort(compare) : items;
+  }, [items, compare]);
+  const itemsWithPreview = useItemsWithPreview({ items: sortedItems, path, strategy: 'layout-stable' });
 
   return (
     <TreeItemComponent.Body className='pis-4'>
-      <Mosaic.SortableContext id={path} items={sortedItems} direction='vertical'>
-        {sortedItems.map((child, index) => (
+      <Mosaic.SortableContext id={path} items={itemsWithPreview} direction='vertical'>
+        {itemsWithPreview.map((child, index) => (
           <TreeComponent.Branch key={child.id}>
             <TreeItemComponent.Root collapsible defaultOpen>
               <Mosaic.SortableTile
@@ -116,7 +122,7 @@ const TreeBranch = ({ path, items }: { path: string; items: TreeData[] }) => {
                 position={index}
                 Component={Component!}
                 isOver={
-                  overItem?.path === Path.create(path, child.id) && (operation === 'adopt' || operation === 'copy')
+                  overItem?.path === Path.create(path, child.id) && (operation === 'transfer' || operation === 'copy')
                 }
               />
             </TreeItemComponent.Root>

package/src/views/Tree/testing.tsx

@@ -5,13 +5,13 @@
 import { faker } from '@faker-js/faker';
 import React, { useCallback, useState } from 'react';
 
-import { type Graph, GraphBuilder, type Node } from '@braneframe/plugin-graph';
-import { buildGraph } from '@braneframe/plugin-graph/testing';
+import { type Graph, GraphBuilder, type Node } from '@dxos/app-graph';
+import { buildGraph } from '@dxos/app-graph/testing';
 import { arrayMove } from '@dxos/util';
 
 import { Tree, type TreeData, type TreeProps } from './Tree';
-import { type MosaicDropEvent, type MosaicMoveEvent, Path } from '../../mosaic';
-import { TestObjectGenerator, nextRearrangeIndex } from '../../testing';
+import { type MosaicDropEvent, type MosaicMoveEvent, Path, type MosaicOperation } from '../../mosaic';
+import { TestObjectGenerator } from '../../testing';
 
 const fake = faker.helpers.fake;
 
@@ -47,8 +47,8 @@ export const DemoTree = ({ id = 'tree', initialItems, types, debug }: DemoTreePr
       }),
   );
 
-  const handleOver = useCallback(({ active, over }: MosaicMoveEvent<number>) => {
-    return !(active.path === id && over.path !== id) ? 'adopt' : 'reject';
+  const handleOver = useCallback(({ over }: MosaicMoveEvent<number>) => {
+    return over && Path.hasChild(id, over.path) ? 'transfer' : 'reject';
   }, []);
 
   // NOTE: Does not handle deep operations.
@@ -67,8 +67,8 @@ export const DemoTree = ({ id = 'tree', initialItems, types, debug }: DemoTreePr
             if (Path.last(Path.parent(active.path)) === item.id) {
               children.splice(active.position!, 1);
             }
-            if (Path.last(Path.parent(over.path)) === item.id) {
-              children.splice(over.position!, 0, active.item as TreeData);
+            if (Path.last(over.path) === item.id) {
+              children.push(active.item as TreeData);
             }
             return { ...item, children };
           }),
@@ -117,7 +117,6 @@ const graphNodeCompare = (a: Node, b: Node) => {
 };
 
 export const GraphTree = ({ id, graph = createGraph(), debug }: { id: string; graph?: Graph; debug: boolean }) => {
-  // TODO(wittjosiah): This graph does not handle order currently.
   const handleDrop = ({ operation, active, over }: MosaicDropEvent<number>) => {
     // Moving within the tree.
     if (Path.hasDescendent(id, active.path) && Path.hasDescendent(id, over.path)) {
@@ -135,20 +134,22 @@ export const GraphTree = ({ id, graph = createGraph(), debug }: { id: string; gr
         operation === 'rearrange'
       ) {
         // This is a rearrange operation
-        const nextIndex = nextRearrangeIndex(activeParent.children.sort(graphNodeCompare), activeNode.id, overNode.id);
-        activeNode.properties.index = nextIndex ?? 'a0';
-      } else if (activeNode && activeParent && overParent && operation === 'adopt') {
+        console.warn('[react-ui-mosaic]', 'Tree', 'rearrange', 'needs implementation');
+      } else if (activeNode && activeParent && overParent && operation === 'transfer') {
         activeParent.removeNode(active.item.id);
         overNode.addNode('tree', { ...activeNode });
       }
     }
   };
 
+  const handleOver = (): MosaicOperation => 'transfer';
+
   return (
     <Tree
       id={id}
       items={graph.root.children as TreeData[]}
       onDrop={handleDrop}
+      onOver={handleOver}
       debug={debug}
       compare={graphNodeCompare}
     />

package/dist/types/src/mosaic/hooks/useSortedItems.d.ts

@@ -1,6 +0,0 @@
-import { type MosaicDataItem } from '../types';
-/**
- * Returns a sorted collection of items if a compare function is provided.
- */
-export declare const useSortedItems: <T extends MosaicDataItem>(items: T[]) => T[];
-//# sourceMappingURL=useSortedItems.d.ts.map

package/dist/types/src/mosaic/hooks/useSortedItems.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSortedItems.d.ts","sourceRoot":"","sources":["../../../../../src/mosaic/hooks/useSortedItems.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAE/C;;GAEG;AACH,eAAO,MAAM,cAAc,+CAG1B,CAAC"}

package/dist/types/src/testing/next-fractional-index.d.ts

@@ -1,5 +0,0 @@
-import { type UniqueIdentifier } from '@dnd-kit/core';
-import { type Node } from '@braneframe/plugin-graph';
-export declare const nextRearrangeIndex: (nodes: Node[], activeId: UniqueIdentifier, overId?: UniqueIdentifier) => string | null;
-export declare const nextCopyIndex: (nodes: Node[], overId?: UniqueIdentifier) => string;
-//# sourceMappingURL=next-fractional-index.d.ts.map

package/dist/types/src/testing/next-fractional-index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"next-fractional-index.d.ts","sourceRoot":"","sources":["../../../../src/testing/next-fractional-index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGtD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD,eAAO,MAAM,kBAAkB,UAAW,IAAI,EAAE,YAAY,gBAAgB,WAAW,gBAAgB,kBAYtG,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,IAAI,EAAE,WAAW,gBAAgB,WAYrE,CAAC"}

package/src/mosaic/hooks/useSortedItems.ts

@@ -1,14 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import { useContainer } from './useContainer';
-import { type MosaicDataItem } from '../types';
-
-/**
- * Returns a sorted collection of items if a compare function is provided.
- */
-export const useSortedItems = <T extends MosaicDataItem>(items: T[]): T[] => {
-  const { compare } = useContainer();
-  return compare ? [...items].sort(compare) : items;
-};

package/src/testing/next-fractional-index.ts

@@ -1,36 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import { type UniqueIdentifier } from '@dnd-kit/core';
-import { getIndexAbove, getIndexBelow, getIndexBetween } from '@tldraw/indices';
-
-import { type Node } from '@braneframe/plugin-graph';
-
-export const nextRearrangeIndex = (nodes: Node[], activeId: UniqueIdentifier, overId?: UniqueIdentifier) => {
-  const overOrderIndex = nodes.length > 0 ? nodes.findIndex(({ id }) => id === overId) : -1;
-  if (overOrderIndex >= 0) {
-    const activeOrderIndex = nodes.findIndex(({ id }) => id === activeId);
-    return overOrderIndex < 1
-      ? getIndexBelow(nodes[overOrderIndex].properties.index)
-      : activeOrderIndex < overOrderIndex
-      ? getIndexBetween(nodes[overOrderIndex].properties.index, nodes[overOrderIndex + 1]?.properties.index)
-      : getIndexBetween(nodes[overOrderIndex - 1].properties.index, nodes[overOrderIndex].properties.index);
-  } else {
-    return null;
-  }
-};
-
-export const nextCopyIndex = (nodes: Node[], overId?: UniqueIdentifier) => {
-  const overOrderIndex = nodes.length > 0 ? nodes.findIndex(({ id }) => id === overId) : -1;
-  const previewOrderIndex = nodes.findIndex(({ id }) => id.startsWith('preview--'));
-  if (overOrderIndex >= 0) {
-    return overOrderIndex < 1
-      ? getIndexBelow(nodes[overOrderIndex].properties.index)
-      : previewOrderIndex < overOrderIndex && previewOrderIndex >= 0
-      ? getIndexBetween(nodes[overOrderIndex].properties.index, nodes[overOrderIndex + 1]?.properties.index)
-      : getIndexBetween(nodes[overOrderIndex - 1].properties.index, nodes[overOrderIndex]?.properties.index);
-  } else {
-    return nodes.length ? getIndexAbove(nodes[nodes.length - 1].properties.index) : 'a0';
-  }
-};