@next-core/brick-kit 2.119.1 → 2.121.0

package/dist/index.esm.js

@@ -4072,8 +4072,16 @@ class WebsocketMessageResponse {
 }
 
 class WebSocketService {
+  get retryCount() {
+    return this._retryCount;
+  }
+
+  set retryCount(value) {
+    this._retryCount = value;
+  }
+
   constructor(options) {
-    _defineProperty$1(this, "retryCount", 0);
+    _defineProperty$1(this, "_retryCount", 0);
 
     _defineProperty$1(this, "ws", null);
 
@@ -4142,7 +4150,18 @@ class WebSocketService {
     };
 
     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();
@@ -4202,7 +4221,7 @@ class WebSocketService {
 
   onClose(event) {}
 
-  onError(event) {}
+  onError(event, data) {}
 
   onMessage(message) {}
 
@@ -5472,8 +5491,27 @@ class MessageDispatcher {
   }
 
   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);
@@ -5486,7 +5524,7 @@ class MessageDispatcher {
 
     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;
     }
 
@@ -5517,6 +5555,10 @@ class MessageDispatcher {
   createWebsocketService() {
     this.ws = createWebSocket();
 
+    this.ws.onError = (_event, data) => {
+      this.handleError(data);
+    };
+
     this.ws.onMessage = message => {
       this.reducer(message);
     };
@@ -5526,6 +5568,19 @@ class MessageDispatcher {
     };
   }
 
+  handleError(data) {
+    var event = new CustomEvent("callback.error", {
+      detail: _objectSpread({
+        payload: {
+          message: {}
+        }
+      }, data)
+    });
+    this.messageCallbackHandlers.forEach(callbacks => {
+      this.messageSubscribeCallbacksHandler(callbacks, "error", event);
+    });
+  }
+
   onClose(event) {
     _internalApiMessageCloseHandler(event);
   }
@@ -5612,19 +5667,22 @@ class MessageDispatcher {
     }
   }
 
-  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();
@@ -6668,7 +6726,14 @@ function builtinMessageListenerFactory(method, args, ifContainer, context) {
       return;
     }
 
-    message[method](...argsFactory(args, context, event));
+    var processArg = argsFactory(args, context, event);
+    var contentNode = /*#__PURE__*/React.createElement("span", null, "".concat(processArg[0]));
+    var argProp = {
+      content: contentNode,
+      className: "ant-message-notice-".concat(method)
+    };
+    processArg[0] = argProp;
+    message[method](...processArg);
   };
 }
 
@@ -9077,12 +9142,16 @@ class LocationContext {
 
     _defineProperty$1(this, "messageHandlers", []);
 
+    _defineProperty$1(this, "scrollIntoViewHandlersMap", new Map());
+
     _defineProperty$1(this, "segues", {});
 
     _defineProperty$1(this, "currentMatch", void 0);
 
     _defineProperty$1(this, "storyboardContextWrapper", new StoryboardContextWrapper());
 
+    _defineProperty$1(this, "observersList", []);
+
     this.kernel = kernel;
     this.location = location;
     this.resolver = new Resolver(kernel);
@@ -9449,7 +9518,7 @@ class LocationContext {
         _this6 = this;
 
     return _asyncToGenerator$4(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];
@@ -9490,7 +9559,7 @@ class LocationContext {
       yield _this6.storyboardContextWrapper.define(brickConf.context, context, brick);
       yield _this6.preCheckPermissions(brickConf, context);
       var trackingContextList = [];
-      Object.assign(brick, {
+      Object.assign(brick, _objectSpread({
         type: tplTagName || brickConf.brick,
         properties: computeRealProperties(brickConf.properties, context, brickConf.injectDeep !== false, trackingContextList),
         events: isObject(brickConf.events) ? brickConf.events : {},
@@ -9500,7 +9569,11 @@ class LocationContext {
         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 => {
@@ -9515,7 +9588,11 @@ class LocationContext {
         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);
@@ -9590,7 +9667,8 @@ class LocationContext {
       onAnchorUnload,
       onMediaChange,
       onMessage,
-      onMessageClose
+      onMessageClose,
+      onScrollIntoView
     } = lifeCycle !== null && lifeCycle !== void 0 ? lifeCycle : {};
 
     if (onBeforePageLoad) {
@@ -9673,6 +9751,15 @@ class LocationContext {
         handler: onMessageClose
       });
     }
+
+    if (onScrollIntoView) {
+      this.scrollIntoViewHandlersMap.set(brick.iid, {
+        brick,
+        match,
+        tplContextId,
+        handler: onScrollIntoView.handlers
+      });
+    }
   }
 
   handleBeforePageLoad() {
@@ -9727,6 +9814,17 @@ class LocationContext {
     }), 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;
   }
@@ -9759,6 +9857,27 @@ class LocationContext {
     })();
   }
 
+  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) {
@@ -10638,6 +10757,8 @@ class Router {
           window.scrollTo(0, 0);
 
           if (!failed) {
+            _this3.locationContext.handleBrickBindObserver();
+
             _this3.locationContext.handlePageLoad();
 
             _this3.locationContext.handleAnchorLoad();