@next-core/brick-kit 2.145.3 → 2.146.0

package/dist/index.esm.js

@@ -2181,26 +2181,6 @@ function _resolveNormalStoryboardContext() {
         // Or if the resolve is ignored or lazy, use its `value` as a fallback.
         value = computeRealValue(contextConf.value, mergedContext, true);
       }
-
-      if (contextConf.track) {
-        // Track its dependencies and auto update when each of them changed.
-        var deps = (isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
-
-        for (var dep of deps) {
-          var _eventTarget;
-
-          var ctx = storyboardContextWrapper.get().get(dep);
-          ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
-            if (load) {
-              storyboardContextWrapper.updateValue(contextConf.name, {
-                cache: "default"
-              }, "refresh");
-            } else {
-              storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
-            }
-          });
-        }
-      }
     }
 
     resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, !isLazyResolve);
@@ -2250,6 +2230,27 @@ function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardC
     }
   }
 
+  if (contextConf.track) {
+    var isTemplateState = !!storyboardContextWrapper.tplContextId; // Track its dependencies and auto update when each of them changed.
+
+    var deps = (isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
+
+    for (var dep of deps) {
+      var _eventTarget;
+
+      var ctx = storyboardContextWrapper.get().get(dep);
+      ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
+        if (load) {
+          storyboardContextWrapper.updateValue(contextConf.name, {
+            cache: "default"
+          }, "refresh");
+        } else {
+          storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
+        }
+      });
+    }
+  }
+
   storyboardContextWrapper.set(contextConf.name, newContext);
 }