@subiz/widget-v4 4.1.27 → 4.1.29

package/compiled_src/chatbox/GenericTemplateAttachments.js

@@ -46,12 +46,16 @@ class GenericTemplateAttachments extends _common.Com {
         let $subtitle = subtitle ? (0, _preact.h)("div", {
           class: "generic-attachment--element-subtitle"
         }, subtitle) : null;
+        let imgsrc = this.props.store.replaceFileUrl(ele.image_url);
+        if (!ele.image_url) {
+          imgsrc = require('../../assets/img/default.jpg');
+        }
         return (0, _preact.h)("div", {
           class: "generic-attachment--element swiper-slide"
         }, (0, _preact.h)("div", null, (0, _preact.h)("img", {
           alt: "generic attachment element",
           class: "generic-attachment--element-img",
-          src: this.props.store.replaceFileUrl(ele.image_url)
+          src: imgsrc
         })), (0, _preact.h)("div", {
           class: "generic-attachment--element-content"
         }, $title, $subtitle), (0, _preact.h)(_Buttons.default, {

package/compiled_src/chatbox/ProductAttachments.js

@@ -72,11 +72,16 @@ class ProductAttachments extends _common.Com {
       if (desc) $subtitle = (0, _preact.h)("div", {
         class: "product_attachment__subtitle"
       }, desc);
+      let currency = product.currency || _index.default.get(acc, 'currency', 'VND');
       let $price = null;
       if (product.price) {
         $price = (0, _preact.h)("div", {
           class: "product_attachment__price"
-        }, product.currency || _index.default.get(acc, 'currency', ''), " ", _index.default.formatCurrency(product.price));
+        }, _index.default.formatCurrency(product.price, currency));
+      }
+      let imgsrc = this.props.store.replaceFileUrl(product.image);
+      if (!product.image) {
+        imgsrc = require('../../assets/img/default.jpg');
       }
       return (0, _preact.h)("div", {
         class: 'product_attachment product_attachment__' + byType
@@ -85,7 +90,7 @@ class ProductAttachments extends _common.Com {
         target: "_blank"
       }, (0, _preact.h)("img", {
         class: "product_attachment__img",
-        src: this.props.store.replaceFileUrl(product.image)
+        src: imgsrc
       }))), $title, $subtitle, $price, (0, _preact.h)("div", {
         class: "product_attachment__btns"
       }, $detailbtns));

package/compiled_src/chatbox/Widget.js

@@ -86,6 +86,7 @@ class Widget extends _common.Com {
       this.focusInput();
     });
     this.userSent = {};
+    this.wasFormInputed = false;
     this.setState({
       creating: false,
       clickedJoin: false,
@@ -289,6 +290,7 @@ class Widget extends _common.Com {
     if (!this.props.store.isMobile()) this.focusInput();
   }
   onBooleanChange(key, e) {
+    this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
     let field = _index.default.find(formData, (_, fkkey) => fkkey === key);
     if (!field) return;
@@ -298,6 +300,7 @@ class Widget extends _common.Com {
     });
   }
   onInputChange(key, val) {
+    this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
     let field = _index.default.find(formData, (_, fkkey) => fkkey === key);
     if (!field) return;
@@ -307,6 +310,7 @@ class Widget extends _common.Com {
     });
   }
   onListAddItem(key, val) {
+    this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
     let field = _index.default.find(formData, (_, fkkey) => fkkey === key);
     if (!field) return;
@@ -317,6 +321,7 @@ class Widget extends _common.Com {
     });
   }
   onListRemoveItem(key, index) {
+    this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
     let field = _index.default.find(formData, (_, fkkey) => fkkey === key);
     if (!field) return;
@@ -348,6 +353,7 @@ class Widget extends _common.Com {
     }));
   }
   toggleCheckboxField(key, v) {
+    this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
     let field = _index.default.find(formData, (f, fkkey) => f.key === key);
     if (!field) return;
@@ -385,6 +391,7 @@ class Widget extends _common.Com {
     }));
   }
   toggleRadioField(key, v) {
+    this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
     let field = _index.default.find(formData, (f, fkkey) => f.key === key);
     if (!field) return;
@@ -394,6 +401,7 @@ class Widget extends _common.Com {
     });
   }
   selectDropdownField(key, v) {
+    this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
     let field = _index.default.find(formData, (f, fkkey) => f.key === key);
     if (!field) return;
@@ -690,11 +698,15 @@ class Widget extends _common.Com {
   createPostback(postback) {
     this.props.store.createPostback(this.props.cid, postback);
   }
+  onChangeMessageInput() {
+    this.wasFormInputed = true;
+  }
   renderChat() {
     let $input = (0, _preact.h)(_MessageInput.default, {
       store: this.props.store,
       ref: this.msgInput,
       cid: this.props.cid,
+      onChange: this.onChangeMessageInput,
       onSend: this.sendMessage,
       t: this.props.t
     });

package/compiled_src/chatbox/main.js

@@ -17,6 +17,7 @@ class Main extends _common.Com {
   constructor(props) {
     super(props);
     this.refButton = (0, _preact.createRef)();
+    this.refWidget = (0, _preact.createRef)();
   }
   async refreshCSS() {
     let plugins = this.props.store.matchPlugin();
@@ -45,7 +46,7 @@ class Main extends _common.Com {
     });
     this.checkExpand();
     this.props.store.onResetCSS(this, () => this.refreshCSS());
-    this.props.store.onConvoEvent(this, _ => this.checkExpand());
+    this.props.store.onConvoEvent(this, ev => this.onConvoEvent(ev));
     this.props.store.onUpdate(this, _ => this.checkExpand());
     await this.refreshCSS();
     this.setState({
@@ -83,9 +84,30 @@ class Main extends _common.Com {
       isShow: this.state.isShowWidget,
       onClose: a => this.onWidgetClose(a),
       onGo: a => this.showWidget(a),
-      t: this.props.t
+      t: this.props.t,
+      ref: this.refWidget
     }));
   }
+  onConvoEvent(ev) {
+    this.checkExpand();
+    this.checkShowBotConvo(ev);
+  }
+  checkShowBotConvo(ev) {
+    let $widget = this.refWidget.current;
+    if (!$widget) return;
+    if ($widget.wasFormInputed) return;
+    if (ev.type !== 'message_sent') return;
+    if (!this.state.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;
+    let cid = _index.default.get(ev, 'data.message.conversation_id');
+    if (!cid) return;
+    this.showWidget({
+      cid,
+      view: 'chat'
+    });
+  }
   checkExpand() {
     if (this.props.store.isMobile()) return;
     if (this.props.plugin._no_auto_expand) return;

package/compiled_src/util/campaign.js

@@ -34,17 +34,12 @@ function trackAreaClicked(selector, cb) {
   common.map(selector.split('\n'), selector => {
     selector = common.trim(selector);
     if (!selector) return;
-    let doms = [];
-    try {
-      doms = document.querySelectorAll(selector);
-    } catch (e) {}
-    common.map(doms, dom => {
-      if (!dom) return;
-      dom.addEventListener('click', cb, false);
-    });
+    on('click', selector, cb);
   });
 }
-function trackInactivity(seconds = 0, cb) {
+function trackInactivity() {
+  let seconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  let cb = arguments.length > 1 ? arguments[1] : undefined;
   let events = ['scroll', 'keyup', 'keydown', 'mousemove', 'mousewheel', 'mouseenter', 'mouseover', 'mousedown', 'touchstart', 'touchmove', 'touchenter'];
   let inactiveSeconds = 0;
   let resetTime = () => {
@@ -67,7 +62,9 @@ let timeOnPage = 0;
 common.setInterval(() => {
   timeOnPage += 5;
 }, 5000);
-function trackTimeOnPage(seconds = 0, cb) {
+function trackTimeOnPage() {
+  let seconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  let cb = arguments.length > 1 ? arguments[1] : undefined;
   if (seconds < 1) {
     return common.setTimeout(function () {
       cb(seconds);
@@ -78,4 +75,20 @@ function trackTimeOnPage(seconds = 0, cb) {
     if (cb) cb(timeOnPage);
     common.clearInterval(timer);
   }, 1000);
+}
+function on(eventName, selector, fn) {
+  document.addEventListener(eventName, function (event) {
+    let possibleTargets = document.querySelectorAll(selector);
+    let target = event.target;
+    for (let i = 0, l = possibleTargets.length; i < l; i++) {
+      let el = target;
+      let p = possibleTargets[i];
+      while (el && el !== document) {
+        if (el === p) {
+          return fn.call(p, event);
+        }
+        el = el.parentNode;
+      }
+    }
+  });
 }