@next-core/brick-kit 2.164.1 → 2.164.2

package/dist/index.bundle.js

@@ -11894,7 +11894,7 @@
    * @param props - 属性。
    */
   var SingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo(function SingleBrickAsComponent(_ref) {
-    var _internalApiGetCurren, _brick, _ref8;
+    var _internalApiGetCurren, _expandedBrickConf$br;
     var {
       useBrick,
       data,
@@ -11904,7 +11904,6 @@
     var firstRunRef = React.useRef(true);
     var innerRefCallbackRef = React.useRef();
     var elementRef = React.useRef();
-    var expandedBrickConfRef = React.useRef();
     var [expandedBrickConf, setExpandedBrickConf] = React.useState(null);
     var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren === void 0 ? void 0 : _internalApiGetCurren.id);
     var isBrickAvailable = React.useMemo(() => {
@@ -11940,15 +11939,22 @@
       if (_internalApiGetRouterState() === "initial" && !window.DEVELOPER_PREVIEW) {
         return;
       }
-      _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
+      var promise = _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
+
+      // 需要等待构件加载完成，因为构件可能包含属性初始化逻辑。
+      // 如果先创建构件，再完成构件加载，其属性默认初始化动作会覆盖用户定义的属性。
+      // 另一方面，避免额外的 MicroTask，因为 graph.general-graph 构件依赖固定的 useBrick 渲染时机。
+      if (useBrick.brick.includes("-") && !customElements.get(useBrick.brick)) {
+        yield promise;
+      }
       var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
       var expanded = useBrick.brick === formRenderer ? (requireSuspense ? AsyncExpandCustomForm : ExpandCustomForm)(typeof useBrick.properties.formData === "string" ? JSON.parse(useBrick.properties.formData) : useBrick.properties.formData, useBrick, false) : expandTemplateInUseBrick(useBrick, tplTagName, brick, requireSuspense);
       if (requireSuspense) {
         setExpandedBrickConf(yield expanded);
-        setSuspenseReady(true);
       } else {
-        expandedBrickConfRef.current = expanded;
+        setExpandedBrickConf(expanded);
       }
+      setSuspenseReady(true);
 
       // Let `transform` works still.
       transformProperties(brick.properties, data, useBrick.transform, useBrick.transformFrom, undefined, {
@@ -12074,14 +12080,12 @@
     var innerRefCallback = React__default["default"].useCallback(element => {
       innerRefCallbackRef.current(element);
     }, []);
-    var childConfs = React.useMemo(() => {
-      var _ref7;
-      return slotsToChildren(((_ref7 = requireSuspense ? expandedBrickConf : expandedBrickConfRef.current) !== null && _ref7 !== void 0 ? _ref7 : useBrick).slots);
-    }, [expandedBrickConf, expandedBrickConfRef.current, useBrick, requireSuspense]);
-    if (!isBrickAvailable || requireSuspense && !suspenseReady) {
+    var childConfs = React.useMemo(() => isBrickAvailable && suspenseReady ? slotsToChildren((expandedBrickConf !== null && expandedBrickConf !== void 0 ? expandedBrickConf : useBrick).slots) : [], [isBrickAvailable, suspenseReady, expandedBrickConf, useBrick]);
+    if (!isBrickAvailable || !suspenseReady) {
       return null;
     }
-    return /*#__PURE__*/React__default["default"].createElement((_brick = (_ref8 = requireSuspense ? expandedBrickConf : expandedBrickConfRef.current) === null || _ref8 === void 0 ? void 0 : _ref8.brick) !== null && _brick !== void 0 ? _brick : tplTagName || useBrick.brick, {
+    var tagName = (_expandedBrickConf$br = expandedBrickConf === null || expandedBrickConf === void 0 ? void 0 : expandedBrickConf.brick) !== null && _expandedBrickConf$br !== void 0 ? _expandedBrickConf$br : tplTagName || useBrick.brick;
+    return /*#__PURE__*/React__default["default"].createElement(tagName, {
       ref: innerRefCallback
     }, ...childConfs.map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
       key: index,
@@ -12108,11 +12112,11 @@
    *
    * @param props - 属性。
    */
-  function BrickAsComponent(_ref9) {
+  function BrickAsComponent(_ref7) {
     var {
       useBrick,
       data
-    } = _ref9;
+    } = _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, {
         key: index,
@@ -12129,8 +12133,8 @@
     if (!slots) {
       return [];
     }
-    return Object.entries(slots).flatMap(_ref10 => {
-      var [slot, slotConf] = _ref10;
+    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
@@ -12148,17 +12152,16 @@
 
   /* istanbul ignore next */
   // eslint-disable-next-line react/display-name
-  var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo( /*#__PURE__*/React.forwardRef(function LegacySingleBrickAsComponent(_ref11, ref) {
-    var _internalApiGetCurren2, _brick2, _ref18;
+  var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React__default["default"].memo( /*#__PURE__*/React.forwardRef(function LegacySingleBrickAsComponent(_ref9, ref) {
+    var _internalApiGetCurren2, _expandedBrickConf$br2;
     var {
       useBrick,
       data,
       refCallback
-    } = _ref11;
+    } = _ref9;
     var firstRunRef = React.useRef(true);
     var innerRefCallbackRef = React.useRef();
     var elementRef = React.useRef();
-    var expandedBrickConfRef = React.useRef();
     var [expandedBrickConf, setExpandedBrickConf] = React.useState(null);
     var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren2 = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren2 === void 0 ? void 0 : _internalApiGetCurren2.id);
     var isBrickAvailable = React__default["default"].useMemo(() => {
@@ -12199,15 +12202,18 @@
       if (_internalApiGetRouterState() === "initial" && !window.DEVELOPER_PREVIEW) {
         return;
       }
-      _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
+      var promise = _internalApiLoadDynamicBricksInBrickConf(useBrick).catch(handleHttpError);
+      if (useBrick.brick.includes("-") && !customElements.get(useBrick.brick)) {
+        yield promise;
+      }
       var brick = getCurrentRunTimeBrick(useBrick, tplTagName, data);
       var expanded = useBrick.brick === formRenderer ? (requireSuspense ? AsyncExpandCustomForm : ExpandCustomForm)(typeof useBrick.properties.formData === "string" ? JSON.parse(useBrick.properties.formData) : useBrick.properties.formData, useBrick, false) : expandTemplateInUseBrick(useBrick, tplTagName, brick, requireSuspense);
       if (requireSuspense) {
         setExpandedBrickConf(yield expanded);
-        setSuspenseReady(true);
       } else {
-        expandedBrickConfRef.current = expanded;
+        setExpandedBrickConf(expanded);
       }
+      setSuspenseReady(true);
 
       // Let `transform` works still.
       transformProperties(brick.properties, data, useBrick.transform, useBrick.transformFrom, undefined, {
@@ -12216,8 +12222,8 @@
 
       // 设置 properties refProperty值
       if (useBrick[symbolForComputedPropsFromProxy]) {
-        Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref13 => {
-          var [propName, propValue] = _ref13;
+        Object.entries(useBrick[symbolForComputedPropsFromProxy]).forEach(_ref11 => {
+          var [propName, propValue] = _ref11;
           _.set(brick.properties, propName, propValue);
         });
       }
@@ -12233,7 +12239,7 @@
       return brick;
     }), [useBrick, data, isBrickAvailable, tplTagName, requireSuspense]);
     var dispatchLifeCycleEvent = /*#__PURE__*/function () {
-      var _ref14 = _asyncToGenerator__default["default"](function* (event, handlers, brick) {
+      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]
@@ -12241,7 +12247,7 @@
         }
       });
       return function dispatchLifeCycleEvent(_x5, _x6, _x7) {
-        return _ref14.apply(this, arguments);
+        return _ref12.apply(this, arguments);
       };
     }();
     var updateBrick = React.useCallback((brick, element) => {
@@ -12292,7 +12298,7 @@
       })();
     }, [runtimeBrick, updateBrick]);
     innerRefCallbackRef.current = /*#__PURE__*/function () {
-      var _ref16 = _asyncToGenerator__default["default"](function* (element) {
+      var _ref14 = _asyncToGenerator__default["default"](function* (element) {
         elementRef.current = element;
         var brick;
         try {
@@ -12318,7 +12324,7 @@
         refCallback === null || refCallback === void 0 ? void 0 : refCallback(element);
       });
       return function (_x8) {
-        return _ref16.apply(this, arguments);
+        return _ref14.apply(this, arguments);
       };
     }();
 
@@ -12326,14 +12332,12 @@
     var innerRefCallback = React__default["default"].useCallback(element => {
       innerRefCallbackRef.current(element);
     }, []);
-    var childConfs = React.useMemo(() => {
-      var _ref17;
-      return slotsToChildren(((_ref17 = requireSuspense ? expandedBrickConf : expandedBrickConfRef.current) !== null && _ref17 !== void 0 ? _ref17 : useBrick).slots);
-    }, [expandedBrickConf, expandedBrickConfRef.current, useBrick, requireSuspense]);
-    if (!isBrickAvailable || requireSuspense && !suspenseReady) {
+    var childConfs = React.useMemo(() => isBrickAvailable && suspenseReady ? slotsToChildren((expandedBrickConf !== null && expandedBrickConf !== void 0 ? expandedBrickConf : useBrick).slots) : [], [isBrickAvailable, suspenseReady, expandedBrickConf, useBrick]);
+    if (!isBrickAvailable || !suspenseReady) {
       return null;
     }
-    return /*#__PURE__*/React__default["default"].createElement((_brick2 = (_ref18 = requireSuspense ? expandedBrickConf : expandedBrickConfRef.current) === null || _ref18 === void 0 ? void 0 : _ref18.brick) !== null && _brick2 !== void 0 ? _brick2 : tplTagName || useBrick.brick, {
+    var tagName = (_expandedBrickConf$br2 = expandedBrickConf === null || expandedBrickConf === void 0 ? void 0 : expandedBrickConf.brick) !== null && _expandedBrickConf$br2 !== void 0 ? _expandedBrickConf$br2 : tplTagName || useBrick.brick;
+    return /*#__PURE__*/React__default["default"].createElement(tagName, {
       ref: innerRefCallback
     }, ...childConfs.map((item, index) => /*#__PURE__*/React__default["default"].createElement(SingleBrickAsComponent, {
       key: index,