@plasmicapp/react-web 0.2.306 → 0.2.309

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/react-web",
-  "version": "0.2.306",
+  "version": "0.2.309",
   "description": "plasmic library for rendering in the presentational style",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -90,7 +90,7 @@
     "@plasmicapp/data-sources": "0.1.143",
     "@plasmicapp/data-sources-context": "0.1.20",
     "@plasmicapp/host": "1.0.185",
-    "@plasmicapp/loader-splits": "1.0.49",
+    "@plasmicapp/loader-splits": "1.0.52",
     "@plasmicapp/prepass": "1.0.13",
     "@plasmicapp/query": "0.1.77",
     "@react-aria/checkbox": "^3.11.2",
@@ -157,5 +157,5 @@
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
-  "gitHead": "5e19b5a45a778666682fcbf5b25014db21c36517"
+  "gitHead": "60e590bf33cd69167cb9fda7cad1807118943548"
 }

package/skinny/dist/index.js

@@ -944,6 +944,7 @@ function findStateCell(root, pathStr, repetitionIndex) {
     };
 }
 
+var defer = setTimeout;
 function isNum$1(value) {
     return typeof value === "symbol" ? false : !isNaN(+value);
 }
@@ -1234,6 +1235,22 @@ function useDollarState(specs) {
         rest[_i - 1] = arguments[_i];
     }
     var _a = extractDollarStateParametersBackwardCompatible.apply(void 0, __spreadArray([], __read(rest), false)), env = _a.env, opts = _a.opts;
+    var _b = __read(React__default.useState(), 2), setState = _b[1];
+    var mountedRef = React__default.useRef(false);
+    var isMounted = React__default.useCallback(function () { return mountedRef.current; }, []);
+    React__default.useEffect(function () {
+        mountedRef.current = true;
+        return function () { return (mountedRef.current = false); };
+    }, []);
+    var pendingUpdate = React__default.useRef(false);
+    var forceUpdate = React__default.useCallback(function () {
+        return defer(function () {
+            if (isMounted()) {
+                setState([]);
+                pendingUpdate.current = false;
+            }
+        });
+    }, []);
     var $$state = React__default.useRef((function () {
         var rootSpecTree = buildTree(specs);
         return {
@@ -1242,7 +1259,7 @@ function useDollarState(specs) {
             stateValues: proxy({}),
             env: envFieldsAreNonNill(env),
             specs: [],
-            registrationsQueue: proxy([]),
+            registrationsQueue: [],
             stateInitializationEnv: { stack: [], visited: new Set() },
         };
     })()).current;
@@ -1279,14 +1296,18 @@ function useDollarState(specs) {
                     ? envFieldsAreNonNill(overrideEnv)
                     : $$state.env;
                 if (!deepEqual(stateCell.initialValue, f(__assign({ $state: $state }, env)))) {
-                    $$state.registrationsQueue.push(mkUntrackedValue({
+                    $$state.registrationsQueue.push({
                         node: node,
                         path: realPath,
                         f: f,
                         overrideEnv: overrideEnv
                             ? envFieldsAreNonNill(overrideEnv)
                             : undefined,
-                    }));
+                    });
+                    if (!pendingUpdate.current) {
+                        pendingUpdate.current = true;
+                        forceUpdate();
+                    }
                 }
             } }, ((opts === null || opts === void 0 ? void 0 : opts.inCanvas)
             ? {
@@ -1357,9 +1378,16 @@ function useDollarState(specs) {
         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 });
+                try {
+                    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 });
+                    }
+                }
+                catch (_b) {
+                    // Exception may be thrown from initFunc -- for example, if it tries to access $queries
+                    // that are still loading. We swallow those here, since we're only interested in
+                    // checking if the init value has changed, not in handling these errors.
                 }
             }
         });
@@ -1376,7 +1404,7 @@ function useDollarState(specs) {
             stateCell.overrideEnv = overrideEnv;
             reInitializeState(stateCell);
         }
-    }, [$$state.registrationsQueue.length]);
+    });
     // immediately initialize exposed non-private states
     useIsomorphicLayoutEffect(function () {
         $$state.specTreeLeaves.forEach(function (node) {
@@ -1389,7 +1417,6 @@ function useDollarState(specs) {
     }, []);
     // Re-render if any value changed in one of these objects
     useSnapshot($$state.stateValues, { sync: true });
-    useSnapshot($$state.registrationsQueue, { sync: true });
     return $state;
 }