@next-core/brick-kit 2.153.4 → 2.153.5

package/dist/index.bundle.js

@@ -3165,8 +3165,7 @@
           }
         }
       })).list;
-      yield Promise.all(menuList.map(loadDynamicMenuItems));
-      var menuData = mergeMenu(menuList);
+      var menuData = yield mergeMenu(menuList, kernel);
 
       if (!menuData) {
         throw new Error("Menu not found: ".concat(menuId));
@@ -3179,52 +3178,63 @@
     return _fetchMenuById.apply(this, arguments);
   }
 
-  function mergeMenu(menuList) {
-    var mainMenu = menuList.find(menu => menu.type !== "inject");
+  function mergeMenu(_x10, _x11) {
+    return _mergeMenu.apply(this, arguments);
+  }
 
-    if (!mainMenu) {
-      return undefined;
-    }
+  function _mergeMenu() {
+    _mergeMenu = _asyncToGenerator__default["default"](function* (menuList, kernel) {
+      var mainMenu = menuList.find(menu => menu.type !== "inject");
 
-    var validMenuList = [];
-    var injectWithMenus = new Map();
-    var menuWithI18n = new WeakMap();
+      if (!mainMenu) {
+        return undefined;
+      }
 
-    for (var menu of menuList) {
-      var _menu$items;
+      var validMenuList = [];
+      var injectWithMenus = new Map();
+      var menuWithI18n = new WeakMap();
 
-      if (menu.i18n) {
-        (function () {
-          var menuI18nNamespace = getI18nNamespace("menu", "".concat(menu.menuId, "~").concat(menu.app[0].appId, "+").concat(menu.instanceId)); // Support any language in `meta.i18n`.
+      for (var menu of menuList) {
+        if (menu.i18n) {
+          (function () {
+            var menuI18nNamespace = getI18nNamespace("menu", "".concat(menu.menuId, "~").concat(menu.app[0].appId, "+").concat(menu.instanceId)); // Support any language in `meta.i18n`.
 
-          Object.entries(menu.i18n).forEach(_ref => {
-            var [lang, resources] = _ref;
-            i18next__default["default"].addResourceBundle(lang, menuI18nNamespace, resources);
-          });
-          menuWithI18n.set(menu, menuI18nNamespace);
-        })();
+            Object.entries(menu.i18n).forEach(_ref3 => {
+              var [lang, resources] = _ref3;
+              i18next__default["default"].addResourceBundle(lang, menuI18nNamespace, resources);
+            });
+            menuWithI18n.set(menu, menuI18nNamespace);
+          })();
+        }
       }
 
-      if (((_menu$items = menu.items) === null || _menu$items === void 0 ? void 0 : _menu$items.length) > 0) {
-        if (menu.type === "inject" && menu.injectMenuGroupId) {
-          var injectingMenus = injectWithMenus.get(menu.injectMenuGroupId);
+      yield Promise.all(menuList.map(menu => loadDynamicMenuItems(menu, kernel, menuWithI18n)));
 
-          if (!injectingMenus) {
-            injectingMenus = [];
-            injectWithMenus.set(menu.injectMenuGroupId, injectingMenus);
-          }
+      for (var _menu of menuList) {
+        var _menu$items;
 
-          injectingMenus.push(menu);
-        } else {
-          validMenuList.push(menu);
+        if (((_menu$items = _menu.items) === null || _menu$items === void 0 ? void 0 : _menu$items.length) > 0) {
+          if (_menu.type === "inject" && _menu.injectMenuGroupId) {
+            var injectingMenus = injectWithMenus.get(_menu.injectMenuGroupId);
+
+            if (!injectingMenus) {
+              injectingMenus = [];
+              injectWithMenus.set(_menu.injectMenuGroupId, injectingMenus);
+            }
+
+            injectingMenus.push(_menu);
+          } else {
+            validMenuList.push(_menu);
+          }
         }
       }
-    }
 
-    return _objectSpread__default["default"](_objectSpread__default["default"]({}, mainMenu), {}, {
-      items: validMenuList.flatMap(menu => processGroupInject(menu.items, menu, injectWithMenus, menuWithI18n)),
-      [symbolMenuI18nNamespace]: menuWithI18n.get(mainMenu)
+      return _objectSpread__default["default"](_objectSpread__default["default"]({}, mainMenu), {}, {
+        items: validMenuList.flatMap(menu => processGroupInject(menu.items, menu, injectWithMenus, menuWithI18n)),
+        [symbolMenuI18nNamespace]: menuWithI18n.get(mainMenu)
+      });
     });
+    return _mergeMenu.apply(this, arguments);
   }
 
   function processGroupInject(items, menu, injectWithMenus, menuWithI18n) {
@@ -3246,25 +3256,39 @@
     });
   }
 
-  function loadDynamicMenuItems(_x10) {
+  function loadDynamicMenuItems(_x12, _x13, _x14) {
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
   function _loadDynamicMenuItems() {
-    _loadDynamicMenuItems = _asyncToGenerator__default["default"](function* (menu) {
+    _loadDynamicMenuItems = _asyncToGenerator__default["default"](function* (menu, kernel, menuWithI18n) {
       if (menu.dynamicItems && menu.itemsResolve) {
         var itemsConf = {};
+        var overrideAppId = menu.app[0].appId;
+
+        var context = _internalApiGetCurrentContext();
+
+        var newContext = context;
+
+        if (overrideAppId !== context.app.id && attemptToVisit(menu.itemsResolve, ["APP", "I18N"])) {
+          var storyboard = kernel.bootstrapData.storyboards.find(story => story.app.id === overrideAppId);
+          newContext = _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
+            overrideApp: storyboard === null || storyboard === void 0 ? void 0 : storyboard.app,
+            appendI18nNamespace: menuWithI18n.get(menu)
+          });
+        }
+
         yield _internalApiGetResolver().resolveOne("reference", _objectSpread__default["default"]({
           transform: "items",
           transformMapArray: false
-        }, menu.itemsResolve), itemsConf, null, _internalApiGetCurrentContext());
+        }, menu.itemsResolve), itemsConf, null, newContext);
         menu.items = itemsConf.items;
       }
     });
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
-  function processMenu(_x11, _x12, _x13, _x14, _x15) {
+  function processMenu(_x15, _x16, _x17, _x18, _x19) {
     return _processMenu.apply(this, arguments);
   }
 
@@ -3322,11 +3346,11 @@
 
   function collectAppsRequireI18nFulfilled(items, contextAppId, appIds) {
     function collect(items) {
-      for (var _ref2 of items) {
+      for (var _ref of items) {
         var {
           children
-        } = _ref2,
-            rest = _objectWithoutProperties__default["default"](_ref2, _excluded$6);
+        } = _ref,
+            rest = _objectWithoutProperties__default["default"](_ref, _excluded$6);
 
         var overrideAppId = rest[symbolAppId];
 
@@ -3342,11 +3366,11 @@
   }
 
   function computeMenuItemsWithOverrideApp(items, context, kernel) {
-    return items.map(_ref3 => {
+    return items.map(_ref2 => {
       var {
         children
-      } = _ref3,
-          rest = _objectWithoutProperties__default["default"](_ref3, _excluded2$2);
+      } = _ref2,
+          rest = _objectWithoutProperties__default["default"](_ref2, _excluded2$2);
 
       return _objectSpread__default["default"](_objectSpread__default["default"]({}, computeRealValueWithOverrideApp(rest, rest[symbolAppId], context, kernel)), {}, {
         children: children && computeMenuItemsWithOverrideApp(children, context, kernel)
@@ -3354,7 +3378,7 @@
     });
   }
 
-  function processMenuTitle(_x16) {
+  function processMenuTitle(_x20) {
     return _processMenuTitle.apply(this, arguments);
   }