@next-core/brick-kit 2.104.2 → 2.104.6

package/dist/index.esm.js

@@ -1904,12 +1904,12 @@ function _checkIf(rawIf, ctx, fn) {
 }
 
 class StoryboardContextWrapper {
-  constructor(isTemplateState) {
+  constructor(tplContextId) {
     _defineProperty$1(this, "data", new Map());
 
-    _defineProperty$1(this, "isTemplateState", void 0);
+    _defineProperty$1(this, "tplContextId", void 0);
 
-    this.isTemplateState = isTemplateState;
+    this.tplContextId = tplContextId;
   }
 
   set(name, item) {
@@ -1937,7 +1937,7 @@ class StoryboardContextWrapper {
     var _item$eventTarget;
 
     if (!this.data.has(name)) {
-      if (this.isTemplateState) {
+      if (this.tplContextId) {
         throw new Error("State not found: ".concat(name));
       } else {
         // eslint-disable-next-line no-console
@@ -1970,7 +1970,7 @@ class StoryboardContextWrapper {
       }
     }
 
-    (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.isTemplateState ? "state.change" : "context.change", {
+    (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
       detail: item.value
     }));
   }
@@ -1980,27 +1980,48 @@ class StoryboardContextWrapper {
 
     return _asyncToGenerator$4(function* () {
       if (Array.isArray(contextConfs)) {
-        yield resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(_this.isTemplateState, contextConf, coreContext, _this, brick));
+        var {
+          mergedContext,
+          keyword
+        } = _this.getResolveOptions(coreContext);
+
+        yield resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, mergedContext, _this, brick), keyword);
       }
     })();
   }
 
   syncDefine(contextConfs, coreContext, brick) {
     if (Array.isArray(contextConfs)) {
-      syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, coreContext, this, brick));
+      var {
+        mergedContext,
+        keyword
+      } = this.getResolveOptions(coreContext);
+      syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, mergedContext, this, brick), keyword);
     }
   }
 
+  getResolveOptions(coreContext) {
+    return this.tplContextId ? {
+      mergedContext: _objectSpread(_objectSpread({}, coreContext), {}, {
+        tplContextId: this.tplContextId
+      }),
+      keyword: "STATE"
+    } : {
+      mergedContext: coreContext,
+      keyword: "CTX"
+    };
+  }
+
 }
 
-function resolveStoryboardContext(_x, _x2, _x3, _x4, _x5) {
+function resolveStoryboardContext(_x, _x2, _x3, _x4) {
   return _resolveStoryboardContext.apply(this, arguments);
 }
 
 function _resolveStoryboardContext() {
-  _resolveStoryboardContext = _asyncToGenerator$4(function* (isTemplateState, contextConf, coreContext, storyboardContextWrapper, brick) {
+  _resolveStoryboardContext = _asyncToGenerator$4(function* (contextConf, coreContext, storyboardContextWrapper, brick) {
     if (contextConf.property) {
-      if (isTemplateState) {
+      if (storyboardContextWrapper.tplContextId) {
         throw new Error("Setting `property` is not allowed in template scoped context");
       }
 
@@ -2020,28 +2041,28 @@ function _resolveStoryboardContext() {
   return _resolveStoryboardContext.apply(this, arguments);
 }
 
-function resolveNormalStoryboardContext(_x6, _x7, _x8, _x9) {
+function resolveNormalStoryboardContext(_x5, _x6, _x7, _x8) {
   return _resolveNormalStoryboardContext.apply(this, arguments);
 }
 
 function _resolveNormalStoryboardContext() {
-  _resolveNormalStoryboardContext = _asyncToGenerator$4(function* (contextConf, coreContext, storyboardContextWrapper, brick) {
-    if (!looseCheckIf(contextConf, coreContext)) {
+  _resolveNormalStoryboardContext = _asyncToGenerator$4(function* (contextConf, mergedContext, storyboardContextWrapper, brick) {
+    if (!looseCheckIf(contextConf, mergedContext)) {
       return false;
     }
 
     var isResolve = false;
-    var value = getDefinedTemplateState(contextConf, storyboardContextWrapper, brick);
+    var value = getDefinedTemplateState(!!storyboardContextWrapper.tplContextId, contextConf, brick);
 
     if (value === undefined) {
       if (contextConf.resolve) {
-        if (looseCheckIf(contextConf.resolve, coreContext)) {
+        if (looseCheckIf(contextConf.resolve, mergedContext)) {
           isResolve = true;
           var valueConf = {};
           yield _internalApiGetResolver().resolveOne("reference", _objectSpread({
             transform: "value",
             transformMapArray: false
-          }, contextConf.resolve), valueConf, null, coreContext);
+          }, contextConf.resolve), valueConf, null, mergedContext);
           value = valueConf.value;
         } else if (!hasOwnProperty(contextConf, "value")) {
           return false;
@@ -2049,18 +2070,18 @@ function _resolveNormalStoryboardContext() {
       }
 
       if (!isResolve && contextConf.value !== undefined) {
-        value = computeRealValue(contextConf.value, coreContext, true);
+        value = computeRealValue(contextConf.value, mergedContext, true);
       }
     }
 
-    resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick);
+    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick);
     return true;
   });
   return _resolveNormalStoryboardContext.apply(this, arguments);
 }
 
-function syncResolveStoryboardContext(contextConf, coreContext, storyboardContextWrapper, brick) {
-  if (!looseCheckIf(contextConf, coreContext)) {
+function syncResolveStoryboardContext(contextConf, mergedContext, storyboardContextWrapper, brick) {
+  if (!looseCheckIf(contextConf, mergedContext)) {
     return false;
   }
 
@@ -2068,23 +2089,23 @@ function syncResolveStoryboardContext(contextConf, coreContext, storyboardContex
     throw new Error("resolve is not allowed here");
   }
 
-  var value = getDefinedTemplateState(contextConf, storyboardContextWrapper, brick);
+  var value = getDefinedTemplateState(!!storyboardContextWrapper.tplContextId, contextConf, brick);
 
   if (value === undefined) {
-    value = computeRealValue(contextConf.value, coreContext, true);
+    value = computeRealValue(contextConf.value, mergedContext, true);
   }
 
-  resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick);
+  resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick);
   return true;
 }
 
-function getDefinedTemplateState(contextConf, storyboardContextWrapper, brick) {
-  if (storyboardContextWrapper.isTemplateState && brick.properties && hasOwnProperty(brick.properties, contextConf.name)) {
+function getDefinedTemplateState(isTemplateState, contextConf, brick) {
+  if (isTemplateState && brick.properties && hasOwnProperty(brick.properties, contextConf.name)) {
     return brick.properties[contextConf.name];
   }
 }
 
-function resolveFreeVariableValue(value, contextConf, coreContext, storyboardContextWrapper, brick) {
+function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick) {
   var newContext = {
     type: "free-variable",
     value,
@@ -2094,7 +2115,7 @@ function resolveFreeVariableValue(value, contextConf, coreContext, storyboardCon
 
   if (contextConf.onChange) {
     for (var handler of [].concat(contextConf.onChange)) {
-      newContext.eventTarget.addEventListener(storyboardContextWrapper.isTemplateState ? "state.change" : "context.change", listenerFactory(handler, coreContext, brick));
+      newContext.eventTarget.addEventListener(storyboardContextWrapper.tplContextId ? "state.change" : "context.change", listenerFactory(handler, mergedContext, brick));
     }
   }
 
@@ -2106,12 +2127,13 @@ class CustomTemplateContext {
   constructor(brick) {
     _defineProperty$1(this, "variables", void 0);
 
-    _defineProperty$1(this, "state", new StoryboardContextWrapper(true));
+    _defineProperty$1(this, "state", void 0);
 
     _defineProperty$1(this, "id", uniqueId("tpl-ctx-"));
 
     this.brick = brick;
     tplContextMap.set(this.id, this);
+    this.state = new StoryboardContextWrapper(this.id);
     brick.tplContextId = this.id;
   }
 
@@ -2435,6 +2457,49 @@ function evaluate(raw) {
   }
 }
 
+var customTemplateRegistry = new Map();
+var appRegistered = new Set();
+var symbolForComputedPropsFromProxy = Symbol.for("tpl.computedPropsFromProxy");
+var symbolForRefForProxy = Symbol.for("tpl.refForProxy");
+var symbolForTplContextId = Symbol.for("tpl.contextId");
+
+function setupUseBrickInTemplate(props, tplContextId) {
+  function walk(props) {
+    if (!props) {
+      return;
+    }
+
+    for (var [key, value] of Object.entries(props)) {
+      if (isObject(value)) {
+        if (key === "useBrick") {
+          if (Array.isArray(value)) {
+            value.forEach(setup);
+          } else {
+            setup(value);
+          }
+        } else {
+          walk(value);
+        }
+      }
+    }
+  }
+
+  function setup(item) {
+    item[symbolForTplContextId] = tplContextId;
+    walk(item.properties);
+
+    if (item.slots) {
+      Object.values(item.slots).forEach(slot => {
+        if (Array.isArray(slot.bricks)) {
+          slot.bricks.forEach(setup);
+        }
+      });
+    }
+  }
+
+  walk(props);
+}
+
 var computeRealValue = (value, context, injectDeep, internalOptions) => {
   var preEvaluated = isPreEvaluated(value);
 
@@ -2488,6 +2553,10 @@ var computeRealValue = (value, context, injectDeep, internalOptions) => {
 function setProperties(bricks, properties, context, injectDeep) {
   var realProps = computeRealProperties(properties, context, injectDeep);
 
+  if (context.tplContextId) {
+    setupUseBrickInTemplate(realProps, context.tplContextId);
+  }
+
   if (!Array.isArray(bricks)) {
     bricks = [bricks];
   }
@@ -10002,12 +10071,6 @@ class Router {
 
 }
 
-var customTemplateRegistry = new Map();
-var appRegistered = new Set();
-var symbolForComputedPropsFromProxy = Symbol.for("tpl.computedPropsFromProxy");
-var symbolForRefForProxy = Symbol.for("tpl.refForProxy");
-var symbolForTplContextId = Symbol.for("tpl.contextId");
-
 function isBasicProperty(propRef) {
   return !!propRef.refProperty;
 }
@@ -10182,43 +10245,6 @@ function collectMergeBases(conf, mergeBases, contextInTemplate, refToBrickConf)
   }
 }
 
-function setupUseBrickInTemplate(props, tplContextId) {
-  function walk(props) {
-    if (!props) {
-      return;
-    }
-
-    for (var [key, value] of Object.entries(props)) {
-      if (isObject(value)) {
-        if (key === "useBrick") {
-          if (Array.isArray(value)) {
-            value.forEach(setup);
-          } else {
-            setup(value);
-          }
-        } else {
-          walk(value);
-        }
-      }
-    }
-  }
-
-  function setup(item) {
-    item[symbolForTplContextId] = tplContextId;
-    walk(item.properties);
-
-    if (item.slots) {
-      Object.values(item.slots).forEach(slot => {
-        if (Array.isArray(slot.bricks)) {
-          slot.bricks.forEach(setup);
-        }
-      });
-    }
-  }
-
-  walk(props);
-}
-
 var _excluded$1 = ["properties", "slots"],
     _excluded2 = ["ref", "slots"];
 function expandCustomTemplate(brickConf, proxyBrick, context) {
@@ -10509,7 +10535,7 @@ function getTagNameOfCustomTemplate(brick, appId) {
   return false;
 }
 
-function handleProxyOfCustomTemplate(brick, reRun) {
+function handleProxyOfCustomTemplate(brick) {
   // Ignore non-tpl bricks.
   if (!brick.proxyRefs) {
     return;
@@ -10523,17 +10549,18 @@ function handleProxyOfCustomTemplate(brick, reRun) {
 
       return (_brick$proxyRefs$get$ = brick.proxyRefs.get(ref).brick) === null || _brick$proxyRefs$get$ === void 0 ? void 0 : _brick$proxyRefs$get$.element;
     }
-  } // For usages of `targetRef: "..."`.
-  // `tpl.$$getElementByRef(ref)` will return the ref element inside a custom template.
+  }
 
+  var firstRun = !node.$$getElementByRef; // For usages of `targetRef: "..."`.
+  // `tpl.$$getElementByRef(ref)` will return the ref element inside a custom template.
 
-  if (!reRun) {
+  if (firstRun) {
     Object.defineProperty(node, "$$getElementByRef", {
       value: getElementByRef
     });
   }
 
-  if (!reRun && brick.stateNames) {
+  if (firstRun && brick.stateNames) {
     (function () {
       // Define properties from state for tpl.
       var getState = () => getCustomTemplateContext(brick.tplContextId).state;
@@ -11193,7 +11220,7 @@ var handleProxyOfParentTemplate = (brick, tplContextId) => {
       handleProxyOfCustomTemplate(_objectSpread(_objectSpread({}, tplBrick), {}, {
         proxyRefs: singleRefBrickProxyMap,
         proxy: getFilterProxy(tplBrick.proxy, brick.ref)
-      }), true);
+      }));
       setRealProperties(tplBrick.element, tplBrick.properties || {});
     }
   }