@next-core/brick-kit 2.119.1 → 2.121.0

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.121.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.120.1...@next-core/brick-kit@2.121.0) (2022-06-01)
+
+
+### Features
+
+* **MessageDispatcher:** call error callbacks on WS error event ([d89a993](https://github.com/easyops-cn/next-core/commit/d89a993347107b8bc15e2e54cce68a620374d451))
+
+
+
+
+
+## [2.120.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.120.0...@next-core/brick-kit@2.120.1) (2022-05-27)
+
+
+### Bug Fixes
+
+* theme dark ([8ff6958](https://github.com/easyops-cn/next-core/commit/8ff6958e134c199e58ec4e026003839dcbc5ea57))
+* 兼容message事件传多个参数的情况 ([fbde026](https://github.com/easyops-cn/next-core/commit/fbde026b51f8bd2d4a83b3c2ac3ac93bf6515179))
+* 支持message.*传任意多个参数 ([abbfaeb](https://github.com/easyops-cn/next-core/commit/abbfaeb4752b408005a82e6a6cf57505b9d3aeb8))
+
+
+
+
+
+# [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

package/dist/index.bundle.js

@@ -4071,8 +4071,16 @@
   }
 
   class WebSocketService {
+    get retryCount() {
+      return this._retryCount;
+    }
+
+    set retryCount(value) {
+      this._retryCount = value;
+    }
+
     constructor(options) {
-      _defineProperty__default["default"](this, "retryCount", 0);
+      _defineProperty__default["default"](this, "_retryCount", 0);
 
       _defineProperty__default["default"](this, "ws", null);
 
@@ -4141,7 +4149,18 @@
       };
 
       this.ws.onerror = event => {
-        this.onError(event); // eslint-disable-next-line no-console
+        var {
+          options,
+          retryCount,
+          state,
+          readyState
+        } = this;
+        this.onError(event, {
+          options: getReadOnlyProxy(options),
+          retryCount,
+          state,
+          readyState
+        }); // eslint-disable-next-line no-console
 
         console.log("WebSocket encountered error: ", event);
         this.reconnect();
@@ -4201,7 +4220,7 @@
 
     onClose(event) {}
 
-    onError(event) {}
+    onError(event, data) {}
 
     onMessage(message) {}
 
@@ -5471,8 +5490,27 @@
     }
 
     subscribe(channel, topic, callback) {
+      var _this$ws;
+
       var req = new WebsocketMessageRequest(PluginWebSocketMessageEvent.SUB, topic);
-      this.setMessageCallbackHandlers(req.identity, callback); // Prevent repeated subscriptions to the same topic.
+      this.setMessageCallbackHandlers(req.identity, callback);
+
+      if (((_this$ws = this.ws) === null || _this$ws === void 0 ? void 0 : _this$ws.state) === "finished") {
+        var {
+          options,
+          retryCount,
+          state,
+          readyState
+        } = this.ws;
+        this.handleError({
+          options: getReadOnlyProxy(options),
+          retryCount,
+          state,
+          readyState
+        });
+        return;
+      } // Prevent repeated subscriptions to the same topic.
+
 
       if (!this.channels.has(req.topic)) {
         this.channels.set(req.topic, channel);
@@ -5485,7 +5523,7 @@
 
       if (!t) {
         // eslint-disable-next-line no-console
-        console.error("Message channel\uFF1A\"".concat(channel, "\" not found. "));
+        console.error("Message channel: \"".concat(channel, "\" not found. "));
         return;
       }
 
@@ -5516,6 +5554,10 @@
     createWebsocketService() {
       this.ws = createWebSocket();
 
+      this.ws.onError = (_event, data) => {
+        this.handleError(data);
+      };
+
       this.ws.onMessage = message => {
         this.reducer(message);
       };
@@ -5525,6 +5567,19 @@
       };
     }
 
+    handleError(data) {
+      var event = new CustomEvent("callback.error", {
+        detail: _objectSpread__default["default"]({
+          payload: {
+            message: {}
+          }
+        }, data)
+      });
+      this.messageCallbackHandlers.forEach(callbacks => {
+        this.messageSubscribeCallbacksHandler(callbacks, "error", event);
+      });
+    }
+
     onClose(event) {
       _internalApiMessageCloseHandler(event);
     }
@@ -5611,19 +5666,22 @@
       }
     }
 
-    messageSubscribeResponseEventHandler(response, method, event) {
-      var callbacks = this.messageCallbackHandlers.get(response.identity);
-
+    messageSubscribeCallbacksHandler(callbacks, method, event) {
       if (Array.isArray(callbacks)) {
         for (var handler of callbacks) {
-          var e = new CustomEvent(event, {
-            detail: response.message
-          });
-          this.dispatch(e, handler.runtimeBrick, handler.context, [].concat(handler === null || handler === void 0 ? void 0 : handler[method]).filter(Boolean));
+          this.dispatch(event, handler.runtimeBrick, handler.context, [].concat(handler === null || handler === void 0 ? void 0 : handler[method]).filter(Boolean));
         }
       }
     }
 
+    messageSubscribeResponseEventHandler(response, method, event) {
+      var callbacks = this.messageCallbackHandlers.get(response.identity);
+      var e = new CustomEvent(event, {
+        detail: response.message
+      });
+      this.messageSubscribeCallbacksHandler(callbacks, method, e);
+    }
+
   }
 
   var timeoutIdList = new Set();
@@ -6667,7 +6725,14 @@
         return;
       }
 
-      antd.message[method](...argsFactory(args, context, event));
+      var processArg = argsFactory(args, context, event);
+      var contentNode = /*#__PURE__*/React__default["default"].createElement("span", null, "".concat(processArg[0]));
+      var argProp = {
+        content: contentNode,
+        className: "ant-message-notice-".concat(method)
+      };
+      processArg[0] = argProp;
+      antd.message[method](...processArg);
     };
   }
 
@@ -9076,12 +9141,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);
@@ -9448,7 +9517,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];
@@ -9489,7 +9558,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 : {},
@@ -9499,7 +9568,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 => {
@@ -9514,7 +9587,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);
@@ -9589,7 +9666,8 @@
         onAnchorUnload,
         onMediaChange,
         onMessage,
-        onMessageClose
+        onMessageClose,
+        onScrollIntoView
       } = lifeCycle !== null && lifeCycle !== void 0 ? lifeCycle : {};
 
       if (onBeforePageLoad) {
@@ -9672,6 +9750,15 @@
           handler: onMessageClose
         });
       }
+
+      if (onScrollIntoView) {
+        this.scrollIntoViewHandlersMap.set(brick.iid, {
+          brick,
+          match,
+          tplContextId,
+          handler: onScrollIntoView.handlers
+        });
+      }
     }
 
     handleBeforePageLoad() {
@@ -9726,6 +9813,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;
     }
@@ -9758,6 +9856,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) {
@@ -10637,6 +10756,8 @@
             window.scrollTo(0, 0);
 
             if (!failed) {
+              _this3.locationContext.handleBrickBindObserver();
+
               _this3.locationContext.handlePageLoad();
 
               _this3.locationContext.handleAnchorLoad();