@next-core/brick-kit 2.137.1 → 2.139.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.139.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.138.0...@next-core/brick-kit@2.139.0) (2022-09-13)
+
+
+### Features
+
+* support noCurrentApp evalute ([73a0662](https://github.com/easyops-cn/next-core/commit/73a06628ad66625fa8be18edf48819179ea931b4))
+
+
+
+
+
+# [2.138.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.137.2...@next-core/brick-kit@2.138.0) (2022-09-08)
+
+
+### Features
+
+* support history callback ([ca1d42e](https://github.com/easyops-cn/next-core/commit/ca1d42ee0bef5ab0cacf811c60b1324c1bd14837))
+
+
+
+
+
+## [2.137.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.137.1...@next-core/brick-kit@2.137.2) (2022-09-07)
+
+
+### Bug Fixes
+
+* to collect contracts before state define ([3d7cd86](https://github.com/easyops-cn/next-core/commit/3d7cd86441b33494c387bc2053c8698a688abf71))
+
+
+
+
+
 ## [2.137.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.137.0...@next-core/brick-kit@2.137.1) (2022-09-07)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -3924,15 +3924,33 @@
   }
 
   var _excluded$5 = ["extraQuery", "clear", "keepHash"];
+  var blocked = false;
+  function getUserConfirmation(message, callback) {
+    blocked = !confirm(message);
+    callback(!blocked);
+  }
   function historyExtended(browserHistory) {
     var {
       push: originalPush,
       replace: originalReplace
     } = browserHistory;
 
+    function push(location, state, callback) {
+      blocked = false;
+      originalPush(location, state);
+      callback === null || callback === void 0 ? void 0 : callback(blocked);
+    }
+
+    function replace(location, state, callback) {
+      blocked = false;
+      originalReplace(location, state);
+      callback === null || callback === void 0 ? void 0 : callback(blocked);
+    }
+
     function updateQueryFactory(method) {
       return function updateQuery(query) {
         var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+        var callback = arguments.length > 2 ? arguments[2] : undefined;
 
         var {
           extraQuery,
@@ -3959,30 +3977,28 @@
           }
         }
 
-        (method === "push" ? originalPush : originalReplace)("?".concat(urlSearchParams.toString()).concat(keepHash ? browserHistory.location.hash : ""), state);
+        (method === "push" ? push : replace)("?".concat(urlSearchParams.toString()).concat(keepHash ? browserHistory.location.hash : ""), state, callback);
       };
     }
 
-    function updateAnchorFactory(method) {
-      return function updateAnchor(hash, state) {
-        (method === "push" ? originalPush : originalReplace)(_objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory.location), {}, {
-          key: undefined,
-          hash,
-          state: _objectSpread__default["default"]({
-            // The default notify is false
-            notify: false
-          }, state)
-        }));
-      };
+    function pushAnchor(hash, state, callback) {
+      push(_objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory.location), {}, {
+        key: undefined,
+        hash,
+        state: _objectSpread__default["default"]({
+          // The default notify is false
+          notify: false
+        }, state)
+      }), undefined, callback);
     }
 
-    function reload() {
-      originalReplace(_objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory.location), {}, {
+    function reload(callback) {
+      replace(_objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory.location), {}, {
         state: _objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory.location.state), {}, {
           // Always notify
           notify: true
         })
-      }));
+      }), undefined, callback);
     }
 
     var blockMessage;
@@ -4002,13 +4018,17 @@
     return _objectSpread__default["default"]({
       pushQuery: updateQueryFactory("push"),
       replaceQuery: updateQueryFactory("replace"),
-      pushAnchor: updateAnchorFactory("push"),
-      // replaceAnchor: updateAnchorFactory("replace"),
+      pushAnchor: pushAnchor,
       reload,
       setBlockMessage,
       getBlockMessage,
-      unblock
-    }, window.STANDALONE_MICRO_APPS ? standaloneHistoryOverridden(browserHistory) : null);
+      unblock,
+      push,
+      replace
+    }, window.STANDALONE_MICRO_APPS ? standaloneHistoryOverridden(_objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory), {}, {
+      push,
+      replace
+    })) : {});
   }
   /**
    * Override history for standalone micro apps.
@@ -4023,7 +4043,7 @@
     } = browserHistory;
 
     function updateFactory(method) {
-      return function update(path, state) {
+      return function update(path, state, callback) {
         var pathname;
         var pathIsString = typeof path === "string";
 
@@ -4034,7 +4054,7 @@
         }
 
         if (pathname === "" || _internalApiHasMatchedApp(pathname)) {
-          return (method === "push" ? originalPush : originalReplace)(path, state);
+          return (method === "push" ? originalPush : originalReplace)(path, state, callback);
         } // Going to outside apps.
 
 
@@ -4053,7 +4073,8 @@
 
   function createHistory() {
     var browserHistory = history$1.createBrowserHistory({
-      basename: getBasePath().replace(/\/$/, "")
+      basename: getBasePath().replace(/\/$/, ""),
+      getUserConfirmation
     });
     Object.assign(browserHistory, historyExtended(browserHistory));
     history = browserHistory;
@@ -6303,17 +6324,15 @@
         case "history.replaceQuery":
         case "history.pushAnchor":
         case "history.block":
-          return builtinHistoryListenerFactory(method, handler.args, handler, context);
-
         case "history.goBack":
         case "history.goForward":
         case "history.reload":
         case "history.unblock":
-          return builtinHistoryWithoutArgsListenerFactory(method, handler, context);
+          return builtinHistoryListenerFactory(method, handler.args, handler, handler.callback, context);
 
         case "segue.push":
         case "segue.replace":
-          return builtinSegueListenerFactory(method, handler.args, handler, context);
+          return builtinSegueListenerFactory(method, handler.args, handler, handler.callback, context);
 
         case "alias.push":
         case "alias.replace":
@@ -6555,7 +6574,7 @@
     };
   }
 
-  function builtinSegueListenerFactory(method, args, ifContainer, context) {
+  function builtinSegueListenerFactory(method, args, ifContainer, callback, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
         event
@@ -6568,7 +6587,15 @@
         segues
       } = _internalApiGetCurrentContext();
 
-      getHistory()[method](getUrlBySegueFactory(app, segues)(...argsFactory(args, context, event)));
+      getHistory()[method](getUrlBySegueFactory(app, segues)(...argsFactory(args, context, event)), undefined, callback ? blocked => {
+        var callbackFactory = eventCallbackFactory(callback, () => context, null);
+        callbackFactory(blocked ? "error" : "success")({
+          blocked
+        });
+        callbackFactory("finally")({
+          blocked
+        });
+      } : undefined);
     };
   }
 
@@ -6831,7 +6858,7 @@
     return _brickCallback.apply(this, arguments);
   }
 
-  function builtinHistoryListenerFactory(method, args, ifContainer, context) {
+  function builtinHistoryListenerFactory(method, args, ifContainer, callback, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
         event
@@ -6839,21 +6866,52 @@
         return;
       }
 
-      getHistory()[method === "block" ? "setBlockMessage" : method](...argsFactory(args, context, event, {
-        useEventDetailAsDefault: true
-      }));
-    };
-  }
+      var baseArgsLength = 0;
+      var hasCallback = false;
+      var overrideMethod = method;
 
-  function builtinHistoryWithoutArgsListenerFactory(method, ifContainer, context) {
-    return function (event) {
-      if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
-        event
-      }))) {
-        return;
+      switch (method) {
+        case "push":
+        case "replace":
+        case "pushQuery":
+        case "replaceQuery":
+        case "pushAnchor":
+          baseArgsLength = 2;
+          hasCallback = true;
+          break;
+
+        case "reload":
+          hasCallback = true;
+          break;
+
+        case "block":
+          baseArgsLength = 1;
+          overrideMethod = "setBlockMessage";
+          break;
+      }
+
+      var computedArgs = [];
+
+      if (baseArgsLength > 0) {
+        computedArgs = argsFactory(args, context, event, {
+          useEventDetailAsDefault: true
+        });
+        computedArgs.length = baseArgsLength;
+      }
+
+      if (hasCallback && callback) {
+        var callbackFactory = eventCallbackFactory(callback, () => context, null);
+        computedArgs.push(blocked => {
+          callbackFactory(blocked ? "error" : "success")({
+            blocked
+          });
+          callbackFactory("finally")({
+            blocked
+          });
+        });
       }
 
-      getHistory()[method]();
+      getHistory()[overrideMethod](...computedArgs);
     };
   }
 
@@ -8389,6 +8447,10 @@
     var tplContext = new CustomTemplateContext(proxyBrick);
     var template = customTemplateRegistry.get(brickConf.brick);
 
+    if (template.contracts) {
+      collectWidgetContract(template.contracts);
+    }
+
     if (Array.isArray(template.state)) {
       tplContext.state.syncDefine(template.state, context, proxyBrick);
     }
@@ -8404,6 +8466,10 @@
       var tplContext = new CustomTemplateContext(proxyBrick);
       var template = customTemplateRegistry.get(brickConf.brick);
 
+      if (template.contracts) {
+        collectWidgetContract(template.contracts);
+      }
+
       if (Array.isArray(template.state)) {
         yield tplContext.state.define(template.state, context, proxyBrick);
       }
@@ -8417,8 +8483,7 @@
     var {
       bricks,
       proxy,
-      state,
-      contracts
+      state
     } = template;
 
     var {
@@ -8434,11 +8499,6 @@
     proxyBrick.proxy = proxyCopy;
     proxyBrick.proxyRefs = new Map();
     proxyBrick.stateNames = state === null || state === void 0 ? void 0 : state.map(item => item.name);
-
-    if (contracts) {
-      collectWidgetContract(contracts);
-    }
-
     var refToBrickConf = collectRefsInTemplate(template); // Reversed proxies are used for expand storyboard before rendering page.
 
     var reversedProxies = {
@@ -12021,7 +12081,7 @@
         };
 
         if (storyboard) {
-          var _currentApp$breadcrum, _currentApp$breadcrum2;
+          var _currentApp$breadcrum, _currentApp$breadcrum2, _currentApp$breadcrum3, _currentApp$breadcrum4;
 
           var {
             bricks,
@@ -12045,7 +12105,7 @@
             appBar: {
               breadcrumb: [],
               documentId: null,
-              noCurrentApp: (_currentApp$breadcrum = (_currentApp$breadcrum2 = currentApp.breadcrumb) === null || _currentApp$breadcrum2 === void 0 ? void 0 : _currentApp$breadcrum2.noCurrentApp) !== null && _currentApp$breadcrum !== void 0 ? _currentApp$breadcrum : false
+              noCurrentApp: typeof ((_currentApp$breadcrum = currentApp.breadcrumb) === null || _currentApp$breadcrum === void 0 ? void 0 : _currentApp$breadcrum.noCurrentApp) === "string" ? computeRealValue((_currentApp$breadcrum2 = currentApp.breadcrumb) === null || _currentApp$breadcrum2 === void 0 ? void 0 : _currentApp$breadcrum2.noCurrentApp, _this3.locationContext.getCurrentContext()) : (_currentApp$breadcrum3 = (_currentApp$breadcrum4 = currentApp.breadcrumb) === null || _currentApp$breadcrum4 === void 0 ? void 0 : _currentApp$breadcrum4.noCurrentApp) !== null && _currentApp$breadcrum3 !== void 0 ? _currentApp$breadcrum3 : false
             },
             flags: {
               redirect: undefined,