@next-core/brick-kit 2.104.0 → 2.104.4

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,7 +1980,7 @@ class StoryboardContextWrapper {
 
     return _asyncToGenerator$4(function* () {
       if (Array.isArray(contextConfs)) {
-        yield resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(_this.isTemplateState, contextConf, coreContext, _this, brick));
+        yield resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, coreContext, _this, brick));
       }
     })();
   }
@@ -1993,14 +1993,14 @@ class StoryboardContextWrapper {
 
 }
 
-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,7 +2020,7 @@ function _resolveStoryboardContext() {
   return _resolveStoryboardContext.apply(this, arguments);
 }
 
-function resolveNormalStoryboardContext(_x6, _x7, _x8, _x9) {
+function resolveNormalStoryboardContext(_x5, _x6, _x7, _x8) {
   return _resolveNormalStoryboardContext.apply(this, arguments);
 }
 
@@ -2079,7 +2079,7 @@ function syncResolveStoryboardContext(contextConf, coreContext, storyboardContex
 }
 
 function getDefinedTemplateState(contextConf, storyboardContextWrapper, brick) {
-  if (storyboardContextWrapper.isTemplateState && brick.properties && hasOwnProperty(brick.properties, contextConf.name)) {
+  if (storyboardContextWrapper.tplContextId && brick.properties && hasOwnProperty(brick.properties, contextConf.name)) {
     return brick.properties[contextConf.name];
   }
 }
@@ -2094,7 +2094,13 @@ function resolveFreeVariableValue(value, contextConf, coreContext, storyboardCon
 
   if (contextConf.onChange) {
     for (var handler of [].concat(contextConf.onChange)) {
-      newContext.eventTarget.addEventListener("context.change", listenerFactory(handler, coreContext, brick));
+      if (storyboardContextWrapper.tplContextId) {
+        newContext.eventTarget.addEventListener("state.change", listenerFactory(handler, _objectSpread(_objectSpread({}, coreContext), {}, {
+          tplContextId: storyboardContextWrapper.tplContextId
+        }), brick));
+      } else {
+        newContext.eventTarget.addEventListener("context.change", listenerFactory(handler, coreContext, brick));
+      }
     }
   }
 
@@ -2106,12 +2112,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 +2442,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 +2538,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];
   }
@@ -9046,6 +9100,11 @@ class LocationContext {
   getCurrentMatch() {
     return this.currentMatch;
   }
+  /** @deprecated */
+
+
+  getTplContext() {// Keep it for compatibility only.
+  }
 
   dispatchLifeCycleEvent(event, handlers) {
     for (var brickAndHandler of handlers) {
@@ -9997,12 +10056,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;
 }
@@ -10177,43 +10230,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) {