@next-core/brick-kit 2.154.18 → 2.155.1

package/dist/index.bundle.js

@@ -994,9 +994,10 @@
     Object.entries(to).map(_ref => {
       var [k, v] = _ref;
 
-      if (Array.isArray(options === null || options === void 0 ? void 0 : options.trackingContextList) && brickUtils.isEvaluable(v)) {
-        var contextNames = brickUtils.trackContext(v);
-        var stateNames = brickUtils.trackState(v);
+      if (Array.isArray(options === null || options === void 0 ? void 0 : options.trackingContextList) && (typeof v === "string" ? brickUtils.isEvaluable(v) : isPreEvaluated(v))) {
+        var raw = typeof v === "string" ? v : getPreEvaluatedRaw(v);
+        var contextNames = brickUtils.trackContext(raw);
+        var stateNames = brickUtils.trackState(raw);
 
         if (contextNames || stateNames) {
           options.trackingContextList.push({
@@ -2370,6 +2371,9 @@
   function isPreEvaluated(raw) {
     return !!(raw !== null && raw !== void 0 && raw[symbolForRaw]);
   }
+  function getPreEvaluatedRaw(pre) {
+    return pre[symbolForRaw];
+  }
   function shouldDismissRecursiveMarkingInjected(raw) {
     if (typeof raw === "string") {
       return brickUtils.shouldAllowRecursiveEvaluations(raw);
@@ -2503,18 +2507,29 @@
       });
     }
 
+    var internalContext = _internalApiGetCurrentContext();
+
+    var mergedContext = {}; // Use runtime context over internal context.
+    // Internal context such as `match`, maybe change after `history.push`.
+    // So we prefer memoized runtime context.
+
+    for (var key of ["query", "match", "hash", "pathname", "app", "segues"]) {
+      mergedContext[key] = (brickUtils.hasOwnProperty(runtimeContext, key) ? runtimeContext : internalContext)[key];
+    }
+
     var {
       app: currentApp,
       query,
       match,
-      sys,
-      flags,
       hash,
       pathname,
-      segues,
+      segues
+    } = mergedContext;
+    var {
+      sys,
+      flags,
       storyboardContext
-    } = _internalApiGetCurrentContext();
-
+    } = internalContext;
     var app = (_runtimeContext$overr = runtimeContext.overrideApp) !== null && _runtimeContext$overr !== void 0 ? _runtimeContext$overr : currentApp;
 
     function getIndividualGlobal(variableName) {
@@ -2961,11 +2976,22 @@
 
       if (preEvaluated || brickUtils.isEvaluable(value)) {
         var runtimeContext = {};
-        var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace", "formContextId"];
 
-        for (var key of keys) {
-          if (context !== null && context !== void 0 && context[key]) {
-            runtimeContext[key] = context[key];
+        if (context) {
+          var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace", "formContextId", "query", "match", "app", "segues"];
+
+          for (var key of keys) {
+            if (context[key]) {
+              runtimeContext[key] = context[key];
+            }
+          }
+
+          var simpleKeys = ["hash", "pathname"];
+
+          for (var _key of simpleKeys) {
+            if (brickUtils.hasOwnProperty(context, _key)) {
+              runtimeContext[_key] = context[_key];
+            }
           }
         } // The current runtime context is memoized even if the evaluation maybe lazy.
 
@@ -3054,9 +3080,10 @@
           }
         }
 
-        if (Array.isArray(trackingContextList) && brickUtils.isEvaluable(propValue)) {
-          var contextNames = brickUtils.trackContext(propValue);
-          var stateNames = brickUtils.trackState(propValue);
+        if (Array.isArray(trackingContextList) && (typeof propValue === "string" ? brickUtils.isEvaluable(propValue) : isPreEvaluated(propValue))) {
+          var raw = typeof propValue === "string" ? propValue : getPreEvaluatedRaw(propValue);
+          var contextNames = brickUtils.trackContext(raw);
+          var stateNames = brickUtils.trackState(raw);
 
           if (contextNames || stateNames) {
             trackingContextList.push({
@@ -13063,7 +13090,7 @@
 
 
   var SingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo(function SingleBrickAsComponent(_ref) {
-    var _internalApiGetCurren, _templateRef$current$, _templateRef$current, _templateRef$current2;
+    var _internalApiGetCurren, _templateRef$current$, _templateRef$current2;
 
     var {
       useBrick,
@@ -13071,6 +13098,9 @@
       refCallback,
       immediatelyRefCallback
     } = _ref;
+    var firstRunRef = React.useRef(true);
+    var innerRefCallbackRef = React.useRef();
+    var elementRef = React.useRef();
     var templateRef = React.useRef();
     var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren === void 0 ? void 0 : _internalApiGetCurren.id);
     var isBrickAvailable = React__default["default"].useMemo(() => {
@@ -13125,10 +13155,60 @@
       }
 
       return brick;
-    }), [useBrick, data, isBrickAvailable]);
-    var innerRefCallback = React__default["default"].useCallback( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator__default["default"](function* (element) {
-        immediatelyRefCallback === null || immediatelyRefCallback === void 0 ? void 0 : immediatelyRefCallback(element);
+    }), [useBrick, data, isBrickAvailable, tplTagName]);
+
+    var dispatchLifeCycleEvent = /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator__default["default"](function* (event, handlers, brick) {
+        for (var handler of [].concat(handlers)) {
+          listenerFactory(handler, _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
+            tplContextId: useBrick[symbolForTplContextId]
+          }), brick)(event);
+        }
+      });
+
+      return function dispatchLifeCycleEvent(_x, _x2, _x3) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
+
+    var updateBrick = React.useCallback((brick, element) => {
+      brick.element = element;
+      var {
+        [symbolForTplContextId]: tplContextId
+      } = useBrick;
+
+      if (useBrick.iid) {
+        element.dataset.iid = useBrick.iid;
+      }
+
+      setRealProperties(element, brick.properties);
+      unbindListeners(element);
+
+      if (brick.events) {
+        bindListeners(element, transformEvents(data, brick.events), _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
+          tplContextId
+        }));
+      } // 设置proxyEvent
+
+
+      handleProxyOfCustomTemplate(brick);
+
+      if (element.$$typeof !== "custom-template") {
+        if (!useBrick.brick.includes("-")) {
+          element.$$typeof = "native";
+        } else if (!customElements.get(useBrick.brick)) {
+          element.$$typeof = "invalid";
+        }
+      }
+    }, [data, useBrick]);
+    React.useEffect(() => {
+      if (firstRunRef.current) {
+        firstRunRef.current = false;
+        return;
+      }
+
+      _asyncToGenerator__default["default"](function* () {
+        var element = elementRef.current;
 
         if (element) {
           var brick;
@@ -13144,32 +13224,38 @@
             return;
           }
 
-          brick.element = element;
-          var {
-            [symbolForTplContextId]: tplContextId
-          } = useBrick;
+          updateBrick(brick, element);
+        }
+      })();
+    }, [runtimeBrick, updateBrick]);
 
-          if (useBrick.iid) {
-            element.dataset.iid = useBrick.iid;
-          }
+    innerRefCallbackRef.current = /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator__default["default"](function* (element) {
+        immediatelyRefCallback === null || immediatelyRefCallback === void 0 ? void 0 : immediatelyRefCallback(element);
+        elementRef.current = element;
+        var brick;
 
-          setRealProperties(element, brick.properties);
-          unbindListeners(element);
+        try {
+          brick = yield runtimeBrick;
+        } catch (e) {
+          handleHttpError(e);
+        } // sub-brick rendering is ignored.
 
-          if (brick.events) {
-            bindListeners(element, transformEvents(data, brick.events), _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
-              tplContextId
-            }));
-          } // 设置proxyEvent
 
+        if (brick) {
+          if (element) {
+            var _useBrick$lifeCycle;
+
+            updateBrick(brick, element);
 
-          handleProxyOfCustomTemplate(brick);
+            if ((_useBrick$lifeCycle = useBrick.lifeCycle) !== null && _useBrick$lifeCycle !== void 0 && _useBrick$lifeCycle.onMount) {
+              dispatchLifeCycleEvent(new CustomEvent("mount"), useBrick.lifeCycle.onMount, brick);
+            }
+          } else {
+            var _useBrick$lifeCycle2;
 
-          if (element.$$typeof !== "custom-template") {
-            if (!useBrick.brick.includes("-")) {
-              element.$$typeof = "native";
-            } else if (!customElements.get(useBrick.brick)) {
-              element.$$typeof = "invalid";
+            if ((_useBrick$lifeCycle2 = useBrick.lifeCycle) !== null && _useBrick$lifeCycle2 !== void 0 && _useBrick$lifeCycle2.onUnmount) {
+              dispatchLifeCycleEvent(new CustomEvent("unmount"), useBrick.lifeCycle.onUnmount, brick);
             }
           }
         }
@@ -13177,18 +13263,28 @@
         refCallback === null || refCallback === void 0 ? void 0 : refCallback(element);
       });
 
-      return function (_x) {
-        return _ref4.apply(this, arguments);
+      return function (_x4) {
+        return _ref6.apply(this, arguments);
       };
-    }(), [runtimeBrick, useBrick, data, refCallback, immediatelyRefCallback]);
+    }(); // ref https://reactjs.org/docs/refs-and-the-dom.html#caveats-with-callback-refs
+
+
+    var innerRefCallback = React__default["default"].useCallback(element => {
+      innerRefCallbackRef.current(element);
+    }, []);
+    var childConfs = React.useMemo(() => {
+      var _templateRef$current;
+
+      return slotsToChildren(((_templateRef$current = templateRef.current) !== null && _templateRef$current !== void 0 ? _templateRef$current : useBrick).slots);
+    }, [templateRef.current, useBrick]);
 
     if (!isBrickAvailable) {
       return null;
     }
 
-    return /*#__PURE__*/React__default["default"].createElement((_templateRef$current$ = (_templateRef$current = templateRef.current) === null || _templateRef$current === void 0 ? void 0 : _templateRef$current.brick) !== null && _templateRef$current$ !== void 0 ? _templateRef$current$ : tplTagName || useBrick.brick, {
+    return /*#__PURE__*/React__default["default"].createElement((_templateRef$current$ = (_templateRef$current2 = templateRef.current) === null || _templateRef$current2 === void 0 ? void 0 : _templateRef$current2.brick) !== null && _templateRef$current$ !== void 0 ? _templateRef$current$ : tplTagName || useBrick.brick, {
       ref: innerRefCallback
-    }, ...slotsToChildren(((_templateRef$current2 = templateRef.current) !== null && _templateRef$current2 !== void 0 ? _templateRef$current2 : useBrick).slots).map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
+    }, ...childConfs.map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
       key: index,
       useBrick: item,
       data: data
@@ -13213,11 +13309,11 @@
    * @param props - 属性。
    */
 
-  function BrickAsComponent(_ref5) {
+  function BrickAsComponent(_ref7) {
     var {
       useBrick,
       data
-    } = _ref5;
+    } = _ref7;
 
     if (Array.isArray(useBrick)) {
       return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, useBrick.map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
@@ -13238,8 +13334,8 @@
       return [];
     }
 
-    return Object.entries(slots).flatMap(_ref6 => {
-      var [slot, slotConf] = _ref6;
+    return Object.entries(slots).flatMap(_ref8 => {
+      var [slot, slotConf] = _ref8;
       return Array.isArray(slotConf.bricks) ? slotConf.bricks.map(child => _objectSpread__default["default"](_objectSpread__default["default"]({}, child), {}, {
         properties: _objectSpread__default["default"](_objectSpread__default["default"]({}, child.properties), {}, {
           slot
@@ -13259,15 +13355,17 @@
   // eslint-disable-next-line react/display-name
 
 
-  var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo( /*#__PURE__*/React.forwardRef(function LegacySingleBrickAsComponent(_ref7, ref) {
-    var _internalApiGetCurren2, _templateRef$current$2, _templateRef$current3, _templateRef$current4;
+  var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo( /*#__PURE__*/React.forwardRef(function LegacySingleBrickAsComponent(_ref9, ref) {
+    var _internalApiGetCurren2, _templateRef$current$2, _templateRef$current4;
 
     var {
       useBrick,
       data,
       refCallback
-    } = _ref7;
-    var brickRef = React.useRef();
+    } = _ref9;
+    var firstRunRef = React.useRef(true);
+    var innerRefCallbackRef = React.useRef();
+    var elementRef = React.useRef();
     var templateRef = React.useRef();
     var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren2 = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren2 === void 0 ? void 0 : _internalApiGetCurren2.id);
     var isBrickAvailable = React__default["default"].useMemo(() => {
@@ -13287,7 +13385,7 @@
     /* istanbul ignore next (never reach in test) */
 
     React.useImperativeHandle(ref, () => {
-      return brickRef.current;
+      return elementRef.current;
     });
     var runtimeBrick = React__default["default"].useMemo( /*#__PURE__*/_asyncToGenerator__default["default"](function* () {
       if (!isBrickAvailable) {
@@ -13309,8 +13407,8 @@
       }); // 设置 properties refProperty值
 
       if (useBrick[symbolForComputedPropsFromProxy]) {
-        Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref9 => {
-          var [propName, propValue] = _ref9;
+        Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref11 => {
+          var [propName, propValue] = _ref11;
           _.set(brick.properties, propName, propValue);
         });
       }
@@ -13327,10 +13425,60 @@
       }
 
       return brick;
-    }), [useBrick, data, isBrickAvailable]);
-    var innerRefCallback = React__default["default"].useCallback( /*#__PURE__*/function () {
-      var _ref10 = _asyncToGenerator__default["default"](function* (element) {
-        brickRef.current = element;
+    }), [useBrick, data, isBrickAvailable, tplTagName]);
+
+    var dispatchLifeCycleEvent = /*#__PURE__*/function () {
+      var _ref12 = _asyncToGenerator__default["default"](function* (event, handlers, brick) {
+        for (var handler of [].concat(handlers)) {
+          listenerFactory(handler, _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
+            tplContextId: useBrick[symbolForTplContextId]
+          }), brick)(event);
+        }
+      });
+
+      return function dispatchLifeCycleEvent(_x5, _x6, _x7) {
+        return _ref12.apply(this, arguments);
+      };
+    }();
+
+    var updateBrick = React.useCallback((brick, element) => {
+      brick.element = element;
+      var {
+        [symbolForTplContextId]: tplContextId
+      } = useBrick;
+
+      if (useBrick.iid) {
+        element.dataset.iid = useBrick.iid;
+      }
+
+      setRealProperties(element, brick.properties);
+      unbindListeners(element);
+
+      if (useBrick.events) {
+        bindListeners(element, transformEvents(data, useBrick.events), _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
+          tplContextId
+        }));
+      } // 设置proxyEvent
+
+
+      handleProxyOfCustomTemplate(brick);
+
+      if (element.$$typeof !== "custom-template") {
+        if (!useBrick.brick.includes("-")) {
+          element.$$typeof = "native";
+        } else if (!customElements.get(useBrick.brick)) {
+          element.$$typeof = "invalid";
+        }
+      }
+    }, [data, useBrick]);
+    React.useEffect(() => {
+      if (firstRunRef.current) {
+        firstRunRef.current = false;
+        return;
+      }
+
+      _asyncToGenerator__default["default"](function* () {
+        var element = elementRef.current;
 
         if (element) {
           var brick;
@@ -13346,32 +13494,37 @@
             return;
           }
 
-          brick.element = element;
-          var {
-            [symbolForTplContextId]: tplContextId
-          } = useBrick;
+          updateBrick(brick, element);
+        }
+      })();
+    }, [runtimeBrick, updateBrick]);
 
-          if (useBrick.iid) {
-            element.dataset.iid = useBrick.iid;
-          }
+    innerRefCallbackRef.current = /*#__PURE__*/function () {
+      var _ref14 = _asyncToGenerator__default["default"](function* (element) {
+        elementRef.current = element;
+        var brick;
+
+        try {
+          brick = yield runtimeBrick;
+        } catch (e) {
+          handleHttpError(e);
+        } // sub-brick rendering is ignored.
 
-          setRealProperties(element, brick.properties);
-          unbindListeners(element);
 
-          if (useBrick.events) {
-            bindListeners(element, transformEvents(data, useBrick.events), _objectSpread__default["default"](_objectSpread__default["default"]({}, _internalApiGetCurrentContext()), {}, {
-              tplContextId
-            }));
-          } // 设置proxyEvent
+        if (brick) {
+          if (element) {
+            var _useBrick$lifeCycle3;
 
+            updateBrick(brick, element);
 
-          handleProxyOfCustomTemplate(brick);
+            if ((_useBrick$lifeCycle3 = useBrick.lifeCycle) !== null && _useBrick$lifeCycle3 !== void 0 && _useBrick$lifeCycle3.onMount) {
+              dispatchLifeCycleEvent(new CustomEvent("mount"), useBrick.lifeCycle.onMount, brick);
+            }
+          } else {
+            var _useBrick$lifeCycle4;
 
-          if (element.$$typeof !== "custom-template") {
-            if (!useBrick.brick.includes("-")) {
-              element.$$typeof = "native";
-            } else if (!customElements.get(useBrick.brick)) {
-              element.$$typeof = "invalid";
+            if ((_useBrick$lifeCycle4 = useBrick.lifeCycle) !== null && _useBrick$lifeCycle4 !== void 0 && _useBrick$lifeCycle4.onUnmount) {
+              dispatchLifeCycleEvent(new CustomEvent("unmount"), useBrick.lifeCycle.onUnmount, brick);
             }
           }
         }
@@ -13379,18 +13532,28 @@
         refCallback === null || refCallback === void 0 ? void 0 : refCallback(element);
       });
 
-      return function (_x2) {
-        return _ref10.apply(this, arguments);
+      return function (_x8) {
+        return _ref14.apply(this, arguments);
       };
-    }(), [runtimeBrick, useBrick, data, refCallback]);
+    }(); // ref https://reactjs.org/docs/refs-and-the-dom.html#caveats-with-callback-refs
+
+
+    var innerRefCallback = React__default["default"].useCallback(element => {
+      innerRefCallbackRef.current(element);
+    }, []);
+    var childConfs = React.useMemo(() => {
+      var _templateRef$current3;
+
+      return slotsToChildren(((_templateRef$current3 = templateRef.current) !== null && _templateRef$current3 !== void 0 ? _templateRef$current3 : useBrick).slots);
+    }, [templateRef.current, useBrick]);
 
     if (!isBrickAvailable) {
       return null;
     }
 
-    return /*#__PURE__*/React__default["default"].createElement((_templateRef$current$2 = (_templateRef$current3 = templateRef.current) === null || _templateRef$current3 === void 0 ? void 0 : _templateRef$current3.brick) !== null && _templateRef$current$2 !== void 0 ? _templateRef$current$2 : tplTagName || useBrick.brick, {
+    return /*#__PURE__*/React__default["default"].createElement((_templateRef$current$2 = (_templateRef$current4 = templateRef.current) === null || _templateRef$current4 === void 0 ? void 0 : _templateRef$current4.brick) !== null && _templateRef$current$2 !== void 0 ? _templateRef$current$2 : tplTagName || useBrick.brick, {
       ref: innerRefCallback
-    }, ...slotsToChildren(((_templateRef$current4 = templateRef.current) !== null && _templateRef$current4 !== void 0 ? _templateRef$current4 : useBrick).slots).map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
+    }, ...childConfs.map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
       key: index,
       useBrick: item,
       data: data