fix(proxy-state-tree): fix accessing proxy with wrong tree proxy

Author: christianalfoni

packages/node_modules/overmind-devtools/src/app/actions.ts

@@ -132,7 +132,10 @@ export const toggleCollapsedOperator: Action<number> = ({
   state,
 }) => {
   if (!state.expandAllActionDetails) {
-    const operator = state.currentAction.operators[operatorIndex]
+    const currentApp = state.apps[state.currentAppName]
+    const currentAction = currentApp.actions[currentApp.currentActionId]
+    const operator = currentAction.operators[operatorIndex]
+
     operator.isCollapsed = !operator.isCollapsed
   }
 }

packages/node_modules/proxy-state-tree/src/index.test.ts

@@ -498,7 +498,7 @@ describe('FUNCTIONS', () => {
       item.title
     })
     const paths = tree.clearPathsTracking(trackId)
-    console.log(paths)
+
     tree.addFlushListener(paths, (flushId) => {
       reactionCount++
       expect(flushId).toBe(0)

packages/node_modules/proxy-state-tree/src/proxify.ts

@@ -126,9 +126,20 @@ function createObjectProxy(tree, value, path) {
       trackPath(tree, nestedPath)
 
       if (typeof targetValue === 'function') {
-        return tree.options.dynamicWrapper
+        const dynamicValue = tree.options.dynamicWrapper
           ? tree.options.dynamicWrapper(tree, nestedPath, targetValue)
           : targetValue(tree, nestedPath)
+
+        if (dynamicValue[IS_PROXY]) {
+          delete dynamicValue[VALUE][tree.PROXY]
+          Object.defineProperty(dynamicValue[VALUE], tree.PROXY, {
+            configurable: true,
+            value: proxify(tree, dynamicValue[VALUE], dynamicValue[PATH]),
+          })
+          return dynamicValue[VALUE][tree.PROXY]
+        }
+
+        return dynamicValue
       }
 
       if (targetValue === undefined) {
@@ -186,6 +197,10 @@ function getValue(value, tree) {
     return value
   }
 
+  if (value[IS_PROXY]) {
+    return value[VALUE][tree.PROXY] || value[VALUE]
+  }
+
   if (value[tree.PROXY]) {
     return value[tree.PROXY]
   }