@next-core/brick-kit 2.118.7 → 2.120.0

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.120.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.119.1...@next-core/brick-kit@2.120.0) (2022-05-26)
+
+
+### Features
+
+* support lifeCycle.onScrollIntoView ([4e3a4ec](https://github.com/easyops-cn/next-core/commit/4e3a4ec99a78b312c6efe595d82e214a843458d0))
+
+
+
+
+
+## [2.119.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.119.0...@next-core/brick-kit@2.119.1) (2022-05-13)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+# [2.119.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.118.7...@next-core/brick-kit@2.119.0) (2022-05-11)
+
+
+### Features
+
+* **mock:** add note ([74c0031](https://github.com/easyops-cn/next-core/commit/74c0031c81ded97014384213d99fedce8ed55d54))
+* **mock:** update mock rule ([c8fe9fc](https://github.com/easyops-cn/next-core/commit/c8fe9fccb46117330e1ff2ef42a18bef8dfff864))
+* **mock:** update mock rule ([5898ecf](https://github.com/easyops-cn/next-core/commit/5898ecfd604ca418feeb954a6091e3b940a1e867))
+
+
+
+
+
 ## [2.118.7](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.118.6...@next-core/brick-kit@2.118.7) (2022-05-10)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -5791,11 +5791,14 @@
     var _useMocks$mockList;
 
     if (useMocks) mocks = _objectSpread__default["default"](_objectSpread__default["default"]({}, useMocks), {}, {
-      mockList: (_useMocks$mockList = useMocks.mockList) === null || _useMocks$mockList === void 0 ? void 0 : _useMocks$mockList.map(item => _objectSpread__default["default"](_objectSpread__default["default"]({}, item), {}, {
-        uri: item.uri.replace(/(easyops\.api\.)(.+?)\/(.+)/, (_match, p1, p2, p3) => {
-          return "(".concat(p1, ")?").concat(p2, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p3, "$");
-        }).replace(/:\w+/g, "([^/]+)")
-      }))
+      mockList: (_useMocks$mockList = useMocks.mockList) === null || _useMocks$mockList === void 0 ? void 0 : _useMocks$mockList.map(item => {
+        var isFlowAPi = isCustomApiProvider(item.provider);
+        return _objectSpread__default["default"](_objectSpread__default["default"]({}, item), {}, {
+          uri: "".concat(isFlowAPi ? item.uri.replace(/(.+?)\/(.+)/, (_match, p1, p2) => {
+            return "/".concat(p1, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p2, "$");
+          }) : "/".concat(item.uri.split(".").slice(2).join("."), "$")).replace(/:\w+/g, "([^/]+)")
+        });
+      })
     });
   }
   function getMockList() {
@@ -5815,6 +5818,7 @@
     if (item) {
       return {
         url: requestUrl.replace(/(api\/gateway\/.+?)(@\d+\.\d+\.\d+)?\/(.+)/, (_match, p1, _p2, p3) => {
+          // 忽略版本
           return "".concat(p1, "/").concat(p3);
         }).replace(/(api\/gateway)/, "api/gateway/mock_server.proxy.".concat(mocks.mockId)),
         mockId: mocks.mockId
@@ -9072,12 +9076,16 @@
 
       _defineProperty__default["default"](this, "messageHandlers", []);
 
+      _defineProperty__default["default"](this, "scrollIntoViewHandlersMap", new Map());
+
       _defineProperty__default["default"](this, "segues", {});
 
       _defineProperty__default["default"](this, "currentMatch", void 0);
 
       _defineProperty__default["default"](this, "storyboardContextWrapper", new StoryboardContextWrapper());
 
+      _defineProperty__default["default"](this, "observersList", []);
+
       this.kernel = kernel;
       this.location = location;
       this.resolver = new Resolver(kernel);
@@ -9444,7 +9452,7 @@
           _this6 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        var _this6$kernel$nextApp;
+        var _this6$kernel$nextApp, _brickConf$lifeCycle, _brick$lifeCycle;
 
         var tplStack = _arguments.length > 4 && _arguments[4] !== undefined ? _arguments[4] : [];
         var tplContextId = brickConf[symbolForTplContextId];
@@ -9485,7 +9493,7 @@
         yield _this6.storyboardContextWrapper.define(brickConf.context, context, brick);
         yield _this6.preCheckPermissions(brickConf, context);
         var trackingContextList = [];
-        Object.assign(brick, {
+        Object.assign(brick, _objectSpread__default["default"]({
           type: tplTagName || brickConf.brick,
           properties: computeRealProperties(brickConf.properties, context, brickConf.injectDeep !== false, trackingContextList),
           events: brickUtils.isObject(brickConf.events) ? brickConf.events : {},
@@ -9495,7 +9503,11 @@
           refForProxy: brickConf[symbolForRefForProxy],
           tplContextId,
           iid: brickConf.iid
-        });
+        }, (_brickConf$lifeCycle = brickConf.lifeCycle) !== null && _brickConf$lifeCycle !== void 0 && _brickConf$lifeCycle.onScrollIntoView ? {
+          lifeCycle: {
+            onScrollIntoView: brickConf.lifeCycle.onScrollIntoView
+          }
+        } : {}));
 
         if (brickConf[symbolForComputedPropsFromProxy]) {
           Object.entries(brickConf[symbolForComputedPropsFromProxy]).forEach(_ref2 => {
@@ -9510,7 +9522,11 @@
           brick.refForProxy.brick = brick;
         }
 
-        _this6.registerHandlersFromLifeCycle(brickConf.lifeCycle, brick, match, tplContextId); // Then, resolve the brick.
+        _this6.registerHandlersFromLifeCycle(brickConf.lifeCycle, brick, match, tplContextId);
+
+        if ((_brick$lifeCycle = brick.lifeCycle) !== null && _brick$lifeCycle !== void 0 && _brick$lifeCycle.onScrollIntoView) {
+          _this6.brickBindObserver(brick);
+        } // Then, resolve the brick.
 
 
         yield _this6.resolver.resolve(brickConf, brick, context);
@@ -9585,7 +9601,8 @@
         onAnchorUnload,
         onMediaChange,
         onMessage,
-        onMessageClose
+        onMessageClose,
+        onScrollIntoView
       } = lifeCycle !== null && lifeCycle !== void 0 ? lifeCycle : {};
 
       if (onBeforePageLoad) {
@@ -9668,6 +9685,15 @@
           handler: onMessageClose
         });
       }
+
+      if (onScrollIntoView) {
+        this.scrollIntoViewHandlersMap.set(brick.iid, {
+          brick,
+          match,
+          tplContextId,
+          handler: onScrollIntoView.handlers
+        });
+      }
     }
 
     handleBeforePageLoad() {
@@ -9722,6 +9748,17 @@
       }), this.messageCloseHandlers);
     }
 
+    handleScrollIntoView(id) {
+      var currentHandlers = this.scrollIntoViewHandlersMap.get(id);
+      this.dispatchLifeCycleEvent(new CustomEvent("scroll.into.view"), [currentHandlers]);
+    }
+
+    handleBrickBindObserver() {
+      this.observersList.forEach(value => {
+        value.$$observe();
+      });
+    }
+
     getCurrentMatch() {
       return this.currentMatch;
     }
@@ -9754,6 +9791,27 @@
       })();
     }
 
+    brickBindObserver(brick) {
+      var _brick$lifeCycle$onSc;
+
+      var threshold = (_brick$lifeCycle$onSc = brick.lifeCycle.onScrollIntoView.threshold) !== null && _brick$lifeCycle$onSc !== void 0 ? _brick$lifeCycle$onSc : 0.1;
+      var observer = new IntersectionObserver((entries, observer) => {
+        entries.forEach(entry => {
+          if (entry.isIntersecting) {
+            if (entry.intersectionRatio >= threshold) {
+              this.handleScrollIntoView(brick.iid);
+              observer.disconnect();
+            }
+          }
+        });
+      }, {
+        threshold
+      });
+      this.observersList.push({
+        $$observe: () => observer.observe(brick.element)
+      });
+    }
+
   }
 
   function unmountTree(mountPoint) {
@@ -10633,6 +10691,8 @@
             window.scrollTo(0, 0);
 
             if (!failed) {
+              _this3.locationContext.handleBrickBindObserver();
+
               _this3.locationContext.handlePageLoad();
 
               _this3.locationContext.handleAnchorLoad();