@next-core/brick-kit 2.104.2 → 2.104.3

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

@@ -2434,6 +2434,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 +2530,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 +10048,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 +10222,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) {