@next-core/brick-kit 2.175.0 → 2.176.0

package/dist/index.bundle.js

@@ -1992,6 +1992,23 @@
         }
       })();
     }
+
+    /** 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,
@@ -2078,7 +2095,8 @@
       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);
@@ -2096,10 +2114,13 @@
                 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) || [];
@@ -2118,14 +2139,14 @@
             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);
@@ -2149,7 +2170,7 @@
       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,
@@ -2157,6 +2178,8 @@
       eventTarget: new EventTarget$1(),
       load,
       loaded,
+      loading,
+      async,
       deps: []
     };
     var eventName = storyboardContextWrapper.formContextId ? "formstate.change" : storyboardContextWrapper.tplContextId ? "state.change" : "context.change";
@@ -12063,6 +12086,7 @@
             // 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();