@next-core/brick-kit 2.73.2 → 2.75.1

package/dist/index.esm.js

@@ -10,12 +10,11 @@ import React__default, { useState, useEffect, forwardRef, useRef, useImperativeH
 import { HttpResponseError, HttpFetchError, http } from '@next-core/brick-http';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import i18next from 'i18next';
-import lodash, { set, get, sortBy, isEmpty, difference, cloneDeep, merge, clamp, uniqueId, orderBy, omit } from 'lodash';
+import lodash, { set, get, isNil, sortBy, isEmpty, difference, cloneDeep, merge, clamp, uniqueId, orderBy, omit } from 'lodash';
 import moment from 'moment';
 import { pipes } from '@next-core/pipes';
 import yaml from 'js-yaml';
 import { apiAnalyzer } from '@next-core/easyops-analytics';
-import require$$0 from 'path';
 import { withTranslation } from 'react-i18next';
 import _extends$2 from '@babel/runtime/helpers/esm/extends';
 import { getIllustration } from '@next-core/illustrations';
@@ -1349,7 +1348,16 @@ function _constructMenu() {
     var hasSubMenu = !!menuBar.subMenuId;
 
     if (menuBar.menuId) {
-      menuBar.menu = yield processMenu(menuBar.menuId, context, kernel, hasSubMenu);
+      var _menuBar$menu;
+
+      var defaultCollapsed = (_menuBar$menu = menuBar.menu) === null || _menuBar$menu === void 0 ? void 0 : _menuBar$menu.defaultCollapsed;
+      var menu = yield processMenu(menuBar.menuId, context, kernel, hasSubMenu);
+
+      if (!isNil(defaultCollapsed)) {
+        menu.defaultCollapsed = defaultCollapsed;
+      }
+
+      menuBar.menu = menu;
     }
 
     if (hasSubMenu) {
@@ -3286,7 +3294,7 @@ var path = {
 };
 
 try {
-  path = require$$0;
+  path = require('path');
 } catch (er) {}
 
 var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {};
@@ -5044,8 +5052,8 @@ function builtinWindowListenerFactory(args, ifContainer, context) {
       return;
     }
 
-    var [url, target] = argsFactory(args, context, event);
-    window.open(url, target || "_self");
+    var [url, target, features] = argsFactory(args, context, event);
+    window.open(url, target || "_self", features);
   };
 }
 
@@ -5656,6 +5664,14 @@ class Kernel {
 
     _defineProperty$2(this, "loadingBar", void 0);
 
+    _defineProperty$2(this, "navBar", void 0);
+
+    _defineProperty$2(this, "sideBar", void 0);
+
+    _defineProperty$2(this, "footer", void 0);
+
+    _defineProperty$2(this, "breadcrumb", void 0);
+
     _defineProperty$2(this, "router", void 0);
 
     _defineProperty$2(this, "currentApp", void 0);
@@ -5670,6 +5686,8 @@ class Kernel {
 
     _defineProperty$2(this, "currentLayout", void 0);
 
+    _defineProperty$2(this, "enableUiV8", false);
+
     _defineProperty$2(this, "allUserMapPromise", Promise.resolve(new Map()));
 
     _defineProperty$2(this, "allMagicBrickConfigMapPromise", Promise.resolve(new Map()));
@@ -5698,13 +5716,20 @@ class Kernel {
         throw new Error("No storyboard were found.");
       }
 
+      _this.setUiVersion();
+
       if (isLoggedIn()) {
         _this.loadSharedData();
       }
 
       _this.menuBar = new MenuBar(_this, "menuBar");
       _this.appBar = new AppBar(_this, "appBar");
-      _this.loadingBar = new BaseBar(_this, "loadingBar");
+      _this.loadingBar = new BaseBar(_this, "loadingBar"); // Todo(nlicro): 这里需要新写对应的NavBar...
+
+      _this.navBar = new BaseBar(_this, "navBar");
+      _this.sideBar = new BaseBar(_this, "sideBar");
+      _this.breadcrumb = new BaseBar(_this, "breadcrumb");
+      _this.footer = new BaseBar(_this, "footer");
       _this.router = new Router(_this);
       yield _this.router.bootstrap();
 
@@ -5729,7 +5754,13 @@ class Kernel {
         loadingBar: "business-website.loading-bar",
         pageNotFound: "business-website.page-not-found",
         pageError: "business-website.page-error"
-      } : _objectSpread(_objectSpread({}, _this2.bootstrapData.navbar), {}, {
+      } : _objectSpread(_objectSpread({}, _this2.enableUiV8 ? {
+        loadingBar: _this2.bootstrapData.navbar.loadingBar,
+        navBar: "frame-bricks.nav-bar",
+        sideBar: "frame-bricks.side-bar",
+        breadcrumb: null,
+        footer: null
+      } : _this2.bootstrapData.navbar), {}, {
         pageNotFound: "basic-bricks.page-not-found",
         pageError: "basic-bricks.page-error"
       });
@@ -5744,7 +5775,7 @@ class Kernel {
 
       yield Promise.all([_this2.menuBar.bootstrap(_this2.presetBricks.menuBar, {
         testid: "brick-next-menu-bar"
-      }), _this2.appBar.bootstrap(_this2.presetBricks.appBar), _this2.loadingBar.bootstrap(_this2.presetBricks.loadingBar)]);
+      }), _this2.appBar.bootstrap(_this2.presetBricks.appBar), _this2.navBar.bootstrap(_this2.presetBricks.navBar), _this2.sideBar.bootstrap(_this2.presetBricks.sideBar), _this2.footer.bootstrap(_this2.presetBricks.footer), _this2.breadcrumb.bootstrap(_this2.presetBricks.breadcrumb), _this2.loadingBar.bootstrap(_this2.presetBricks.loadingBar)]);
     })();
   }
 
@@ -6262,6 +6293,16 @@ class Kernel {
     })();
   }
 
+  setUiVersion() {
+    // get from localStorage fot test
+    // this.enableUiV8 = this.getFeatureFlags()["ui-v8"];
+    this.enableUiV8 = !!localStorage.getItem("test-ui-v8");
+
+    if (this.enableUiV8) {
+      document.documentElement.dataset.ui = "v8";
+    }
+  }
+
 } // Since `@next-dll/editor-bricks-helper` depends on `@next-dll/react-dnd`,
 // always load react-dnd before loading editor-bricks-helper.
 
@@ -7552,7 +7593,7 @@ class LocationContext {
 
       if (menuId) {
         mountRoutesResult.menuBar.menuId = menuId;
-        mountRoutesResult.menuBar.menu = null;
+        mountRoutesResult.menuBar.menu = sidebarMenu;
       } else if (sidebarMenu) {
         mountRoutesResult.menuBar.menu = sidebarMenu;
         mountRoutesResult.menuBar.menuId = null;
@@ -8519,7 +8560,10 @@ class Router {
           }; // Omit the "key" when checking whether locations are equal in certain situations.
 
           if ( // When current location is triggered by browser action of hash link.
-          location.key === undefined || action === "POP" && (_this.prevLocation.key === undefined || // or the previous location specified notify false.
+          location.key === undefined || // When current location is triggered by browser action of non-push-or-replace,
+          // such as goBack or goForward,
+          action === "POP" && ( // and the previous location was triggered by hash link,
+          _this.prevLocation.key === undefined || // or the previous location specified notify false.
           ((_this$prevLocation$st = _this.prevLocation.state) === null || _this$prevLocation$st === void 0 ? void 0 : _this$prevLocation$st.notify) === false)) {
             omittedLocationProps.key = null;
           }
@@ -8755,30 +8799,33 @@ class Router {
         if (barsHidden || getRuntimeMisc().isInIframeOfLegacyConsole) {
           _this3.kernel.toggleBars(false);
         } else if (_this3.kernel.currentLayout === "console") {
-          var _menuBar$menu, _menuBar$menu2;
+          /* istanbul ignore next */
+          if (!_this3.kernel.enableUiV8) {
+            var _menuBar$menu, _menuBar$menu2;
 
-          yield constructMenu(menuBar, _this3.locationContext.getCurrentContext(), _this3.kernel);
+            yield constructMenu(menuBar, _this3.locationContext.getCurrentContext(), _this3.kernel);
 
-          if (shouldBeDefaultCollapsed((_menuBar$menu = menuBar.menu) === null || _menuBar$menu === void 0 ? void 0 : _menuBar$menu.defaultCollapsed, (_menuBar$menu2 = menuBar.menu) === null || _menuBar$menu2 === void 0 ? void 0 : _menuBar$menu2.defaultCollapsedBreakpoint)) {
-            _this3.kernel.menuBar.collapse(true);
+            if (shouldBeDefaultCollapsed((_menuBar$menu = menuBar.menu) === null || _menuBar$menu === void 0 ? void 0 : _menuBar$menu.defaultCollapsed, (_menuBar$menu2 = menuBar.menu) === null || _menuBar$menu2 === void 0 ? void 0 : _menuBar$menu2.defaultCollapsedBreakpoint)) {
+              _this3.kernel.menuBar.collapse(true);
 
-            _this3.defaultCollapsed = true;
-          } else {
-            if (_this3.defaultCollapsed) {
-              _this3.kernel.menuBar.collapse(false);
+              _this3.defaultCollapsed = true;
+            } else {
+              if (_this3.defaultCollapsed) {
+                _this3.kernel.menuBar.collapse(false);
+              }
+
+              _this3.defaultCollapsed = false;
             }
 
-            _this3.defaultCollapsed = false;
-          }
+            if (actualLegacy === "iframe") {
+              // Do not modify breadcrumb in iframe mode,
+              // it will be *popped* from iframe automatically.
+              delete appBar.breadcrumb;
+            }
 
-          if (actualLegacy === "iframe") {
-            // Do not modify breadcrumb in iframe mode,
-            // it will be *popped* from iframe automatically.
-            delete appBar.breadcrumb;
+            mountStaticNode(_this3.kernel.menuBar.element, menuBar);
+            mountStaticNode(_this3.kernel.appBar.element, appBar);
           }
-
-          mountStaticNode(_this3.kernel.menuBar.element, menuBar);
-          mountStaticNode(_this3.kernel.appBar.element, appBar);
         }
 
         _this3.kernel.toggleLegacyIframe(actualLegacy === "iframe");
@@ -9378,7 +9425,9 @@ var SingleBrickAsComponent = /*#__PURE__*/React__default.memo(function SingleBri
       // eslint-disable-next-line
       console.warn("Currently resolvable-if in `useBrick` is not supported.");
     } else if (!looseCheckIfByTransform(useBrick, data, {
-      allowInject: true
+      allowInject: true,
+      // useBrick 中嵌套custom-template的情况下, 会存在丢失getTplVariables的情况, 因此需要在此进行补充
+      getTplVariables: () => tplContext.getContext(useBrick[symbolForTplContextId])
     })) {
       return false;
     }