@subiz/widget-v4 4.0.88 → 4.0.89

package/assets/less/chatbox.less

@@ -97,6 +97,8 @@ body div#sbz92 {
 	}
 
 	img {
+		overflow: hidden;
+		flex-shrink: 0;
 		background-repeat: no-repeat;
 		background-position: center;
 		background-size: 100% 100%;

package/compiled_src/chatbox/Event.js

@@ -128,7 +128,7 @@ class Event extends _common.Com {
 
     var uri = acc.logo_url || require('../../assets/img/image_default.png');
 
-    if (true || _index.default.get(this.props, 'chatbox.hide_agent_profile')) {
+    if (_index.default.get(this.props, 'chatbox.hide_agent_profile')) {
       return (0, _preact.h)("div", {
         class: "message-sender"
       }, (0, _preact.h)("img", {

package/compiled_src/chatbox/Widget.js

@@ -54,6 +54,14 @@ class Widget extends _common.Com {
     _defineProperty(this, "msgInput", (0, _preact.createRef)());
 
     _defineProperty(this, "sendMessage", async message => {
+      let hasPostback = _index.default.find(message.attachments, att => att.type === 'postback');
+
+      if (this.isFormRequired() && hasPostback) {
+        this.onStartConvoClick();
+        this.fillQuickReplyToQuestion(message);
+        return;
+      }
+
       let text = message.text;
 
       if (!this.props.cid) {
@@ -115,7 +123,8 @@ class Widget extends _common.Com {
       clickedJoin: false,
       formData: {},
       showOrder: false,
-      order_id: ''
+      order_id: '',
+      quickReplyMessage: ''
     });
     this.props.store.onUpdate(this, _ => this.forceUpdate());
   }
@@ -133,7 +142,8 @@ class Widget extends _common.Com {
     if (prevProp.cid !== this.props.cid) {
       this.closeOrder();
       this.setState({
-        clickedJoin: false
+        clickedJoin: false,
+        quickReplyMessage: ''
       });
       setTimeout(() => {
         this.events && this.events.focus();
@@ -145,6 +155,15 @@ class Widget extends _common.Com {
   }
 
   shouldShowForm() {
+    let form;
+    let accountSetting = this.props.plugin.chatbox || {};
+    let acc = this.props.store.matchAccount() || {};
+    if (_index.default.get(accountSetting, 'prechat_form.enabled')) form = accountSetting.prechat_form;
+
+    let offlineEnabled = _index.default.get(accountSetting, 'offline_form.enabled');
+
+    if (this.isOffline(acc, accountSetting) && offlineEnabled) form = accountSetting.offline_form;
+    if (!this.hasSentMessage(this.props.cid) && form && (_index.default.size(form.groups) || form.group_required)) return true;
     let formRequired = this.isFormRequired();
     return formRequired && !this.props.cid || formRequired && this.props.cid && this.state.clickedJoin;
   }
@@ -263,6 +282,9 @@ class Widget extends _common.Com {
           }]
         }
       });
+      this.setState({
+        quickReplyMessage: ''
+      });
       if (form.end_conversation_after_submit) await this.props.store.endConvo(this.props.cid);
       return;
     }
@@ -308,7 +330,8 @@ class Widget extends _common.Com {
     });
     this.setState({
       creating: false,
-      clickedJoin: false
+      clickedJoin: false,
+      quickReplyMessage: ''
     });
     if (!this.props.store.isMobile()) this.focusInput();
   }
@@ -319,7 +342,8 @@ class Widget extends _common.Com {
       key: 'question',
       is_required: true,
       label: this.props.t.i18n(_index.default.get(form, `i18n_question_label`, {})) || form.question_label,
-      type: 'text'
+      type: 'text',
+      value: this.state.quickReplyMessage
     };
     this.setState({
       formData
@@ -381,6 +405,7 @@ class Widget extends _common.Com {
     if (_index.default.size(this.state.formData) === 0) return null;
 
     let $fields = _index.default.map(this.state.formData, (field, key) => {
+      if (this.state.quickReplyMessage && key === 'question') return null;
       let $field = null;
       var errclass = field.error ? 'input--error' : '';
 
@@ -648,6 +673,19 @@ class Widget extends _common.Com {
     this.focusInput();
   }
 
+  fillQuickReplyToQuestion(message) {
+    let formData = this.state.formData;
+
+    if (formData) {
+      _index.default.set(formData, 'question.value', message.text);
+    }
+
+    this.setState({
+      formData,
+      quickReplyMessage: message.text
+    });
+  }
+
   createPostback(postback) {
     this.props.store.createPostback(this.props.cid, postback);
   }
@@ -718,7 +756,8 @@ class Widget extends _common.Com {
       cid: ''
     });
     this.setState({
-      clickedJoin: true
+      clickedJoin: true,
+      quickReplyMessage: ''
     });
   }
 
@@ -745,7 +784,6 @@ class Widget extends _common.Com {
     let formData = this.fillForm(form);
     let convo = this.props.store.matchConvo(this.props.cid) || {};
     if (convo.state === 'ended') return true;
-    if (this.userHasSent(this.props.cid)) return false;
     if (convo.state && convo.state !== 'pending') delete formData.group;
     return !!_index.default.find(formData, field => field.value == null || field.value === '');
   }
@@ -868,6 +906,17 @@ class Widget extends _common.Com {
     return joined;
   }
 
+  hasSentMessage(cid) {
+    let convo = this.props.store.matchConvo(cid) || {};
+
+    let joined = _index.default.find(convo.members, mem => {
+      if (mem.type === 'bot') return true;
+      return mem.last_sent;
+    });
+
+    return joined;
+  }
+
   isOffline(acc, accSetting) {
     let enableWhen = _index.default.get(accSetting, 'offline_form.enable_when');
 

package/compiled_src/util/common.js

@@ -894,7 +894,7 @@ function checkRunConditions(freq, conds, lastrun, store) {
 
       case 'source':
         if (size(cond.sources) > 0) {
-          let source = store.matchTrafficSource();
+          let source = store.matchTrafficSource() || 'direct';
           if (!find(cond.sources, src => norm(src) === norm(source))) return false;
         }
 

package/dist/132.js

@@ -2756,7 +2756,7 @@ class Event extends common/* Com */.up {
 
     var uri = acc.logo_url || __webpack_require__(9895);
 
-    if (true) {
+    if (util/* default.get */.Z.get(this.props, 'chatbox.hide_agent_profile')) {
       return (0,preact_module.h)("div", {
         class: "message-sender"
       }, (0,preact_module.h)("img", {
@@ -5668,6 +5668,14 @@ class Widget extends common/* Com */.up {
     Widget_defineProperty(this, "msgInput", (0,preact_module/* createRef */.Vf)());
 
     Widget_defineProperty(this, "sendMessage", async message => {
+      let hasPostback = util/* default.find */.Z.find(message.attachments, att => att.type === 'postback');
+
+      if (this.isFormRequired() && hasPostback) {
+        this.onStartConvoClick();
+        this.fillQuickReplyToQuestion(message);
+        return;
+      }
+
       let text = message.text;
 
       if (!this.props.cid) {
@@ -5729,7 +5737,8 @@ class Widget extends common/* Com */.up {
       clickedJoin: false,
       formData: {},
       showOrder: false,
-      order_id: ''
+      order_id: '',
+      quickReplyMessage: ''
     });
     this.props.store.onUpdate(this, _ => this.forceUpdate());
   }
@@ -5747,7 +5756,8 @@ class Widget extends common/* Com */.up {
     if (prevProp.cid !== this.props.cid) {
       this.closeOrder();
       this.setState({
-        clickedJoin: false
+        clickedJoin: false,
+        quickReplyMessage: ''
       });
       setTimeout(() => {
         this.events && this.events.focus();
@@ -5759,6 +5769,13 @@ class Widget extends common/* Com */.up {
   }
 
   shouldShowForm() {
+    let form;
+    let accountSetting = this.props.plugin.chatbox || {};
+    let acc = this.props.store.matchAccount() || {};
+    if (util/* default.get */.Z.get(accountSetting, 'prechat_form.enabled')) form = accountSetting.prechat_form;
+    let offlineEnabled = util/* default.get */.Z.get(accountSetting, 'offline_form.enabled');
+    if (this.isOffline(acc, accountSetting) && offlineEnabled) form = accountSetting.offline_form;
+    if (!this.hasSentMessage(this.props.cid) && form && (util/* default.size */.Z.size(form.groups) || form.group_required)) return true;
     let formRequired = this.isFormRequired();
     return formRequired && !this.props.cid || formRequired && this.props.cid && this.state.clickedJoin;
   }
@@ -5866,6 +5883,9 @@ class Widget extends common/* Com */.up {
           }]
         }
       });
+      this.setState({
+        quickReplyMessage: ''
+      });
       if (form.end_conversation_after_submit) await this.props.store.endConvo(this.props.cid);
       return;
     }
@@ -5911,7 +5931,8 @@ class Widget extends common/* Com */.up {
     });
     this.setState({
       creating: false,
-      clickedJoin: false
+      clickedJoin: false,
+      quickReplyMessage: ''
     });
     if (!this.props.store.isMobile()) this.focusInput();
   }
@@ -5922,7 +5943,8 @@ class Widget extends common/* Com */.up {
       key: 'question',
       is_required: true,
       label: this.props.t.i18n(util/* default.get */.Z.get(form, `i18n_question_label`, {})) || form.question_label,
-      type: 'text'
+      type: 'text',
+      value: this.state.quickReplyMessage
     };
     this.setState({
       formData
@@ -5975,6 +5997,7 @@ class Widget extends common/* Com */.up {
   renderFields() {
     if (util/* default.size */.Z.size(this.state.formData) === 0) return null;
     let $fields = util/* default.map */.Z.map(this.state.formData, (field, key) => {
+      if (this.state.quickReplyMessage && key === 'question') return null;
       let $field = null;
       var errclass = field.error ? 'input--error' : '';
 
@@ -6231,6 +6254,19 @@ class Widget extends common/* Com */.up {
     this.focusInput();
   }
 
+  fillQuickReplyToQuestion(message) {
+    let formData = this.state.formData;
+
+    if (formData) {
+      util/* default.set */.Z.set(formData, 'question.value', message.text);
+    }
+
+    this.setState({
+      formData,
+      quickReplyMessage: message.text
+    });
+  }
+
   createPostback(postback) {
     this.props.store.createPostback(this.props.cid, postback);
   }
@@ -6301,7 +6337,8 @@ class Widget extends common/* Com */.up {
       cid: ''
     });
     this.setState({
-      clickedJoin: true
+      clickedJoin: true,
+      quickReplyMessage: ''
     });
   }
 
@@ -6326,7 +6363,6 @@ class Widget extends common/* Com */.up {
     let formData = this.fillForm(form);
     let convo = this.props.store.matchConvo(this.props.cid) || {};
     if (convo.state === 'ended') return true;
-    if (this.userHasSent(this.props.cid)) return false;
     if (convo.state && convo.state !== 'pending') delete formData.group;
     return !!util/* default.find */.Z.find(formData, field => field.value == null || field.value === '');
   }
@@ -6431,6 +6467,15 @@ class Widget extends common/* Com */.up {
     return joined;
   }
 
+  hasSentMessage(cid) {
+    let convo = this.props.store.matchConvo(cid) || {};
+    let joined = util/* default.find */.Z.find(convo.members, mem => {
+      if (mem.type === 'bot') return true;
+      return mem.last_sent;
+    });
+    return joined;
+  }
+
   isOffline(acc, accSetting) {
     let enableWhen = util/* default.get */.Z.get(accSetting, 'offline_form.enable_when');
     let isonline = true;