@dxos/react-ui-mosaic 0.3.3-main.97c2b9e → 0.3.3-main.ad8134b

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

@@ -1,4 +1,4 @@
-import { Schema as SchemaType } from '@dxos/client/echo';
+import { Schema } from '@dxos/client/echo';
 import { type TypedObject } from '@dxos/echo-schema';
 export declare const range: <T>(fn: (i: number) => T | undefined, length: number) => T[];
 export type TestItem = {
@@ -6,11 +6,11 @@ export type TestItem = {
     type: string;
 } & Record<string, any>;
 type ObjectDataGenerator = {
-    createSchema?: () => SchemaType;
+    createSchema?: () => Schema;
     createData: () => any;
 };
 type ObjectFactory<T extends TypedObject> = {
-    schema?: SchemaType;
+    schema?: Schema;
     createObject: () => T;
 };
 type ObjectFactoryMap = {
@@ -30,7 +30,7 @@ export declare class TestObjectGenerator {
         types?: string[];
         factories?: ObjectFactoryMap;
     });
-    get schema(): SchemaType[];
+    get schema(): Schema[];
     createObject({ types }?: {
         types?: string[];
     }): any;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/testing/generator.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAW,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG9D,eAAO,MAAM,KAAK,cAAe,MAAM,4BAA4B,MAAM,QAG9C,CAAC;AAG5B,MAAM,MAAM,QAAQ,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE1E,KAAK,mBAAmB,GAAG;IACzB,YAAY,CAAC,EAAE,MAAM,UAAU,CAAC;IAChC,UAAU,EAAE,MAAM,GAAG,CAAC;CACvB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,WAAW,IAAI;IAC1C,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;AAW/D,eAAO,MAAM,MAAM,UAAgC,CAAC;AACpD,eAAO,MAAM,QAAQ,UAAkB,CAAC;AAExC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAAA;CA6CpE,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,SAAgB,SAAS,EAAE,gBAAgB,CAAC;gBAEhC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,gBAAgB,CAAA;KAAO;IASzF,IAAI,MAAM,IAAI,UAAU,EAAE,CAEzB;IAED,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO;IAMjD,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAGtE"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/testing/generator.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAW,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG9D,eAAO,MAAM,KAAK,cAAe,MAAM,4BAA4B,MAAM,QAG9C,CAAC;AAG5B,MAAM,MAAM,QAAQ,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE1E,KAAK,mBAAmB,GAAG;IACzB,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,CAAC;CACvB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,WAAW,IAAI;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;AAW/D,eAAO,MAAM,MAAM,UAAgC,CAAC;AACpD,eAAO,MAAM,QAAQ,UAAkB,CAAC;AAExC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAAA;CA6CpE,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,SAAgB,SAAS,EAAE,gBAAgB,CAAC;gBAEhC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,gBAAgB,CAAA;KAAO;IASzF,IAAI,MAAM,IAAI,MAAM,EAAE,CAErB;IAED,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO;IAMjD,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAGtE"}

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

@@ -1,5 +1,4 @@
 export * from './decorators';
 export * from './generator';
-export * from './next-fractional-index';
 export * from './Cards';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AAExC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAE5B,cAAc,SAAS,CAAC"}

package/dist/types/src/views/Tree/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../../../src/views/Tree/testing.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,KAAK,EAA2B,MAAM,iBAAiB,CAAC;AAItE,OAAO,EAAQ,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAC;AAM7D,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACtC,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,QAAQ,uCAAiD,aAAa,gBA0DlF,CAAC;AAEF,eAAO,MAAM,WAAW,aAqBvB,CAAC;AAcF,eAAO,MAAM,SAAS;QAAgD,MAAM;;WAAwB,OAAO;iBAuC1G,CAAC"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../../../src/views/Tree/testing.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,KAAK,EAA2B,MAAM,iBAAiB,CAAC;AAItE,OAAO,EAAQ,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAC;AAM7D,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACtC,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,QAAQ,uCAAiD,aAAa,gBA0DlF,CAAC;AAEF,eAAO,MAAM,WAAW,aAqBvB,CAAC;AAcF,eAAO,MAAM,SAAS;QAAgD,MAAM;;WAAwB,OAAO;iBAsC1G,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-mosaic",
-  "version": "0.3.3-main.97c2b9e",
+  "version": "0.3.3-main.ad8134b",
   "description": "An intermediate interface for drag-and-drop interactions.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -21,18 +21,17 @@
     "@dnd-kit/utilities": "^3.2.0",
     "@preact/signals-core": "^1.5.0",
     "@radix-ui/react-compose-refs": "^1.0.0",
-    "@tldraw/indices": "2.0.0-alpha.14",
     "deepsignal": "1.4.0-shallow.0",
     "lodash.defaultsdeep": "^4.6.1",
     "lodash.pick": "^4.4.0",
     "react-resize-detector": "^7.1.2",
-    "@dxos/debug": "0.3.3-main.97c2b9e",
-    "@dxos/invariant": "0.3.3-main.97c2b9e",
-    "@dxos/keys": "0.3.3-main.97c2b9e",
-    "@dxos/react-ui": "0.3.3-main.97c2b9e",
-    "@dxos/react-ui-theme": "0.3.3-main.97c2b9e",
-    "@dxos/react-ui-types": "0.3.3-main.97c2b9e",
-    "@dxos/util": "0.3.3-main.97c2b9e"
+    "@dxos/debug": "0.3.3-main.ad8134b",
+    "@dxos/invariant": "0.3.3-main.ad8134b",
+    "@dxos/keys": "0.3.3-main.ad8134b",
+    "@dxos/react-ui": "0.3.3-main.ad8134b",
+    "@dxos/react-ui-theme": "0.3.3-main.ad8134b",
+    "@dxos/react-ui-types": "0.3.3-main.ad8134b",
+    "@dxos/util": "0.3.3-main.ad8134b"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.0.2",
@@ -42,16 +41,16 @@
     "@types/lodash.pick": "^4.4.7",
     "@types/react": "^18.0.21",
     "@types/react-dom": "^18.0.6",
-    "chromatic": "^6.17.0",
+    "chromatic": "^7.5.0",
     "d3": "^7.4.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.3.9",
     "vite-plugin-turbosnap": "^1.0.2",
-    "@dxos/app-graph": "0.3.3-main.97c2b9e",
-    "@dxos/echo-schema": "0.3.3-main.97c2b9e",
-    "@dxos/gem-core": "0.3.3-main.97c2b9e",
-    "@dxos/react-client": "0.3.3-main.97c2b9e"
+    "@dxos/app-graph": "0.3.3-main.ad8134b",
+    "@dxos/echo-schema": "0.3.3-main.ad8134b",
+    "@dxos/gem-core": "0.3.3-main.ad8134b",
+    "@dxos/react-client": "0.3.3-main.ad8134b"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.0.5",

package/src/testing/generator.ts

@@ -8,7 +8,7 @@
 
 import { faker } from '@faker-js/faker';
 
-import { Schema as SchemaType } from '@dxos/client/echo';
+import { Schema } from '@dxos/client/echo';
 import { Expando, type TypedObject } from '@dxos/echo-schema';
 
 // TODO(burdon): Util.
@@ -21,12 +21,12 @@ export const range = <T>(fn: (i: number) => T | undefined, length: number): T[]
 export type TestItem = { id: string; type: string } & Record<string, any>;
 
 type ObjectDataGenerator = {
-  createSchema?: () => SchemaType;
+  createSchema?: () => Schema;
   createData: () => any;
 };
 
 type ObjectFactory<T extends TypedObject> = {
-  schema?: SchemaType; // TODO(burdon): Support both typed and expando schema.
+  schema?: Schema; // TODO(burdon): Support both typed and expando schema.
   createObject: () => T;
 };
 
@@ -62,23 +62,23 @@ export const defaultGenerators: { [type: string]: ObjectDataGenerator } = {
 
   project: {
     createSchema: () =>
-      new SchemaType({
+      new Schema({
         props: [
           {
             id: 'title',
-            type: SchemaType.PropType.STRING,
+            type: Schema.PropType.STRING,
           },
           {
             id: 'repo',
-            type: SchemaType.PropType.STRING,
+            type: Schema.PropType.STRING,
           },
           {
             id: 'status',
-            type: SchemaType.PropType.STRING,
+            type: Schema.PropType.STRING,
           },
           {
             id: 'priority',
-            type: SchemaType.PropType.NUMBER,
+            type: Schema.PropType.NUMBER,
           },
         ],
       }),
@@ -106,7 +106,7 @@ export class TestObjectGenerator {
       }, {});
   }
 
-  get schema(): SchemaType[] {
+  get schema(): Schema[] {
     return Object.values(this.factories).map((f) => f.schema!);
   }
 

package/src/testing/index.ts

@@ -4,6 +4,5 @@
 
 export * from './decorators';
 export * from './generator';
-export * from './next-fractional-index';
 
 export * from './Cards';

package/src/views/Tree/testing.tsx

@@ -11,7 +11,7 @@ import { arrayMove } from '@dxos/util';
 
 import { Tree, type TreeData, type TreeProps } from './Tree';
 import { type MosaicDropEvent, type MosaicMoveEvent, Path, type MosaicOperation } from '../../mosaic';
-import { TestObjectGenerator, nextRearrangeIndex } from '../../testing';
+import { TestObjectGenerator } from '../../testing';
 
 const fake = faker.helpers.fake;
 
@@ -134,8 +134,7 @@ 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';
+        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 });

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 '@dxos/app-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,iBAAiB,CAAC;AAE5C,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/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 '@dxos/app-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';
-  }
-};