@next-core/brick-kit 2.164.1 → 2.164.2

package/dist/index.esm.js

@@ -11895,7 +11895,7 @@ var getCurrentRunTimeBrick = (useBrick, tplTagName, data) => {
  * @param props - 属性。
  */
 var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsComponent(_ref) {
-  var _internalApiGetCurren, _brick, _ref8;
+  var _internalApiGetCurren, _expandedBrickConf$br;
   var {
     useBrick,
     data,
@@ -11905,7 +11905,6 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
   var firstRunRef = useRef(true);
   var innerRefCallbackRef = useRef();
   var elementRef = useRef();
-  var expandedBrickConfRef = useRef();
   var [expandedBrickConf, setExpandedBrickConf] = useState(null);
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren === void 0 ? void 0 : _internalApiGetCurren.id);
   var isBrickAvailable = useMemo(() => {
@@ -11941,15 +11940,22 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
     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, {
@@ -12075,14 +12081,12 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
   var innerRefCallback = React.useCallback(element => {
     innerRefCallbackRef.current(element);
   }, []);
-  var childConfs = 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 = useMemo(() => isBrickAvailable && suspenseReady ? slotsToChildren((expandedBrickConf !== null && expandedBrickConf !== void 0 ? expandedBrickConf : useBrick).slots) : [], [isBrickAvailable, suspenseReady, expandedBrickConf, useBrick]);
+  if (!isBrickAvailable || !suspenseReady) {
     return null;
   }
-  return /*#__PURE__*/React.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.createElement(tagName, {
     ref: innerRefCallback
   }, ...childConfs.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
     key: index,
@@ -12109,11 +12113,11 @@ var SingleBrickAsComponent = /*#__PURE__*/React.memo(function SingleBrickAsCompo
  *
  * @param props - 属性。
  */
-function BrickAsComponent(_ref9) {
+function BrickAsComponent(_ref7) {
   var {
     useBrick,
     data
-  } = _ref9;
+  } = _ref7;
   if (Array.isArray(useBrick)) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, useBrick.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
       key: index,
@@ -12130,8 +12134,8 @@ function slotsToChildren(slots) {
   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(_objectSpread({}, child), {}, {
       properties: _objectSpread(_objectSpread({}, child.properties), {}, {
         slot
@@ -12149,17 +12153,16 @@ function transformEvents(data, events) {
 
 /* istanbul ignore next */
 // eslint-disable-next-line react/display-name
-var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref11, ref) {
-  var _internalApiGetCurren2, _brick2, _ref18;
+var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function LegacySingleBrickAsComponent(_ref9, ref) {
+  var _internalApiGetCurren2, _expandedBrickConf$br2;
   var {
     useBrick,
     data,
     refCallback
-  } = _ref11;
+  } = _ref9;
   var firstRunRef = useRef(true);
   var innerRefCallbackRef = useRef();
   var elementRef = useRef();
-  var expandedBrickConfRef = useRef();
   var [expandedBrickConf, setExpandedBrickConf] = useState(null);
   var tplTagName = getTagNameOfCustomTemplate(useBrick.brick, (_internalApiGetCurren2 = _internalApiGetCurrentContext().app) === null || _internalApiGetCurren2 === void 0 ? void 0 : _internalApiGetCurren2.id);
   var isBrickAvailable = React.useMemo(() => {
@@ -12200,15 +12203,18 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     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, {
@@ -12217,8 +12223,8 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
 
     // 设置 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);
       });
     }
@@ -12234,7 +12240,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     return brick;
   }), [useBrick, data, isBrickAvailable, tplTagName, requireSuspense]);
   var dispatchLifeCycleEvent = /*#__PURE__*/function () {
-    var _ref14 = _asyncToGenerator$3(function* (event, handlers, brick) {
+    var _ref12 = _asyncToGenerator$3(function* (event, handlers, brick) {
       for (var handler of [].concat(handlers)) {
         listenerFactory(handler, _objectSpread(_objectSpread({}, _internalApiGetCurrentContext()), {}, {
           tplContextId: useBrick[symbolForTplContextId]
@@ -12242,7 +12248,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
       }
     });
     return function dispatchLifeCycleEvent(_x5, _x6, _x7) {
-      return _ref14.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }();
   var updateBrick = useCallback((brick, element) => {
@@ -12293,7 +12299,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
     })();
   }, [runtimeBrick, updateBrick]);
   innerRefCallbackRef.current = /*#__PURE__*/function () {
-    var _ref16 = _asyncToGenerator$3(function* (element) {
+    var _ref14 = _asyncToGenerator$3(function* (element) {
       elementRef.current = element;
       var brick;
       try {
@@ -12319,7 +12325,7 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
       refCallback === null || refCallback === void 0 ? void 0 : refCallback(element);
     });
     return function (_x8) {
-      return _ref16.apply(this, arguments);
+      return _ref14.apply(this, arguments);
     };
   }();
 
@@ -12327,14 +12333,12 @@ var ForwardRefSingleBrickAsComponent = /*#__PURE__*/React.memo( /*#__PURE__*/for
   var innerRefCallback = React.useCallback(element => {
     innerRefCallbackRef.current(element);
   }, []);
-  var childConfs = 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 = useMemo(() => isBrickAvailable && suspenseReady ? slotsToChildren((expandedBrickConf !== null && expandedBrickConf !== void 0 ? expandedBrickConf : useBrick).slots) : [], [isBrickAvailable, suspenseReady, expandedBrickConf, useBrick]);
+  if (!isBrickAvailable || !suspenseReady) {
     return null;
   }
-  return /*#__PURE__*/React.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.createElement(tagName, {
     ref: innerRefCallback
   }, ...childConfs.map((item, index) => /*#__PURE__*/React.createElement(SingleBrickAsComponent, {
     key: index,