@dxos/plugin-space 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.9.1-staging.ee54ba693a",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -86,6 +86,16 @@
       "types": "./dist/types/src/plugin.d.ts",
       "default": "./dist/lib/neutral/plugin.mjs"
     },
+    "./components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "./constants": {
+      "source": "./src/constants.ts",
+      "types": "./dist/types/src/constants.d.ts",
+      "default": "./dist/lib/neutral/constants.mjs"
+    },
     "./testing": {
       "source": "./src/testing.ts",
       "types": "./dist/types/src/testing.d.ts",
@@ -115,74 +125,75 @@
     "@effect/cli": "0.75.2",
     "react-drag-drop-files": "^2.3.8",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.9.1-main.c7dcc2e112",
-    "@dxos/async": "0.9.1-main.c7dcc2e112",
-    "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
-    "@dxos/cli-util": "0.9.1-main.c7dcc2e112",
-    "@dxos/client": "0.9.1-main.c7dcc2e112",
-    "@dxos/client-protocol": "0.9.1-main.c7dcc2e112",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/display-name": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/effect": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-graph": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/migrations": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-settings": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-status-bar": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-observability": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-components": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-form": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-list": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-attention": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-menu": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-mosaic": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-masonry": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-attention": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-pickers": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-search": "0.9.1-main.c7dcc2e112",
-    "@dxos/schema": "0.9.1-main.c7dcc2e112",
-    "@dxos/types": "0.9.1-main.c7dcc2e112",
-    "@dxos/shell": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-types": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112"
+    "@dxos/client-protocol": "0.9.1-staging.ee54ba693a",
+    "@dxos/async": "0.9.1-staging.ee54ba693a",
+    "@dxos/cli-util": "0.9.1-staging.ee54ba693a",
+    "@dxos/app-framework": "0.9.1-staging.ee54ba693a",
+    "@dxos/client": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute": "0.9.1-staging.ee54ba693a",
+    "@dxos/context": "0.9.1-staging.ee54ba693a",
+    "@dxos/app-toolkit": "0.9.1-staging.ee54ba693a",
+    "@dxos/display-name": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/effect": "0.9.1-staging.ee54ba693a",
+    "@dxos/errors": "0.9.1-staging.ee54ba693a",
+    "@dxos/keys": "0.9.1-staging.ee54ba693a",
+    "@dxos/migrations": "0.9.1-staging.ee54ba693a",
+    "@dxos/log": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-attention": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-graph": "0.9.1-staging.ee54ba693a",
+    "@dxos/invariant": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-settings": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-observability": "0.9.1-staging.ee54ba693a",
+    "@dxos/protocols": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-attention": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-form": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-components": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-list": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-masonry": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-menu": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-mosaic": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-pickers": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-status-bar": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-search": "0.9.1-staging.ee54ba693a",
+    "@dxos/shell": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-types": "0.9.1-staging.ee54ba693a",
+    "@dxos/schema": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a",
+    "@dxos/util": "0.9.1-staging.ee54ba693a",
+    "@dxos/types": "0.9.1-staging.ee54ba693a"
   },
   "devDependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
     "@babel/core": "^7.18.13",
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.96.1",
-    "@types/react": "~19.2.7",
+    "@effect/platform": "0.96.2",
+    "@types/react": "~19.2.17",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
     "vite": "^8.0.16",
-    "@dxos/lit-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-testing": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-preview": "0.9.1-main.c7dcc2e112",
-    "@dxos/random": "0.9.1-main.c7dcc2e112",
-    "@dxos/storybook-utils": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112"
+    "@dxos/plugin-preview": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-testing": "0.9.1-staging.ee54ba693a",
+    "@dxos/lit-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/random": "0.9.1-staging.ee54ba693a",
+    "@dxos/storybook-utils": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.96.1",
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "@effect/platform": "0.96.2",
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -26,19 +26,19 @@ import {
 } from '@dxos/types';
 
 import {
+  AppGraphBuilder,
   CreateObject,
   IdentityCreated,
   NavigationHandler,
   NavigationResolver,
   OperationHandler,
-  UndoMappings,
   ReactRoot,
   ReactSurface,
   Repair,
   SpaceSettings,
-  SpaceState,
   SpacesReady,
-  AppGraphBuilder,
+  SpaceState,
+  UndoMappings,
 } from '#capabilities';
 import { meta } from '#meta';
 import { translations } from '#translations';

package/src/capabilities/app-graph-builder/extensions/collections.ts

@@ -5,13 +5,13 @@
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
-import { Capabilities, Capability } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
 import { AppAnnotation, AppCapabilities, AppNode, AppNodeMatcher, LayoutOperation, Paths } from '@dxos/app-toolkit';
-import { SpaceState, isSpace } from '@dxos/client/echo';
+import { isSpace } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
 import { Annotation, Collection, Obj, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { CreateAtom, Graph, GraphBuilder, Node } from '@dxos/plugin-graph';
+import { Graph, GraphBuilder, Node } from '@dxos/plugin-graph';
 import { isNonNullable } from '@dxos/util';
 
 import { meta } from '#meta';
@@ -23,7 +23,6 @@ import {
   COPY_LINK_LABEL,
   CREATE_OBJECT_IN_COLLECTION_LABEL,
   EXPOSE_OBJECT_LABEL,
-  REMOVE_FROM_COLLECTION_LABEL,
 } from './shared';
 
 //
@@ -39,16 +38,28 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
   const capabilities = yield* Capability.Service;
 
   return yield* Effect.all([
-    // Collections section virtual node under each space.
+    // Content section group — created alongside collections so the group always
+    // appears when the space plugin is active and hides when there are no children.
     GraphBuilder.createExtension({
-      id: 'collectionsSection',
+      id: Paths.GroupSegments.content,
       match: AppNodeMatcher.whenSpace,
-      connector: (space, get) => {
-        const spaceState = get(CreateAtom.fromObservable(space.state));
-        if (spaceState !== SpaceState.SPACE_READY) {
-          return Effect.succeed([]);
-        }
+      connector: (space) =>
+        Effect.succeed([
+          AppNode.makeGroup({
+            id: Paths.GroupSegments.content,
+            type: Paths.GroupTypes.content,
+            label: ['nav-tree-group-content.label', { ns: meta.profile.key }],
+            space,
+            position: 200,
+          }),
+        ]),
+    }),
 
+    // Collections section virtual node under the content group.
+    GraphBuilder.createExtension({
+      id: 'collectionsSection',
+      match: AppNodeMatcher.whenNavTreeGroup(Paths.GroupTypes.content),
+      connector: (space, get) => {
         get(Obj.atom(space.properties));
         const collectionRef = Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(
           Option.getOrUndefined,
@@ -69,9 +80,8 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
             properties: {
               label: ['collections-section.label', { ns: meta.profile.key }],
               icon: 'ph--folder--regular',
-              iconHue: 'amber',
+              iconHue: 'indigo',
               role: 'branch',
-              position: 'first',
               testId: 'spacePlugin.collectionsSection',
               draggable: false,
               droppable: false,
@@ -120,7 +130,10 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
                 db: space.db,
                 object,
                 navigable: ephemeralState.navigableCollections,
-                parentCollection: collectionRef?.target,
+                canDrop: AppNode.CAN_DROP_COLLECTION_ITEM,
+                onRearrange: collectionRef?.target
+                  ? AppNode.makeCollectionRearrangeCallback(collectionRef.target)
+                  : undefined,
               }),
             )
             .filter(isNonNullable),
@@ -157,7 +170,8 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
                   object,
                   db,
                   navigable: ephemeralState.navigableCollections,
-                  parentCollection: collection,
+                  canDrop: AppNode.CAN_DROP_COLLECTION_ITEM,
+                  onRearrange: AppNode.makeCollectionRearrangeCallback(collection),
                 }),
             )
             .filter(isNonNullable),
@@ -207,7 +221,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
       },
     }),
 
-    // Action on the collections section header to create a new collection.
+    // Action on the collections section header to add an object to the space's root collection.
     GraphBuilder.createExtension({
       id: 'collectionsSectionActions',
       match: (node) => {
@@ -217,16 +231,26 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
       actions: (space) =>
         Effect.succeed([
           Node.makeAction({
-            id: 'create-collection',
+            id: SpaceOperation.OpenCreateObject.meta.key,
             data: () =>
-              Operation.invoke(SpaceOperation.OpenCreateObject, {
-                target: space.db,
-                typename: Type.getTypename(Collection.Collection),
+              Effect.gen(function* () {
+                // Target the root collection so the create dialog offers collection-eligible types, like
+                // any other collection; fall back to the space db if it hasn't been created yet.
+                const rootCollection = Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(
+                  Option.getOrUndefined,
+                )?.target;
+                yield* Operation.invoke(SpaceOperation.OpenCreateObject, {
+                  // Qualified id of the collections section node (root/<spaceId>/collections), so the new
+                  // object's navigation path resolves under the section — the bare segment would not.
+                  target: rootCollection ?? space.db,
+                  targetNodeId: Paths.getCollectionsPath(space.id),
+                });
               }),
             properties: {
-              label: ['add-object.label', { ns: Type.getTypename(Collection.Collection) }],
+              label: CREATE_OBJECT_IN_COLLECTION_LABEL,
               icon: 'ph--plus--regular',
               disposition: 'list-item-primary',
+              testId: 'spacePlugin.createObject',
             },
           }),
         ]),
@@ -285,37 +309,6 @@ const constructObjectActions = ({
         testId: 'spacePlugin.renameObject',
       },
     }),
-    ...(parentCollection && !Obj.instanceOf(Collection.Collection, object)
-      ? [
-          Node.makeAction({
-            id: 'removeFromCollection',
-            data: () =>
-              Effect.gen(function* () {
-                const index = parentCollection.objects.findIndex((ref: any) => ref.target === object);
-                if (index !== -1) {
-                  const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
-                  const isActive = layout.active.includes(nodeId);
-
-                  Obj.update(parentCollection, (parentCollection) => {
-                    parentCollection.objects.splice(index, 1);
-                  });
-
-                  if (isActive) {
-                    yield* Operation.invoke(LayoutOperation.Open, {
-                      subject: [Paths.getObjectPathFromObject(object)],
-                    });
-                  }
-                }
-              }),
-            properties: {
-              label: REMOVE_FROM_COLLECTION_LABEL,
-              icon: 'ph--minus-circle--regular',
-              disposition: 'list-item',
-              testId: 'spacePlugin.removeFromCollection',
-            },
-          }),
-        ]
-      : []),
     Node.makeAction({
       id: SpaceOperation.RemoveObjects.meta.key,
       data: () =>

package/src/capabilities/app-graph-builder/extensions/companions.ts

@@ -11,6 +11,7 @@ import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 import { linkedSegment } from '@dxos/react-ui-attention';
 import type { EchoViewRefPath } from '@dxos/schema';
 import { ViewAnnotation } from '@dxos/schema';
+import { Position } from '@dxos/util';
 
 import { meta } from '#meta';
 
@@ -34,7 +35,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
               label: ['object-properties.label', { ns: meta.profile.key }],
               icon: 'ph--sliders--regular',
               data: 'settings', // TODO(burdon): Change to 'object-properties'.
-              position: 'last',
+              position: Position.last,
             }),
           ]),
       }),
@@ -50,7 +51,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
               label: ['companion-related.label', { ns: meta.profile.key }],
               icon: 'ph--graph--regular',
               data: 'related',
-              position: 'last',
+              position: Position.last,
             }),
           ]),
       }),