@dxos/react-client 0.8.1-staging.5be625a → 0.8.1-staging.97aedb1

package/dist/types/src/echo/useQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQueue.d.ts","sourceRoot":"","sources":["../../../../src/echo/useQueue.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAMtC,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;GAEG;AAIH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,cAAc,aACpC,GAAG,YACL,eAAe,KACvB,KAAK,CAAC,CAAC,CAAC,GAAG,SAgCb,CAAC"}
+{"version":3,"file":"useQueue.d.ts","sourceRoot":"","sources":["../../../../src/echo/useQueue.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAMtC,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;GAEG;AAKH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,cAAc,aACpC,GAAG,YACL,eAAe,KACvB,KAAK,CAAC,CAAC,CAAC,GAAG,SA2Cb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.8.1-staging.5be625a",
+  "version": "0.8.1-staging.97aedb1",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -78,40 +78,40 @@
   },
   "dependencies": {
     "react-error-boundary": "^4.0.13",
-    "@dxos/async": "0.8.1-staging.5be625a",
-    "@dxos/codec-protobuf": "0.8.1-staging.5be625a",
-    "@dxos/client": "0.8.1-staging.5be625a",
-    "@dxos/config": "0.8.1-staging.5be625a",
-    "@dxos/echo-schema": "0.8.1-staging.5be625a",
-    "@dxos/echo-signals": "0.8.1-staging.5be625a",
-    "@dxos/log": "0.8.1-staging.5be625a",
-    "@dxos/node-std": "0.8.1-staging.5be625a",
-    "@dxos/debug": "0.8.1-staging.5be625a",
-    "@dxos/invariant": "0.8.1-staging.5be625a",
-    "@dxos/protocols": "0.8.1-staging.5be625a",
-    "@dxos/react-hooks": "0.8.1-staging.5be625a",
-    "@dxos/util": "0.8.1-staging.5be625a"
+    "@dxos/async": "0.8.1-staging.97aedb1",
+    "@dxos/client": "0.8.1-staging.97aedb1",
+    "@dxos/codec-protobuf": "0.8.1-staging.97aedb1",
+    "@dxos/config": "0.8.1-staging.97aedb1",
+    "@dxos/debug": "0.8.1-staging.97aedb1",
+    "@dxos/echo-schema": "0.8.1-staging.97aedb1",
+    "@dxos/echo-signals": "0.8.1-staging.97aedb1",
+    "@dxos/invariant": "0.8.1-staging.97aedb1",
+    "@dxos/node-std": "0.8.1-staging.97aedb1",
+    "@dxos/log": "0.8.1-staging.97aedb1",
+    "@dxos/protocols": "0.8.1-staging.97aedb1",
+    "@dxos/util": "0.8.1-staging.97aedb1",
+    "@dxos/react-hooks": "0.8.1-staging.97aedb1"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/random": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-theme": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-syntax-highlighter": "0.8.1-staging.5be625a",
-    "@dxos/storybook-utils": "0.8.1-staging.5be625a",
-    "@dxos/react-ui": "0.8.1-staging.5be625a",
-    "@dxos/test-utils": "0.8.1-staging.5be625a"
+    "@dxos/random": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-syntax-highlighter": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-theme": "0.8.1-staging.97aedb1",
+    "@dxos/storybook-utils": "0.8.1-staging.97aedb1",
+    "@dxos/test-utils": "0.8.1-staging.97aedb1"
   },
   "peerDependencies": {
     "react": "~18.2.0",
     "react-dom": "~18.2.0"
   },
   "optionalDependencies": {
-    "@dxos/random": "0.8.1-staging.5be625a",
-    "@dxos/react-ui": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-theme": "0.8.1-staging.5be625a"
+    "@dxos/random": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-theme": "0.8.1-staging.97aedb1"
   },
   "publishConfig": {
     "access": "public"

package/src/echo/useQuery.ts

@@ -9,9 +9,9 @@ import {
   type Echo,
   type FilterSource,
   Filter,
-  type ReactiveEchoObject,
   type Query,
   type QueryOptions,
+  type ReactiveEchoObject,
   type Space,
 } from '@dxos/client/echo';
 

package/src/echo/useQueue.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 
 import type { Queue } from '@dxos/client/echo';
 import { raise } from '@dxos/debug';
@@ -23,18 +23,19 @@ export type UseQueueOptions = {
 // TODO(burdon): Replace polling with socket?
 // TODO(dmaretskyi): Move into client package.
 // TODO(dmaretskyi): Consider passing the space into the hook to support queue DXNs without space id.
+// TODO(ZaymonFC): If queue is unchanged returned object should be refferentially stable on poll.
 export const useQueue = <T extends BaseEchoObject>(
   queueDxn?: DXN,
   options: UseQueueOptions = {},
 ): Queue<T> | undefined => {
   const client = useClient();
+  const mountedRef = useRef(true);
+
   const queue = useMemo<Queue<T> | undefined>(() => {
     if (!queueDxn) {
       return undefined;
     }
-
     const { spaceId } = queueDxn.asQueueDXN() ?? raise(new TypeError('Invalid queue DXN'));
-
     return client.spaces.get(spaceId)?.queues.get<T>(queueDxn);
   }, [client, queueDxn?.toString()]);
 
@@ -44,17 +45,28 @@ export const useQueue = <T extends BaseEchoObject>(
 
   useEffect(() => {
     let timeout: NodeJS.Timeout;
-    if (options.pollInterval) {
-      const poll = () => {
-        void queue?.refresh().finally(() => {
+    mountedRef.current = true;
+
+    const poll = () => {
+      if (!mountedRef.current) {
+        return;
+      }
+
+      void queue?.refresh().finally(() => {
+        if (mountedRef.current && options.pollInterval) {
           timeout = setTimeout(poll, Math.max(options.pollInterval ?? 0, MIN_POLL_INTERVAL));
-        });
-      };
+        }
+      });
+    };
 
+    if (options.pollInterval) {
       poll();
     }
 
-    return () => clearTimeout(timeout);
+    return () => {
+      mountedRef.current = false;
+      clearTimeout(timeout);
+    };
   }, [queue, options.pollInterval]);
 
   return queue;