@subiz/widget-v4 4.0.98 → 4.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.98",
+	"version": "4.0.99",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -24,7 +24,7 @@
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.20.2",
+		"@babel/core": "^7.20.5",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.19.0",
 		"@babel/preset-env": "^7.20.2",

package/src/chatbox/ShadowDomRoot.js

@@ -14,7 +14,7 @@ export default class ShadowDomRoot extends Com {
 
 	update (html) {
 		this.shadowRoot.innerHTML = `<style type="text/css">
-body { font-family: 'Roboto', sans-serif!important; font-size: 14px!important; line-height: 20px; overflow-y: hidden; margin:0 }
+body { font-family: 'Inter', sans-serif!important; font-size: 14px!important; line-height: 20px; overflow-y: hidden; margin:0 }
 h{ font-size: 14/18px!important; }
 a { text-decoration: none;}
 img { max-width: 100%; display: block; margin: 10px auto; }

package/src/chatbox/Widget.js

@@ -875,18 +875,13 @@ export default class Widget extends Com {
 
 		var $you = null
 		if (convo.lastSenderType === 'user') {
-			$you = <span class='yourmessage'>{this.props.t('you')}:</span>
+			$you = <span>{this.props.t('you')}:</span>
 		}
 
 		let seen = sb.isConvoSeen(convo, this.props.store.matchUser().id)
-		var lastmsg = this.renderMessagePreview(convo.last_message_sent || {data: {message: sb.get(convo, 'last_message')}})
-
-		var time =
-			sb.getMs(sb.get(convo, 'last_message_sent.created')) ||
-			sb.getMs(sb.get(convo, 'last_sent.created')) ||
-			sb.getMs(convo.created)
-		var $tim = <Time ago time={time} key={time} short />
+		var lastmsg = this.renderMessagePreview(convo.last_message_sent)
 
+		var time = sb.getMs(sb.get(convo, 'last_message_sent.created')) || sb.getMs(convo.created)
 		let $unread = seen ? null : <div class='convo-list--item-unread'></div>
 		if (convo.state === 'ended') {
 			$unread = (
@@ -903,7 +898,9 @@ export default class Widget extends Com {
 			<div class='convo-list--convo-last-info'>
 				<div class='d-flex flex-row'>
 					<div class='convo-list--convo-name'>{name}</div>
-					<div class='convo-list--convo-time'>{$tim}</div>
+					<div class='convo-list--convo-time'>
+						<Time ago time={time} key={time} short />
+					</div>
 				</div>
 
 				<div class='d-flex flex-row'>
@@ -925,7 +922,6 @@ export default class Widget extends Com {
 
 	renderMessagePreview(ev) {
 		let defmsg = this.props.t('sent_you_a_message')
-
 		let message = sb.get(ev, 'data.message.text')
 		var format = sb.get(ev, 'data.message.format')
 

package/src/lib.js

@@ -3,11 +3,11 @@ import sb from './util/index.js'
 import PluginMgr from './plugin.js'
 
 var $link = document.createElement('link')
-$link.href = 'https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap'
+$link.href = 'https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap'
 $link.rel = 'stylesheet'
 document.head.append($link)
 
-sb.preloadWebfonts(['Roboto'], [400, 500])
+sb.preloadWebfonts(['Inter'], [400, 500, 600])
 
 class Widget {
 	constructor(ApiURL, FileURL, RealtimeURL, inmem, fake) {

package/src/store/store.js

@@ -310,6 +310,7 @@ export default class Store {
 	readyGate = new sb.Gate()
 	convoGate = new sb.Gate(true)
 	reconnectGate = new sb.Gate(true)
+	wsGate = new sb.Gate(true)
 
 	// last widget screen
 	matchLastview = () => this.kv.match('lastview') || {}
@@ -646,6 +647,13 @@ export default class Store {
 	matchTrafficSource = () => this.kv.match('traffic_source')
 
 	async onWs(ev) {
+		await this.wsGate.entry()
+		this.wsGate.close()
+		await this._onWs(ev)
+		this.wsGate.open()
+	}
+
+	async _onWs(ev) {
 		if (!ev || !ev.type) return
 		ev.created = sb.getMs(ev.created)
 		if (ev.type === 'user_info_updated') {
@@ -660,12 +668,16 @@ export default class Store {
 		let user = this.kv.match('user') || {}
 		let cid = sb.convoOfEv(ev)
 		let convo
+
+		let alreadyFetched = false
 		if (cid) {
-			convo = this.matchConvo(cid)
+			convo = this.cache.match('convo_' + cid)
 			if (!convo || !convo.id) {
 				let {body: apiconvo, error} = await this.api.getConversation(cid)
 				if (!apiconvo) return
 				convo = apiconvo
+				alreadyFetched = true
+				this._setConvo(convo)
 			}
 		}
 
@@ -685,14 +697,14 @@ export default class Store {
 			if (me) {
 				await this.chain.reload(cid, (type, anchor, limit) => this.listmessageapi(type, anchor, limit))
 				this.markSync('events' + cid)
-
-				let {body: apiconvo} = await this.api.getConversation(cid)
-				if (apiconvo) {
-					convo = apiconvo
-					this._setConvo(convo)
+				if (!alreadyFetched) {
+					let {body: apiconvo} = await this.api.getConversation(cid)
+					if (apiconvo) {
+						convo = apiconvo
+						this._setConvo(convo)
+					}
+					this.pubsub.publish('account')
 				}
-
-				this.pubsub.publish('account')
 			}
 		}