@subiz/widget-v4 4.1.124 → 4.1.126

package/package.json

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

package/src/chatbox/ChatButton.js

@@ -388,7 +388,18 @@ export default class ChatButton extends Com {
 		defmsg = defmsg || this.props.t('sent_you_a_message')
 		var format = sb.get(ev, 'data.message.format')
 		let block = sb.get(ev, 'data.message.block')
-		if (block || format == 'block') return <Block block={block} />
+		if (block || format == 'block') {
+			if (sb.isBlockEmpty(block)) {
+				let attachments = sb.get(ev, 'data.message.attachments')
+				if (sb.size(attachments) > 0) {
+					return (
+						<div>{`${this.props.t('send')} ${sb.size(attachments)} ${sb.size(attachments) > 1 ? this.props.t('attachments') : this.props.t('attachment')}`}</div>
+					)
+				}
+				return defmsg
+			}
+			return <Block block={block} />
+		}
 
 		let message = sb.get(ev, 'data.message.text', defmsg)
 		if (!message && sb.size(sb.get(ev, 'data.message.attachments')) > 0) message = defmsg

package/src/chatbox/Events.js

@@ -93,7 +93,7 @@ export default class Events extends Com {
 		if (this.state.error) return this.renderError()
 		let events = sb.map(this.props.store.listEvents(this.props.cid))
 
-		if (!this.state.loading && sb.size(events) === 0) {
+		if (!this.state.loading && sb.size(events) === 0 && !this.props.cid) {
 			return (
 				<div ref={(ref) => (this.refBody = ref)} class='widget-body--events-container'>
 					<div class='widget-body--empty'>

package/src/chatbox/Header.js

@@ -9,6 +9,20 @@ export default class Header extends Com {
 		super(props)
 	}
 
+	renderAccountAvatar() {
+		let acc = this.props.store.matchAccount() || {}
+		if (!acc.logo_url) return null
+		return (
+			<img
+				width={38}
+				height={38}
+				alt={acc.name}
+				class='avatar avatar__account'
+				src={this.props.store.replaceFileUrl(acc.logo_url) || require('../../assets/img/image_default.png')}
+			/>
+		)
+	}
+
 	render() {
 		let headerMode = 'collapsed'
 
@@ -55,6 +69,7 @@ export default class Header extends Com {
 		return (
 			<div class={cls} style={style}>
 				{$back}
+				{this.renderAccountAvatar()}
 				<div class='widget-header--title-container'>
 					<div class='widget-header--title'>{this.getTitle()}</div>
 					<div class='widget-header--description' title={desc}>

package/src/util/common.js

@@ -1411,6 +1411,22 @@ export function blockToText(block) {
 	return _blockToText(block).trim()
 }
 
+export function isBlockEmpty(block) {
+	return _isBlockEmpty(block)
+}
+
+function _isBlockEmpty(block = {}) {
+	if (!size(block.contents)) {
+		if ((block.text || '').trim()) return false
+		return true
+	}
+	let result = true
+	map(block.contents, (content) => {
+		result = result && _isBlockEmpty(content)
+	})
+	return result
+}
+
 function _blockToText(block) {
 	if (!block || !block.type) return ''
 	let out = ''