@next-core/brick-kit 2.117.10 → 2.117.13

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.117.13](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.12...@next-core/brick-kit@2.117.13) (2022-04-19)
+
+
+### Bug Fixes
+
+* fix menu in iframe ([4a6f83d](https://github.com/easyops-cn/next-core/commit/4a6f83dda1c00665453cf2df2742cb8d27aff7c0))
+
+
+
+
+
+## [2.117.12](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.11...@next-core/brick-kit@2.117.12) (2022-04-19)
+
+
+### Bug Fixes
+
+* **getMenu:** fix menu lose ([3be0166](https://github.com/easyops-cn/next-core/commit/3be0166378cd5ae735c76b41cb7537fa6f3327d6))
+
+
+
+
+
+## [2.117.11](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.10...@next-core/brick-kit@2.117.11) (2022-04-15)
+
+
+### Bug Fixes
+
+* template preview with context ([f71bc07](https://github.com/easyops-cn/next-core/commit/f71bc07d1b5b0eea719d5886a177712dcb934c4c))
+
+
+
+
+
 ## [2.117.10](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.9...@next-core/brick-kit@2.117.10) (2022-04-14)
 
 

package/dist/index.bundle.js

@@ -2753,7 +2753,6 @@
 
   function _constructMenuByMenusList() {
     _constructMenuByMenusList = _asyncToGenerator__default["default"](function* (menus, context, kernel) {
-      processMenuCache.clear();
       var data = yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel)));
       data.forEach((item, index) => processMenuCache.set(menus[index], item));
     });
@@ -8080,7 +8079,7 @@
         path: previewPath,
         bricks: [_objectSpread__default["default"]({
           brick: templateId
-        }, lodash.pick(settings, "properties", "events", "lifeCycle"))],
+        }, lodash.pick(settings, "properties", "events", "lifeCycle", "context"))],
         menu: false,
         exact: true
       };
@@ -8665,6 +8664,9 @@
     if (!misc) {
       misc = {
         isInIframe: false,
+        isInIframeOfSameSite: false,
+        isInIframeOfNext: false,
+        isInIframeOfVisualBuilder: false,
         isInIframeOfLegacyConsole: false
       };
 
@@ -8672,8 +8674,19 @@
         misc.isInIframe = true;
 
         try {
-          // Handle when previewing in visual builder by iframe.
-          misc.isInIframeOfLegacyConsole = window.origin === window.parent.origin && getBasePath() === "/next/" && !window.parent.location.pathname.startsWith("/next/");
+          // Handle:
+          // - Previewing in visual builder by iframe.
+          // - Nesting next in next.
+          // - Nesting console in next.
+          if (window.origin === window.parent.origin) {
+            misc.isInIframeOfSameSite = true;
+            var selfIsNext = getBasePath() === "/next/";
+            var parentPathname = window.parent.location.pathname;
+            var parentIsNext = parentPathname.startsWith("/next/");
+            misc.isInIframeOfNext = (Number(selfIsNext) ^ Number(parentIsNext)) === 0;
+            misc.isInIframeOfVisualBuilder = parentPathname.startsWith("".concat(parentIsNext ? "/next" : "", "/visual-builder/"));
+            misc.isInIframeOfLegacyConsole = selfIsNext && !parentIsNext;
+          }
         } catch (e) {// do nothing
         }
       }
@@ -10306,7 +10319,9 @@
             }));
           }
 
-          if (barsHidden || getRuntimeMisc().isInIframeOfLegacyConsole) {
+          var misc;
+
+          if (barsHidden || (misc = getRuntimeMisc(), misc.isInIframeOfSameSite && !misc.isInIframeOfVisualBuilder)) {
             _this3.kernel.toggleBars(false);
           } else {
             yield constructMenu(menuBar, _this3.locationContext.getCurrentContext(), _this3.kernel);