@dxos/react-ui-list 0.7.5-labs.ea4b4c2 → 0.7.5-labs.f400bbc

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@dxos/react-ui-list",
-  "version": "0.7.5-labs.ea4b4c2",
+  "version": "0.7.5-labs.f400bbc",
   "description": "A list component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
@@ -26,16 +27,15 @@
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@preact/signals-core": "^1.6.0",
     "@radix-ui/react-context": "1.1.1",
-    "@dxos/debug": "0.7.5-labs.ea4b4c2",
-    "@dxos/echo-schema": "0.7.5-labs.ea4b4c2",
-    "@dxos/live-object": "0.7.5-labs.ea4b4c2",
-    "@dxos/invariant": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-attention": "0.7.5-labs.ea4b4c2",
-    "@dxos/log": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-text-tooltip": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-mosaic": "0.7.5-labs.ea4b4c2",
-    "@dxos/util": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-types": "0.7.5-labs.ea4b4c2"
+    "@dxos/debug": "0.7.5-labs.f400bbc",
+    "@dxos/echo-schema": "0.7.5-labs.f400bbc",
+    "@dxos/invariant": "0.7.5-labs.f400bbc",
+    "@dxos/live-object": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-text-tooltip": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-attention": "0.7.5-labs.f400bbc",
+    "@dxos/log": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-types": "0.7.5-labs.f400bbc",
+    "@dxos/util": "0.7.5-labs.f400bbc"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -45,18 +45,18 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-theme": "0.7.5-labs.ea4b4c2",
-    "@dxos/storybook-utils": "0.7.5-labs.ea4b4c2"
+    "@dxos/random": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-theme": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui": "0.7.5-labs.f400bbc",
+    "@dxos/storybook-utils": "0.7.5-labs.f400bbc"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "effect": "^3.12.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.5-labs.ea4b4c2",
-    "@dxos/react-ui-theme": "0.7.5-labs.ea4b4c2"
+    "@dxos/react-ui": "0.7.5-labs.f400bbc",
+    "@dxos/react-ui-theme": "0.7.5-labs.f400bbc"
   },
   "publishConfig": {
     "access": "public"

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

@@ -12,12 +12,12 @@ import React, { useEffect } from 'react';
 import { create, type ReactiveObject } from '@dxos/live-object';
 import { faker } from '@dxos/random';
 import { Icon } from '@dxos/react-ui';
-import { Path } from '@dxos/react-ui-mosaic';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { Tree } from './Tree';
 import { type TreeData } from './TreeItem';
 import { createTree, updateState, type TestItem } from './testing';
+import { Path } from '../../util';
 
 faker.seed(1234);
 

package/src/components/Tree/TreeItem.tsx

@@ -218,7 +218,7 @@ export const RawTreeItem = <T = any,>({
         aria-labelledby={`${id}__label`}
         parentOf={parentOf?.join(Treegrid.PARENT_OF_SEPARATOR)}
         classNames={mx(
-          'grid grid-cols-subgrid col-[tree-row] mbs-0.5 aria-[current]:bg-input',
+          'grid grid-cols-subgrid col-[tree-row] mbs-0.5 aria-[current]:bg-groupSurface',
           hoverableControls,
           hoverableFocusedKeyboardControls,
           hoverableFocusedWithinControls,

package/src/index.ts

@@ -3,3 +3,4 @@
 //
 
 export * from './components';
+export * from './util';

package/src/util/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export * from './path';

package/src/util/path.test.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { describe, expect, test } from 'vitest';
+
+import { Path } from './path';
+
+describe('paths', () => {
+  test('create', () => {
+    const path = Path.create('a', 'b', 'c');
+    expect(Path.first(path)).to.eq('a');
+    expect(Path.last(path)).to.eq('c');
+
+    expect(Path.hasRoot(path, 'a')).to.be.true;
+    expect(Path.hasRoot(path, 'x')).to.be.false;
+
+    expect(Path.hasChild(Path.create('a', 'b'), path)).to.be.true;
+    expect(Path.hasChild(Path.create('a'), path)).to.be.false;
+
+    expect(Path.hasDescendent(Path.create('a', 'b'), path)).to.be.true;
+    expect(Path.hasDescendent(Path.create('a'), path)).to.be.true;
+  });
+});

package/src/util/path.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+const SEPARATOR = '~';
+
+export const Path = {
+  create: (...args: string[]) => args.join(SEPARATOR),
+
+  parts: (path: string) => path.split(SEPARATOR),
+  length: (path: string) => path.split(SEPARATOR).length,
+  first: (path: string) => path.split(SEPARATOR)[0] ?? path,
+  last: (path: string) => path.split(SEPARATOR).at(-1) ?? path,
+  parent: (path: string) => path.split(SEPARATOR).slice(0, -1).join(SEPARATOR),
+
+  hasRoot: (path: string, id: string) => Path.first(path) === id,
+  hasChild: (path: string, compare: string) => Path.parent(compare) === path,
+  hasDescendent: (path: string, compare: string) => compare !== path && compare.startsWith(path),
+  siblings: (path: string, compare: string) => Path.parent(path) === Path.parent(compare),
+  onPath: (path: string, id: string) => Path.parts(path).includes(id),
+};