@subiz/widget-v4 4.1.178 → 4.1.184

package/compiled_src/chatbox/Widget.js

@@ -250,8 +250,9 @@ class Widget extends _common.Com {
     let $body = null;
     if (this.props.view === 'list') $body = this.renderConvoList();else if (showform) $body = this.renderForm(form, submitLabel, formName);else $body = this.renderChat();
     let position = _index.default.get(accountSetting, 'desktop_button.position') || 'right';
-    if (this.props.store.isMobile()) position = _index.default.get(accountSetting, 'mobile_button.position', position);
+    if (this.props.store.isMobile() || this.props.store.isEmbededChatMode()) position = _index.default.get(accountSetting, 'mobile_button.position', position);
     let cls = 'widget-container widget-container--' + position;
+    if (this.props.store.isEmbededChatMode()) cls += ' embed-chat';
     if (!this.props.store.isMobile() && _index.default.get(accountSetting, 'window_mode') === 'full') cls += ' widget-container--full';
     if (!this.props.isShow) cls += ' widget-container--hide';
     let hideheader = _index.default.get(accountSetting, 'header.hidden', false);

package/compiled_src/chatbox/main.js

@@ -40,10 +40,7 @@ class Main extends _common.Com {
       this.$cssStyleDiv.id = 'subiz-style-for-' + this.props.plugin.id;
     }
     this.setState({
-      cssReady: false,
-      isShowWidget: false,
-      widgetView: '',
-      widgetConvoId: ''
+      cssReady: false
     });
     this.checkExpand();
     this.props.store.onResetCSS(this, () => this.refreshCSS());
@@ -59,15 +56,6 @@ class Main extends _common.Com {
     this.setState({
       cssReady: true
     });
-    if (this.props.store.matchIsOpen() && this.props.store.matchLastview().view) {
-      if (this.props.store.isMobile()) return;
-      this.showWidget(Object.assign({}, this.props.store.matchLastview().opts, {
-        view: this.props.store.matchLastview().view
-      }));
-    } else {
-      restoreViewport();
-      if (!this.state.isShowWidget) this.hideWidget();
-    }
   }
   render() {
     if (!this.state.cssReady) {
@@ -83,22 +71,27 @@ class Main extends _common.Com {
       return null;
     }
     if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_main = _index.default.Date.now();
+    let lastview = this.props.store.matchLastview() || {};
+    let isShowWidget = lastview.screen === 'widget';
+    let widgetView = lastview.view;
+    let widgetConvoId = _index.default.get(lastview, 'opts.cid');
     return (0, _preact.h)("div", {
-      class: this.props.store.isMobile() ? 'mobile' : 'desktop'
+      class: this.props.store.isMobile() || this.props.store.isEmbededChatMode() ? 'mobile' : 'desktop'
     }, (0, _preact.h)(_ChatButton.default, {
       plugin: this.props.plugin,
       store: this.props.store,
       key: "chat_button",
       ref: this.refButton,
-      isShow: !this.state.isShowWidget,
+      isShow: !isShowWidget,
       onClick: e => this.showWidget(e),
+      onSelectQuickReply: msg => this.onSelectQuickReply(msg),
       t: this.props.t
     }), (0, _preact.h)(_Widget.default, {
       plugin: this.props.plugin,
       store: this.props.store,
-      view: this.state.widgetView,
-      cid: this.state.widgetConvoId,
-      isShow: this.state.isShowWidget,
+      view: widgetView,
+      cid: widgetConvoId,
+      isShow: isShowWidget,
       onClose: a => this.onWidgetClose(a),
       onGo: a => this.showWidget(a),
       t: this.props.t,
@@ -114,7 +107,8 @@ class Main extends _common.Com {
     if (!$widget) return;
     if ($widget.wasFormInputed) return;
     if (ev.type !== 'message_sent') return;
-    if (!this.state.isShowWidget) return;
+    let isShowWidget = _index.default.get(this.props.store.matchLastview(), 'screen') === 'widget';
+    if (!isShowWidget) return;
     let byType = _index.default.get(ev, 'by.type');
     let byid = _index.default.get(ev, 'by.id') || '';
     if (!byid.startsWith('bb') || byType !== 'agent') return;
@@ -128,49 +122,48 @@ class Main extends _common.Com {
   checkExpand() {
     if (this.props.store.isMobile()) return;
     if (this.props.plugin._no_auto_expand) return;
-    if (this.props.store.matchHasManuallyClosed()) return;
+    return;
     let convoM = this.props.store.matchConvo('*');
     let redconvo = _index.default.find(convoM, convo => !_index.default.isConvoSeen(convo, this.props.store.matchUser().id));
     if (!redconvo || !redconvo.id) return;
-    if (!this.state.isShowWidget) this.showWidget({
+    let isShowWidget = _index.default.get(this.props.store.matchLastview(), 'screen') === 'widget';
+    if (!isShowWidget) this.showWidget({
       view: 'chat',
       cid: redconvo.id
     });
   }
-  getCurrentView() {
-    return {
-      is_show_widget: this.state.isShowWidget,
-      conversation_id: this.state.widgetConvoId,
-      view: this.state.widgetView
-    };
+  onSelectQuickReply(message) {
+    this.showWidget({
+      view: 'chat',
+      cid: message.conversation_id
+    });
+    this.forceUpdate(() => {
+      this.refWidget.current && this.refWidget.current.sendMessage(message);
+    });
   }
   async showWidget(p) {
-    this.refButton.current && this.refButton.current.ClearPreview();
-    if (!p.view) {
-      let lastview = this.props.store.matchLastview() || {};
-      p.view = _index.default.get(lastview, 'view');
-      p.cid = _index.default.get(lastview, 'opts.cid');
-    }
-    p = p || {};
+    let cid = p.cid;
+    let newView = {
+      screen: 'widget',
+      minimized: 0,
+      view: p.view,
+      previewEvent: {},
+      opts: {
+        cid
+      }
+    };
     if (!p.view && !p.cid) {
       let convoM = this.props.store.matchConvo('*');
       let redconvo = _index.default.find(convoM, convo => !_index.default.isConvoSeen(convo, this.props.store.matchUser().id));
-      p.cid = _index.default.get(redconvo, 'id', _index.default.get(convoM, '0.id'));
-      p.view = 'chat';
+      cid = _index.default.get(redconvo, 'id', _index.default.get(convoM, '0.id'));
+      newView.view = 'chat';
+      newView.opts = {
+        cid
+      };
     }
     if (this.props.store.isMobile()) modifyViewport();
-    this.setState({
-      widgetConvoId: p.cid,
-      widgetView: p.view
-    });
-    this.props.store.setIsOpen(true);
+    this.props.store.updateLastview(newView);
     this.forceUpdate();
-    this.setState({
-      isShowWidget: true
-    });
-    this.props.store.setLastview(p.view, {
-      cid: p.cid
-    });
   }
   applyMessage(text) {
     this.refWidget.current && this.refWidget.current.applyMessage(text);
@@ -186,15 +179,13 @@ class Main extends _common.Com {
   }
   hideWidget() {
     restoreViewport();
-    this.props.store.setIsOpen(false);
-    this.setState({
-      isShowWidget: false
+    this.props.store.updateLastview({
+      screen: 'button',
+      previewEvent: {}
     });
+    this.forceUpdate();
   }
   onWidgetClose() {
-    this.refButton.current && this.refButton.current.ClearPreview();
-    this.refButton.current && this.refButton.current.ClosePreview();
-    this.props.store.setHasManuallyClosed();
     this.hideWidget();
     this.props.store.emitCloseWidgetEvent();
   }

package/compiled_src/store/store.js

@@ -50,6 +50,24 @@ class Store {
       return unreadcount;
     });
     _defineProperty(this, "matchPlugin", () => {
+      if (this.is_embed_chat_mode) {
+        let pluginM = this.cache.match('plugin');
+        if (_index.default.size(this.forcePlugins) > 0) pluginM = this.forcePlugins;
+        let chatboxs = _index.default.filter(pluginM, (plugin, id) => plugin && plugin.type === 'chatbox');
+        if (_index.default.size(chatboxs) === 0) {
+          console.error('no chatbox found.');
+          return;
+        }
+        let chatbox = _index.default.find(chatboxs, chatbox => !!chatbox);
+        if (!chatbox) {
+          chatbox = chatboxs[0];
+        }
+        chatbox = _index.default.cloneDeep(chatbox);
+        chatbox.triggers = undefined;
+        return {
+          [chatbox.id]: chatbox
+        };
+      }
       if (_index.default.size(this.forcePlugins) > 0) return _index.default.cloneDeep(this.forcePlugins);
       return _index.default.cloneDeep(this.cache.match('plugin')) || {};
     });
@@ -137,12 +155,21 @@ class Store {
     _defineProperty(this, "matchLastview", () => {
       let lastView = this.kv.match('lastview') || {};
       let user = this.cache.match('user') || {};
-      if (!user.id) return {};
-      if (lastView.user_id != user.id) return {};
+      if (!user.id) return {
+        screen: 'preview'
+      };
+      if (lastView.user_id != user.id) return {
+        screen: 'preview'
+      };
+      if (!lastView.screen) {
+        lastView.screen = 'preview';
+        if (lastView.view === 'list' || lastView.view === 'chat') {
+          lastView.screen = 'widget';
+        }
+      }
       return lastView;
     });
     _defineProperty(this, "matchIsOpen", () => !!this.kv.match('isopen'));
-    _defineProperty(this, "matchHasManuallyClosed", () => !!this.kv.match('hasManuallyClosed'));
     _defineProperty(this, "matchClosePreviewAt", () => this.kv.match('close_preview_at') || 0);
     _defineProperty(this, "checkFormToken", (accid, token) => this.api.checkFormToken(accid, token));
     _defineProperty(this, "submitForm2", (accid, token, data) => this.api.submitForm2(accid, token, data));
@@ -176,24 +203,20 @@ class Store {
     _defineProperty(this, "onConnection", (o, cb) => this.pubsub.on2(o, 'connection', cb));
     _defineProperty(this, "onResetCSS", (o, cb) => this.pubsub.on2(o, 'resetCSS', cb));
     _defineProperty(this, "onHighlight", (o, cb) => this.pubsub.on2(o, 'highlight', cb));
-    _defineProperty(this, "setHasManuallyClosed", () => this.kv.put('hasManuallyClosed', true));
-    _defineProperty(this, "setIsOpen", isopen => {
-      let lastisopen = this.kv.match('isopen');
-      this.kv.put('isopen', isopen);
-      if (!lastisopen && isopen) {
-        sendEventToThirdParty('SUBIZ Chat', 'Opened', 'Subiz Windows');
-      }
-    });
     _defineProperty(this, "closePreview", () => this.kv.put('close_preview_at', new _index.default.Date().getTime()));
-    _defineProperty(this, "setLastview", (view, opts) => {
+    _defineProperty(this, "updateLastview", obj => {
       let user = this.cache.match('user') || {};
       if (!user.id) return;
-      this.kv.put('lastview', {
-        user_id: user.id,
-        view,
-        opts
-      });
+      let lastview = this.matchLastview() || {};
+      let newview = {
+        ...lastview,
+        ...obj,
+        user_id: user.id
+      };
+      this.kv.put('lastview', newview);
+      this.pubsub.publish('lastview', newview, lastview);
     });
+    _defineProperty(this, "onLastview", (o, cb) => this.pubsub.on2(o, 'lastview', cb));
     _defineProperty(this, "timeDiff", 0);
     this.connectionStatus = 'active';
     this.CONNECTION_CHECK_INTERVAL = 3000;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.178",
+	"version": "4.1.184",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -13,10 +13,10 @@
 		"@subiz/flow": "^1.1.0",
 		"@subiz/wsclient": "^4.0.34",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.45.1",
+		"core-js": "^3.46.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
-		"less": "^4.4.1",
+		"less": "^4.4.2",
 		"less-loader": "^12.3.0",
 		"preact": "10.19.3"
 	},
@@ -29,8 +29,8 @@
 		"babel-loader": "^10.0.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.4",
-		"puppeteer": "^24.22.2",
-		"webpack": "^5.101.3",
+		"puppeteer": "^24.24.0",
+		"webpack": "^5.102.1",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^6.0.1",
 		"webpack-dev-server": "^5.2.2"