@subiz/widget-v4 4.0.90 → 4.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.90",
+	"version": "4.0.92",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,25 +14,25 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.25.2",
+		"core-js": "^3.25.5",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.3",
 		"less-loader": "^11.0.0",
-		"marked": "^4.1.0",
-		"preact": "^10.11.0"
+		"marked": "^4.1.1",
+		"preact": "^10.11.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.18.10",
-		"@babel/core": "^7.19.1",
+		"@babel/cli": "^7.19.3",
+		"@babel/core": "^7.19.3",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.19.0",
-		"@babel/preset-env": "^7.19.1",
+		"@babel/preset-env": "^7.19.4",
 		"babel-loader": "^8.2.5",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
 		"prettier": "^2.7.1",
-		"puppeteer": "^17.1.3",
+		"puppeteer": "^18.2.1",
 		"webpack": "^5.74.0",
 		"webpack-bundle-analyzer": "^4.6.1",
 		"webpack-cli": "^4.10.0",

package/src/chatbox/TextMessage.js

@@ -106,15 +106,16 @@ export default class TextMessage extends Com {
 
 				if (attributes) {
 					if (attributes.italic && attributes.bold)
-						return <span style='font-weight: bold; font-style: italic'>{$tags}</span>
-					if (attributes.italic) return <span style='font-style: italic'>{$tags}</span>
-					if (attributes.bold) return <span style='font-weight: bold'>{$tags}</span>
+						return <span style='font-weight: bold !important; font-style: italic !important'>{$tags}</span>
+					if (attributes.italic) return <span style='font-style: italic !important'>{$tags}</span>
+					if (attributes.bold) return <span style='font-weight: bold !important'>{$tags}</span>
 				}
 				return <span>{$tags}</span>
 			}
 			return null
 		})
 		let byType = sb.get(this.ev, 'by.type')
+		if (byType !== 'user') byType = 'agent'
 		if (sb.size($deltas) === 0) return null
 		if (byType === 'agent') {
 			return <div class='message-agent message-text--agent'>{$deltas}</div>
@@ -221,3 +222,8 @@ function trimQuillDelta(delta) {
 	newops.pop()
 	return trimQuillDelta({ops: newops})
 }
+
+function absLink(url) {
+	if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) return 'http://' + url
+	return url
+}

package/src/chatbox/main.js

@@ -22,7 +22,8 @@ export default class Main extends Com {
 		let found = sb.find(plugins, (plugin) => plugin.id === this.props.plugin.id)
 		if (!found) return
 		let css = (await promiseMainCSS).default.default.toString()
-		var outcss = sb.replaceCssVariable(css, this.props.plugin.chatbox)
+
+		var outcss = sb.replaceCssVariable(css, found.chatbox)
 		sb.setCss(this.props.plugin.id, this.$cssStyleDiv, outcss)
 	}
 
@@ -68,9 +69,8 @@ export default class Main extends Com {
 		if (!this.state.cssready) return null
 		if (sb.isUserBanned(this.props.store.matchUser())) return null
 		if (!this.props.t) return null
-		var cls = this.props.store.isMobile() ? 'mobile' : 'desktop'
 		return (
-			<div class={cls}>
+			<div class={this.props.store.isMobile() ? 'mobile' : 'desktop'}>
 				<ChatButton
 					plugin={this.props.plugin}
 					store={this.props.store}

package/src/store/api.js

@@ -52,7 +52,7 @@ export default class {
 	ajax = ajax
 
 	start = (extraData) => {
-		let data = {starter_id: this.uid, starter_type: 'user', integration_id: `${this.accid}.subizv4.subikon`}
+		let data = {starter_id: this.uid, starter_type: 'user', touchpoint: {channel: 'subiz', source: 'web'}}
 		sb.each(extraData, (v, k) => {
 			data[k] = v
 		})

package/src/store/store.js

@@ -618,8 +618,6 @@ export default class Store {
 
 		// convo events
 		let user = this.kv.match('user') || {}
-		const INTEGRATION_ID = sb.getIntegrationId(user.account_id)
-
 		let cid = sb.convoOfEv(ev)
 		let convo
 		if (cid) {
@@ -633,10 +631,10 @@ export default class Store {
 
 		if (!convo) return
 
-		// ignore wrong integration
-		let integrationId = sb.get(convo, 'integration.id', '')
-		if (!integrationId) integrationId = sb.get(ev, 'data.message.integration_id', '')
-		if (!integrationId || integrationId !== INTEGRATION_ID) return
+		// ignore wrong channel
+		let channel = sb.get(ev, 'touchpoint.channel', '')
+		if (channel && channel != 'subiz') return
+
 		this.pubsub.publish('events', ev)
 
 		// server doesn't send events before conversation_joined occur
@@ -867,9 +865,9 @@ export default class Store {
 
 		// ignore invalid conversation
 		let user = this.kv.match('user')
-		const INTEGRATION_ID = sb.getIntegrationId(user.account_id)
-		let integrationId = sb.get(convo, 'integration.id', '')
-		if (!integrationId || integrationId !== INTEGRATION_ID) return
+
+		let channel = sb.get(convo, 'touchpoint.channel', '')
+		if (channel && channel != 'subiz') return
 		let allconvo = {}
 		// trim
 		sb.map(this.cache.all(), (value, key) => {

package/src/util/common.js

@@ -311,10 +311,6 @@ export function orderBy(a, k, d) {
 	return clone
 }
 
-export function getIntegrationId(accid) {
-	return `${accid}.subizv4.subikon`
-}
-
 export function isPhone(phone) {
 	var re = /^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/im
 	return re.test(String(phone))