@subiz/widget-v4 4.1.108 → 4.1.109

package/compiled_src/chatbox/TextMessage.js

@@ -63,13 +63,15 @@ class TextMessage extends _common.Com {
       return (0, _preact.h)("div", {
         class: "message-agent message-text--agent"
       }, (0, _preact.h)(_block.default, {
-        block: block
+        block: block,
+        onLink: this.props.onLink
       }));
     }
     return (0, _preact.h)("div", {
       class: "message-user message-text--user"
     }, (0, _preact.h)(_block.default, {
-      block: block
+      block: block,
+      onLink: this.props.onLink
     }));
   }
 }

package/compiled_src/chatbox/Widget.js

@@ -949,6 +949,7 @@ class Widget extends _common.Com {
     return joined;
   }
   hasSentMessage(cid) {
+    if (this.userSent[cid]) return true;
     let convo = this.props.store.matchConvo(cid) || {};
     let joined = _index.default.find(convo.members, mem => {
       if (mem.type === 'bot') return true;

package/compiled_src/chatbox/block.js

@@ -100,7 +100,33 @@ class Block extends _common.Com {
       return null;
     }
     let $body = null;
-    if (_index.default.size(block.content)) $body = _index.default.map(block.content, block => this.renderBlock(block));else $body = ele.text;
+    if (_index.default.size(block.content)) {
+      $body = _index.default.map(block.content, block => this.renderBlock(block));
+    } else if (block.type === 'text') {
+      let $tags = _index.default.extractText(ele.text).map(tag => {
+        if (tag.type === 'link') {
+          let url = tag.text || '';
+          if (!url.startsWith('//') && !url.startsWith('https://') && !url.startsWith('http://') && !url.startsWith('data:')) {
+            url = '//' + url;
+          }
+          return (0, _preact.h)("a", {
+            href: url,
+            target: "_blank",
+            onClick: e => this.props.onLink(e, url)
+          }, tag.text);
+        }
+        if (tag.type === 'phone') return (0, _preact.h)("a", {
+          href: 'tel:' + tag.text
+        }, tag.text);
+        if (tag.type === 'email') return (0, _preact.h)("a", {
+          href: 'mailto:' + tag.text
+        }, tag.text);
+        return tag.text;
+      });
+      $body = $tags;
+    } else {
+      $body = ele.text;
+    }
     switch (ele.tag) {
       case 'div':
         return (0, _preact.h)("div", null, $body);

package/compiled_src/store/store.js

@@ -1109,6 +1109,16 @@ function sendToFBPixel(category, action, label) {
   });
 }
 function sendToGA(category, action, label) {
+  if (window.sbz_no_gtag) {
+    console.log('SKIPSENT.', category, action, label);
+    return;
+  }
+  let dataLayer = window.dataLayer || [];
+  dataLayer.push({
+    event: category,
+    event_action: action,
+    event_label: label
+  });
   if (window.gtag) window.gtag('event', category, {
     Action: action,
     Label: label
@@ -1131,12 +1141,6 @@ function sendEventToThirdParty(category, action, label) {
   }));
   sendToGA(category, action, label);
   sendToFBPixel(category, action, label);
-  let dataLayer = window.dataLayer || [];
-  dataLayer.push({
-    event: category,
-    event_action: action,
-    event_label: label
-  });
 }
 let cleanLocalStorage = () => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.108",
+	"version": "4.1.109",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,24 +14,24 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^4.0.27",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.38.1",
+		"core-js": "^3.39.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
-		"less": "^4.2.0",
+		"less": "^4.2.1",
 		"less-loader": "^12.2.0",
 		"preact": "10.19.3"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.25.7",
-		"@babel/core": "^7.25.7",
+		"@babel/cli": "^7.26.4",
+		"@babel/core": "^7.26.0",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
-		"@babel/plugin-transform-react-jsx": "^7.25.7",
-		"@babel/preset-env": "^7.25.7",
+		"@babel/plugin-transform-react-jsx": "^7.25.9",
+		"@babel/preset-env": "^7.26.0",
 		"babel-loader": "^9.2.1",
 		"babel-plugin-syntax-jsx": "^6.18.0",
-		"html-webpack-plugin": "^5.6.0",
-		"puppeteer": "^23.5.0",
-		"webpack": "^5.95.0",
+		"html-webpack-plugin": "^5.6.3",
+		"puppeteer": "^23.10.2",
+		"webpack": "^5.97.1",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "^5.1.0"

package/src/chatbox/TextMessage.js

@@ -55,13 +55,13 @@ export default class TextMessage extends Com {
 		if (byType === 'agent') {
 			return (
 				<div class='message-agent message-text--agent'>
-					<Block block={block} />
+					<Block block={block} onLink={this.props.onLink} />
 				</div>
 			)
 		}
 		return (
 			<div class='message-user message-text--user'>
-				<Block block={block} />
+				<Block block={block} onLink={this.props.onLink} />
 			</div>
 		)
 	}

package/src/chatbox/Widget.js

@@ -1029,6 +1029,7 @@ export default class Widget extends Com {
 	}
 
 	hasSentMessage(cid) {
+		if (this.userSent[cid]) return true
 		let convo = this.props.store.matchConvo(cid) || {}
 		let joined = sb.find(convo.members, (mem) => {
 			// sometime bot didnt update last_sent

package/src/chatbox/block.js

@@ -108,8 +108,35 @@ export default class Block extends Com {
 		}
 
 		let $body = null
-		if (sb.size(block.content)) $body = sb.map(block.content, (block) => this.renderBlock(block))
-		else $body = ele.text
+		if (sb.size(block.content)) {
+			$body = sb.map(block.content, (block) => this.renderBlock(block))
+		} else if (block.type === 'text') {
+			let $tags = sb.extractText(ele.text).map((tag) => {
+				if (tag.type === 'link') {
+					let url = tag.text || ''
+					if (
+						!url.startsWith('//') &&
+						!url.startsWith('https://') &&
+						!url.startsWith('http://') &&
+						!url.startsWith('data:')
+					) {
+						url = '//' + url
+					}
+
+					return (
+						<a href={url} target='_blank' onClick={(e) => this.props.onLink(e, url)}>
+							{tag.text}
+						</a>
+					)
+				}
+				if (tag.type === 'phone') return <a href={'tel:' + tag.text}>{tag.text}</a>
+				if (tag.type === 'email') return <a href={'mailto:' + tag.text}>{tag.text}</a>
+				return tag.text
+			})
+			$body = $tags
+		} else {
+			$body = ele.text
+		}
 		switch (ele.tag) {
 			case 'div':
 				return <div>{$body}</div>

package/src/store/store.js

@@ -1306,7 +1306,13 @@ function sendToFBPixel(category, action, label) {
 }
 
 function sendToGA(category, action, label) {
-	// console.log('SENT.', category, action, label)
+	if (window.sbz_no_gtag) {
+		console.log('SKIPSENT.', category, action, label)
+		return
+	}
+	let dataLayer = window.dataLayer || []
+	dataLayer.push({event: category, event_action: action, event_label: label})
+
 	if (window.gtag) window.gtag('event', category, {Action: action, Label: label})
 	if (window.ga && window.ga.getAll) {
 		// only send gtag when ga is not available
@@ -1322,8 +1328,6 @@ function sendEventToThirdParty(category, action, label) {
 	document.dispatchEvent(new CustomEvent('subiz', {detail: {category, action, label}}))
 	sendToGA(category, action, label)
 	sendToFBPixel(category, action, label)
-	let dataLayer = window.dataLayer || []
-	dataLayer.push({event: category, event_action: action, event_label: label})
 }
 
 let cleanLocalStorage = () => {