@dxos/react-client 2.28.3-dev.969c91bc → 2.28.3-dev.cb8eaf22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.28.3-dev.969c91bc",
+  "version": "2.28.3-dev.cb8eaf22",
   "description": "React client API",
   "keywords": [],
   "license": "MIT",
@@ -8,23 +8,23 @@
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@dxos/async": "2.28.3-dev.969c91bc",
-    "@dxos/bot-factory-client": "2.28.3-dev.969c91bc",
-    "@dxos/client": "2.28.3-dev.969c91bc",
-    "@dxos/config": "2.28.3-dev.969c91bc",
-    "@dxos/credentials": "2.28.3-dev.969c91bc",
-    "@dxos/crypto": "2.28.3-dev.969c91bc",
-    "@dxos/debug": "2.28.3-dev.969c91bc",
-    "@dxos/echo-db": "2.28.3-dev.969c91bc",
-    "@dxos/network-manager": "2.28.3-dev.969c91bc",
-    "@dxos/util": "2.28.3-dev.969c91bc",
+    "@dxos/async": "2.28.3-dev.cb8eaf22",
+    "@dxos/bot-factory-client": "2.28.3-dev.cb8eaf22",
+    "@dxos/client": "2.28.3-dev.cb8eaf22",
+    "@dxos/config": "2.28.3-dev.cb8eaf22",
+    "@dxos/credentials": "2.28.3-dev.cb8eaf22",
+    "@dxos/crypto": "2.28.3-dev.cb8eaf22",
+    "@dxos/debug": "2.28.3-dev.cb8eaf22",
+    "@dxos/echo-db": "2.28.3-dev.cb8eaf22",
+    "@dxos/network-manager": "2.28.3-dev.cb8eaf22",
+    "@dxos/util": "2.28.3-dev.cb8eaf22",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
     "react-display-name": "^0.2.5",
     "use-subscription": "^1.4.1"
   },
   "devDependencies": {
-    "@dxos/esbuild-plugins": "2.28.3-dev.969c91bc",
+    "@dxos/esbuild-plugins": "2.28.3-dev.cb8eaf22",
     "@dxos/toolchain-node-library": "2.28.2",
     "@mui/material": "^5.4.2",
     "@testing-library/react": "^11.0.4",

package/src/hooks/echo-selections/useSelection.ts

@@ -23,21 +23,20 @@ export const useSelection = <T extends Entity<any>> (
   deps: readonly any[] = []
 ): T[] | undefined => {
   const [result, setResult] = useState(() => coerceSelection(selection));
-  const [data, setData] = useState(() => result ? result.result : undefined);
+  const [data, setData] = useState<T[] | undefined>(() => result ? result.result : undefined);
 
   // Update selection when the query or customs deps change.
   useEffect(() => {
     const newResult = coerceSelection(selection);
-    const newData = newResult?.result;
     setResult(newResult);
-    setData(newData);
+    setData(newResult?.result);
   }, [!!selection, !!selection && selection.root, ...deps]);
 
   // Update data when database updates.
   useEffect(() => {
     if (result) {
-      return result.update.on(newData => {
-        setData(newData);
+      return result.update.on((entities: T[]) => {
+        setData(entities);
       });
     }
   }, [result]);
@@ -45,6 +44,43 @@ export const useSelection = <T extends Entity<any>> (
   return data;
 };
 
+/**
+ * @param selection
+ * @param value
+ * @param deps
+ */
+// TODO(burdon): Factor out common code with useSelection.
+export const useReducer = <T extends Entity<any>, R> (
+  selection: Selection<T> | SelectionResult<T> | Falsy,
+  value: R,
+  deps: readonly any[] = []
+) => {
+  const [result, setResult] = useState(() => coerceSelection(selection));
+  const [data, setData] = useState<R | undefined>(() => result ? result.value : undefined);
+
+  // Update selection when the query or customs deps change.
+  useEffect(() => {
+    const newResult = coerceSelection(selection);
+    setResult(newResult);
+    setData(newResult?.value);
+  }, [!!selection, !!selection && selection.root, ...deps]);
+
+  // Update data when database updates.
+  useEffect(() => {
+    if (result) {
+      return result.update.on(() => {
+        setData(result.value);
+      });
+    }
+  }, [result]);
+
+  return data;
+};
+
+/**
+ * @param arg
+ */
+// TODO(burdon): ???
 const coerceSelection = <T extends Entity>(
   arg: Selection<T> | SelectionResult<T> | Falsy
 ): SelectionResult<T> | undefined => !arg ? undefined : arg instanceof Selection ? arg.query() : arg;