@plasmicapp/react-web 0.2.170 → 0.2.172

package/skinny/dist/index.js

@@ -5,9 +5,9 @@ import * as React from 'react';
 import React__default, { useLayoutEffect, useEffect } from 'react';
 import get from 'dlv';
 export { default as get } from 'dlv';
-import { c as createElementWithChildren, m as mergeProps, e as ensureNotArray, N as NONE, a as mergePropVals, i as isReactNode, b as isBrowser, u as useIsomorphicLayoutEffect$1 } from './react-utils-76d05959.js';
-import { _ as __awaiter, a as __generator, b as __rest, c as __assign, d as __spreadArray, e as __read, o as omit, p as pick, f as __values, i as isSubset, g as chainSingleArgFuncs, n as notNil } from './common-c2744215.js';
-export { o as omit, p as pick } from './common-c2744215.js';
+import { c as createElementWithChildren, m as mergeProps, e as ensureNotArray, N as NONE, a as mergePropVals, i as isReactNode, b as isBrowser, u as useIsomorphicLayoutEffect$1 } from './react-utils-628465ba.js';
+import { _ as __awaiter, a as __generator, b as __rest, c as __assign, d as __spreadArray, e as __read, o as omit, p as pick, f as __values, i as isSubset, g as chainSingleArgFuncs, n as notNil, h as ensure } from './common-dd6b46fb.js';
+export { o as omit, p as pick } from './common-dd6b46fb.js';
 export { PlasmicHead, plasmicHeadMeta } from './render/PlasmicHead/index.js';
 export { PlasmicImg } from './render/PlasmicImg/index.js';
 import { T as Trans } from './ssr-08aff522.js';
@@ -16,7 +16,7 @@ import ReactDOM__default from 'react-dom';
 import { useFocusRing } from '@react-aria/focus';
 import clone from 'clone';
 import deepEqual from 'fast-deep-equal';
-import { proxy, useSnapshot, ref } from 'valtio';
+import { proxy, ref, useSnapshot } from 'valtio';
 import '@react-aria/ssr';
 
 // https://stackoverflow.com/a/2117523
@@ -746,14 +746,13 @@ function useTrigger(trigger, opts) {
 }
 
 var ARRAY_SYMBOL = Symbol("[]");
-var PLASMIC_STATE_PROXY_SYMBOL = Symbol("plasmic.state.proxy");
+var PLASMIC_STATE_PROXY_SYMBOL = Symbol("plasmic.state.proxy");
+var UNINITIALIZED = Symbol("plasmic.unitialized");
 
-var UNINITIALIZED = Symbol("plasmic.unitialized");
 var StateSpecNode = /** @class */ (function () {
     function StateSpecNode(specs) {
         this._specs = specs;
         this._edges = new Map();
-        this._state = {};
     }
     StateSpecNode.prototype.setSpecs = function (specs) {
         this._specs = specs;
@@ -761,9 +760,6 @@ var StateSpecNode = /** @class */ (function () {
     StateSpecNode.prototype.edges = function () {
         return this._edges;
     };
-    StateSpecNode.prototype.state = function () {
-        return this._state;
-    };
     StateSpecNode.prototype.hasEdge = function (key) {
         return this._edges.has(key);
     };
@@ -777,11 +773,11 @@ var StateSpecNode = /** @class */ (function () {
         return this._edges.values();
     };
     StateSpecNode.prototype.makeTransition = function (key) {
-        key = isNum$1(key) ? ARRAY_SYMBOL : key;
+        key = isNum(key) ? ARRAY_SYMBOL : key;
         return this._edges.get(key);
     };
     StateSpecNode.prototype.isLeaf = function () {
-        return this._edges.size === 0;
+        return this._edges.size === 0 && this.getAllSpecs().length > 0;
     };
     StateSpecNode.prototype.hasArrayTransition = function () {
         return this._edges.has(ARRAY_SYMBOL);
@@ -792,52 +788,6 @@ var StateSpecNode = /** @class */ (function () {
     StateSpecNode.prototype.getAllSpecs = function () {
         return this._specs;
     };
-    StateSpecNode.prototype.getState = function (path) {
-        return this._state[JSON.stringify(path)];
-    };
-    StateSpecNode.prototype.getInitFunc = function (stateCell) {
-        var _a;
-        return (_a = stateCell.registeredInitFunc) !== null && _a !== void 0 ? _a : this.getSpec().initFunc;
-    };
-    StateSpecNode.prototype.clearStates = function () {
-        this._state = {};
-    };
-    StateSpecNode.prototype.states = function () {
-        return Object.values(this._state);
-    };
-    StateSpecNode.prototype.hasState = function (path) {
-        var key = JSON.stringify(path);
-        return key in this._state;
-    };
-    StateSpecNode.prototype.createStateCell = function (path) {
-        var key = JSON.stringify(path);
-        this._state[key] = {
-            listeners: [],
-            initialValue: UNINITIALIZED,
-            path: path
-        };
-    };
-    StateSpecNode.prototype.deleteStateCell = function (prefixPath) {
-        var _this = this;
-        __spreadArray([], __read(Object.keys(this._state)), false).forEach(function (key) {
-            var path = JSON.parse(key);
-            if (shallowEqual(prefixPath, path.slice(0, prefixPath.length))) {
-                delete _this._state[key];
-            }
-        });
-    };
-    StateSpecNode.prototype.setInitialValue = function (path, value) {
-        var key = JSON.stringify(path);
-        this._state[key].initialValue = value;
-    };
-    StateSpecNode.prototype.getInitialValue = function (path) {
-        var key = JSON.stringify(path);
-        return this._state[key].initialValue;
-    };
-    StateSpecNode.prototype.addListener = function (path, f) {
-        var key = JSON.stringify(path);
-        this._state[key].listeners.push(f);
-    };
     return StateSpecNode;
 }());
 var transformPathStringToObj = function (str) {
@@ -891,7 +841,7 @@ function updateTree(root, specs) {
     };
     return rec(root, []);
 }
-function getStateCells(root) {
+function getSpecTreeLeaves(root) {
     var leaves = [];
     var rec = function (node) {
         var e_1, _a;
@@ -954,169 +904,84 @@ function findStateCell(root, pathStr, repetitionIndex) {
     };
 }
 
-function generateStateOnChangeProp($state, path) {
-    return function (val) { return set($state, path, val); };
-}
-function generateStateValueProp($state, path) {
-    return get($state, path);
-}
-var useIsomorphicLayoutEffect = typeof window !== "undefined" ? useLayoutEffect : useEffect;
-function isPlasmicStateProxy(obj) {
-    return (obj != null && typeof obj === "object" && !!obj[PLASMIC_STATE_PROXY_SYMBOL]);
-}
-function getStateCellsInPlasmicProxy(obj) {
-    if (!isPlasmicStateProxy(obj)) {
-        return [];
-    }
-    var _a = obj[PLASMIC_STATE_PROXY_SYMBOL], rootNode = _a.node, rootPath = _a.path, isOutside = _a.isOutside;
-    if (isOutside) {
-        return [];
-    }
-    return getStateCells(rootNode).flatMap(function (node) {
-        return node.states().map(function (stateCell) { return ({
-            path: node.getSpec().path,
-            realPath: stateCell.path.slice(rootPath.length)
-        }); });
-    });
-}
-function getStateSpecInPlasmicProxy(obj, path) {
-    obj = get(obj, path.slice(0, path.length - 1));
-    if (!isPlasmicStateProxy(obj)) {
-        return undefined;
-    }
-    var _a = obj[PLASMIC_STATE_PROXY_SYMBOL], node = _a.node, isOutside = _a.isOutside;
-    var nextNode = node.makeTransition(path[path.length - 1]);
-    if (isOutside || node.isLeaf() || !nextNode) {
-        return undefined;
-    }
-    return {
-        spec: nextNode.getSpec(),
-        isImplicitStateArray: nextNode.hasArrayTransition()
-    };
-}
-function shallowEqual(a1, a2) {
-    if (a1.length !== a2.length) {
-        return false;
-    }
-    for (var i = 0; i < a1.length; i++) {
-        if (a1[i] !== a2[i]) {
-            return false;
-        }
-    }
-    return true;
-}
-/**
- * Shallow comparison of arrays.
- */
-function arrayEq(xs, ys) {
-    return (xs.length === ys.length && xs.every(function (_, index) { return xs[index] === ys[index]; }));
-}
 function isNum$1(value) {
     return typeof value === "symbol" ? false : !isNaN(+value);
 }
-function assert(cond, msg) {
-    if (msg === void 0) { msg = "Assertion failed"; }
-    if (!cond) {
-        // We always generate an non empty message so that it doesn't get swallowed
-        // by the async library.
-        msg = (typeof msg === "string" ? msg : msg()) || "Assertion failed";
-        debugger;
-        throw new Error(msg);
-    }
-}
-/**
- * Forked from https://github.com/lukeed/dset
- * Changes: fixed setting a deep value to a proxy object
- */
-function set(obj, keys, val) {
-    keys = keys.split ? keys.split(".") : keys;
-    var i = 0, l = keys.length, t = obj, x, k;
-    while (i < l) {
-        k = keys[i++];
-        if (k === "__proto__" || k === "constructor" || k === "prototype")
-            break;
-        var newValue = i === l
-            ? val
-            : typeof (x = t[k]) === typeof keys
-                ? x
-                : keys[i] * 0 !== 0 || !!~("" + keys[i]).indexOf(".")
-                    ? {}
-                    : [];
-        assignValue(t, k, newValue);
-        t = t[k];
-    }
+function canProxy(value) {
+    return typeof value === "object" && value != null;
 }
-/**
- * Forked from lodash
- */
-function baseAssignValue(object, key, value) {
-    if (key == "__proto__") {
-        Object.defineProperty(object, key, {
-            configurable: true,
-            enumerable: true,
-            value: value,
-            writable: true
-        });
+var proxyObjToStateCell = new WeakMap();
+function ensureStateCell(target, property, path, node) {
+    var _a;
+    if (!proxyObjToStateCell.has(target)) {
+        proxyObjToStateCell.set(target, {});
     }
-    else {
-        object[key] = value;
+    var stateCell = proxyObjToStateCell.get(target);
+    if (!(property in stateCell)) {
+        stateCell[property] = {
+            listeners: [],
+            initialValue: UNINITIALIZED,
+            path: path,
+            node: node,
+            initFunc: node.getSpec().initFunc,
+            initFuncHash: (_a = node.getSpec().initFuncHash) !== null && _a !== void 0 ? _a : ""
+        };
     }
+    return stateCell[property];
 }
-function eq(value, other) {
-    return value === other || (value !== value && other !== other);
+function getStateCell(target, property) {
+    var _a;
+    return (_a = proxyObjToStateCell.get(target)) === null || _a === void 0 ? void 0 : _a[property];
 }
-function assignValue(object, key, value) {
-    var objValue = object[key];
-    if (!(Object.prototype.hasOwnProperty.call(object, key) && eq(objValue, value)) ||
-        (value === undefined && !(key in object))) {
-        baseAssignValue(object, key, value);
+function tryGetStateCellFrom$StateRoot($state, path) {
+    if (path.length === 0) {
+        throw new Error("expected a path with length greater than 0");
     }
-}
-
-function isNum(value) {
-    return typeof value === "symbol" ? false : !isNaN(+value);
+    var target = get($state, path.slice(0, -1));
+    get(target, path.slice(-1)); // create state cell;
+    return getStateCell(target, path.slice(-1)[0]);
 }
-function canProxy(value) {
-    return typeof value === "object" && value != null;
+function getStateCellFrom$StateRoot($state, path) {
+    return ensure(tryGetStateCellFrom$StateRoot($state, path));
 }
-function initializeStateValue($$state, initialSpecNode, initialStatePath, proxyRoot) {
-    var _a, _b;
+function initializeStateValue($$state, initialStateCell, proxyRoot) {
+    var _a, _b, _c;
     var stateAccess = new Set();
-    var $state = create$StateProxy($$state, function (node, path) { return ({
+    var $state = create$StateProxy($$state, function (internalStateCell) { return ({
         get: function () {
-            stateAccess.add({ path: path, node: node });
-            var spec = node.getSpec();
+            var stateCell = getStateCellFrom$StateRoot(proxyRoot, internalStateCell.path);
+            stateAccess.add({ stateCell: stateCell });
+            var spec = stateCell.node.getSpec();
             if (spec.valueProp) {
                 return $$state.env.$props[spec.valueProp];
             }
-            else if (!node.hasState(path) && spec.initFunc) {
-                node.createStateCell(path);
-                return initializeStateValue($$state, node, path, proxyRoot);
+            else if (spec.initFunc && stateCell.initialValue === UNINITIALIZED) {
+                return initializeStateValue($$state, stateCell, proxyRoot);
             }
-            return get(proxyRoot, path);
+            return get(proxyRoot, stateCell.path);
         },
         set: function () {
             throw new Error("Cannot update state values during initialization");
         }
     }); });
     stateAccess.forEach(function (_a) {
-        var node = _a.node, path = _a.path;
-        node.addListener(path, function () {
-            var newValue = invokeInitFuncBackwardsCompatible(initialSpecNode.getSpec().initFunc, __assign({ $state: $state }, $$state.env));
-            set(proxyRoot, initialStatePath, newValue);
+        var stateCell = _a.stateCell;
+        stateCell.listeners.push(function () {
+            var _a;
+            var newValue = invokeInitFuncBackwardsCompatible(initialStateCell.node.getSpec().initFunc, __assign({ $state: $state }, ((_a = initialStateCell.overrideEnv) !== null && _a !== void 0 ? _a : $$state.env)));
+            set(proxyRoot, initialStateCell.path, newValue);
         });
     });
-    var initFunc = initialSpecNode.getInitFunc(initialSpecNode.getState(initialStatePath));
-    var initialValue = invokeInitFuncBackwardsCompatible(initFunc, __assign({ $state: $state }, $$state.env));
-    initialSpecNode.setInitialValue(initialStatePath, clone(initialValue));
-    var initialSpec = initialSpecNode.getSpec();
+    var initialValue = invokeInitFuncBackwardsCompatible(initialStateCell.initFunc, __assign({ $state: $state }, ((_a = initialStateCell.overrideEnv) !== null && _a !== void 0 ? _a : $$state.env)));
+    initialStateCell.initialValue = clone(initialValue);
+    var initialSpec = initialStateCell.node.getSpec();
     var value = initialSpec.isImmutable
         ? mkUntrackedValue(initialValue)
         : clone(initialValue);
-    set(proxyRoot, initialStatePath, value);
+    set(proxyRoot, initialStateCell.path, value);
     //immediately fire onChange
     if (initialSpec.onChangeProp) {
-        (_b = (_a = $$state.env.$props)[initialSpec.onChangeProp]) === null || _b === void 0 ? void 0 : _b.call(_a, initialValue);
+        (_c = (_b = $$state.env.$props)[initialSpec.onChangeProp]) === null || _c === void 0 ? void 0 : _c.call(_b, initialValue);
     }
     return initialValue;
 }
@@ -1124,7 +989,7 @@ function create$StateProxy($$state, leafHandlers) {
     var proxyRoot;
     var rec = function (currPath, currNode, isOutside, initialObject) {
         var getNextPath = function (property) { return __spreadArray(__spreadArray([], __read(currPath), false), [
-            isNum(property) ? +property : property,
+            isNum$1(property) ? +property : property,
         ], false); };
         var spec = currNode.getSpec();
         var handlers = {
@@ -1133,7 +998,7 @@ function create$StateProxy($$state, leafHandlers) {
                 if (!isOutside &&
                     !currNode.isLeaf() &&
                     !currNode.hasArrayTransition() &&
-                    !isNum(property)) {
+                    !isNum$1(property)) {
                     throw new Error("Can't delete a property in the middle of the state spec");
                 }
                 delete get($$state.stateValues, currPath)[property];
@@ -1143,13 +1008,6 @@ function create$StateProxy($$state, leafHandlers) {
                     // 2 - delete indices in repeated implicit states, but these can't be exposed, so they don't have onChangeProp
                     (_b = (_a = $$state.env.$props)[spec.onChangeProp]) === null || _b === void 0 ? void 0 : _b.call(_a, get(proxyRoot, currPath.slice(spec.pathObj.length)));
                 }
-                var nextPath = getNextPath(property);
-                var nextNode = currNode.makeTransition(property);
-                if (nextNode) {
-                    getStateCells(nextNode).forEach(function (node) {
-                        node.deleteStateCell(nextPath);
-                    });
-                }
                 return Reflect.deleteProperty(target, property);
             },
             get: function (target, property, receiver) {
@@ -1167,7 +1025,7 @@ function create$StateProxy($$state, leafHandlers) {
                 }
                 var nextNode = currNode.makeTransition(property);
                 if (nextNode === null || nextNode === void 0 ? void 0 : nextNode.isLeaf()) {
-                    return (_b = (_a = leafHandlers(nextNode, nextPath)).get) === null || _b === void 0 ? void 0 : _b.call(_a, target, property, receiver);
+                    return (_b = (_a = leafHandlers(ensureStateCell(receiver, property, nextPath, nextNode))).get) === null || _b === void 0 ? void 0 : _b.call(_a, target, property, receiver);
                 }
                 else if (nextNode && !(property in target)) {
                     target[property] = rec(nextPath, nextNode, false, undefined);
@@ -1187,7 +1045,7 @@ function create$StateProxy($$state, leafHandlers) {
                     return Reflect.set(target, property, value, receiver);
                 }
                 if (nextNode === null || nextNode === void 0 ? void 0 : nextNode.isLeaf()) {
-                    (_b = (_a = leafHandlers(nextNode, nextPath)).set) === null || _b === void 0 ? void 0 : _b.call(_a, target, property, value, receiver);
+                    (_b = (_a = leafHandlers(ensureStateCell(receiver, property, nextPath, nextNode))).set) === null || _b === void 0 ? void 0 : _b.call(_a, target, property, value, receiver);
                 }
                 if (!isOutside && !currNode.isLeaf() && !nextNode) {
                     // can't set an unknown field in $state
@@ -1319,29 +1177,29 @@ function useDollarState(specs) {
         var rootSpecTree = buildTree(specs);
         return {
             rootSpecTree: rootSpecTree,
-            specTreeLeaves: getStateCells(rootSpecTree),
+            specTreeLeaves: getSpecTreeLeaves(rootSpecTree),
             stateValues: proxy({}),
             env: envFieldsAreNonNill(env),
             specs: [],
             registrationsQueue: proxy([])
         };
     })()).current;
-    ($$state.env = envFieldsAreNonNill(env)), ($$state.specs = specs);
-    var create$State = function () {
-        var $state = Object.assign(create$StateProxy($$state, function (node, path) {
-            if (!node.hasState(path)) {
-                node.createStateCell(path);
-                var spec = node.getSpec();
-                if (spec.initFunc) {
-                    initializeStateValue($$state, node, path, $state);
-                }
-                else if (!spec.valueProp) {
-                    set($state, path, spec.initVal);
-                }
+    $$state.env = envFieldsAreNonNill(env);
+    $$state.specs = specs;
+    var create$State = React__default.useCallback(function () {
+        var $state = Object.assign(create$StateProxy($$state, function (stateCell) {
+            var spec = stateCell.node.getSpec();
+            if (stateCell.initialValue === UNINITIALIZED && spec.initFunc) {
+                initializeStateValue($$state, stateCell, $state);
+            }
+            else if (stateCell.initialValue === UNINITIALIZED &&
+                !spec.valueProp) {
+                stateCell.initialValue = spec.initVal;
+                set($state, stateCell.path, spec.initVal);
             }
             return {
                 get: function (target, property, receiver) {
-                    var spec = node.getSpec();
+                    var spec = stateCell.node.getSpec();
                     if (spec.valueProp) {
                         return $$state.env.$props[spec.valueProp];
                     }
@@ -1351,18 +1209,26 @@ function useDollarState(specs) {
                 }
             };
         }), {
-            registerInitFunc: function (pathStr, f, repetitionIndex) {
+            registerInitFunc: function (pathStr, f, repetitionIndex, overrideEnv) {
                 var _a = findStateCell($$state.rootSpecTree, pathStr, repetitionIndex), node = _a.node, realPath = _a.realPath;
-                if (!node.hasState(realPath)) {
-                    node.createStateCell(realPath);
-                }
-                if (!deepEqual(node.getState(realPath).initialValue, f(__assign({ $state: $state }, $$state.env)))) {
-                    $$state.registrationsQueue.push(mkUntrackedValue({ node: node, path: realPath, f: f }));
+                var stateCell = getStateCellFrom$StateRoot($state, realPath);
+                var env = overrideEnv
+                    ? envFieldsAreNonNill(overrideEnv)
+                    : $$state.env;
+                if (!deepEqual(stateCell.initialValue, f(__assign({ $state: $state }, env)))) {
+                    $$state.registrationsQueue.push(mkUntrackedValue({
+                        node: node,
+                        path: realPath,
+                        f: f,
+                        overrideEnv: overrideEnv
+                            ? envFieldsAreNonNill(overrideEnv)
+                            : undefined
+                    }));
                 }
             }
         });
         return $state;
-    };
+    }, []);
     var ref = React__default.useRef(undefined);
     if (!ref.current) {
         ref.current = create$State();
@@ -1370,29 +1236,37 @@ function useDollarState(specs) {
     var $state = ref.current;
     if (opts === null || opts === void 0 ? void 0 : opts.inCanvas) {
         $$state.rootSpecTree = updateTree($$state.rootSpecTree, specs);
-        var newLeaves = getStateCells($$state.rootSpecTree);
+        var newLeaves = getSpecTreeLeaves($$state.rootSpecTree);
         if (!arrayEq(newLeaves, $$state.specTreeLeaves)) {
-            var old$State_1 = $state;
+            var old$state_1 = $state;
             $state = ref.current = create$State();
             $$state.specTreeLeaves = newLeaves;
-            $$state.specTreeLeaves
-                .flatMap(function (node) { return node.states(); })
-                .forEach(function (_a) {
+            getStateCells(newLeaves, $$state.rootSpecTree).forEach(function (_a) {
                 var path = _a.path;
-                set($state, path, get(old$State_1, path));
+                var oldStateCell = tryGetStateCellFrom$StateRoot(old$state_1, path);
+                if (oldStateCell) {
+                    set($state, path, get(old$state_1, path));
+                }
             });
         }
         // we need to eager initialize all states in canvas to populate the data picker
         $$state.specTreeLeaves.forEach(function (node) {
+            var _a;
             var spec = node.getSpec();
-            if (spec.isRepeated || node.hasState(spec.pathObj)) {
+            if (spec.isRepeated) {
+                return;
+            }
+            var stateCell = getStateCellFrom$StateRoot($state, spec.pathObj);
+            var newSpec = specs.find(function (sp) { return sp.path === spec.path; });
+            if (!newSpec || stateCell.initFuncHash === (newSpec === null || newSpec === void 0 ? void 0 : newSpec.initFuncHash)) {
                 return;
             }
-            node.createStateCell(spec.pathObj);
+            stateCell.initFunc = newSpec.initFunc;
+            stateCell.initFuncHash = (_a = newSpec.initFuncHash) !== null && _a !== void 0 ? _a : "";
             var init = spec.valueProp
                 ? $$state.env.$props[spec.valueProp]
                 : spec.initFunc
-                    ? initializeStateValue($$state, node, spec.pathObj, $state)
+                    ? initializeStateValue($$state, stateCell, $state)
                     : spec.initVal;
             set($state, spec.pathObj, init);
         });
@@ -1400,38 +1274,36 @@ function useDollarState(specs) {
     // For each spec with an initFunc, evaluate it and see if
     // the init value has changed. If so, reset its state.
     var resetSpecs = [];
-    $$state.specTreeLeaves
-        .flatMap(function (node) { return node.states().map(function (stateCell) { return ({ stateCell: stateCell, node: node }); }); })
-        .forEach(function (_a) {
-        var node = _a.node, stateCell = _a.stateCell;
-        var initFunc = node.getInitFunc(stateCell);
-        if (initFunc) {
-            var newInit = invokeInitFuncBackwardsCompatible(initFunc, __assign({ $state: $state }, envFieldsAreNonNill(env)));
+    getStateCells($state, $$state.rootSpecTree).forEach(function (stateCell) {
+        var _a;
+        if (stateCell.initFunc) {
+            var newInit = invokeInitFuncBackwardsCompatible(stateCell.initFunc, __assign({ $state: $state }, ((_a = stateCell.overrideEnv) !== null && _a !== void 0 ? _a : envFieldsAreNonNill(env))));
             if (!deepEqual(newInit, stateCell.initialValue)) {
-                resetSpecs.push({ stateCell: stateCell, node: node });
+                resetSpecs.push({ stateCell: stateCell });
             }
         }
     });
-    var reInitializeState = function (node, stateCell) {
+    var reInitializeState = function (stateCell) {
         var _a, _b;
-        var newInit = initializeStateValue($$state, node, stateCell.path, $state);
-        var spec = node.getSpec();
+        var newInit = initializeStateValue($$state, stateCell, $state);
+        var spec = stateCell.node.getSpec();
         if (spec.onChangeProp) {
             (_b = (_a = $$state.env.$props)[spec.onChangeProp]) === null || _b === void 0 ? void 0 : _b.call(_a, newInit);
         }
     };
     useIsomorphicLayoutEffect(function () {
         resetSpecs.forEach(function (_a) {
-            var stateCell = _a.stateCell, node = _a.node;
-            reInitializeState(node, stateCell);
+            var stateCell = _a.stateCell;
+            reInitializeState(stateCell);
         });
     }, [env.$props, resetSpecs]);
     useIsomorphicLayoutEffect(function () {
         while ($$state.registrationsQueue.length) {
-            var _a = $$state.registrationsQueue.shift(), node = _a.node, path = _a.path, f = _a.f;
-            var stateCell = node.getState(path);
-            stateCell.registeredInitFunc = f;
-            reInitializeState(node, stateCell);
+            var _a = $$state.registrationsQueue.shift(), path = _a.path, f = _a.f, overrideEnv = _a.overrideEnv;
+            var stateCell = getStateCellFrom$StateRoot($state, path);
+            stateCell.initFunc = f;
+            stateCell.overrideEnv = overrideEnv;
+            reInitializeState(stateCell);
         }
     }, [$$state.registrationsQueue.length]);
     // immediately initialize exposed non-private states
@@ -1439,19 +1311,172 @@ function useDollarState(specs) {
         $$state.specTreeLeaves.forEach(function (node) {
             var spec = node.getSpec();
             if (!spec.isRepeated && spec.type !== "private" && spec.initFunc) {
-                node.createStateCell(spec.pathObj);
-                initializeStateValue($$state, node, spec.pathObj, $state);
+                var stateCell = getStateCellFrom$StateRoot($state, spec.pathObj);
+                initializeStateValue($$state, stateCell, $state);
             }
         });
     }, []);
     // Re-render if any value changed in one of these objects
     useSnapshot($$state.stateValues, { sync: true });
-    useSnapshot($$state.registrationsQueue);
+    useSnapshot($$state.registrationsQueue, { sync: true });
     return $state;
 }
 
+function generateStateOnChangeProp($state, path) {
+    return function (val) { return set($state, path, val); };
+}
+function generateStateValueProp($state, path) {
+    return get($state, path);
+}
+var useIsomorphicLayoutEffect = typeof window !== "undefined" ? useLayoutEffect : useEffect;
+function isPlasmicStateProxy(obj) {
+    return (obj != null && typeof obj === "object" && !!obj[PLASMIC_STATE_PROXY_SYMBOL]);
+}
+function getStateCells($state, root) {
+    var _a;
+    if ($state == null || typeof $state !== "object") {
+        return [];
+    }
+    var stateCells = Object.values((_a = proxyObjToStateCell.get($state)) !== null && _a !== void 0 ? _a : {});
+    if (root.isLeaf()) {
+        return stateCells;
+    }
+    if (root.hasArrayTransition()) {
+        return __spreadArray(__spreadArray([], __read(stateCells), false), __read(Object.keys($state).flatMap(function (key) {
+            return getStateCells($state[key], ensure(root.makeTransition(ARRAY_SYMBOL)));
+        })), false);
+    }
+    else {
+        return __spreadArray(__spreadArray([], __read(stateCells), false), __read(__spreadArray([], __read(root.edges().entries()), false).flatMap(function (_a) {
+            var _b = __read(_a, 2), key = _b[0], child = _b[1];
+            return typeof key === "string" && key in $state
+                ? getStateCells($state[key], child)
+                : [];
+        })), false);
+    }
+}
+function getStateCellsInPlasmicProxy(obj) {
+    if (!isPlasmicStateProxy(obj)) {
+        return [];
+    }
+    var _a = obj[PLASMIC_STATE_PROXY_SYMBOL], rootNode = _a.node, rootPath = _a.path, isOutside = _a.isOutside;
+    if (isOutside) {
+        return [];
+    }
+    return getStateCells(obj, rootNode).map(function (stateCell) { return ({
+        path: stateCell.node.getSpec().path,
+        realPath: stateCell.path.slice(rootPath.length)
+    }); });
+}
+function getStateSpecInPlasmicProxy(obj, path) {
+    obj = get(obj, path.slice(0, path.length - 1));
+    if (!isPlasmicStateProxy(obj)) {
+        return undefined;
+    }
+    var _a = obj[PLASMIC_STATE_PROXY_SYMBOL], node = _a.node, isOutside = _a.isOutside;
+    var nextNode = node.makeTransition(path[path.length - 1]);
+    if (isOutside || node.isLeaf() || !nextNode) {
+        return undefined;
+    }
+    return {
+        spec: nextNode.getSpec(),
+        isImplicitStateArray: nextNode.hasArrayTransition()
+    };
+}
+function getCurrentInitialValue(obj, path) {
+    var _a;
+    if (!isPlasmicStateProxy(obj)) {
+        return undefined;
+    }
+    return (_a = tryGetStateCellFrom$StateRoot(obj, path)) === null || _a === void 0 ? void 0 : _a.initialValue;
+}
+function resetToInitialValue(obj, path) {
+    var stateCell = tryGetStateCellFrom$StateRoot(obj, path);
+    if (stateCell) {
+        set(obj, path, stateCell.initialValue);
+    }
+}
+function shallowEqual(a1, a2) {
+    if (a1.length !== a2.length) {
+        return false;
+    }
+    for (var i = 0; i < a1.length; i++) {
+        if (a1[i] !== a2[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Shallow comparison of arrays.
+ */
+function arrayEq(xs, ys) {
+    return (xs.length === ys.length && xs.every(function (_, index) { return xs[index] === ys[index]; }));
+}
+function isNum(value) {
+    return typeof value === "symbol" ? false : !isNaN(+value);
+}
+function assert(cond, msg) {
+    if (msg === void 0) { msg = "Assertion failed"; }
+    if (!cond) {
+        // We always generate an non empty message so that it doesn't get swallowed
+        // by the async library.
+        msg = (typeof msg === "string" ? msg : msg()) || "Assertion failed";
+        debugger;
+        throw new Error(msg);
+    }
+}
+/**
+ * Forked from https://github.com/lukeed/dset
+ * Changes: fixed setting a deep value to a proxy object
+ */
+function set(obj, keys, val) {
+    keys = keys.split ? keys.split(".") : keys;
+    var i = 0, l = keys.length, t = obj, x, k;
+    while (i < l) {
+        k = keys[i++];
+        if (k === "__proto__" || k === "constructor" || k === "prototype")
+            break;
+        var newValue = i === l
+            ? val
+            : typeof (x = t[k]) === typeof keys
+                ? x
+                : keys[i] * 0 !== 0 || !!~("" + keys[i]).indexOf(".")
+                    ? {}
+                    : [];
+        assignValue(t, k, newValue);
+        t = t[k];
+    }
+}
+/**
+ * Forked from lodash
+ */
+function baseAssignValue(object, key, value) {
+    if (key == "__proto__") {
+        Object.defineProperty(object, key, {
+            configurable: true,
+            enumerable: true,
+            value: value,
+            writable: true
+        });
+    }
+    else {
+        object[key] = value;
+    }
+}
+function eq(value, other) {
+    return value === other || (value !== value && other !== other);
+}
+function assignValue(object, key, value) {
+    var objValue = object[key];
+    if (!(Object.prototype.hasOwnProperty.call(object, key) && eq(objValue, value)) ||
+        (value === undefined && !(key in object))) {
+        baseAssignValue(object, key, value);
+    }
+}
+
 // Utilities used by generated code
 var classNames = classNames$1;
 
-export { PlasmicIcon, PlasmicLink, PlasmicPageGuard, PlasmicSlot, Stack, classNames, createPlasmicElementProxy, createUseScreenVariants, deriveRenderOpts, ensureGlobalVariants, generateStateOnChangeProp, generateStateValueProp, getStateCellsInPlasmicProxy, getStateSpecInPlasmicProxy, hasVariant, isPlasmicStateProxy, makeFragment, mergeVariantsWithStates, renderPlasmicSlot, set, useDollarState, useTrigger, wrapWithClassName };
+export { PlasmicIcon, PlasmicLink, PlasmicPageGuard, PlasmicSlot, Stack, classNames, createPlasmicElementProxy, createUseScreenVariants, deriveRenderOpts, ensureGlobalVariants, generateStateOnChangeProp, generateStateValueProp, getCurrentInitialValue, getStateCellsInPlasmicProxy, getStateSpecInPlasmicProxy, hasVariant, isPlasmicStateProxy, makeFragment, mergeVariantsWithStates, renderPlasmicSlot, resetToInitialValue, set, useDollarState, useTrigger, wrapWithClassName };
 //# sourceMappingURL=index.js.map