@dxos/plugin-navtree 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-navtree",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "DXOS Surface plugin for a tree view visualization of the graph.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,29 +31,29 @@
     "@radix-ui/react-dismissable-layer": "1.1.5",
     "@radix-ui/react-use-controllable-state": "1.1.0",
     "date-fns": "^3.3.1",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/app-graph": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/keyboard": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/lit-ui": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-observability": "0.8.4-main.72ec0f3",
-    "@dxos/protocols": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-searchlist": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-tabs": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-list": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3"
+    "@dxos/app-framework": "0.8.4-main.7ace549",
+    "@dxos/app-graph": "0.8.4-main.7ace549",
+    "@dxos/async": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/debug": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/live-object": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/keyboard": "0.8.4-main.7ace549",
+    "@dxos/plugin-deck": "0.8.4-main.7ace549",
+    "@dxos/lit-ui": "0.8.4-main.7ace549",
+    "@dxos/local-storage": "0.8.4-main.7ace549",
+    "@dxos/plugin-graph": "0.8.4-main.7ace549",
+    "@dxos/plugin-observability": "0.8.4-main.7ace549",
+    "@dxos/protocols": "0.8.4-main.7ace549",
+    "@dxos/react-client": "0.8.4-main.7ace549",
+    "@dxos/react-ui-attention": "0.8.4-main.7ace549",
+    "@dxos/react-ui-menu": "0.8.4-main.7ace549",
+    "@dxos/react-ui-searchlist": "0.8.4-main.7ace549",
+    "@dxos/react-ui-list": "0.8.4-main.7ace549",
+    "@dxos/react-ui-stack": "0.8.4-main.7ace549",
+    "@dxos/react-ui-tabs": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -64,16 +64,16 @@
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/echo-signals": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-attention": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-storybook-layout": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-theme": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3"
+    "@dxos/echo-signals": "0.8.4-main.7ace549",
+    "@dxos/plugin-attention": "0.8.4-main.7ace549",
+    "@dxos/plugin-client": "0.8.4-main.7ace549",
+    "@dxos/plugin-space": "0.8.4-main.7ace549",
+    "@dxos/plugin-storybook-layout": "0.8.4-main.7ace549",
+    "@dxos/plugin-theme": "0.8.4-main.7ace549",
+    "@dxos/random": "0.8.4-main.7ace549",
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
+    "@dxos/storybook-utils": "0.8.4-main.7ace549"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -81,8 +81,8 @@
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/keyboard.ts

@@ -34,9 +34,7 @@ export default (context: PluginContext) => {
     if (shortcut && isAction(node)) {
       Keyboard.singleton.getContext(path.slice(0, -1).join('/')).bind({
         shortcut,
-        handler: () => {
-          void node.data({ parent: node, caller: KEY_BINDING });
-        },
+        handler: () => node.data({ parent: node, caller: KEY_BINDING }),
         data: node.properties.label,
       });
     }

package/src/capabilities/state.ts

@@ -5,8 +5,7 @@
 import { effect, untracked } from '@preact/signals-core';
 
 import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
-import { type Live } from '@dxos/echo';
-import { live } from '@dxos/live-object';
+import { type Live, live } from '@dxos/live-object';
 import { Path } from '@dxos/react-ui-list';
 
 import { meta } from '../meta';

package/src/components/NavTreeContainer.tsx

@@ -179,6 +179,13 @@ export const NavTreeContainer = memo(({ tab, popoverAnchorId, topbar }: NavTreeC
     [dispatch, layout.active, tab, navigationSidebarState, isLg],
   );
 
+  const blockInstruction = useCallback(
+    ({ instruction, source, target }: { instruction: Instruction; source: TreeData; target: TreeData }) => {
+      return target.item.properties.blockInstruction?.(source, instruction) ?? false;
+    },
+    [],
+  );
+
   const canDrop = useCallback(({ source, target }: { source: TreeData; target: TreeData }) => {
     return target.item.properties.canDrop?.(source) ?? false;
   }, []);
@@ -321,43 +328,45 @@ export const NavTreeContainer = memo(({ tab, popoverAnchorId, topbar }: NavTreeC
 
   const navTreeContextValue = useMemo(
     () => ({
-      useItems,
-      tab,
-      useActions,
-      loadDescendents,
-      renderItemEnd,
-      popoverAnchorId,
-      topbar,
-      getProps,
-      isCurrent,
-      isOpen,
+      blockInstruction,
       canDrop,
       canSelect,
+      getProps,
       isAlternateTree,
-      setAlternateTree,
-      onTabChange: handleTabChange,
+      isCurrent,
+      isOpen,
+      loadDescendents,
+      onBack: handleBack,
       onOpenChange: handleOpenChange,
       onSelect: handleSelect,
-      onBack: handleBack,
-    }),
-    [
-      tab,
-      useActions,
-      loadDescendents,
-      renderItemEnd,
+      onTabChange: handleTabChange,
       popoverAnchorId,
+      renderItemEnd,
+      setAlternateTree,
+      tab,
       topbar,
-      getProps,
-      isCurrent,
-      isOpen,
+      useActions,
+      useItems,
+    }),
+    [
+      blockInstruction,
       canDrop,
       canSelect,
-      isAlternateTree,
-      setAlternateTree,
-      handleTabChange,
+      getProps,
+      handleBack,
       handleOpenChange,
       handleSelect,
-      handleBack,
+      handleTabChange,
+      isAlternateTree,
+      isCurrent,
+      isOpen,
+      loadDescendents,
+      popoverAnchorId,
+      renderItemEnd,
+      setAlternateTree,
+      tab,
+      topbar,
+      useActions,
     ],
   );
 

package/src/components/types.ts

@@ -15,7 +15,7 @@ import type { L1PanelProps } from './Sidebar';
 
 export type NavTreeContextValue = Pick<
   TreeProps<NavTreeItemGraphNode, { disposition?: string; sort?: boolean }>,
-  'useItems' | 'getProps' | 'isCurrent' | 'isOpen' | 'canDrop' | 'onOpenChange' | 'onSelect'
+  'useItems' | 'getProps' | 'isCurrent' | 'isOpen' | 'blockInstruction' | 'canDrop' | 'onOpenChange' | 'onSelect'
 > &
   Pick<L1PanelProps, 'onBack'> & {
     tab: string;

package/src/testing/generator.ts

@@ -5,8 +5,8 @@
 import * as Schema from 'effect/Schema';
 
 import { type NodeArg } from '@dxos/app-graph';
-import { type Live, Obj, Type } from '@dxos/echo';
-import { TypedObject } from '@dxos/echo/internal';
+import { Obj, Type } from '@dxos/echo';
+import { type Live } from '@dxos/live-object';
 import { faker } from '@dxos/random';
 import { range } from '@dxos/util';
 
@@ -58,15 +58,17 @@ export const defaultGenerators: { [type: string]: ObjectDataGenerator } = {
 
   project: {
     createSchema: () =>
-      class ProjectType extends TypedObject({
-        typename: 'example.com/type/Project',
-        version: '0.1.0',
-      })({
+      Schema.Struct({
         title: Schema.String,
         repo: Schema.String,
         status: Schema.String,
         priority: Schema.Number,
-      }) {},
+      }).pipe(
+        Type.Obj({
+          typename: 'example.com/type/Project',
+          version: '0.1.0',
+        }),
+      ),
 
     createData: () => ({
       title: faker.commerce.productName(),

package/dist/lib/browser/state-EUSVT6BI.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/state.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { effect, untracked } from '@preact/signals-core';\n\nimport { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';\nimport { type Live } from '@dxos/echo';\nimport { live } from '@dxos/live-object';\nimport { Path } from '@dxos/react-ui-list';\n\nimport { meta } from '../meta';\n\nimport { NavTreeCapabilities } from './capabilities';\n\nconst KEY = `${meta.id}/state/v1`;\n\nconst getInitialState = () => {\n  const stringified = localStorage.getItem(KEY);\n  if (!stringified) {\n    return;\n  }\n\n  try {\n    const cached: [string, { open: boolean; current: boolean }][] = JSON.parse(stringified);\n    return cached.map(([key, value]): [string, Live<{ open: boolean; current: boolean }>] => [\n      key,\n      live({ open: value.open, current: false }),\n    ]);\n  } catch {}\n};\n\nexport default (context: PluginContext) => {\n  const layout = context.getCapability(Capabilities.Layout);\n\n  // TODO(wittjosiah): This currently needs to be not a Live at the root.\n  //   If it is a Live then React errors when initializing new paths because of state change during render.\n  //   Ideally this could be a Live but be able to access and update the root level without breaking render.\n  //   Wrapping accesses and updates in `untracked` didn't seem to work in all cases.\n  const state = new Map<string, Live<{ open: boolean; current: boolean; alternateTree?: boolean }>>(\n    getInitialState() ?? [\n      // TODO(thure): Initialize these dynamically.\n      ['root', live({ open: true, current: false })],\n      ['root~dxos.org/plugin/space-spaces', live({ open: true, current: false })],\n      ['root~dxos.org/plugin/files', live({ open: true, current: false })],\n    ],\n  );\n\n  const getItem = (_path: string[]) => {\n    const path = Path.create(..._path);\n    const value = state.get(path) ?? live({ open: false, current: false, alternateTree: false });\n    if (!state.has(path)) {\n      state.set(path, value);\n    }\n\n    return value;\n  };\n\n  const setItem = (path: string[], key: 'open' | 'current' | 'alternateTree', next: boolean) => {\n    const value = getItem(path);\n    value[key] = next;\n\n    localStorage.setItem(KEY, JSON.stringify(Array.from(state.entries())));\n  };\n\n  const isOpen = (path: string[]) => getItem(path).open;\n  const isCurrent = (path: string[]) => getItem(path).current;\n  const isAlternateTree = (path: string[]) => {\n    const item = getItem(path);\n    return item.alternateTree ?? false;\n  };\n\n  let previous: string[] = [];\n  const unsubscribe = effect(() => {\n    const removed = previous.filter((id) => !layout.active.includes(id));\n    previous = layout.active;\n\n    const handleUpdate = () => {\n      removed.forEach((id) => {\n        const keys = Array.from(state.keys()).filter((key) => Path.last(key) === id);\n        keys.forEach((key) => {\n          setItem(Path.parts(key), 'current', false);\n        });\n      });\n\n      layout.active.forEach((id) => {\n        const keys = Array.from(new Set([...state.keys(), id])).filter((key) => Path.last(key) === id);\n        keys.forEach((key) => {\n          setItem(Path.parts(key), 'current', true);\n        });\n      });\n    };\n\n    // TODO(wittjosiah): This is setTimeout because there's a race between the keys be initialized.\n    //   Keys are initialized on the first render of an item in the navtree.\n    //   This could be avoided if the location was a path as well and not just an id.\n    const timeout = setTimeout(handleUpdate, 500);\n    untracked(() => handleUpdate());\n    return () => clearTimeout(timeout);\n  });\n\n  return contributes(NavTreeCapabilities.State, { state, getItem, setItem, isOpen, isCurrent, isAlternateTree }, () =>\n    unsubscribe(),\n  );\n};\n"],
-  "mappings": "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",
-  "names": ["effect", "untracked", "Capabilities", "contributes", "live", "Path", "KEY", "meta", "id", "getInitialState", "stringified", "localStorage", "getItem", "cached", "JSON", "parse", "map", "key", "value", "live", "open", "current", "context", "layout", "getCapability", "Capabilities", "Layout", "state", "Map", "_path", "path", "Path", "create", "get", "alternateTree", "has", "set", "setItem", "next", "stringify", "Array", "from", "entries", "isOpen", "isCurrent", "isAlternateTree", "item", "previous", "unsubscribe", "effect", "removed", "filter", "active", "includes", "handleUpdate", "forEach", "keys", "last", "parts", "Set", "timeout", "setTimeout", "untracked", "clearTimeout", "contributes", "NavTreeCapabilities", "State"]
-}