@subiz/widget-v4 4.1.68 → 4.1.70

package/package.json

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

package/src/chatbox/Rating.js

@@ -117,14 +117,18 @@ export default class Rating extends Com {
 		var ended
 
 		let user = this.props.store.matchUser()
+		// user must send message
+		let foundUser = false
 		sb.map(this.props.store.listEvents(this.props.cid), (ev) => {
-			if (sb.get(ev, 'type') === 'conversation_state_updated' && sb.get(ev, 'data.conversation.state') === 'ended') {
+			if (!ev || !ev.by) return
+			if (ev.by.type == 'user') foundUser = true
+			if (ev.type === 'conversation_state_updated' && sb.get(ev, 'data.conversation.state') === 'ended') {
 				ended = ev
 			}
-			if (sb.get(ev, 'type') === 'conversation_rating_requested') requested = ev
-			if (sb.get(ev, 'type') === 'conversation_rated' && sb.get(ev, 'by.id') === user.id) rated = ev
+			if (ev.type === 'conversation_rating_requested') requested = ev
+			if (ev.type === 'conversation_rated' && ev.by.id === user.id) rated = ev
 		})
-
+		if (!foundUser) return false
 		if (rated) return false
 		let accountSetting = this.props.plugin.chatbox
 		var auto = accountSetting.auto_request_rating && ended

package/src/chatbox/Widget.js

@@ -93,7 +93,6 @@ export default class Widget extends Com {
 		// choose form to display
 		let accountSetting = this.props.plugin.chatbox || {}
 		let acc = this.props.store.matchAccount() || {}
-
 		let submitLabel = this.props.t('prechat_form_btn')
 		if (sb.get(accountSetting, 'prechat_form.enabled')) form = accountSetting.prechat_form
 		let offlineEnabled = sb.get(accountSetting, 'offline_form.enabled')
@@ -247,7 +246,7 @@ export default class Widget extends Com {
 		if (!this.props.store.isMobile()) this.focusInput()
 	}
 
-	formMounted(form) {
+	formMounted = (form) => {
 		// waiting for element to be created
 		let formData = this.fillForm(form)
 		formData['question'] = {
@@ -259,7 +258,8 @@ export default class Widget extends Com {
 		}
 
 		this.setState({formData})
-		if (!this.props.store.isMobile()) this.focusInput()
+		// dont steal focus on mobile or trying to override form
+		if (!this.props.store.isMobile() && !form._updated) this.focusInput()
 	}
 
 	onBooleanChange(key, e) {
@@ -578,7 +578,7 @@ export default class Widget extends Com {
 
 		return (
 			<div class='widget-body'>
-				<FormMounter form={form} onMount={(f) => this.formMounted(f)} />
+				<FormMounter key={form._updated} form={form} onMount={this.formMounted} />
 				<div class='widget-body--content flex-grow-1 pl-3 pr-3 d-flex flex-column'>
 					<div class='flex-grow-1'>
 						<div class='form mt-3 pl-3 pr-3 pt-3 pb-3 d-flex flex-column'>

package/src/plugin.js

@@ -284,56 +284,47 @@ export default class PluginMgr {
 
 	getCurrentView() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		return chatbox.call('getCurrentView')
+		if (chatbox) return chatbox.call('getCurrentView')
 	}
 
 	showCurrentChatbox(p) {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('showWidget', p)
+		if (chatbox) return chatbox.call('showWidget', p)
 	}
 
 	showCurrentGreeting() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('showGreeting')
+		if (chatbox) return chatbox.call('showGreeting')
 	}
 
 	hideCurrentGreeting() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('hideGreeting')
+		if (chatbox) return chatbox.call('hideGreeting')
 	}
 
 	hideCurrentChatbox() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('hideWidget')
+		if (chatbox) return chatbox.call('hideWidget')
 	}
 
 	forceUpdateLang(id) {
 		let plugin = this.pluginM[id]
-		if (!plugin) return
-		plugin.forceDownloadLanguage()
+		if (plugin) return plugin.forceDownloadLanguage()
 	}
 
 	forceRunPopup(id) {
 		let plugin = this.pluginM[id]
-		if (!plugin) return
-		plugin.forceRunPopup(id)
+		if (plugin) return plugin.forceRunPopup(id)
 	}
 
 	setPluginLocale(id, locale) {
 		let plugin = this.pluginM[id]
-		if (!plugin) return
-		return plugin.setLocale(locale)
+		if (plugin) return plugin.setLocale(locale)
 	}
 
 	setCurrentChatboxLocale(locale) {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.setLocale(locale)
+		if (chatbox) return chatbox.setLocale(locale)
 	}
 
 	destroy() {