From cf07da244b983cd43f75ec7bad95273326d03cb0 Mon Sep 17 00:00:00 2001
From: afonsocrg <afonso.crg@gmail.com>
Date: Sat, 8 Jun 2024 21:41:03 +0100
Subject: [PATCH 1/2] support nested models inside arrays/objects

---
 bindings/src/hooks/useReactModelRoot.tsx | 52 +++++++++++++++++-------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/bindings/src/hooks/useReactModelRoot.tsx b/bindings/src/hooks/useReactModelRoot.tsx
index 8279b00..13ca2e9 100644
--- a/bindings/src/hooks/useReactModelRoot.tsx
+++ b/bindings/src/hooks/useReactModelRoot.tsx
@@ -1,35 +1,59 @@
 import { useModelRoot } from './useModelRoot'
-import { usePublish } from './usePublish'
 import { ReactModel } from '../ReactModel'
+import { useCroquetView } from './useCroquetView';
+import { CroquetReactView } from '../CroquetReactView';
 
-function getModelObject<T extends ReactModel>(model: T): T {
+// We need to receive croquetView to pass it to eventual getModelObject calls
+function convertRecursively<T>(what: T, croquetView: CroquetReactView): T {
+  if (what instanceof ReactModel) {
+    return getModelObject(what, croquetView)
+  }
+  if(what instanceof Array) {
+    return what.map(w => convertRecursively(w, croquetView)) as T;
+  }
+  if (what instanceof Object) {
+    const result = {}
+    Object.entries(what).forEach(([key, value]) => {
+      // @ts-expect-error ---
+      result[key] = convertRecursively(value)
+    })
+    
+    return result as T
+  }
+  return what
+}
+
+// We need croquetView so that we can publish events
+function getModelObject<T extends ReactModel>(model: T, croquetView: CroquetReactView): T {
   const methods: Partial<T> = {}
   const excludeMethods = new Set(['view-join', 'view-exit'])
   model.__reactEvents
     .filter((e) => !excludeMethods.has(e.event))
     .forEach(({ scope, event }) => {
+      // Should not use the usePublsh hook because
+      // the number of nested models may change over time
+      // and the number of hooks inside a component should be constant
+
       // @ts-expect-error ---
-      methods[event] = usePublish((data) => [scope, event, data])
+      methods[event] = (data) => croquetView.publish(scope, event, data)
     })
 
   const properties: Partial<T> = {}
   const excludeProperties = new Set(['__reactEvents'])
-  for (const p in model) {
-    if (!excludeProperties.has(p)) {
-      const prop = model[p]
-      if (prop instanceof ReactModel) {
-        properties[p] = getModelObject(prop)
-      } else {
-        properties[p] = prop
-      }
-    }
-  }
+
+  Object.entries(model)
+  .filter(([key]) => !excludeProperties.has(key))
+  .forEach(([key, value]) => {
+    // @ts-expect-error ---
+    properties[key] = convertRecursively(value, croquetView)
+  })
 
   return { ...properties, ...methods } as T
 }
 
 export function useReactModelRoot<T extends ReactModel>(): T {
   const model = useModelRoot() as T
+  const croquetView = useCroquetView()
 
-  return getModelObject(model)
+  return getModelObject(model, croquetView!)
 }

From 2da2805ccf327ae4cf0572d09862d94e78b515f3 Mon Sep 17 00:00:00 2001
From: afonsocrg <afonso.crg@gmail.com>
Date: Sat, 8 Jun 2024 21:41:24 +0100
Subject: [PATCH 2/2] update version to 2.0.1

---
 bindings/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bindings/package.json b/bindings/package.json
index 030f702..a391480 100644
--- a/bindings/package.json
+++ b/bindings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@croquet/react",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "React bindings for Croquet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",