@dxos/shell 0.5.1-main.6564b82 → 0.5.1-main.6df1309

package/dist/lib/browser/react.mjs

@@ -3792,37 +3792,17 @@ var StatusDialog = () => {
 
 // packages/sdk/shell/src/composites/Shell/Shell.tsx
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/composites/Shell/Shell.tsx";
-var Shell = ({ runtime }) => {
+var Shell = ({ runtime, origin }) => {
   const [{ layout, invitationCode, spaceKey, target }, setLayout] = useState13({
     layout: runtime.layout,
     invitationCode: runtime.invitationCode,
     spaceKey: runtime.spaceKey,
     target: runtime.target
   });
-  const [{ invitationUrl, deviceInvitationParam, spaceInvitationParam }, setInvitationUrl] = useState13({
-    invitationUrl: runtime.invitationUrl,
-    deviceInvitationParam: runtime.deviceInvitationParam,
-    spaceInvitationParam: runtime.spaceInvitationParam
-  });
   const client = useClient7();
   const space = useSpace2(spaceKey);
-  const createDeviceInvitationUrl = (invitationCode2) => {
-    const baseUrl = new URL(invitationUrl);
-    baseUrl.searchParams.set(deviceInvitationParam, invitationCode2);
-    return baseUrl.toString();
-  };
-  const createSpaceInvitationUrl = (invitationCode2) => {
-    const baseUrl = new URL(invitationUrl);
-    baseUrl.searchParams.set(spaceInvitationParam, invitationCode2);
-    return baseUrl.toString();
-  };
   useEffect7(() => {
-    const unsubscribeLayout = runtime.layoutUpdate.on((request) => setLayout(request));
-    const unsubscribeInvitationUrl = runtime.invitationUrlUpdate.on((request) => setInvitationUrl(request));
-    return () => {
-      unsubscribeLayout();
-      unsubscribeInvitationUrl();
-    };
+    return runtime.layoutUpdate.on((request) => setLayout(request));
   }, [
     runtime
   ]);
@@ -3830,7 +3810,7 @@ var Shell = ({ runtime }) => {
     if (layout === ShellLayout.SPACE && !space) {
       log14.warn("No space found for shell space invitations.", void 0, {
         F: __dxlog_file13,
-        L: 64,
+        L: 33,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -3874,7 +3854,7 @@ var Shell = ({ runtime }) => {
     case ShellLayout.SHARE_IDENTITY:
     case ShellLayout.EDIT_PROFILE:
       return /* @__PURE__ */ React46.createElement(IdentityDialog, {
-        createInvitationUrl: createDeviceInvitationUrl,
+        createInvitationUrl: (invitationCode2) => `${origin}?deviceInvitationCode=${invitationCode2}`,
         onResetStorage: async () => {
           runtime.setLayout({
             layout: ShellLayout.STATUS
@@ -3908,7 +3888,7 @@ var Shell = ({ runtime }) => {
       return space ? /* @__PURE__ */ React46.createElement(SpaceDialog, {
         space,
         target,
-        createInvitationUrl: createSpaceInvitationUrl,
+        createInvitationUrl: (invitationCode2) => `${origin}?spaceInvitationCode=${invitationCode2}`,
         onDone: async () => {
           await runtime.setAppContext({
             display: ShellDisplay.NONE
@@ -4122,7 +4102,8 @@ var runShell = async (config = new Config()) => {
         status: SystemStatus.ACTIVE
       }
     }, /* @__PURE__ */ React47.createElement(ClipboardProvider, null, /* @__PURE__ */ React47.createElement(Tooltip7.Provider, null, /* @__PURE__ */ React47.createElement(AgentHostingProvider, null, /* @__PURE__ */ React47.createElement(Shell, {
-      runtime
+      runtime,
+      origin: location.origin
     }))))))));
   } catch {
     createRoot(document.getElementById("root")).render(/* @__PURE__ */ React47.createElement(StrictMode, null, /* @__PURE__ */ React47.createElement(ThemeProvider, {
@@ -4161,16 +4142,12 @@ import { mx as mx25 } from "@dxos/react-ui-theme";
 import { Event } from "@dxos/async";
 import { ShellLayout as ShellLayout2 } from "@dxos/react-client";
 var MemoryShellRuntime = class {
-  constructor({ layout, invitationCode, spaceKey, invitationUrl, deviceInvitationParam, spaceInvitationParam } = {}) {
+  constructor({ layout, invitationCode, spaceKey } = {}) {
     this.layoutUpdate = new Event();
-    this.invitationUrlUpdate = new Event();
     this.contextUpdate = new Event();
     this._layout = layout ?? ShellLayout2.DEFAULT;
     this._invitationCode = invitationCode;
     this._spaceKey = spaceKey;
-    this._invitationUrl = invitationUrl ?? window.location.origin;
-    this._deviceInvitationParam = deviceInvitationParam ?? "deviceInvitationCode";
-    this._spaceInvitationParam = spaceInvitationParam ?? "spaceInvitationCode";
   }
   get layout() {
     return this._layout;
@@ -4181,27 +4158,12 @@ var MemoryShellRuntime = class {
   get spaceKey() {
     return this._spaceKey;
   }
-  get invitationUrl() {
-    return this._invitationUrl;
-  }
-  get deviceInvitationParam() {
-    return this._deviceInvitationParam;
-  }
-  get spaceInvitationParam() {
-    return this._spaceInvitationParam;
-  }
   setLayout(request) {
     this._layout = request.layout;
     this._invitationCode = request.invitationCode;
     this._spaceKey = request.spaceKey;
     this.layoutUpdate.emit(request);
   }
-  setInvitationUrl(request) {
-    this._invitationUrl = request.invitationUrl;
-    this._deviceInvitationParam = request.deviceInvitationParam;
-    this._spaceInvitationParam = request.spaceInvitationParam;
-    this.invitationUrlUpdate.emit(request);
-  }
   async setAppContext(context) {
     this.contextUpdate.emit(context);
   }
@@ -4306,7 +4268,8 @@ var ShellProvider = ({ space, deviceInvitationCode, spaceInvitationCode, onJoine
   return /* @__PURE__ */ React48.createElement(React48.Fragment, null, shellRuntime && /* @__PURE__ */ React48.createElement("div", {
     className: mx25(display === ShellDisplay3.NONE ? "hidden" : "")
   }, /* @__PURE__ */ React48.createElement(Shell, {
-    runtime: shellRuntime
+    runtime: shellRuntime,
+    origin: window.location.origin
   })), /* @__PURE__ */ React48.createElement(ShellContext.Provider, {
     value: {
       runtime: shellRuntime,