@next-core/brick-kit 2.104.2 → 2.104.6

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.104.6](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.5...@next-core/brick-kit@2.104.6) (2022-02-15)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+## [2.104.5](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.4...@next-core/brick-kit@2.104.5) (2022-02-15)
+
+
+### Bug Fixes
+
+* fix re-render of useBrick of tpl ([7cbd0d8](https://github.com/easyops-cn/next-core/commit/7cbd0d83517afdb1eef9fafb5e803655f3e698b9))
+
+
+
+
+
+## [2.104.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.3...@next-core/brick-kit@2.104.4) (2022-02-15)
+
+
+### Bug Fixes
+
+* fix targetRef on working in state.onChange ([bac0003](https://github.com/easyops-cn/next-core/commit/bac000367d82ebd428a2aa08d05193b129718eb7))
+
+
+
+
+
+## [2.104.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.2...@next-core/brick-kit@2.104.3) (2022-02-15)
+
+
+### Bug Fixes
+
+* fix missing tpl context when setting properties by callback ([c681dd4](https://github.com/easyops-cn/next-core/commit/c681dd41baec10a9f5eb13ac6bccfa5ae559044c))
+
+
+
+
+
 ## [2.104.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.104.1...@next-core/brick-kit@2.104.2) (2022-02-15)
 
 

package/dist/index.bundle.js

@@ -1903,12 +1903,12 @@
   }
 
   class StoryboardContextWrapper {
-    constructor(isTemplateState) {
+    constructor(tplContextId) {
       _defineProperty__default["default"](this, "data", new Map());
 
-      _defineProperty__default["default"](this, "isTemplateState", void 0);
+      _defineProperty__default["default"](this, "tplContextId", void 0);
 
-      this.isTemplateState = isTemplateState;
+      this.tplContextId = tplContextId;
     }
 
     set(name, item) {
@@ -1936,7 +1936,7 @@
       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
@@ -1969,7 +1969,7 @@
         }
       }
 
-      (_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
       }));
     }
@@ -1979,27 +1979,48 @@
 
       return _asyncToGenerator__default["default"](function* () {
         if (Array.isArray(contextConfs)) {
-          yield brickUtils.resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(_this.isTemplateState, contextConf, coreContext, _this, brick));
+          var {
+            mergedContext,
+            keyword
+          } = _this.getResolveOptions(coreContext);
+
+          yield brickUtils.resolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, mergedContext, _this, brick), keyword);
         }
       })();
     }
 
     syncDefine(contextConfs, coreContext, brick) {
       if (Array.isArray(contextConfs)) {
-        brickUtils.syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, coreContext, this, brick));
+        var {
+          mergedContext,
+          keyword
+        } = this.getResolveOptions(coreContext);
+        brickUtils.syncResolveContextConcurrently(contextConfs, contextConf => syncResolveStoryboardContext(contextConf, mergedContext, this, brick), keyword);
       }
     }
 
+    getResolveOptions(coreContext) {
+      return this.tplContextId ? {
+        mergedContext: _objectSpread__default["default"](_objectSpread__default["default"]({}, 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__default["default"](function* (isTemplateState, contextConf, coreContext, storyboardContextWrapper, brick) {
+    _resolveStoryboardContext = _asyncToGenerator__default["default"](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");
         }
 
@@ -2019,28 +2040,28 @@
     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__default["default"](function* (contextConf, coreContext, storyboardContextWrapper, brick) {
-      if (!looseCheckIf(contextConf, coreContext)) {
+    _resolveNormalStoryboardContext = _asyncToGenerator__default["default"](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__default["default"]({
               transform: "value",
               transformMapArray: false
-            }, contextConf.resolve), valueConf, null, coreContext);
+            }, contextConf.resolve), valueConf, null, mergedContext);
             value = valueConf.value;
           } else if (!brickUtils.hasOwnProperty(contextConf, "value")) {
             return false;
@@ -2048,18 +2069,18 @@
         }
 
         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;
     }
 
@@ -2067,23 +2088,23 @@
       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 && brickUtils.hasOwnProperty(brick.properties, contextConf.name)) {
+  function getDefinedTemplateState(isTemplateState, contextConf, brick) {
+    if (isTemplateState && brick.properties && brickUtils.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,
@@ -2093,7 +2114,7 @@
 
     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));
       }
     }
 
@@ -2105,12 +2126,13 @@
     constructor(brick) {
       _defineProperty__default["default"](this, "variables", void 0);
 
-      _defineProperty__default["default"](this, "state", new StoryboardContextWrapper(true));
+      _defineProperty__default["default"](this, "state", void 0);
 
       _defineProperty__default["default"](this, "id", lodash.uniqueId("tpl-ctx-"));
 
       this.brick = brick;
       tplContextMap.set(this.id, this);
+      this.state = new StoryboardContextWrapper(this.id);
       brick.tplContextId = this.id;
     }
 
@@ -2434,6 +2456,49 @@
     }
   }
 
+  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 (brickUtils.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);
 
@@ -2487,6 +2552,10 @@
   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];
     }
@@ -10001,12 +10070,6 @@
 
   }
 
-  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;
   }
@@ -10181,43 +10244,6 @@
     }
   }
 
-  function setupUseBrickInTemplate(props, tplContextId) {
-    function walk(props) {
-      if (!props) {
-        return;
-      }
-
-      for (var [key, value] of Object.entries(props)) {
-        if (brickUtils.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) {
@@ -10508,7 +10534,7 @@
     return false;
   }
 
-  function handleProxyOfCustomTemplate(brick, reRun) {
+  function handleProxyOfCustomTemplate(brick) {
     // Ignore non-tpl bricks.
     if (!brick.proxyRefs) {
       return;
@@ -10522,17 +10548,18 @@
 
         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;
@@ -11192,7 +11219,7 @@
         handleProxyOfCustomTemplate(_objectSpread__default["default"](_objectSpread__default["default"]({}, tplBrick), {}, {
           proxyRefs: singleRefBrickProxyMap,
           proxy: getFilterProxy(tplBrick.proxy, brick.ref)
-        }), true);
+        }));
         setRealProperties(tplBrick.element, tplBrick.properties || {});
       }
     }