@subiz/widget-v4 4.0.89 → 4.0.91

package/compiled_src/chatbox/Event.js

@@ -142,7 +142,7 @@ class Event extends _common.Com {
 
     let agentM = this.props.store.matchAgent('*');
 
-    if (byid !== 'system' || bytype !== 'dummy') {
+    if (byid !== 'system' && bytype !== 'dummy' && bytype !== 'workflow') {
       uri = _index.default.get(agentM[byid], 'avatar_url') || acc.logo_url || require('../../assets/img/default_avatar.png');
     }
 
@@ -330,11 +330,10 @@ class Event extends _common.Com {
 
     let byid = _index.default.get(ev, 'by.display_id', _index.default.get(ev, 'by.id'));
 
-    if (byid === 'system' || bytype === 'dummy') return 'system';
-    let user = this.props.store.matchUser();
+    if (bytype === 'user') return _index.default.getUserDisplayName(this.props.store.matchUser());
     let acc = this.props.store.matchAccount();
-    if (bytype === 'user') return _index.default.getUserDisplayName(user);
     if (bytype === 'agent') return _index.default.getAgentDisplayName(acc, this.props.store.matchAgent(byid));
+    if (byid === 'system' || bytype === 'dummy' || bytype === 'workflow') return acc.name || 'system';
     return '';
   }
 

package/compiled_src/chatbox/TextMessage.js

@@ -100,19 +100,87 @@ class TextMessage extends _common.Com {
   }
 
   renderDelta() {
-    let deltas = _index.default.get(this.props.ev, 'data.message.quill_delta');
+    let deltas = _index.default.get(this.props.ev, 'data.message.quill_delta') || _index.default.get(this.props.ev, 'data.message.text');
 
-    deltas = _index.default.parseJSON(deltas) || {};
-    deltas = deltas.ops || [];
+    let quilldeltas = _index.default.parseJSON(deltas) || {};
+    quilldeltas = trimQuillDelta(quilldeltas);
+    if (!quilldeltas || _index.default.size(quilldeltas.ops) === 0) return null;
 
-    let isMarkdown = _index.default.find(deltas, delta => _index.default.get(delta, 'attributes.bold') || _index.default.get(delta, 'attributes.italic') || _index.default.get(delta, 'attributes.underline') || _index.default.get(delta, 'insert.emoji'));
+    let $deltas = _index.default.map(quilldeltas.ops, delta => {
+      let html = '';
+      let insert = delta.insert;
+      let attributes = delta.attributes;
 
-    if (isMarkdown) {
-      var text = deltaToMarkdown(deltas);
-      return this.renderMarkdown(text);
+      if (insert.dynamicField) {
+        return _index.default.get(insert, 'dynamicField.text', '');
+      }
+
+      if (insert.mention) {
+        if (insert.mention.id == '*' || insert.mention.id == 'all') {
+          return (0, _preact.h)("span", {
+            class: "mention"
+          }, "@", this.$t('all'));
+        }
+
+        let ag = store.matchAgent(insert.mention.id);
+
+        let name = _index.default.getAgentDisplayName(ag, insert.mention.fullname);
+
+        return (0, _preact.h)("span", {
+          class: "mention",
+          "data-agent-id": ag.id,
+          "data-agent-fullname": name
+        }, "@", name);
+      }
+
+      if (insert.emoji) return (0, _preact.h)(_Emoji.default, {
+        emojiCode: `:${insert.emoji}:`
+      });
+
+      if (typeof insert === 'string') {
+        let $tags = _index.default.extractText(insert).map((tag, i) => {
+          if (tag.type === 'link') {
+            return (0, _preact.h)("a", {
+              href: absLink(tag.text),
+              target: "_blank"
+            }, tag.text);
+          }
+
+          return tag.text;
+        });
+
+        if (attributes) {
+          if (attributes.italic && attributes.bold) return (0, _preact.h)("span", {
+            style: "font-weight: bold !important; font-style: italic !important"
+          }, $tags);
+          if (attributes.italic) return (0, _preact.h)("span", {
+            style: "font-style: italic !important"
+          }, $tags);
+          if (attributes.bold) return (0, _preact.h)("span", {
+            style: "font-weight: bold !important"
+          }, $tags);
+        }
+
+        return (0, _preact.h)("span", null, $tags);
+      }
+
+      return null;
+    });
+
+    let byType = _index.default.get(this.ev, 'by.type');
+
+    if (byType !== 'user') byType = 'agent';
+    if (_index.default.size($deltas) === 0) return null;
+
+    if (byType === 'agent') {
+      return (0, _preact.h)("div", {
+        class: "message-agent message-text--agent"
+      }, $deltas);
     }
 
-    return this.renderPlainText();
+    return (0, _preact.h)("div", {
+      class: "message-user message-text--user"
+    }, $deltas);
   }
 
   renderMarkdown(text) {
@@ -187,4 +255,37 @@ const emojiCodes = {
   tired: '😩',
   surprised: '😮',
   wink: '😉'
-};
+};
+
+function trimQuillDelta(delta) {
+  if (!delta) return delta;
+  if (!delta.ops || !delta.ops.length) return delta;
+  let last = delta.ops[delta.ops.length - 1];
+  if (typeof last.insert != 'string') return delta;
+  let insert = last.insert.trim();
+
+  if (insert) {
+    if (last.insert != insert) {
+      let newops = delta.ops.slice();
+      let last = newops.pop();
+      last.insert = insert;
+      newops.push(last);
+      return {
+        ops: newops
+      };
+    }
+
+    return delta;
+  }
+
+  let newops = delta.ops.slice();
+  newops.pop();
+  return trimQuillDelta({
+    ops: newops
+  });
+}
+
+function absLink(url) {
+  if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) return 'http://' + url;
+  return url;
+}

package/compiled_src/chatbox/Widget.js

@@ -124,7 +124,7 @@ class Widget extends _common.Com {
       formData: {},
       showOrder: false,
       order_id: '',
-      quickReplyMessage: ''
+      quickReplyMessage: {}
     });
     this.props.store.onUpdate(this, _ => this.forceUpdate());
   }
@@ -143,7 +143,7 @@ class Widget extends _common.Com {
       this.closeOrder();
       this.setState({
         clickedJoin: false,
-        quickReplyMessage: ''
+        quickReplyMessage: {}
       });
       setTimeout(() => {
         this.events && this.events.focus();
@@ -279,11 +279,12 @@ class Widget extends _common.Com {
           fields: [{
             key: 'to_agent_group',
             value: _index.default.stringify(groupid)
-          }]
+          }],
+          attachments: this.state.quickReplyMessage.attachments
         }
       });
       this.setState({
-        quickReplyMessage: ''
+        quickReplyMessage: {}
       });
       if (form.end_conversation_after_submit) await this.props.store.endConvo(this.props.cid);
       return;
@@ -331,7 +332,7 @@ class Widget extends _common.Com {
     this.setState({
       creating: false,
       clickedJoin: false,
-      quickReplyMessage: ''
+      quickReplyMessage: {}
     });
     if (!this.props.store.isMobile()) this.focusInput();
   }
@@ -343,7 +344,7 @@ class Widget extends _common.Com {
       is_required: true,
       label: this.props.t.i18n(_index.default.get(form, `i18n_question_label`, {})) || form.question_label,
       type: 'text',
-      value: this.state.quickReplyMessage
+      value: this.state.quickReplyMessage.text
     };
     this.setState({
       formData
@@ -405,7 +406,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;
+      if (this.state.quickReplyMessage.text && key === 'question') return null;
       let $field = null;
       var errclass = field.error ? 'input--error' : '';
 
@@ -682,7 +683,7 @@ class Widget extends _common.Com {
 
     this.setState({
       formData,
-      quickReplyMessage: message.text
+      quickReplyMessage: message
     });
   }
 
@@ -757,7 +758,7 @@ class Widget extends _common.Com {
     });
     this.setState({
       clickedJoin: true,
-      quickReplyMessage: ''
+      quickReplyMessage: {}
     });
   }
 
@@ -785,7 +786,7 @@ class Widget extends _common.Com {
     let convo = this.props.store.matchConvo(this.props.cid) || {};
     if (convo.state === 'ended') return true;
     if (convo.state && convo.state !== 'pending') delete formData.group;
-    return !!_index.default.find(formData, field => field.value == null || field.value === '');
+    return !!_index.default.find(formData, field => field.is_required && (field.value == null || field.value === ''));
   }
 
   renderConvoSummary(convo) {

package/dist/0b82fa7e5c3b07b40a44.png

@@ -0,0 +1 @@
+module.exports = __webpack_public_path__ + "assets/img/emoji/messenger/sub_58.824_78.431.f910f2a.png";

package/dist/0f4af006e38ee8b93633.png

@@ -0,0 +1 @@
+module.exports = __webpack_public_path__ + "assets/img/emoji/messenger/sub_60.784_29.412.e36d284.png";