@dxos/plugin-space 0.7.3-staging.cc8dd3e → 0.7.3

package/dist/lib/browser/index.mjs

@@ -37,7 +37,7 @@ import { createExtension, memoize as memoize2, toSignal } from "@dxos/plugin-gra
 import { ObservabilityAction as ObservabilityAction2 } from "@dxos/plugin-observability/meta";
 import { EdgeReplicationSetting as EdgeReplicationSetting3 } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { PublicKey as PublicKey2 } from "@dxos/react-client";
-import { Expando, FQ_ID_LENGTH, Filter as Filter3, OBJECT_ID_LENGTH, SPACE_ID_LENGTH, SpaceState as SpaceState2, fullyQualifiedId as fullyQualifiedId4, getSpace as getSpace4, getTypename as getTypename2, isEchoObject as isEchoObject2, isSpace as isSpace4, loadObjectReferences, parseFullyQualifiedId, parseId } from "@dxos/react-client/echo";
+import { Expando, FQ_ID_LENGTH, Filter as Filter3, OBJECT_ID_LENGTH, SPACE_ID_LENGTH, SpaceState as SpaceState2, fullyQualifiedId as fullyQualifiedId4, getSpace as getSpace5, getTypename as getTypename2, isEchoObject as isEchoObject2, isSpace as isSpace4, loadObjectReferences, parseFullyQualifiedId, parseId } from "@dxos/react-client/echo";
 import { osTranslations } from "@dxos/shell/react";
 import { ComplexMap as ComplexMap2, nonNullable as nonNullable2, reduceGroupBy } from "@dxos/util";
 
@@ -140,7 +140,7 @@ var AwaitingObject = ({ id }) => {
 import React3, { useCallback as useCallback2, useRef } from "react";
 import { NavigationAction as NavigationAction2, useIntentDispatcher } from "@dxos/app-framework";
 import { useClient as useClient2 } from "@dxos/react-client";
-import { isReactiveObject as isReactiveObject2, isSpace as isSpace3, useSpaces } from "@dxos/react-client/echo";
+import { getSpace as getSpace2, isReactiveObject as isReactiveObject2, isSpace as isSpace3, useSpaces } from "@dxos/react-client/echo";
 import { Button as Button2, Dialog, Icon as Icon2, useTranslation as useTranslation3 } from "@dxos/react-ui";
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectPanel.tsx
@@ -802,10 +802,12 @@ var CreateObjectDialog = ({ schemas, target, typename, name, navigableCollection
       return;
     }
     closeRef.current?.click();
+    const space = isSpace3(target2) ? target2 : getSpace2(target2);
     const result = await dispatch({
       action: createObjectAction,
       data: {
-        name: name2
+        name: name2,
+        space
       }
     });
     const object = result?.data;
@@ -974,7 +976,7 @@ import { ObservabilityAction } from "@dxos/plugin-observability/meta";
 import { useSpaces as useSpaces2 } from "@dxos/react-client/echo";
 import { Dialog as Dialog3, useTranslation as useTranslation8 } from "@dxos/react-ui";
 import { JoinPanel } from "@dxos/shell/react";
-var JoinDialog = ({ navigableCollections, ...props }) => {
+var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
   const { t } = useTranslation8(SPACE_PLUGIN);
   const dispatch = useIntentDispatcher3();
   const spaces = useSpaces2();
@@ -1029,6 +1031,7 @@ var JoinDialog = ({ navigableCollections, ...props }) => {
         })
       ]);
     }
+    await onDone?.(result);
     if (space) {
       await dispatch({
         action: ObservabilityAction.SEND_EVENT,
@@ -1059,13 +1062,13 @@ var JoinDialog = ({ navigableCollections, ...props }) => {
 // packages/plugins/plugin-space/src/components/MenuFooter.tsx
 import { Planet } from "@phosphor-icons/react";
 import React9 from "react";
-import { getSpace as getSpace2 } from "@dxos/client/echo";
+import { getSpace as getSpace3 } from "@dxos/client/echo";
 import { useClient as useClient3 } from "@dxos/react-client";
 import { DropdownMenu, toLocalizedString as toLocalizedString2, useTranslation as useTranslation9 } from "@dxos/react-ui";
 var MenuFooter = ({ object }) => {
   const { t } = useTranslation9(SPACE_PLUGIN);
   const client = useClient3();
-  const space = getSpace2(object);
+  const space = getSpace3(object);
   const spaceName = space ? getSpaceDisplayName(space, {
     personal: client.spaces.default === space
   }) : "";
@@ -1267,7 +1270,7 @@ import React14, { useCallback as useCallback7, useEffect as useEffect3, useState
 import { usePlugin } from "@dxos/app-framework";
 import { generateName } from "@dxos/display-name";
 import { PublicKey, useClient as useClient4 } from "@dxos/react-client";
-import { getSpace as getSpace3, useMembers, fullyQualifiedId as fullyQualifiedId3 } from "@dxos/react-client/echo";
+import { getSpace as getSpace4, useMembers, fullyQualifiedId as fullyQualifiedId3 } from "@dxos/react-client/echo";
 import { useIdentity } from "@dxos/react-client/halo";
 import { Avatar, AvatarGroup, AvatarGroupItem, Tooltip as Tooltip2, useTranslation as useTranslation14, List, ListItem, useDefaultValue } from "@dxos/react-ui";
 import { AttentionGlyph, useAttention } from "@dxos/react-ui-attention";
@@ -1280,7 +1283,7 @@ var SpacePresence = ({ object, spaceKey }) => {
   const spacePlugin = usePlugin(SPACE_PLUGIN);
   const client = useClient4();
   const identity = useIdentity();
-  const space = spaceKey ? client.spaces.get(spaceKey) : getSpace3(object);
+  const space = spaceKey ? client.spaces.get(spaceKey) : getSpace4(object);
   const spaceMembers = useMembers(space?.key);
   const [_moment, setMoment] = useState6(Date.now());
   useEffect3(() => {
@@ -1443,9 +1446,9 @@ var SpacePluginSettings = ({ settings }) => {
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsDialog.tsx
 import React17, { useState as useState8 } from "react";
 import { useClient as useClient6 } from "@dxos/react-client";
-import { Button as Button6, Dialog as Dialog4, Icon as Icon4, toLocalizedString as toLocalizedString3, useTranslation as useTranslation17 } from "@dxos/react-ui";
+import { Button as Button6, Clipboard, Dialog as Dialog4, Icon as Icon4, toLocalizedString as toLocalizedString3, useTranslation as useTranslation17 } from "@dxos/react-ui";
 import { Tabs } from "@dxos/react-ui-tabs";
-import { ClipboardProvider, SpacePanel } from "@dxos/shell/react";
+import { SpacePanel } from "@dxos/shell/react";
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx
 import React16, { useCallback as useCallback8, useState as useState7 } from "react";
@@ -1564,7 +1567,7 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
     })), /* @__PURE__ */ React17.createElement(Tabs.Tabpanel, {
       value: "members",
       classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
-    }, /* @__PURE__ */ React17.createElement(ClipboardProvider, null, /* @__PURE__ */ React17.createElement(SpacePanel, {
+    }, /* @__PURE__ */ React17.createElement(Clipboard.Provider, null, /* @__PURE__ */ React17.createElement(SpacePanel, {
       space,
       hideHeading: true,
       target,
@@ -1574,7 +1577,7 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
 };
 
 // packages/plugins/plugin-space/src/components/SyncStatus/InlineSyncStatus.tsx
-import React18, { useEffect as useEffect5, useState as useState10 } from "react";
+import React18, { useEffect as useEffect5, useMemo, useState as useState10 } from "react";
 import { QueryEdgeStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
 import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { useClient as useClient8 } from "@dxos/react-client";
@@ -1676,21 +1679,29 @@ var useEdgeStatus = () => {
   return status;
 };
 var InlineSyncStatus = ({ space }) => {
-  const { t } = useTranslation18(SPACE_PLUGIN);
   const connectedToEdge = useEdgeStatus() === QueryEdgeStatusResponse.EdgeStatus.CONNECTED;
   const edgeSyncEnabled = space.internal.data.edgeReplication === EdgeReplicationSetting2.ENABLED;
   const syncState = useSpaceSyncState(space);
   if (!connectedToEdge || !edgeSyncEnabled || !syncState || syncState.missingOnLocal === 0) {
     return null;
   }
+  return /* @__PURE__ */ React18.createElement(InlineSyncStatusIndicator, null);
+};
+var InlineSyncStatusIndicator = () => {
+  const { t } = useTranslation18(SPACE_PLUGIN);
+  const animationProps = useMemo(() => ({
+    // Synchronize animations.
+    animationDelay: `-${Date.now() % 2e3}ms`
+  }), []);
   return /* @__PURE__ */ React18.createElement("div", {
     role: "status",
     "aria-label": t("syncing message"),
     className: "flex items-center"
   }, /* @__PURE__ */ React18.createElement(Icon5, {
-    icon: "ph--arrows-clockwise--regular",
+    icon: "ph--circle-notch--regular",
     size: 3,
-    classNames: "animate-spin"
+    style: animationProps,
+    classNames: "text-subdued animate-[spin_2s_linear_infinite]"
   }));
 };
 
@@ -2528,7 +2539,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               if (!isEchoObject2(data.object) && !isSpace4(data.object)) {
                 return null;
               }
-              const space = isSpace4(data.object) ? data.object : getSpace4(data.object);
+              const space = isSpace4(data.object) ? data.object : getSpace5(data.object);
               const object = isSpace4(data.object) ? data.object.state.get() === SpaceState2.SPACE_READY ? space?.properties[CollectionType.typename] : void 0 : data.object;
               return space && object ? {
                 node: /* @__PURE__ */ React21.createElement(React21.Fragment, null, /* @__PURE__ */ React21.createElement(SpacePresence, {
@@ -2575,63 +2586,51 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
           if (!client || !dispatch || !resolve || !graph) {
             return [];
           }
+          const spacesNode = {
+            id: SPACES,
+            type: SPACES,
+            cacheable: [
+              "label",
+              "role"
+            ],
+            properties: {
+              label: [
+                "spaces label",
+                {
+                  ns: SPACE_PLUGIN
+                }
+              ],
+              testId: "spacePlugin.spaces",
+              role: "branch",
+              disabled: true,
+              childrenPersistenceClass: "echo",
+              onRearrangeChildren: async (nextOrder) => {
+                graph._sortEdges(SPACES, "outbound", nextOrder.map(({ id }) => id));
+                const { objects: [spacesOrder] } = await client.spaces.default.db.query(Filter3.schema(Expando, {
+                  key: SHARED
+                })).run();
+                if (spacesOrder) {
+                  spacesOrder.order = nextOrder.map(({ id }) => id);
+                } else {
+                  log3.warn("spaces order object not found", void 0, {
+                    F: __dxlog_file6,
+                    L: 649,
+                    S: void 0,
+                    C: (f, a) => f(...a)
+                  });
+                }
+              }
+            }
+          };
           return [
             // Create spaces group node.
             createExtension({
               id: `${SPACE_PLUGIN}/root`,
               filter: (node) => node.id === "root",
-              connector: () => {
-                const isReady = toSignal((onChange) => {
-                  let defaultSpaceUnsubscribe;
-                  client.spaces.isReady.subscribe((ready) => {
-                    if (ready) {
-                      defaultSpaceUnsubscribe = client.spaces.default.state.subscribe(() => onChange()).unsubscribe;
-                    }
-                  });
-                  return () => defaultSpaceUnsubscribe?.();
-                }, () => client.spaces.isReady.get() && client.spaces.default.state.get() === SpaceState2.SPACE_READY);
-                if (!isReady) {
-                  return [];
-                }
-                return [
-                  {
-                    id: SPACES,
-                    type: SPACES,
-                    cacheable: [
-                      "label",
-                      "role"
-                    ],
-                    properties: {
-                      label: [
-                        "spaces label",
-                        {
-                          ns: SPACE_PLUGIN
-                        }
-                      ],
-                      testId: "spacePlugin.spaces",
-                      role: "branch",
-                      disabled: true,
-                      childrenPersistenceClass: "echo",
-                      onRearrangeChildren: async (nextOrder) => {
-                        graph._sortEdges(SPACES, "outbound", nextOrder.map(({ id }) => id));
-                        const { objects: [spacesOrder] } = await client.spaces.default.db.query(Filter3.schema(Expando, {
-                          key: SHARED
-                        })).run();
-                        if (spacesOrder) {
-                          spacesOrder.order = nextOrder.map(({ id }) => id);
-                        } else {
-                          log3.warn("spaces order object not found", void 0, {
-                            F: __dxlog_file6,
-                            L: 674,
-                            S: void 0,
-                            C: (f, a) => f(...a)
-                          });
-                        }
-                      }
-                    }
-                  }
-                ];
-              }
+              connector: () => [
+                spacesNode
+              ],
+              resolver: ({ id }) => id === SPACES ? spacesNode : void 0
             }),
             // Create space nodes.
             createExtension({
@@ -2776,7 +2775,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               filter: (node) => node.data instanceof CollectionType,
               connector: ({ node }) => {
                 const collection = node.data;
-                const space = getSpace4(collection);
+                const space = getSpace5(collection);
                 if (!space) {
                   return;
                 }
@@ -2812,7 +2811,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                       objectId
                     }, {
                       F: __dxlog_file6,
-                      L: 891,
+                      L: 872,
                       S: void 0,
                       C: (f, a) => f(...a)
                     }));
@@ -3061,7 +3060,8 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                         component: "dxos.org/plugin/space/JoinDialog",
                         dialogBlockAlign: "start",
                         subject: {
-                          initialInvitationCode: intent.data?.invitationCode
+                          initialInvitationCode: intent.data?.invitationCode,
+                          onDone: intent.data?.onDone
                         }
                       }
                     }
@@ -3276,7 +3276,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               if (!isReactiveObject3(object)) {
                 return;
               }
-              const space = isSpace4(intent.data?.target) ? intent.data?.target : getSpace4(intent.data?.target);
+              const space = isSpace4(intent.data?.target) ? intent.data?.target : getSpace5(intent.data?.target);
               if (!space) {
                 return;
               }
@@ -3365,15 +3365,15 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               const objects = intent.data?.objects ?? intent.data?.result;
               invariant2(Array.isArray(objects), void 0, {
                 F: __dxlog_file6,
-                L: 1430,
+                L: 1412,
                 S: void 0,
                 A: [
                   "Array.isArray(objects)",
                   ""
                 ]
               });
-              const space = getSpace4(objects[0]);
-              if (!space || !objects.every((obj) => isEchoObject2(obj) && getSpace4(obj) === space)) {
+              const space = getSpace5(objects[0]);
+              if (!space || !objects.every((obj) => isEchoObject2(obj) && getSpace5(obj) === space)) {
                 return;
               }
               const resolve = resolvePlugin(plugins, parseMetadataResolverPlugin)?.provides.metadata.resolver;
@@ -3481,7 +3481,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             case SpaceAction.DUPLICATE_OBJECT: {
               const originalObject = intent.data?.object ?? intent.data?.result;
               const resolve = resolvePlugin(plugins, parseMetadataResolverPlugin)?.provides.metadata.resolver;
-              const space = isSpace4(intent.data?.target) ? intent.data?.target : getSpace4(intent.data?.target);
+              const space = isSpace4(intent.data?.target) ? intent.data?.target : getSpace5(intent.data?.target);
               if (!isEchoObject2(originalObject) || !resolve || !space) {
                 return;
               }
@@ -3540,6 +3540,7 @@ export {
   DefaultObjectSettings,
   FullPresence,
   InlineSyncStatus,
+  InlineSyncStatusIndicator,
   JoinDialog,
   MenuFooter,
   MessageState,