@next-core/brick-kit 2.114.0 → 2.116.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.116.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.115.1...@next-core/brick-kit@2.116.0) (2022-04-01)
+
+
+### Features
+
+* support re-registering custom templates ([ea91d7d](https://github.com/easyops-cn/next-core/commit/ea91d7de23e0a9d3a935c01a9a103fb44b8cdfb3))
+
+
+
+
+
+## [2.115.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.115.0...@next-core/brick-kit@2.115.1) (2022-03-30)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+# [2.115.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.114.0...@next-core/brick-kit@2.115.0) (2022-03-30)
+
+
+### Features
+
+* APP.getMenu support scan template & routes ([5498846](https://github.com/easyops-cn/next-core/commit/54988465a5357a97834aaca317b41b3fcb2c6a65))
+* loactionContext preFetchMenu ([9a0ec7b](https://github.com/easyops-cn/next-core/commit/9a0ec7b0a19e26633772a71de829f014574ec735))
+* support walkAny unit function ([8adff8e](https://github.com/easyops-cn/next-core/commit/8adff8e2538a43676c5eef1f275e1c5a8127171a))
+* unit test update ([00b3606](https://github.com/easyops-cn/next-core/commit/00b3606c2a2d7ba9a26f3a0255721a11e225c7d9))
+
+
+
+
+
 # [2.114.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.113.0...@next-core/brick-kit@2.114.0) (2022-03-29)
 
 

package/dist/index.bundle.js

@@ -2186,28 +2186,28 @@
     return tplContextMap.get(tplContextId);
   }
 
-  var MediaSize;
+  var MediaBreakpoint;
 
-  (function (MediaSize) {
-    MediaSize["xLarge"] = "xLarge";
-    MediaSize["large"] = "large";
-    MediaSize["medium"] = "medium";
-    MediaSize["small"] = "small";
-    MediaSize["xSmall"] = "xSmall";
-  })(MediaSize || (MediaSize = {}));
+  (function (MediaBreakpoint) {
+    MediaBreakpoint["xLarge"] = "xLarge";
+    MediaBreakpoint["large"] = "large";
+    MediaBreakpoint["medium"] = "medium";
+    MediaBreakpoint["small"] = "small";
+    MediaBreakpoint["xSmall"] = "xSmall";
+  })(MediaBreakpoint || (MediaBreakpoint = {}));
 
-  var mediaSizeBreakpointMap = new Map([[MediaSize.xLarge, "1920px"], [MediaSize.large, "1600px"], [MediaSize.medium, "1280px"], [MediaSize.small, "1024px"], [MediaSize.xSmall, 0]]);
+  var mediaBreakpointMinWidthMap = new Map([[MediaBreakpoint.xLarge, "1920px"], [MediaBreakpoint.large, "1600px"], [MediaBreakpoint.medium, "1280px"], [MediaBreakpoint.small, "1024px"], [MediaBreakpoint.xSmall, 0]]);
   var mediaEventTarget = new EventTarget$1();
-  var sizeMatchesMap = {};
+  var breakpointMatchesMap = {};
   var MEDIA = {};
 
-  function handleMatchesChange(data, size) {
+  function handleMatchesChange(data, breakpoint) {
     var changed = false;
-    sizeMatchesMap[size] = data.matches;
+    breakpointMatchesMap[breakpoint] = data.matches;
 
-    for (var [_size] of mediaSizeBreakpointMap) {
-      if (sizeMatchesMap[_size] && MEDIA.size !== _size) {
-        MEDIA.size = _size;
+    for (var [_breakpoint] of mediaBreakpointMinWidthMap) {
+      if (breakpointMatchesMap[_breakpoint] && MEDIA.breakpoint !== _breakpoint) {
+        MEDIA.breakpoint = _breakpoint;
         changed = true;
         break;
       }
@@ -2220,17 +2220,17 @@
     }
   }
 
-  mediaSizeBreakpointMap.forEach((breakpoint, size) => {
-    var mediaQueryList = window.matchMedia("(min-width: ".concat(breakpoint, ")"));
-    handleMatchesChange(mediaQueryList, size);
+  mediaBreakpointMinWidthMap.forEach((minWidth, breakpoint) => {
+    var mediaQueryList = window.matchMedia("(min-width: ".concat(minWidth, ")"));
+    handleMatchesChange(mediaQueryList, breakpoint);
 
     if (mediaQueryList.addEventListener) {
       mediaQueryList.addEventListener("change", event => {
-        handleMatchesChange(event, size);
+        handleMatchesChange(event, breakpoint);
       });
     } else {
       mediaQueryList.addListener(event => {
-        handleMatchesChange(event, size);
+        handleMatchesChange(event, breakpoint);
       });
     }
   });
@@ -7903,7 +7903,9 @@
       var storyboard = this.bootstrapData.storyboards.find(item => item.app.id === appId);
       Object.assign(storyboard, _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboardPatch), {}, {
         $$fulfilling: Promise.resolve(),
-        $$fulfilled: true
+        $$fulfilled: true,
+        $$registerCustomTemplateProcessed: false,
+        $$depsProcessed: false
       }));
       this.postProcessStoryboard(storyboard);
     }
@@ -8837,15 +8839,11 @@
             }
 
             if (isRouteConfOfRoutes(route) && Array.isArray(route.routes)) {
+              yield _this.preFetchMenu(route.context);
               yield _this.mountRoutes(route.routes, slotId, mountRoutesResult);
             } else if (isRouteConfOfBricks(route) && Array.isArray(route.bricks)) {
-              var useMenus = brickUtils.scanAppGetMenuInAny(route);
-
-              if (useMenus.length) {
-                yield constructMenuByMenusList(useMenus, _this.getCurrentContext(), _this.kernel);
-              }
-
-              yield _this.mountBricks(route.bricks, matched.match, slotId, mountRoutesResult); // analytics data (page_view event)
+              yield _this.mountBricks(route.bricks, matched.match, slotId, mountRoutesResult);
+              yield _this.preFetchMenu(route); // analytics data (page_view event)
 
               if (route.analyticsData) {
                 mountRoutesResult.analyticsData = computeRealValue(route.analyticsData, context, true);
@@ -9101,6 +9099,9 @@
         var expandedBrickConf = brickConf;
 
         if (tplTagName) {
+          var _customTemplateRegist;
+
+          yield _this6.preFetchMenu((_customTemplateRegist = customTemplateRegistry.get(tplTagName)) === null || _customTemplateRegist === void 0 ? void 0 : _customTemplateRegist.bricks);
           expandedBrickConf = yield asyncExpandCustomTemplate(_objectSpread__default["default"](_objectSpread__default["default"]({}, brickConf), {}, {
             brick: tplTagName,
             // Properties are computed for custom templates.
@@ -9321,6 +9322,18 @@
       }
     }
 
+    preFetchMenu(data) {
+      var _this7 = this;
+
+      return _asyncToGenerator__default["default"](function* () {
+        var useMenus = brickUtils.scanAppGetMenuInAny(data);
+
+        if (useMenus.length) {
+          yield constructMenuByMenusList(useMenus, _this7.getCurrentContext(), _this7.kernel);
+        }
+      })();
+    }
+
   }
 
   function unmountTree(mountPoint) {
@@ -10955,37 +10968,37 @@
   }
 
   function registerCustomTemplate(tplName, tplConstructor, appId) {
-    var _tplConstructor$proxy;
-
     var tagName = tplName; // When a template is registered by an app, its namespace maybe missed.
 
     if (appId && !tplName.includes(".")) {
       tagName = "".concat(appId, ".").concat(tplName);
     }
 
-    if (customTemplateRegistry.has(tagName)) {
+    var registered = customTemplateRegistry.has(tagName);
+
+    if (registered) {
       // When open launchpad, the storyboard will be updated.
       // However, we can't *undefine* a custom element.
       // Just ignore re-registering custom templates.
       if (!appId || appRegistered.has(appId)) {
         // eslint-disable-next-line no-console
-        console.error("Custom template of \"".concat(tagName, "\" already registered."));
+        console.warn("Custom template of \"".concat(tagName, "\" already registered."));
       }
+    } else {
+      registered = !!customElements.get(tagName);
 
-      return;
-    }
+      if (registered) {
+        // eslint-disable-next-line no-console
+        console.warn("Custom template of \"".concat(tagName, "\" already defined by customElements."));
+      }
+    } // Now we allow re-register custom template
 
-    if (customElements.get(tagName)) {
-      // eslint-disable-next-line no-console
-      console.error("Custom template of \"".concat(tagName, "\" already defined by customElements."));
-      return;
-    }
 
     customTemplateRegistry.set(tagName, _objectSpread__default["default"](_objectSpread__default["default"]({}, tplConstructor), {}, {
       name: tagName
     })); // Collect defined properties of the template.
 
-    var props = Object.keys(((_tplConstructor$proxy = tplConstructor.proxy) === null || _tplConstructor$proxy === void 0 ? void 0 : _tplConstructor$proxy.properties) || {});
+    var props = getPropsOfCustomTemplate(tagName);
     var nativeProp = props.find(prop => prop in HTMLElement.prototype); // istanbul ignore if
 
     if (nativeProp !== undefined) {
@@ -10993,13 +11006,17 @@
       console.error("In custom template \"".concat(tagName, "\", \"").concat(nativeProp, "\" is a native HTMLElement property, and should be avoid to be used as a brick property."));
     }
 
+    if (registered) {
+      return;
+    }
+
     customElements.define(tagName, class TplElement extends HTMLElement {
       get $$typeof() {
         return "custom-template";
       }
 
       static get _dev_only_definedProperties() {
-        return props;
+        return getPropsOfCustomTemplate(tagName);
       }
 
       connectedCallback() {
@@ -11017,6 +11034,16 @@
     }
   }
 
+  function getPropsOfCustomTemplate(tagName) {
+    var _state$map, _proxy$properties;
+
+    var {
+      state,
+      proxy
+    } = customTemplateRegistry.get(tagName);
+    return ((_state$map = state === null || state === void 0 ? void 0 : state.map(item => item.name)) !== null && _state$map !== void 0 ? _state$map : []).concat(Object.keys((_proxy$properties = proxy === null || proxy === void 0 ? void 0 : proxy.properties) !== null && _proxy$properties !== void 0 ? _proxy$properties : {}));
+  }
+
   var customProcessorRegistry = new Map();
   function registerCustomProcessor(processorFullName, processorFunc) {
     // `namespace` should be the camelCase of the package name.