@next-core/brick-kit 2.154.18 → 2.155.1

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
-import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, useContext, createContext, useReducer, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback, useMemo, forwardRef, useImperativeHandle, useContext, createContext, useReducer } from 'react';
 import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, matchPath, deepFreeze, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, sortBy, orderBy, merge, isObject as isObject$1, uniq, pick, omit, findLastIndex, noop, isString as isString$1 } from 'lodash';
 import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
@@ -995,9 +995,10 @@ function doTransform(data, to, options) {
   Object.entries(to).map(_ref => {
     var [k, v] = _ref;
 
-    if (Array.isArray(options === null || options === void 0 ? void 0 : options.trackingContextList) && isEvaluable(v)) {
-      var contextNames = trackContext(v);
-      var stateNames = trackState(v);
+    if (Array.isArray(options === null || options === void 0 ? void 0 : options.trackingContextList) && (typeof v === "string" ? isEvaluable(v) : isPreEvaluated(v))) {
+      var raw = typeof v === "string" ? v : getPreEvaluatedRaw(v);
+      var contextNames = trackContext(raw);
+      var stateNames = trackState(raw);
 
       if (contextNames || stateNames) {
         options.trackingContextList.push({
@@ -2371,6 +2372,9 @@ var symbolForContext = Symbol.for("pre.evaluated.context");
 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 shouldAllowRecursiveEvaluations(raw);
@@ -2504,18 +2508,29 @@ function evaluate(raw) {
     });
   }
 
+  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] = (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) {
@@ -2962,11 +2977,22 @@ var computeRealValue = (value, context, injectDeep, internalOptions) => {
 
     if (preEvaluated || 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 (hasOwnProperty(context, _key)) {
+            runtimeContext[_key] = context[_key];
+          }
         }
       } // The current runtime context is memoized even if the evaluation maybe lazy.
 
@@ -3055,9 +3081,10 @@ function computeRealProperties(properties, context, injectDeep, trackingContextL
         }
       }
 
-      if (Array.isArray(trackingContextList) && isEvaluable(propValue)) {
-        var contextNames = trackContext(propValue);
-        var stateNames = trackState(propValue);
+      if (Array.isArray(trackingContextList) && (typeof propValue === "string" ? isEvaluable(propValue) : isPreEvaluated(propValue))) {
+        var raw = typeof propValue === "string" ? propValue : getPreEvaluatedRaw(propValue);
+        var contextNames = trackContext(raw);
+        var stateNames = trackState(raw);
 
         if (contextNames || stateNames) {
           trackingContextList.push({
@@ -13064,7 +13091,7 @@ var getCurrentRunTimeBrick = (useBrick, tplTagName, data) => {
 
 
 var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsComponent(_ref) {
-  var _internalApiGetCurren, _templateRef$current$, _templateRef$current, _templateRef$current2;
+  var _internalApiGetCurren, _templateRef$current$, _templateRef$current2;
 
   var {
     useBrick,
@@ -13072,6 +13099,9 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     refCallback,
     immediatelyRefCallback
   } = _ref;
+  var firstRunRef = useRef(true);
+  var innerRefCallbackRef = useRef();
+  var elementRef = useRef();
   var templateRef = useRef();
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren === void 0 ? void 0 : _internalApiGetCurren.id);
   var isBrickAvailable = React.useMemo(() => {
@@ -13126,10 +13156,60 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     }
 
     return brick;
-  }), [useBrick, data, isBrickAvailable]);
-  var innerRefCallback = React.useCallback( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator$3(function* (element) {
-      immediatelyRefCallback === null || immediatelyRefCallback === void 0 ? void 0 : immediatelyRefCallback(element);
+  }), [useBrick, data, isBrickAvailable, tplTagName]);
+
+  var dispatchLifeCycleEvent = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator$3(function* (event, handlers, brick) {
+      for (var handler of [].concat(handlers)) {
+        listenerFactory(handler, _objectSpread(_objectSpread({}, _internalApiGetCurrentContext()), {}, {
+          tplContextId: useBrick[symbolForTplContextId]
+        }), brick)(event);
+      }
+    });
+
+    return function dispatchLifeCycleEvent(_x, _x2, _x3) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+
+  var updateBrick = 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(_objectSpread({}, _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]);
+  useEffect(() => {
+    if (firstRunRef.current) {
+      firstRunRef.current = false;
+      return;
+    }
+
+    _asyncToGenerator$3(function* () {
+      var element = elementRef.current;
 
       if (element) {
         var brick;
@@ -13145,32 +13225,38 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
           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$3(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(_objectSpread({}, _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);
           }
         }
       }
@@ -13178,18 +13264,28 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
       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.useCallback(element => {
+    innerRefCallbackRef.current(element);
+  }, []);
+  var childConfs = 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.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.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.createElement(SingleBrickAsComponent, {
+  }, ...childConfs.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
     key: index,
     useBrick: item,
     data: data
@@ -13214,11 +13310,11 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
  * @param props - 属性。
  */
 
-function BrickAsComponent(_ref5) {
+function BrickAsComponent(_ref7) {
   var {
     useBrick,
     data
-  } = _ref5;
+  } = _ref7;
 
   if (Array.isArray(useBrick)) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, useBrick.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
@@ -13239,8 +13335,8 @@ function slotsToChildren(slots) {
     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(_objectSpread({}, child), {}, {
       properties: _objectSpread(_objectSpread({}, child.properties), {}, {
         slot
@@ -13260,15 +13356,17 @@ function transformEvents(data, events) {
 // eslint-disable-next-line react/display-name
 
 
-var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref7, ref) {
-  var _internalApiGetCurren2, _templateRef$current$2, _templateRef$current3, _templateRef$current4;
+var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref9, ref) {
+  var _internalApiGetCurren2, _templateRef$current$2, _templateRef$current4;
 
   var {
     useBrick,
     data,
     refCallback
-  } = _ref7;
-  var brickRef = useRef();
+  } = _ref9;
+  var firstRunRef = useRef(true);
+  var innerRefCallbackRef = useRef();
+  var elementRef = useRef();
   var templateRef = useRef();
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren2 = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren2 === void 0 ? void 0 : _internalApiGetCurren2.id);
   var isBrickAvailable = React.useMemo(() => {
@@ -13288,7 +13386,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
   /* istanbul ignore next (never reach in test) */
 
   useImperativeHandle(ref, () => {
-    return brickRef.current;
+    return elementRef.current;
   });
   var runtimeBrick = React.useMemo( /*#__PURE__*/_asyncToGenerator$3(function* () {
     if (!isBrickAvailable) {
@@ -13310,8 +13408,8 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     }); // 设置 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);
       });
     }
@@ -13328,10 +13426,60 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     }
 
     return brick;
-  }), [useBrick, data, isBrickAvailable]);
-  var innerRefCallback = React.useCallback( /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator$3(function* (element) {
-      brickRef.current = element;
+  }), [useBrick, data, isBrickAvailable, tplTagName]);
+
+  var dispatchLifeCycleEvent = /*#__PURE__*/function () {
+    var _ref12 = _asyncToGenerator$3(function* (event, handlers, brick) {
+      for (var handler of [].concat(handlers)) {
+        listenerFactory(handler, _objectSpread(_objectSpread({}, _internalApiGetCurrentContext()), {}, {
+          tplContextId: useBrick[symbolForTplContextId]
+        }), brick)(event);
+      }
+    });
+
+    return function dispatchLifeCycleEvent(_x5, _x6, _x7) {
+      return _ref12.apply(this, arguments);
+    };
+  }();
+
+  var updateBrick = 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(_objectSpread({}, _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]);
+  useEffect(() => {
+    if (firstRunRef.current) {
+      firstRunRef.current = false;
+      return;
+    }
+
+    _asyncToGenerator$3(function* () {
+      var element = elementRef.current;
 
       if (element) {
         var brick;
@@ -13347,32 +13495,37 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
           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$3(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(_objectSpread({}, _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);
           }
         }
       }
@@ -13380,18 +13533,28 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
       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.useCallback(element => {
+    innerRefCallbackRef.current(element);
+  }, []);
+  var childConfs = 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.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.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.createElement(SingleBrickAsComponent, {
+  }, ...childConfs.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
     key: index,
     useBrick: item,
     data: data