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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.28.3-dev.969c91bc",
+  "version": "2.28.3-dev.b60166ab",
   "description": "React client API",
   "keywords": [],
   "license": "MIT",
@@ -8,24 +8,25 @@
   "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.b60166ab",
+    "@dxos/bot-factory-client": "2.28.3-dev.b60166ab",
+    "@dxos/client": "2.28.3-dev.b60166ab",
+    "@dxos/config": "2.28.3-dev.b60166ab",
+    "@dxos/credentials": "2.28.3-dev.b60166ab",
+    "@dxos/crypto": "2.28.3-dev.b60166ab",
+    "@dxos/debug": "2.28.3-dev.b60166ab",
+    "@dxos/echo-db": "2.28.3-dev.b60166ab",
+    "@dxos/network-manager": "2.28.3-dev.b60166ab",
+    "@dxos/util": "2.28.3-dev.b60166ab",
     "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/toolchain-node-library": "2.28.2",
+    "@dxos/esbuild-plugins": "~2.28.2",
+    "@dxos/eslint-plugin": "~1.0.26",
+    "@dxos/protocols-toolchain": "2.28.2",
     "@mui/material": "^5.4.2",
     "@testing-library/react": "^11.0.4",
     "@testing-library/react-hooks": "5.1.2",
@@ -36,6 +37,7 @@
     "@types/react": "^17.0.24",
     "@types/testing-library__jest-dom": "~5.9.5",
     "@types/use-subscription": "^1.0.0",
+    "eslint": "^7.12.1",
     "expect": "~27.0.2",
     "fork-ts-checker-webpack-plugin": "~6.2.5",
     "level-js": "^5.0.2",

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.entities : 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?.entities);
   }, [!!selection, !!selection && selection.root, ...deps]);
 
   // Update data when database updates.
   useEffect(() => {
     if (result) {
-      return result.update.on(newData => {
-        setData(newData);
+      return result.update.on(result => {
+        setData(result.entities);
       });
     }
   }, [result]);
@@ -45,6 +44,45 @@ export const useSelection = <T extends Entity<any>> (
   return data;
 };
 
+/**
+ * Hook to process selection reducer.
+ *
+ * @param selection
+ * @param value
+ * @param deps
+ */
+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(result => {
+        setData(result.value);
+      });
+    }
+  }, [result]);
+
+  return data;
+};
+
+/**
+ * @param value Selection or SelectionResult from hook.
+ */
 const coerceSelection = <T extends Entity>(
-  arg: Selection<T> | SelectionResult<T> | Falsy
-): SelectionResult<T> | undefined => !arg ? undefined : arg instanceof Selection ? arg.query() : arg;
+  value: Selection<T> | SelectionResult<T> | Falsy
+): SelectionResult<T> | undefined => {
+  return !value ? undefined : value instanceof Selection ? value.query() : value;
+};