@subiz/widget-v4 4.1.210 → 4.1.212

package/compiled_src/chatbox/MessageInput.js

@@ -45,10 +45,14 @@ class MessageInput extends _common.Com {
     $input.blur();
   }
   render() {
+    const disabled = this.hasUnfinishRequiredFormOrLock() || this.props.disabled || this.props.is_loading;
     var $buttons = (0, _preact.h)("div", {
       class: "d-flex flex-row align-self-end"
-    }, this.renderEmoji(), (0, _preact.h)("div", {
-      "data-tooltip-poasition": "top-left",
+    }, this.renderEmoji(), (0, _preact.h)("button", {
+      type: "button",
+      disabled: disabled,
+      "aria-label": this.props.t('attachment'),
+      "data-tooltip-position": "top-left",
       class: "message-input--button message-input--attachment-button",
       onClick: e => this.selectFile(e)
     }));
@@ -56,7 +60,10 @@ class MessageInput extends _common.Com {
     if (msg.length > 0) {
       $buttons = (0, _preact.h)("div", {
         class: "d-flex flex-row align-self-end"
-      }, this.renderEmoji(), (0, _preact.h)("div", {
+      }, this.renderEmoji(), (0, _preact.h)("button", {
+        type: "button",
+        disabled: disabled,
+        "aria-label": this.props.t('send'),
         "data-tooltip-position": "top-left",
         class: "message-input--button message-input--send-button",
         onClick: () => this.submitMessage()
@@ -70,7 +77,6 @@ class MessageInput extends _common.Com {
       }));
     }
     var containercls = '';
-    var disabled = this.hasUnfinishRequiredFormOrLock() || this.props.disabled;
     if (disabled || this.props.is_loading) containercls = 'message-input--disabled';
     return (0, _preact.h)("div", {
       class: `message-input ${containercls}`,
@@ -85,6 +91,7 @@ class MessageInput extends _common.Com {
       multiple: true
     }), (0, _preact.h)("textarea", {
       disabled: disabled,
+      "aria-label": this.props.t('message_input_help'),
       class: "message-input--input",
       maxlength: "1024",
       placeholder: this.props.t('message_input_help').substr(0, 25),
@@ -247,7 +254,11 @@ class MessageInput extends _common.Com {
     }, 100);
   }
   renderEmoji() {
-    return (0, _preact.h)("div", null, this.renderEmojiPopup(), (0, _preact.h)("div", {
+    return (0, _preact.h)("div", null, this.renderEmojiPopup(), (0, _preact.h)("button", {
+      type: "button",
+      "aria-label": "Emoji",
+      "aria-expanded": !!this.state.openEmoji,
+      disabled: this.props.disabled || this.props.is_loading,
       class: "message-input--button message-input--emoji-button",
       onClick: e => this.toggleEmoji(e)
     }));
@@ -277,13 +288,15 @@ class MessageInput extends _common.Com {
       return e.preventDefault();
     }
     this._forceUpdate();
-    this.sendTyping();
   }
   onChange(e) {
+    const value = e.target.value;
+    const changed = value !== (this.state.msgValue || '');
     this.setState({
-      msgValue: e.target.value
+      msgValue: value
     });
     this.resizeInput();
+    if (changed && _index.default.trim(value)) this.sendTyping();
   }
   selectFile() {
     if (this.props.disabled) return;
@@ -315,10 +328,10 @@ class MessageInput extends _common.Com {
     if (!msg) return;
     if (this.props.disabled) return;
     if (this.props.onSend) {
-      await this.props.onSend({
+      if ((await this.props.onSend({
         text: msg,
         format: 'plaintext'
-      });
+      })) === false) return;
     }
     this.setState({
       openEmoji: false,
@@ -327,7 +340,9 @@ class MessageInput extends _common.Com {
     this.resizeInput();
   }
   sendTyping() {
+    if (this.props.disabled || this.props.is_loading) return;
     if (!this.props.cid) return;
+    if (_index.default.get(this.props.store.matchConvo(this.props.cid), 'state') === 'ended') return;
     return this.props.store.typing(this.props.cid);
   }
   pasteImage(event) {

package/compiled_src/chatbox/OrderAttachments.js

@@ -167,12 +167,12 @@ class ProductAttachments extends _common.Com {
 }
 exports.default = ProductAttachments;
 function getProductPropName(product, seperator = ' - ') {
-  let options = op.get(product, 'options', []);
-  let props = op.get(product, 'props', []);
-  let multiPropsOptions = op.filter(options, option => op.size(option.values) > 1);
+  let options = _index.default.get(product, 'options', []);
+  let props = _index.default.get(product, 'props', []);
+  let multiPropsOptions = _index.default.filter(options, option => _index.default.size(option.values) > 1);
   let names = [];
-  op.each(multiPropsOptions, option => {
-    let prop = op.find(props, prop => prop.key === option.key) || {};
+  _index.default.each(multiPropsOptions, option => {
+    let prop = _index.default.find(props, prop => prop.key === option.key) || {};
     if (prop.value) names.push(prop.value);
   });
   return names.join(seperator);
@@ -181,7 +181,7 @@ function getOrderDisplayName(order = {}) {
   return order.number || order.id || '';
 }
 function displayOrderShippingAddress(order, isShorten) {
-  let addr = op.get(order, 'shipping.address', {});
+  let addr = _index.default.get(order, 'shipping.address', {});
   let fulladdr = [addr.address, addr.ward, addr.district, addr.province].filter(a => a).join(', ').trim();
   if (isShorten) fulladdr = shortenAddr(fulladdr);
   return fulladdr;
@@ -197,9 +197,9 @@ function calcOrderTotal(order) {
   let subtotal = 0;
   let beforeTaxDiscount = 0;
   let ordervalue = 0;
-  op.map(order.items, item => {
+  _index.default.map(order.items, item => {
     if (!item.product) return 0;
-    let price = op.get(item, 'product.price', 0) * (item.quantity || 0);
+    let price = _index.default.get(item, 'product.price', 0) * (item.quantity || 0);
     ordervalue += price;
     if (item.discount_type == 'percentage') {
       if (item.discount_percentage > 0) {
@@ -217,7 +217,7 @@ function calcOrderTotal(order) {
     subtotal += price;
   });
   let taxM = {};
-  op.map(order.items, (item, i) => {
+  _index.default.map(order.items, (item, i) => {
     if (!item.product) return;
     let tax = item.product.tax;
     if (!tax) return;
@@ -230,16 +230,16 @@ function calcOrderTotal(order) {
     };
   });
   let totaltax = 0;
-  op.map(taxM, t => totaltax += t.taxprice);
+  _index.default.map(taxM, t => totaltax += t.taxprice);
   let computed_discount = 0;
   if (order.discount_type == 'percentage' && order.discount_percentage > 0) {
     computed_discount = (subtotal + totaltax) * order.discount_percentage / 10000;
   } else if (order.discount_type == 'amount') {
     computed_discount = order.discount_amount || 0;
   }
-  let shippingfee = op.get(order, 'shipping.nominal_fee', 0);
+  let shippingfee = _index.default.get(order, 'shipping.nominal_fee', 0);
   if (shippingfee > 0) {
-    if (op.get(order, 'shipping.tax.id')) {
+    if (_index.default.get(order, 'shipping.tax.id')) {
       let tax = order.shipping.tax;
       let taxprice = shippingfee * (tax.percentage / 10000);
       taxM['ship'] = {
@@ -250,7 +250,7 @@ function calcOrderTotal(order) {
     }
   }
   totaltax = 0;
-  op.map(taxM, t => totaltax += t.taxprice);
+  _index.default.map(taxM, t => totaltax += t.taxprice);
   let total = subtotal + totaltax - computed_discount + shippingfee;
   total += order.adjustment || 0;
   if (total < 0) total = 0;

package/compiled_src/chatbox/QuoteMessage.js

@@ -44,7 +44,7 @@ class QuoteMessage extends _common.Com {
       if (_index.default.get(this.props, 'chatbox.hide_agent_profile')) sendername = acc.name;
     }
     let att = _index.default.get(this.props.ev, 'data.message.attachments.0');
-    if (att) {
+    if (att && !_index.default.get(this.props.ev, 'data.message.deleted')) {
       let isImg = _index.default.includes(att.mimetype, 'image');
       if (isImg) {
         let uri = att.url;
@@ -78,7 +78,8 @@ class QuoteMessage extends _common.Com {
     let format = _index.default.get(this.props.ev, 'data.message.format', 'plaintext');
     let block = _index.default.get(this.props.ev, 'data.message.block');
     let text = _index.default.get(this.props.ev, 'data.message.text');
-    if (block) text = _index.default.blockToText(block);
+    if (block) text = _index.default.blockToText(block) || text;
+    if (_index.default.get(this.props.ev, 'data.message.deleted')) text = this.props.t('recalled_message');
     return (0, _preact.h)("div", {
       class: "message-quote",
       onClick: () => this.scrollToSourceEvent(this.props.ev)

package/compiled_src/chatbox/TextMessage.js

@@ -9,8 +9,8 @@ var _block = _interopRequireDefault(require("./block.js"));
 var _common = require("../common.js");
 var _preact = require("preact");
 var _Emoji = _interopRequireDefault(require("./Emoji.js"));
-var _time = _interopRequireDefault(require("./time.js"));
 var _QuoteMessage = _interopRequireDefault(require("./QuoteMessage.js"));
+var _url = require("../util/url.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class TextMessage extends _common.Com {
   constructor(props) {
@@ -21,12 +21,9 @@ class TextMessage extends _common.Com {
   }
   renderTime() {
     return null;
-    if (!this.props.showTime && !this.props.isLast && !this.props.isFirst) return null;
-    return (0, _preact.h)("div", null, (0, _preact.h)(_time.default, {
-      class: "inline-time",
-      time: _index.default.get(this.props.ev, 'created', _index.default.Date.now()),
-      t: this.props.t
-    }));
+  }
+  componentWillUnmount() {
+    _index.default.clearTimeout(this.focusTimeout);
   }
   focusSourceEventFromQuote(ev) {
     if (ev.id !== this.props.ev.id) return;
@@ -34,7 +31,7 @@ class TextMessage extends _common.Com {
     let attachmentIndexField = _index.default.find(fields, f => f.key === 'attachment_index');
     let attachmentIndex = _index.default.get(attachmentIndexField, 'value');
     try {
-      attachmentIndex = JSON.parse(attachmentIndex);
+      attachmentIndex = _index.default.parseJSON(attachmentIndex);
     } catch (err) {
       attachmentIndex = undefined;
     }
@@ -42,17 +39,22 @@ class TextMessage extends _common.Com {
     this.setState({
       focused: true
     });
-    if (this.focusTimeout) clearTimeout(this.focusTimeout);
-    this.focusTimeout = setTimeout(() => {
+    if (this.focusTimeout) _index.default.clearTimeout(this.focusTimeout);
+    this.focusTimeout = _index.default.setTimeout(() => {
       this.setState({
         focused: false
       });
     }, 3000);
   }
   render() {
-    var format = _index.default.get(this.props.ev, 'data.message.format', 'plaintext');
+    if (_index.default.get(this.props.ev, 'data.message.deleted')) {
+      let byType = _index.default.get(this.props.ev, 'by.type') === 'user' ? 'user' : 'agent';
+      return (0, _preact.h)("div", {
+        class: 'message-' + byType + ' message-text--' + byType + ' message-text--deleted'
+      }, this.props.t('recalled_message'));
+    }
     let block = _index.default.get(this.props.ev, 'data.message.block');
-    if (block) return this.renderBlock(block);
+    if (block && !_index.default.isEmptyBlock(block)) return this.renderBlock(block);
     return this.renderPlainText();
   }
   renderPlainText() {
@@ -72,11 +74,14 @@ class TextMessage extends _common.Com {
         if (!url.startsWith('//') && !url.startsWith('https://') && !url.startsWith('http://') && !url.startsWith('data:')) {
           url = '//' + url;
         }
+        url = (0, _url.safeUrl)(url);
+        if (!url) return tag.text;
         return (0, _preact.h)("a", {
           class: "text-message-link",
           href: url,
           target: "_blank",
-          onClick: e => this.props.onLink(e, url)
+          rel: "noopener noreferrer",
+          onClick: e => this.props.onLink && this.props.onLink(e, url)
         }, tag.text);
       }
       if (tag.type === 'phone') return (0, _preact.h)("a", {
@@ -90,15 +95,10 @@ class TextMessage extends _common.Com {
       return tag.text;
     });
     if (_index.default.size(tags) === 0) return null;
-    let isDeleted = _index.default.get(this.props.ev, 'data.message.deleted');
     let attachments = _index.default.get(this.props.ev, 'data.message.attachments', []);
     let quote = _index.default.find(attachments, att => att.type === 'quote');
     if (byType === 'agent') {
       let cls = 'message-agent message-text--agent';
-      if (isDeleted) {
-        tags = this.props.t('recalled_message');
-        cls += ' message-text--deleted';
-      }
       if (this.state.focused) cls += ' just-focused';
       return (0, _preact.h)("div", {
         class: cls,
@@ -130,6 +130,8 @@ class TextMessage extends _common.Com {
       }, (0, _preact.h)(_block.default, {
         block: block,
         onLink: this.props.onLink,
+        store: this.props.store,
+        t: this.props.t,
         textMessage: true
       }), this.renderTime());
     }
@@ -141,6 +143,8 @@ class TextMessage extends _common.Com {
     }, (0, _preact.h)(_block.default, {
       block: block,
       onLink: this.props.onLink,
+      store: this.props.store,
+      t: this.props.t,
       textMessage: true
     }));
   }