@dxos/plugin-explorer 0.8.4-main.e098934 → 0.8.4-main.e8ec1fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-explorer",
-  "version": "0.8.4-main.e098934",
+  "version": "0.8.4-main.e8ec1fe",
   "description": "Braneframe data visualization plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -47,57 +47,59 @@
     "3d-force-graph": "^1.76.1",
     "@observablehq/plot": "^0.6.11",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "d3": "^7.9.0",
-    "effect": "3.17.7",
+    "effect": "3.18.3",
     "force-graph": "^1.49.4",
     "lodash.defaultsdeep": "^4.6.1",
     "react-resize-detector": "^11.0.1",
     "three": "^0.178.0",
     "topojson-client": "^3.1.0",
-    "@dxos/app-framework": "0.8.4-main.e098934",
-    "@dxos/async": "0.8.4-main.e098934",
-    "@dxos/echo": "0.8.4-main.e098934",
-    "@dxos/echo-schema": "0.8.4-main.e098934",
-    "@dxos/graph": "0.8.4-main.e098934",
-    "@dxos/invariant": "0.8.4-main.e098934",
-    "@dxos/live-object": "0.8.4-main.e098934",
-    "@dxos/client": "0.8.4-main.e098934",
-    "@dxos/log": "0.8.4-main.e098934",
-    "@dxos/plugin-client": "0.8.4-main.e098934",
-    "@dxos/plugin-graph": "0.8.4-main.e098934",
-    "@dxos/plugin-search": "0.8.4-main.e098934",
-    "@dxos/react-client": "0.8.4-main.e098934",
-    "@dxos/react-ui-attention": "0.8.4-main.e098934",
-    "@dxos/plugin-space": "0.8.4-main.e098934",
-    "@dxos/react-ui-graph": "0.8.4-main.e098934",
-    "@dxos/react-ui-stack": "0.8.4-main.e098934",
-    "@dxos/schema": "0.8.4-main.e098934",
-    "@dxos/util": "0.8.4-main.e098934"
+    "@dxos/app-framework": "0.8.4-main.e8ec1fe",
+    "@dxos/async": "0.8.4-main.e8ec1fe",
+    "@dxos/client": "0.8.4-main.e8ec1fe",
+    "@dxos/echo": "0.8.4-main.e8ec1fe",
+    "@dxos/graph": "0.8.4-main.e8ec1fe",
+    "@dxos/echo-query": "0.8.4-main.e8ec1fe",
+    "@dxos/log": "0.8.4-main.e8ec1fe",
+    "@dxos/invariant": "0.8.4-main.e8ec1fe",
+    "@dxos/plugin-client": "0.8.4-main.e8ec1fe",
+    "@dxos/live-object": "0.8.4-main.e8ec1fe",
+    "@dxos/plugin-search": "0.8.4-main.e8ec1fe",
+    "@dxos/react-client": "0.8.4-main.e8ec1fe",
+    "@dxos/plugin-graph": "0.8.4-main.e8ec1fe",
+    "@dxos/plugin-space": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-components": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-graph": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-stack": "0.8.4-main.e8ec1fe",
+    "@dxos/schema": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-attention": "0.8.4-main.e8ec1fe",
+    "@dxos/types": "0.8.4-main.e8ec1fe",
+    "@dxos/util": "0.8.4-main.e8ec1fe"
   },
   "devDependencies": {
     "@types/d3": "^7.4.3",
     "@types/d3-hierarchy": "^3.1.6",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
     "@types/topojson-client": "^3.1.4",
     "@types/topojson-specification": "^1.0.5",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/echo-generator": "0.8.4-main.e098934",
-    "@dxos/react-ui-theme": "0.8.4-main.e098934",
-    "@dxos/storybook-utils": "0.8.4-main.e098934",
-    "@dxos/random": "0.8.4-main.e098934",
-    "@dxos/react-ui": "0.8.4-main.e098934"
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/echo-generator": "0.8.4-main.e8ec1fe",
+    "@dxos/random": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-theme": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui": "0.8.4-main.e8ec1fe",
+    "@dxos/storybook-utils": "0.8.4-main.e8ec1fe"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.e098934",
-    "@dxos/react-ui-theme": "0.8.4-main.e098934"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.e8ec1fe",
+    "@dxos/react-ui-theme": "0.8.4-main.e8ec1fe"
   },
   "publishConfig": {
     "access": "public"

package/src/ExplorerPlugin.tsx

@@ -10,51 +10,53 @@ import { defineObjectForm } from '@dxos/plugin-space/types';
 import { IntentResolver, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
-import { ExplorerAction, ViewType } from './types';
+import { ExplorerAction, Graph } from './types';
 
-export const ExplorerPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () =>
-        contributes(Capabilities.Metadata, {
-          id: ViewType.typename,
-          metadata: {
-            icon: 'ph--graph--regular',
-          },
+export const ExplorerPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, translations),
+  }),
+  defineModule({
+    id: `${meta.id}/module/metadata`,
+    activatesOn: Events.SetupMetadata,
+    activate: () =>
+      contributes(Capabilities.Metadata, {
+        id: Graph.Graph.typename,
+        metadata: {
+          icon: 'ph--graph--regular',
+          iconHue: 'green',
+        },
+      }),
+  }),
+  defineModule({
+    id: `${meta.id}/module/object-form`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () =>
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Graph.Graph,
+          formSchema: ExplorerAction.GraphProps,
+          hidden: true,
+          getIntent: (props, options) => createIntent(ExplorerAction.CreateGraph, { ...props, space: options.space }),
         }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: ViewType,
-            getIntent: () => createIntent(ExplorerAction.Create),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ViewType]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-  ]);
+      ),
+  }),
+  defineModule({
+    id: `${meta.id}/module/schema`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () => contributes(ClientCapabilities.Schema, [Graph.Graph]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+]);

package/src/capabilities/intent-resolver.ts

@@ -2,18 +2,20 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
+import { Capabilities, type PluginContext, contributes, createResolver } from '@dxos/app-framework';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
-import { ExplorerAction, ViewType } from '../types';
+import { ExplorerAction, Graph } from '../types';
 
-export default () =>
+export default (context: PluginContext) =>
   contributes(
     Capabilities.IntentResolver,
     createResolver({
-      intent: ExplorerAction.Create,
-      resolve: ({ name }) => ({
-        data: { object: Obj.make(ViewType, { name, type: '' }) },
-      }),
+      intent: ExplorerAction.CreateGraph,
+      resolve: async ({ space, name, typename }) => {
+        const client = context.getCapability(ClientCapabilities.Client);
+        const { view } = await Graph.makeView({ client, space, name, typename });
+        return { data: { object: view } };
+      },
     }),
   );

package/src/capabilities/react-surface.tsx

@@ -6,18 +6,22 @@ import React from 'react';
 
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
+import { View } from '@dxos/schema';
 
 import { ExplorerContainer } from '../components';
-import { EXPLORER_PLUGIN } from '../meta';
-import { ViewType } from '../types';
+import { meta } from '../meta';
+import { Graph } from '../types';
 
 export default () =>
   contributes(
     Capabilities.ReactSurface,
     createSurface({
-      id: `${EXPLORER_PLUGIN}/article`,
+      id: `${meta.id}/article`,
       role: ['article', 'section'],
-      filter: (data): data is { subject: ViewType } => Obj.instanceOf(ViewType, data.subject),
-      component: ({ data, role }) => <ExplorerContainer view={data.subject} role={role} />,
+      filter: (data): data is { subject: View.View } =>
+        Obj.instanceOf(View.View, data.subject) && Obj.instanceOf(Graph.Graph, data.subject.presentation.target),
+      component: ({ data, role }) => {
+        return <ExplorerContainer view={data.subject} role={role} />;
+      },
     }),
   );

package/src/components/Chart/Chart.stories.tsx

@@ -2,13 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta } from '@storybook/react-vite';
 import React from 'react';
 
 import { ClientRepeater } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import CitiesData from '../../../data/cities.js';
 
@@ -36,7 +34,10 @@ export const Default = () => <ClientRepeater component={Story} />;
 const meta = {
   title: 'plugins/plugin-explorer/Chart',
   component: Chart,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+  },
 } satisfies Meta<typeof Chart>;
 
 export default meta;

package/src/components/ExplorerContainer.tsx

@@ -2,33 +2,50 @@
 // Copyright 2023 DXOS.org
 //
 
-import React from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
+import { type Filter } from '@dxos/echo';
+import { QueryBuilder } from '@dxos/echo-query';
 import { useGlobalSearch } from '@dxos/plugin-search';
 import { getSpace } from '@dxos/react-client/echo';
+import { Toolbar } from '@dxos/react-ui';
+import { QueryEditor, type QueryEditorProps } from '@dxos/react-ui-components';
 import { StackItem } from '@dxos/react-ui-stack';
+import { type View } from '@dxos/schema';
 
 import { useGraphModel } from '../hooks';
-import { type ViewType } from '../types';
 
 import { D3ForceGraph } from './Graph';
 
 type ExplorerContainerProps = {
   role: string;
-  view: ViewType;
+  view: View.View;
 };
 
 const ExplorerContainer = ({ role, view }: ExplorerContainerProps) => {
   const space = getSpace(view);
-  const model = useGraphModel(space);
+  const [filter, setFilter] = useState<Filter.Any>();
+  const model = useGraphModel(space, filter);
   const { match } = useGlobalSearch();
 
+  const builder = useMemo(() => new QueryBuilder(), []);
+  const handleChange = useCallback<NonNullable<QueryEditorProps['onChange']>>((value) => {
+    setFilter(builder.build(value).filter);
+  }, []);
+
+  const showToolbar = role === 'article';
+
   if (!space || !model) {
     return null;
   }
 
   return (
-    <StackItem.Content size={role === 'section' ? 'square' : 'intrinsic'}>
+    <StackItem.Content toolbar={showToolbar}>
+      {showToolbar && (
+        <Toolbar.Root>
+          <QueryEditor db={space.db} onChange={handleChange} />
+        </Toolbar.Root>
+      )}
       <D3ForceGraph model={model} match={match} />
     </StackItem.Content>
   );

package/src/components/Globe/Globe.stories.tsx

@@ -2,8 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { dot, geo, graticule, plot, sphere } from '@observablehq/plot';
 import { type Meta } from '@storybook/react-vite';
 import { geoCircle } from 'd3';
@@ -12,7 +10,7 @@ import { useResizeDetector } from 'react-resize-detector';
 import { feature } from 'topojson-client';
 
 import { ClientRepeater } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import CitiesData from '../../../data/cities.js';
 import CountriesData from '../../../data/countries-110m.js';
@@ -83,7 +81,10 @@ const ExtendedStory = () => {
 
 const meta = {
   title: 'plugins/plugin-explorer/Globe',
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+  },
 } satisfies Meta;
 
 export default meta;

package/src/components/Graph/D3ForceGraph.stories.tsx

@@ -2,22 +2,22 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 
-import { Obj } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { DataType } from '@dxos/schema';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
+import { View } from '@dxos/schema';
 import { type ValueGenerator } from '@dxos/schema/testing';
-import { render, withLayout, withTheme } from '@dxos/storybook-utils';
+import { render } from '@dxos/storybook-utils';
+import { HasRelationship, Organization, Person, Project } from '@dxos/types';
 
 import { useGraphModel } from '../../hooks';
-import { ViewType } from '../../types';
+import { Graph } from '../../types';
 
 import { D3ForceGraph } from './D3ForceGraph';
 import { generate } from './testing';
@@ -29,11 +29,13 @@ faker.seed(1);
 const DefaultStory = () => {
   const client = useClient();
   const [space, setSpace] = useState<Space>();
-  const [view, setView] = useState<ViewType>();
-  useEffect(() => {
+  const [view, setView] = useState<View.View>();
+
+  useAsyncEffect(async () => {
     const space = client.spaces.default;
     void generate(space, generator);
-    const view = space.db.add(Obj.make(ViewType, { name: '', type: '' }));
+    const { view } = await Graph.makeView({ client, space, name: 'Test', typename: Graph.Graph.typename });
+    space.db.add(view);
     setSpace(space);
     setView(view);
   }, []);
@@ -51,13 +53,22 @@ const meta = {
   component: D3ForceGraph,
   render: render(DefaultStory),
   decorators: [
+    withTheme,
     withClientProvider({
       createSpace: true,
-      types: [ViewType, DataType.Organization, DataType.Project, DataType.Person, DataType.HasRelationship],
+      types: [
+        Graph.Graph,
+        View.View,
+        Organization.Organization,
+        Project.Project,
+        Person.Person,
+        HasRelationship.HasRelationship,
+      ],
     }),
-    withTheme,
-    withLayout({ fullscreen: true }),
   ],
+  parameters: {
+    layout: 'fullscreen',
+  },
 } satisfies Meta<typeof D3ForceGraph>;
 
 export default meta;

package/src/components/Graph/D3ForceGraph.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { type FC, useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 
 import { Obj } from '@dxos/echo';
 import { SelectionModel } from '@dxos/graph';
@@ -15,7 +15,7 @@ import {
   SVG,
   type SVGContext,
 } from '@dxos/react-ui-graph';
-import { getHashColor } from '@dxos/react-ui-theme';
+import { getHashStyles } from '@dxos/react-ui-theme';
 import { type SpaceGraphEdge, type SpaceGraphModel, type SpaceGraphNode } from '@dxos/schema';
 
 import '@dxos/react-ui-graph/styles/graph.css';
@@ -29,7 +29,7 @@ export type D3ForceGraphProps = ThemedClassName<
   } & Pick<GraphProps, 'drag'>
 >;
 
-export const D3ForceGraph: FC<D3ForceGraphProps> = ({ classNames, model, selection: _selection, grid, ...props }) => {
+export const D3ForceGraph = ({ classNames, model, selection: _selection, grid, ...props }: D3ForceGraphProps) => {
   const context = useRef<SVGContext>(null);
   const projector = useMemo<GraphForceProjector | undefined>(() => {
     if (context.current) {
@@ -85,7 +85,7 @@ export const D3ForceGraph: FC<D3ForceGraphProps> = ({ classNames, model, selecti
               const obj = node.data?.data.object;
               return {
                 data: {
-                  color: getHashColor(obj && Obj.getTypename(obj))?.color,
+                  color: getHashStyles(obj && Obj.getTypename(obj))?.hue,
                 },
                 classes: {
                   'dx-selected': selection.contains(node.id),

package/src/components/Graph/ForceGraph.stories.tsx

@@ -2,22 +2,22 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 
-import { Obj } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { DataType } from '@dxos/schema';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
+import { View } from '@dxos/schema';
 import { type ValueGenerator } from '@dxos/schema/testing';
-import { render, withLayout, withTheme } from '@dxos/storybook-utils';
+import { render } from '@dxos/storybook-utils';
+import { HasRelationship, Organization, Person, Project } from '@dxos/types';
 
 import { useGraphModel } from '../../hooks';
-import { ViewType } from '../../types';
+import { Graph } from '../../types';
 
 import { ForceGraph } from './ForceGraph';
 import { generate } from './testing';
@@ -29,11 +29,13 @@ faker.seed(1);
 const DefaultStory = () => {
   const client = useClient();
   const [space, setSpace] = useState<Space>();
-  const [view, setView] = useState<ViewType>();
-  useEffect(() => {
+  const [view, setView] = useState<View.View>();
+
+  useAsyncEffect(async () => {
     const space = client.spaces.default;
     void generate(space, generator);
-    const view = space.db.add(Obj.make(ViewType, { name: '', type: '' }));
+    const { view } = await Graph.makeView({ client, space, name: 'Test', typename: Graph.Graph.typename });
+    space.db.add(view);
     setSpace(space);
     setView(view);
   }, []);
@@ -51,13 +53,22 @@ const meta = {
   component: ForceGraph,
   render: render(DefaultStory),
   decorators: [
+    withTheme,
     withClientProvider({
       createSpace: true,
-      types: [ViewType, DataType.HasRelationship, DataType.Organization, DataType.Project, DataType.Person],
+      types: [
+        Graph.Graph,
+        View.View,
+        HasRelationship.HasRelationship,
+        Organization.Organization,
+        Project.Project,
+        Person.Person,
+      ],
     }),
-    withTheme,
-    withLayout({ fullscreen: true }),
   ],
+  parameters: {
+    layout: 'fullscreen',
+  },
 } satisfies Meta<typeof ForceGraph>;
 
 export default meta;

package/src/components/Graph/ForceGraph.tsx

@@ -20,9 +20,9 @@ export type ForceGraphProps = {
 export const ForceGraph: FC<ForceGraphProps> = ({ model, match }) => {
   const { ref, width, height } = useResizeDetector({ refreshRate: 200 });
   const rootRef = useRef<HTMLDivElement>(null);
-  const forceGraph = useRef<NativeForceGraph>();
+  const forceGraph = useRef<NativeForceGraph>(null);
 
-  const filteredRef = useRef<SearchResult[]>();
+  const filteredRef = useRef<SearchResult[]>([]);
   filteredRef.current = filterObjectsSync(model?.objects ?? [], match);
 
   const [data, setData] = useState<GraphAdapter>();
@@ -48,7 +48,7 @@ export const ForceGraph: FC<ForceGraphProps> = ({ model, match }) => {
 
     return () => {
       forceGraph.current?.pauseAnimation().graphData({ nodes: [], links: [] });
-      forceGraph.current = undefined;
+      forceGraph.current = null;
     };
   }, []);
 

package/src/components/Graph/testing.ts

@@ -4,16 +4,16 @@
 
 import { type Space } from '@dxos/client/echo';
 import { type Obj, Query, Relation } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
 import { type TypeSpec, type ValueGenerator, createObjectFactory } from '@dxos/schema/testing';
+import { HasRelationship, Organization, Person, Project } from '@dxos/types';
 import { range } from '@dxos/util';
 
 const getObject = (objects: Obj.Any[]) => objects[Math.floor(Math.random() * objects.length)];
 
 const defaultTypes: TypeSpec[] = [
-  { type: DataType.Organization, count: 5 },
-  { type: DataType.Project, count: 5 },
-  { type: DataType.Person, count: 10 },
+  { type: Organization.Organization, count: 5 },
+  { type: Project.Project, count: 5 },
+  { type: Person.Person, count: 10 },
 ];
 
 export type GenerateOptions = {
@@ -38,13 +38,13 @@ export const generate = async (
   await createObjects(spec);
 
   // Add relations between objects.
-  const { objects: contacts } = await space.db.query(Query.type(DataType.Person)).run();
+  const { objects: contacts } = await space.db.query(Query.type(Person.Person)).run();
   for (const _ of range(relations.count)) {
     const source = getObject(contacts);
     const target = getObject(contacts);
     if (source.id !== target.id) {
       space.db.add(
-        Relation.make(DataType.HasRelationship, {
+        Relation.make(HasRelationship.HasRelationship, {
           [Relation.Source]: source,
           [Relation.Target]: target,
           kind: relations.kind,

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

@@ -2,15 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type ClientRepeatedComponentProps, ClientRepeater } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { Tree, type TreeComponentProps } from './Tree';
 import { Tree as TreeModel, TreeType } from './types';
@@ -48,7 +46,7 @@ const meta = {
   title: 'plugins/plugin-explorer/Tree',
   component: Tree as any,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+  decorators: [withTheme],
   parameters: {
     layout: 'fullscreen',
   },

package/src/components/Tree/Tree.tsx

@@ -75,8 +75,8 @@ export const Tree = <N,>({ space, selected, variant = 'tidy', onNodeClick }: Tre
   const context = useRef<SVGContext>(null);
 
   useEffect(() => {
-    if (context.current) {
-      const { width, height } = context.current.size!;
+    if (context.current?.size) {
+      const { width, height } = context.current.size;
       const size = Math.min(width, height);
       const radius = size * 0.4;
       const options = {