@plasmicapp/react-web 0.2.157 → 0.2.159

package/dist/all.d.ts

@@ -20,7 +20,7 @@ declare function classNames$1(...args: Argument[]): string;
 interface PlasmicPageGuardProps {
     appId: string;
     authorizeEndpoint: string;
-    minRole: string;
+    minRole?: string;
     canTriggerLogin: boolean;
     children: React__default.ReactNode;
 }
@@ -36,17 +36,7 @@ declare type HTMLElementRefOf<T extends keyof JSX.IntrinsicElements> = Exclude<R
 
 declare function dlv(object: object, key: string | Array<string | number>, defaultValue?: any): any;
 
-declare type InitFuncEnv = {
-    $props: Record<string, any>;
-    $state: Record<string, any>;
-    $queries?: Record<string, any>;
-    $ctx?: Record<string, any>;
-};
-declare type DollarStateEnv = Omit<InitFuncEnv, "$state">;
-declare type NoUndefinedField<T> = {
-    [P in keyof T]-?: T[P];
-};
-declare type InitFunc<T> = (env: NoUndefinedField<InitFuncEnv>) => T;
+declare type InitFunc<T> = ($props: Record<string, any>, $state: $State, $ctx: Record<string, any>, indexes?: number[]) => T;
 declare type ObjectPath = (string | number)[];
 interface $StateSpec<T> {
     path: string;
@@ -84,7 +74,7 @@ declare function getStateSpecInPlasmicProxy(obj: any, path: ObjectPath): {
  */
 declare function set(obj: any, keys: any, val: any): void;
 
-declare function useDollarState(specs: $StateSpec<any>[], env: DollarStateEnv, opts?: {
+declare function useDollarState(specs: $StateSpec<any>[], props: Record<string, any>, $ctx?: Record<string, any>, opts?: {
     inCanvas: boolean;
 }): $State;
 

package/dist/auth/PlasmicPageGuard.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 interface PlasmicPageGuardProps {
     appId: string;
     authorizeEndpoint: string;
-    minRole: string;
+    minRole?: string;
     canTriggerLogin: boolean;
     children: React.ReactNode;
 }

package/dist/react-web.cjs.development.js

@@ -859,6 +859,9 @@ function PlasmicPageGuard(props) {
     }
   }, [dataSourceCtxValue, appId, authorizeEndpoint, canTriggerLogin]);
   function canUserViewPage() {
+    if (!minRole) {
+      return true;
+    }
     if (!dataSourceCtxValue) {
       return false;
     }
@@ -2622,7 +2625,7 @@ function initializeStateValue($$state, initialSpecNode, initialStatePath, proxyR
         });
         var spec = node.getSpec();
         if (spec.valueProp) {
-          return $$state.env.$props[spec.valueProp];
+          return $$state.props[spec.valueProp];
         } else if (!node.hasState(path) && spec.initFunc) {
           node.createStateCell(path);
           return initializeStateValue($$state, node, path, proxyRoot);
@@ -2638,23 +2641,19 @@ function initializeStateValue($$state, initialSpecNode, initialStatePath, proxyR
     var node = _ref.node,
       path = _ref.path;
     node.addListener(path, function () {
-      var newValue = initialSpecNode.getSpec().initFunc(_extends({
-        $state: $state
-      }, $$state.env));
+      var newValue = initialSpecNode.getSpec().initFunc($$state.props, $state, $$state.ctx);
       set(proxyRoot, initialStatePath, newValue);
     });
   });
-  var initialValue = initialSpecNode.getInitFunc(initialSpecNode.getState(initialStatePath))(_extends({
-    $state: $state
-  }, $$state.env));
+  var initialValue = initialSpecNode.getInitFunc(initialSpecNode.getState(initialStatePath))($$state.props, $state, $$state.ctx);
   initialSpecNode.setInitialValue(initialStatePath, clone(initialValue));
   var initialSpec = initialSpecNode.getSpec();
   var value = initialSpec.isImmutable ? mkUntrackedValue(initialValue) : clone(initialValue);
   set(proxyRoot, initialStatePath, value);
   //immediately fire onChange
   if (initialSpec.onChangeProp) {
-    var _$$state$env$$props$i, _$$state$env$$props;
-    (_$$state$env$$props$i = (_$$state$env$$props = $$state.env.$props)[initialSpec.onChangeProp]) == null ? void 0 : _$$state$env$$props$i.call(_$$state$env$$props, initialValue);
+    var _$$state$props$initia, _$$state$props;
+    (_$$state$props$initia = (_$$state$props = $$state.props)[initialSpec.onChangeProp]) == null ? void 0 : _$$state$props$initia.call(_$$state$props, initialValue);
   }
   return initialValue;
 }
@@ -2672,11 +2671,11 @@ function create$StateProxy($$state, leafHandlers) {
         }
         delete _get($$state.stateValues, currPath)[property];
         if (spec.onChangeProp) {
-          var _$$state$env$$props$s, _$$state$env$$props2;
+          var _$$state$props$spec$o, _$$state$props2;
           //we are always in a leaf, since we only have two cases:
           // 1 - delete properties outside the state tree
           // 2 - delete indices in repeated implicit states, but these can't be exposed, so they don't have onChangeProp
-          (_$$state$env$$props$s = (_$$state$env$$props2 = $$state.env.$props)[spec.onChangeProp]) == null ? void 0 : _$$state$env$$props$s.call(_$$state$env$$props2, _get(proxyRoot, currPath.slice(spec.pathObj.length)));
+          (_$$state$props$spec$o = (_$$state$props2 = $$state.props)[spec.onChangeProp]) == null ? void 0 : _$$state$props$spec$o.call(_$$state$props2, _get(proxyRoot, currPath.slice(spec.pathObj.length)));
         }
         var nextPath = getNextPath(property);
         var nextNode = currNode.makeTransition(property);
@@ -2740,19 +2739,12 @@ function create$StateProxy($$state, leafHandlers) {
         } else {
           Reflect.set(target, property, value, receiver);
         }
-        if (currNode.isLeaf()) {
+        nextNode.getAllSpecs().forEach(function (spec) {
           if (spec.onChangeProp) {
-            var _$$state$env$$props$s2, _$$state$env$$props3;
-            (_$$state$env$$props$s2 = (_$$state$env$$props3 = $$state.env.$props)[spec.onChangeProp]) == null ? void 0 : _$$state$env$$props$s2.call(_$$state$env$$props3, target);
+            var _$$state$props$spec$o2, _$$state$props3;
+            (_$$state$props$spec$o2 = (_$$state$props3 = $$state.props)[spec.onChangeProp]) == null ? void 0 : _$$state$props$spec$o2.call(_$$state$props3, value);
           }
-        } else {
-          nextNode.getAllSpecs().forEach(function (spec) {
-            if (spec.onChangeProp) {
-              var _$$state$env$$props$s3, _$$state$env$$props4;
-              (_$$state$env$$props$s3 = (_$$state$env$$props4 = $$state.env.$props)[spec.onChangeProp]) == null ? void 0 : _$$state$env$$props$s3.call(_$$state$env$$props4, value);
-            }
-          });
-        }
+        });
         var newValue = (isOutside || currNode.isLeaf()) && currNode.getSpec().isImmutable ? mkUntrackedValue(value) : value;
         set($$state.stateValues, nextPath, newValue);
         return true;
@@ -2780,27 +2772,22 @@ function create$StateProxy($$state, leafHandlers) {
 var mkUntrackedValue = function mkUntrackedValue(o) {
   return o != null && typeof o === "object" ? valtio.ref(o) : o;
 };
-var envFieldsAreNonNill = function envFieldsAreNonNill(env) {
-  var _env$$ctx, _env$$queries;
-  return {
-    $props: env.$props,
-    $ctx: (_env$$ctx = env.$ctx) != null ? _env$$ctx : {},
-    $queries: (_env$$queries = env.$queries) != null ? _env$$queries : {}
-  };
-};
-function useDollarState(specs, env, opts) {
+function useDollarState(specs, props, $ctx, opts) {
   var $$state = React__default.useRef(function () {
     var rootSpecTree = buildTree(specs);
     return {
       rootSpecTree: rootSpecTree,
       specTreeLeaves: getStateCells(rootSpecTree),
       stateValues: valtio.proxy({}),
-      env: envFieldsAreNonNill(env),
+      props: {},
+      ctx: {},
       specs: [],
       registrationsQueue: valtio.proxy([])
     };
   }()).current;
-  $$state.env = envFieldsAreNonNill(env), $$state.specs = specs;
+  $$state.props = props;
+  $$state.ctx = $ctx != null ? $ctx : {};
+  $$state.specs = specs;
   var create$State = function create$State() {
     var $state = Object.assign(create$StateProxy($$state, function (node, path) {
       if (!node.hasState(path)) {
@@ -2816,7 +2803,7 @@ function useDollarState(specs, env, opts) {
         get: function get(target, property, receiver) {
           var spec = node.getSpec();
           if (spec.valueProp) {
-            return $$state.env.$props[spec.valueProp];
+            return $$state.props[spec.valueProp];
           } else {
             return Reflect.get(target, property, receiver);
           }
@@ -2830,9 +2817,7 @@ function useDollarState(specs, env, opts) {
         if (!node.hasState(realPath)) {
           node.createStateCell(realPath);
         }
-        if (!deepEqual(node.getState(realPath).initialValue, f(_extends({
-          $state: $state
-        }, $$state.env)))) {
+        if (!deepEqual(node.getState(realPath).initialValue, f($$state.props, $state, $$state.ctx))) {
           $$state.registrationsQueue.push(mkUntrackedValue({
             node: node,
             path: realPath,
@@ -2869,7 +2854,7 @@ function useDollarState(specs, env, opts) {
         return;
       }
       node.createStateCell(spec.pathObj);
-      var init = spec.valueProp ? $$state.env.$props[spec.valueProp] : spec.initFunc ? initializeStateValue($$state, node, spec.pathObj, $state) : spec.initVal;
+      var init = spec.valueProp ? $$state.props[spec.valueProp] : spec.initFunc ? initializeStateValue($$state, node, spec.pathObj, $state) : spec.initVal;
       set($state, spec.pathObj, init);
     });
   }
@@ -2888,9 +2873,7 @@ function useDollarState(specs, env, opts) {
       stateCell = _ref3.stateCell;
     var initFunc = node.getInitFunc(stateCell);
     if (initFunc) {
-      var newInit = initFunc(_extends({
-        $state: $state
-      }, envFieldsAreNonNill(env)));
+      var newInit = initFunc(props, $state, $ctx != null ? $ctx : {});
       if (!deepEqual(newInit, stateCell.initialValue)) {
         resetSpecs.push({
           stateCell: stateCell,
@@ -2903,8 +2886,8 @@ function useDollarState(specs, env, opts) {
     var newInit = initializeStateValue($$state, node, stateCell.path, $state);
     var spec = node.getSpec();
     if (spec.onChangeProp) {
-      var _$$state$env$$props$s4, _$$state$env$$props5;
-      (_$$state$env$$props$s4 = (_$$state$env$$props5 = $$state.env.$props)[spec.onChangeProp]) == null ? void 0 : _$$state$env$$props$s4.call(_$$state$env$$props5, newInit);
+      var _$$state$props$spec$o3, _$$state$props4;
+      (_$$state$props$spec$o3 = (_$$state$props4 = $$state.props)[spec.onChangeProp]) == null ? void 0 : _$$state$props$spec$o3.call(_$$state$props4, newInit);
     }
   };
   useIsomorphicLayoutEffect$1(function () {
@@ -2913,7 +2896,7 @@ function useDollarState(specs, env, opts) {
         node = _ref4.node;
       reInitializeState(node, stateCell);
     });
-  }, [env.$props, resetSpecs]);
+  }, [props, resetSpecs]);
   useIsomorphicLayoutEffect$1(function () {
     while ($$state.registrationsQueue.length) {
       var _$$state$registration = $$state.registrationsQueue.shift(),