@next-core/brick-kit 2.175.1 → 2.176.0

package/dist/index.esm.js

@@ -1993,6 +1993,23 @@ class StoryboardContextWrapper {
       }
     })();
   }
+
+  /** After mount, dispatch the change event when an async data is loaded */
+  handleAsyncAfterMount() {
+    this.data.forEach(item => {
+      if (item.type === "free-variable" && item.async) {
+        // An async data always has `loading`
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        item.loading.then(value => {
+          item.loaded = true;
+          item.value = value;
+          item.eventTarget.dispatchEvent(new CustomEvent(this.eventName, {
+            detail: value
+          }));
+        });
+      }
+    });
+  }
   deferDefine(contextConfs, coreContext, brick) {
     var {
       mergedContext,
@@ -2079,7 +2096,8 @@ function _resolveNormalStoryboardContext() {
     var isTemplateState = !!storyboardContextWrapper.tplContextId;
     var value = getDefinedTemplateState(isTemplateState, contextConf, brick);
     var load = null;
-    var isLazyResolve = false;
+    var loading;
+    var resolvePolicy = "eager";
     if (value === undefined) {
       if (contextConf.resolve) {
         yield storyboardContextWrapper.waitForUsedContext(contextConf.resolve.if);
@@ -2097,10 +2115,13 @@ function _resolveNormalStoryboardContext() {
               return _ref.apply(this, arguments);
             };
           }();
-          isLazyResolve = contextConf.resolve.lazy;
-          if (!isLazyResolve) {
+          // `async` take precedence over `lazy`
+          resolvePolicy = contextConf.resolve.async && !isTemplateState ? "async" : contextConf.resolve.lazy ? "lazy" : "eager";
+          if (resolvePolicy === "eager") {
             value = yield load();
-          } else if (isLazyResolve && contextConf.resolve.trigger) {
+          } else if (resolvePolicy === "async") {
+            loading = load();
+          } else if (contextConf.resolve.trigger) {
             var lifecycleName = contextConf.resolve.trigger;
             if (supportContextResolveTriggerBrickLifeCycle.includes(lifecycleName)) {
               var contextNameArray = storyboardContextWrapper.batchTriggerContextsNamesMap.get(lifecycleName) || [];
@@ -2119,14 +2140,14 @@ function _resolveNormalStoryboardContext() {
           return false;
         }
       }
-      if ((!load || isLazyResolve) && contextConf.value !== undefined) {
+      if ((!load || resolvePolicy !== "eager") && contextConf.value !== undefined) {
         yield storyboardContextWrapper.waitForUsedContext(contextConf.value);
         // If the context has no resolve, just use its `value`.
         // Or if the resolve is ignored or lazy, use its `value` as a fallback.
         value = computeRealValue(contextConf.value, mergedContext, true);
       }
     }
-    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, !isLazyResolve);
+    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, resolvePolicy === "eager", loading, resolvePolicy === "async");
     return true;
   });
   return _resolveNormalStoryboardContext.apply(this, arguments);
@@ -2150,7 +2171,7 @@ function getDefinedTemplateState(isTemplateState, contextConf, brick) {
     return brick.properties[contextConf.name];
   }
 }
-function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, loaded) {
+function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, loaded, loading, async) {
   var newContext = {
     type: "free-variable",
     value,
@@ -2158,6 +2179,8 @@ function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardC
     eventTarget: new EventTarget$1(),
     load,
     loaded,
+    loading,
+    async,
     deps: []
   };
   var eventName = storyboardContextWrapper.formContextId ? "formstate.change" : storyboardContextWrapper.tplContextId ? "state.change" : "context.change";
@@ -12064,6 +12087,7 @@ class Router {
           // See https://github.com/ReactTraining/react-router/blob/master/packages/react-router-dom/docs/guides/scroll-restoration.md
           window.scrollTo(0, 0);
           if (!failed) {
+            locationContext.storyboardContextWrapper.handleAsyncAfterMount();
             _this3.locationContext.handleBrickBindObserver();
             _this3.locationContext.handlePageLoad();
             _this3.locationContext.handleAnchorLoad();