@subiz/widget-v4 4.1.105 → 4.1.107

package/package.json

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

package/src/chatbox/Event.js

@@ -252,7 +252,7 @@ export default class Event extends Com {
 		let acc = this.props.store.matchAccount()
 		if (bytype === 'agent') return sb.getAgentDisplayName(acc, this.props.store.matchAgent(byid))
 		if (bytype === 'bot') {
-			let bot = this.props.store.matchBot(byid)
+			let bot = this.props.store.matchBot()[byid]
 			if (!bot) return 'Bot'
 			return bot.fullname || 'Bot'
 		}

package/src/popup/popup.js

@@ -906,6 +906,12 @@ export default class Popup extends Com {
 		return containercss
 	}
 
+	onClickOverlay() {
+		let popup = sb.get(this.props.plugin, 'popup', {})
+		if (!popup.overlay) return
+		this.setClose(true)
+	}
+
 	render() {
 		if (!this.props.t) return null
 		if (!this.state.cssready) return null
@@ -984,7 +990,7 @@ export default class Popup extends Com {
 		}
 
 		return (
-			<div class='overlay' style={overlaystyle}>
+			<div class='overlay' style={overlaystyle} onClick={() => this.onClickOverlay()}>
 				<div class={animation} style={this.js2css(containercss)} onClick={(e) => e.stopPropagation()}>
 					{this.renderCloseButton()}
 					<div style={this.js2css(bodycss)} onClick={(e) => this.onButtonClick(e, 'background')}>

package/src/util/common.js

@@ -1,12 +1,11 @@
 var op = require('./op.js')
 
-
-export function extractEmojis (text) {
+export function extractEmojis(text) {
 	var out = []
 	for (var i = 0; i < text.length; i++) {
 		for (var e = 0; e < emojis.length; e++) {
 			if (text.indexOf(emojis[e], i) !== i) continue
-			out.push({ index: i, length: emojis[e].length })
+			out.push({index: i, length: emojis[e].length})
 			i += emojis[e].length - 1
 			break
 		}
@@ -15,32 +14,33 @@ export function extractEmojis (text) {
 	return out
 }
 
-export function extractLinks (text) {
+export function extractLinks(text) {
 	text = text || ''
-	var reg = /(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.,~#?&//=]*)/gim
+	var reg = /(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9@:%_\+.,~#?&//=]*)/gim
 	var out = []
 	var match
 	while ((match = reg.exec(text))) {
-		out.push({ index: match.index, length: reg.lastIndex - match.index })
+		out.push({index: match.index, length: reg.lastIndex - match.index})
 	}
 
 	return out
 }
 
-export function extractEmails (text) {
+export function extractEmails(text) {
 	text = text || ''
-	var reg = /(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/gim
+	var reg =
+		/(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/gim
 
 	var out = []
 	var match
 	while ((match = reg.exec(text))) {
-		out.push({ index: match.index, length: reg.lastIndex - match.index })
+		out.push({index: match.index, length: reg.lastIndex - match.index})
 	}
 
 	return out
 }
 
-export function extractPhones (msg) {
+export function extractPhones(msg) {
 	msg = msg || ''
 	var fgmsg = ''
 	// fine-grained msg
@@ -71,21 +71,21 @@ export function extractPhones (msg) {
 	var out = []
 	var match
 	while ((match = reg.exec(fgmsg))) {
-		out.push({ index: realchmap[match.index], length: realchmap[reg.lastIndex - 1] - realchmap[match.index] + 1 })
+		out.push({index: realchmap[match.index], length: realchmap[reg.lastIndex - 1] - realchmap[match.index] + 1})
 	}
 
 	return out
 }
 
-export function extract (text, extractor, type) {
+export function extract(text, extractor, type) {
 	if (!text) return []
 	var out = []
 	var lastindex = 0
 	var tags = extractor(text)
-	if (size(tags) === 0) return [{ type: 'text', text }]
-	each(tags, tag => {
-		out.push({ type: 'text', text: text.substr(lastindex, tag.index - lastindex) })
-		out.push({ type, text: text.substr(tag.index, tag.length) })
+	if (size(tags) === 0) return [{type: 'text', text}]
+	each(tags, (tag) => {
+		out.push({type: 'text', text: text.substr(lastindex, tag.index - lastindex)})
+		out.push({type, text: text.substr(tag.index, tag.length)})
 		lastindex = tag.index + tag.length
 	})
 	var lastTag = last(tags)
@@ -94,16 +94,16 @@ export function extract (text, extractor, type) {
 		text: text.substr(lastTag.index + lastTag.length, text.length - lastTag.index + lastTag.length),
 	})
 
-	return filter(out, o => o.text !== '')
+	return filter(out, (o) => o.text !== '')
 }
 
-export function pipeExtracts (text, extractors) {
+export function pipeExtracts(text, extractors) {
 	var out = []
-	if (size(extractors) === 0) return [{ type: 'text', text }]
+	if (size(extractors) === 0) return [{type: 'text', text}]
 	var ext = extractors.shift()
 
 	var tags = extract(text, ext, ext.type)
-	each(tags, t => {
+	each(tags, (t) => {
 		if (t.type !== 'text') return out.push(t)
 		out = out.concat(pipeExtracts(t.text, extractors.slice()))
 	})
@@ -111,7 +111,7 @@ export function pipeExtracts (text, extractors) {
 	return out
 }
 
-export function extractText (text) {
+export function extractText(text) {
 	var link = extractLinks
 	link.type = 'link'
 
@@ -127,7 +127,6 @@ export function extractText (text) {
 	return pipeExtracts(text, [email, link, phone, emoji])
 }
 
-
 export function parseJSON(str) {
 	try {
 		return parse(str)
@@ -1324,47 +1323,46 @@ function _blockToText(block) {
 	return out
 }
 
-
 let emojis = [
-		'like',
-		'unlike',
-		'wink',
-		'tongue-out',
-		'tired',
-		'surprised',
-		'smiling',
-		'sleepy',
-		'sad',
-		'neutral',
-		'heart-eyes',
-		'grinning',
-		'crying',
-		'confused',
-		'angry',
-
-		'cry',
-		'heart_eyes',
-		'neutral_face',
-		'emoji--disappointed',
-		'smile',
-		'open_mouth',
-		'tired_face',
-		'stuck_out_tongue',
-		'moyai',
-		'thumbsdown',
-		'dislike',
-		'thumbsup',
-		'ok_hand',
-		'octopus',
-		'pig2',
-		'wave',
-		'mouse',
-		'mouse2',
-		'rat',
+	'like',
+	'unlike',
+	'wink',
+	'tongue-out',
+	'tired',
+	'surprised',
+	'smiling',
+	'sleepy',
+	'sad',
+	'neutral',
+	'heart-eyes',
+	'grinning',
+	'crying',
+	'confused',
+	'angry',
+
+	'cry',
+	'heart_eyes',
+	'neutral_face',
+	'emoji--disappointed',
+	'smile',
+	'open_mouth',
+	'tired_face',
+	'stuck_out_tongue',
+	'moyai',
+	'thumbsdown',
+	'dislike',
+	'thumbsup',
+	'ok_hand',
+	'octopus',
+	'pig2',
+	'wave',
+	'mouse',
+	'mouse2',
+	'rat',
 ]
-emojis = map(emojis, e => ':' + e + ':')
+emojis = map(emojis, (e) => ':' + e + ':')
 
 function absLink(url) {
-		if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) return 'http://' + url
-		return url
+	if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) return 'http://' + url
+	return url
 }