@subiz/widget-v4 4.1.161 → 4.1.162

package/dist/HASH

@@ -1 +1 @@
-1989dde475e
+198a2601817

package/dist/screenshoot.js

@@ -7202,6 +7202,13 @@ class MessageInput extends common/* Com */.Mw {
   }
   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();
     util/* default */.A.setTimeout(() => {
       this.refMessageInput.current && this.refMessageInput.current.focus();
@@ -8848,7 +8855,7 @@ class Event extends common/* Com */.Mw {
     let ev = this.props.event.ev;
     let attachments = util/* default */.A.get(ev, 'data.message.attachments');
     let hasForm = util/* default */.A.find(attachments, att => att.type === 'form');
-    if (ev.id === 'evshpgaeetsplfqprzmynrvrl') hasForm = true;
+    if (isEmptyMessage(util/* default */.A.get(ev, 'data.message'))) return null;
     this.tryLoadOrder(ev);
     let t = new util/* default */.A.Date(ev.created).toLocaleString();
     if (util/* default */.A.get(ev, 'by.type') !== 'user') {
@@ -9117,6 +9124,10 @@ class Event extends common/* Com */.Mw {
     return acc.name;
   }
 }
+function isEmptyMessage(msg) {
+  if (!msg) return true;
+  if (!msg.text && !msg.block && !util/* default */.A.size(msg.attachments)) return true;
+}
 ;// ./src/chatbox/Events.js
 
 
@@ -11737,7 +11748,25 @@ class lib_Widget {
     return this.store.sendConversion(formid, values, impressiontoken);
   }
   startConvo(req) {
-    if (!req.is_light) return this.store.startConvo(req);else return this.store.startLightConvo(req.bot_id, req.welcome_message, req.locale, req.is_testing, req.bot_version);
+    req = util/* default */.A.cloneDeep(req) || {};
+    if (req.welcome_message) {
+      return this.store.startLightConvo(req.bot_id, req.welcome_message, req.locale, req.is_testing, req.bot_version);
+    }
+    let members = req.members || [];
+    if (req.bot_id) {
+      let botid = req.bot_id;
+      delete req.bot_id;
+      if (!util/* default */.A.find(members, m => b.id == botid)) {
+        members.push({
+          type: 'bot',
+          id: botid,
+          bot_version: req.bot_version
+        });
+      }
+    }
+    req.members = members;
+    req.initial_by = this.store.matchUser().id;
+    return this.store.startConvo(req);
   }
   async showGreeting() {
     await this.domGate.entry();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.161",
+	"version": "4.1.162",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",

package/src/chatbox/Event.js

@@ -234,7 +234,7 @@ export default class Event extends Com {
 		let ev = this.props.event.ev
 		let attachments = sb.get(ev, 'data.message.attachments')
 		let hasForm = sb.find(attachments, (att) => att.type === 'form')
-		if (ev.id === 'evshpgaeetsplfqprzmynrvrl') hasForm = true
+		if (isEmptyMessage(sb.get(ev, 'data.message'))) return null
 		this.tryLoadOrder(ev)
 		let t = new sb.Date(ev.created).toLocaleString()
 		// message of agent
@@ -468,3 +468,8 @@ export default class Event extends Com {
 		return acc.name
 	}
 }
+
+function isEmptyMessage(msg) {
+	if (!msg) return true
+	if (!msg.text && !msg.block && !sb.size(msg.attachments)) return true
+}

package/src/chatbox/MessageInput.js

@@ -242,6 +242,16 @@ export default class MessageInput extends Com {
 
 	focus() {
 		if (this.props.disabled) return
+		// check document has current input focused, so we dont interupt the compose procedure
+		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()
 		sb.setTimeout(() => {
 			this.refMessageInput.current && this.refMessageInput.current.focus()

package/src/lib.js

@@ -218,12 +218,12 @@ class Widget {
 		return this.store.sendConversion(formid, values, impressiontoken)
 	}
 
+	// req.bot_id != "" -> start conversation with bot id
 	startConvo(req) {
 		req = sb.cloneDeep(req) || {}
 		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/src/store/store.js

@@ -1067,8 +1067,6 @@ export default class Store {
 		let {body: convo, error} = await this.api.start(req)
 		this.convoGate.open()
 
-
-
 		if (error) return {error}
 		this._setConvo(convo)
 		return {convo}