@dxos/react-client 0.5.9-main.bdf733d → 0.5.9-main.bf3bb8f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.5.9-main.bdf733d",
+  "version": "0.5.9-main.bf3bb8f",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -91,18 +91,18 @@
     }
   },
   "dependencies": {
-    "@dxos/async": "0.5.9-main.bdf733d",
-    "@dxos/codec-protobuf": "0.5.9-main.bdf733d",
-    "@dxos/client": "0.5.9-main.bdf733d",
-    "@dxos/config": "0.5.9-main.bdf733d",
-    "@dxos/debug": "0.5.9-main.bdf733d",
-    "@dxos/echo-schema": "0.5.9-main.bdf733d",
-    "@dxos/echo-signals": "0.5.9-main.bdf733d",
-    "@dxos/invariant": "0.5.9-main.bdf733d",
-    "@dxos/log": "0.5.9-main.bdf733d",
-    "@dxos/react-async": "0.5.9-main.bdf733d",
-    "@dxos/util": "0.5.9-main.bdf733d",
-    "@dxos/node-std": "0.5.9-main.bdf733d"
+    "@dxos/async": "0.5.9-main.bf3bb8f",
+    "@dxos/client": "0.5.9-main.bf3bb8f",
+    "@dxos/config": "0.5.9-main.bf3bb8f",
+    "@dxos/codec-protobuf": "0.5.9-main.bf3bb8f",
+    "@dxos/echo-schema": "0.5.9-main.bf3bb8f",
+    "@dxos/debug": "0.5.9-main.bf3bb8f",
+    "@dxos/echo-signals": "0.5.9-main.bf3bb8f",
+    "@dxos/invariant": "0.5.9-main.bf3bb8f",
+    "@dxos/log": "0.5.9-main.bf3bb8f",
+    "@dxos/node-std": "0.5.9-main.bf3bb8f",
+    "@dxos/react-async": "0.5.9-main.bf3bb8f",
+    "@dxos/util": "0.5.9-main.bf3bb8f"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.17.1",
@@ -112,17 +112,17 @@
     "@types/react-dom": "^18.0.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@dxos/random": "0.5.9-main.bdf733d",
-    "@dxos/react-ui": "0.5.9-main.bdf733d",
-    "@dxos/react-ui-theme": "0.5.9-main.bdf733d",
-    "@dxos/storybook-utils": "0.5.9-main.bdf733d"
+    "@dxos/random": "0.5.9-main.bf3bb8f",
+    "@dxos/react-ui": "0.5.9-main.bf3bb8f",
+    "@dxos/react-ui-theme": "0.5.9-main.bf3bb8f",
+    "@dxos/storybook-utils": "0.5.9-main.bf3bb8f"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "optionalDependencies": {
-    "@dxos/random": "0.5.9-main.bdf733d"
+    "@dxos/random": "0.5.9-main.bf3bb8f"
   },
   "publishConfig": {
     "access": "public"

package/src/client/useShell.ts

@@ -2,7 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Shell } from '@dxos/client/services';
+import { useEffect, useState } from 'react';
+
+import { type Shell, type ShellDisplay } from '@dxos/client/services';
 
 import { useClient } from './ClientContext';
 
@@ -13,3 +15,13 @@ export const useShell = (): Shell => {
   const client = useClient();
   return client.shell;
 };
+
+/**
+ * Hook to access the shell’s display state.
+ */
+export const useShellDisplay = (): ShellDisplay => {
+  const client = useClient();
+  const [display, setDisplay] = useState(client.shell.display);
+  useEffect(() => client.shell.onDisplayChange(setDisplay), [client]);
+  return display;
+};

package/src/echo/useSpaces.ts

@@ -16,16 +16,16 @@ import { useClient } from '../client';
  * Returns the default space if no key is provided.
  * Requires a ClientProvider somewhere in the parent tree.
  *
- * @param spaceKey the key of the space to look for
+ * @param spaceKeyLike the key of the space to look for
  */
-export const useSpace = (spaceKey?: PublicKeyLike): Space | undefined => {
+export const useSpace = (spaceKeyLike?: PublicKeyLike): Space | undefined => {
   const client = useClient();
   const spaces = useMulticastObservable<Space[]>(client.spaces);
   const [ready, setReady] = useState(false);
 
   useEffect(() => {
     // Only wait for ready if looking for the default space.
-    if (spaceKey) {
+    if (spaceKeyLike) {
       return;
     }
 
@@ -35,10 +35,10 @@ export const useSpace = (spaceKey?: PublicKeyLike): Space | undefined => {
     });
 
     return () => clearTimeout(timeout);
-  }, [client, spaceKey]);
+  }, [client, spaceKeyLike]);
 
-  if (spaceKey) {
-    return spaces.find((space) => space.key.equals(spaceKey));
+  if (spaceKeyLike) {
+    return spaces.find((space) => space.key.equals(spaceKeyLike) || space.id === spaceKeyLike);
   }
 
   if (ready && client.halo.identity.get()) {