@subiz/widget-v4 4.1.161 → 4.1.163

package/compiled_src/chatbox/Event.js

@@ -246,7 +246,7 @@ class Event extends _common.Com {
     let ev = this.props.event.ev;
     let attachments = _index.default.get(ev, 'data.message.attachments');
     let hasForm = _index.default.find(attachments, att => att.type === 'form');
-    if (ev.id === 'evshpgaeetsplfqprzmynrvrl') hasForm = true;
+    if (_index.default.isEmptyMessage(_index.default.get(ev, 'data.message'))) return null;
     this.tryLoadOrder(ev);
     let t = new _index.default.Date(ev.created).toLocaleString();
     if (_index.default.get(ev, 'by.type') !== 'user') {

package/compiled_src/chatbox/MessageInput.js

@@ -230,6 +230,13 @@ class MessageInput extends _common.Com {
   }
   focus() {
     if (this.props.disabled) return;
+    const activeElement = document.activeElement;
+    let focused = false;
+    if (activeElement) {
+      if (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA') focused = true;
+      if (activeElement.hasAttribute('contenteditable') && activeElement.getAttribute('contenteditable') === 'true') focused = true;
+    }
+    if (focused) return;
     this.refMessageInput.current && this.refMessageInput.current.focus();
     _index.default.setTimeout(() => {
       this.refMessageInput.current && this.refMessageInput.current.focus();

package/compiled_src/chatbox/TextMessage.js

@@ -71,7 +71,7 @@ class TextMessage extends _common.Com {
     }, tags);
   }
   renderBlock(block) {
-    if (isEmptyBlock(block)) return null;
+    if (_index.default.isEmptyBlock(block)) return null;
     let t = new _index.default.Date(_index.default.get(this.props.ev, 'created')).toLocaleString();
     let byType = _index.default.get(this.props.ev, 'by.type');
     if (byType !== 'user') byType = 'agent';
@@ -97,9 +97,4 @@ class TextMessage extends _common.Com {
     }));
   }
 }
-exports.default = TextMessage;
-function isEmptyBlock(block) {
-  if (!block || !block.type) return true;
-  let hasContent = _index.default.size(_index.default.filter(_index.default.map(block.content, block => isEmptyBlock(block)), isEmpty => !isEmpty)) > 0;
-  return !_index.default.trim(block.text) && !hasContent;
-}
+exports.default = TextMessage;

package/compiled_src/lib.js

@@ -221,7 +221,6 @@ class Widget {
     if (req.welcome_message) {
       return this.store.startLightConvo(req.bot_id, req.welcome_message, req.locale, req.is_testing, req.bot_version);
     }
-    console.log(req);
     let members = req.members || [];
     if (req.bot_id) {
       let botid = req.bot_id;

package/compiled_src/util/common.js

@@ -34,6 +34,8 @@ exports.includes = includes;
 exports.isBlockEmpty = isBlockEmpty;
 exports.isConvoSeen = isConvoSeen;
 exports.isEmail = isEmail;
+exports.isEmptyBlock = isEmptyBlock;
+exports.isEmptyMessage = isEmptyMessage;
 exports.isNumber = isNumber;
 exports.isPhone = isPhone;
 exports.isURL = isURL;
@@ -1291,4 +1293,13 @@ emojis = map(emojis, e => ':' + e + ':');
 function absLink(url) {
   if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) return 'http://' + url;
   return url;
+}
+function isEmptyBlock(block) {
+  if (!block || !block.type) return true;
+  let hasContent = size(filter(map(block.content, block => isEmptyBlock(block)), isEmpty => !isEmpty)) > 0;
+  return !trim(block.text) && !hasContent;
+}
+function isEmptyMessage(msg) {
+  if (!msg) return true;
+  if (!msg.text && isEmptyBlock(msg.block) && !size(msg.attachments)) return true;
 }