@subiz/widget-v4 4.0.88 → 4.0.89

package/dist/441.js

@@ -37,6 +37,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function getDefaults() {
   return {
+    async: false,
     baseUrl: null,
     breaks: false,
     extensions: null,
@@ -355,7 +356,7 @@ function outputLink(cap, link, raw, lexer) {
       href,
       title,
       text,
-      tokens: lexer.inlineTokens(text, [])
+      tokens: lexer.inlineTokens(text)
     };
     lexer.state.inLink = false;
     return token;
@@ -461,15 +462,13 @@ class Tokenizer {
         }
       }
 
-      const token = {
+      return {
         type: 'heading',
         raw: cap[0],
         depth: cap[1].length,
         text,
-        tokens: []
+        tokens: this.lexer.inline(text)
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
@@ -691,10 +690,10 @@ class Tokenizer {
         text: cap[0]
       };
       if (this.options.sanitize) {
+        const text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
         token.type = 'paragraph';
-        token.text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
-        token.tokens = [];
-        this.lexer.inline(token.text, token.tokens);
+        token.text = text;
+        token.tokens = this.lexer.inline(text);
       }
       return token;
     }
@@ -752,8 +751,7 @@ class Tokenizer {
         // header child tokens
         l = item.header.length;
         for (j = 0; j < l; j++) {
-          item.header[j].tokens = [];
-          this.lexer.inline(item.header[j].text, item.header[j].tokens);
+          item.header[j].tokens = this.lexer.inline(item.header[j].text);
         }
 
         // cell child tokens
@@ -761,8 +759,7 @@ class Tokenizer {
         for (j = 0; j < l; j++) {
           row = item.rows[j];
           for (k = 0; k < row.length; k++) {
-            row[k].tokens = [];
-            this.lexer.inline(row[k].text, row[k].tokens);
+            row[k].tokens = this.lexer.inline(row[k].text);
           }
         }
 
@@ -774,45 +771,40 @@ class Tokenizer {
   lheading(src) {
     const cap = this.rules.block.lheading.exec(src);
     if (cap) {
-      const token = {
+      return {
         type: 'heading',
         raw: cap[0],
         depth: cap[2].charAt(0) === '=' ? 1 : 2,
         text: cap[1],
-        tokens: []
+        tokens: this.lexer.inline(cap[1])
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
   paragraph(src) {
     const cap = this.rules.block.paragraph.exec(src);
     if (cap) {
-      const token = {
+      const text = cap[1].charAt(cap[1].length - 1) === '\n'
+        ? cap[1].slice(0, -1)
+        : cap[1];
+      return {
         type: 'paragraph',
         raw: cap[0],
-        text: cap[1].charAt(cap[1].length - 1) === '\n'
-          ? cap[1].slice(0, -1)
-          : cap[1],
-        tokens: []
+        text,
+        tokens: this.lexer.inline(text)
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
   text(src) {
     const cap = this.rules.block.text.exec(src);
     if (cap) {
-      const token = {
+      return {
         type: 'text',
         raw: cap[0],
         text: cap[0],
-        tokens: []
+        tokens: this.lexer.inline(cap[0])
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
@@ -981,7 +973,7 @@ class Tokenizer {
             type: 'em',
             raw: src.slice(0, lLength + match.index + rLength + 1),
             text,
-            tokens: this.lexer.inlineTokens(text, [])
+            tokens: this.lexer.inlineTokens(text)
           };
         }
 
@@ -991,7 +983,7 @@ class Tokenizer {
           type: 'strong',
           raw: src.slice(0, lLength + match.index + rLength + 1),
           text,
-          tokens: this.lexer.inlineTokens(text, [])
+          tokens: this.lexer.inlineTokens(text)
         };
       }
     }
@@ -1032,7 +1024,7 @@ class Tokenizer {
         type: 'del',
         raw: cap[0],
         text: cap[2],
-        tokens: this.lexer.inlineTokens(cap[2], [])
+        tokens: this.lexer.inlineTokens(cap[2])
       };
     }
   }
@@ -2581,13 +2573,7 @@ function marked(src, opt, callback) {
     return;
   }
 
-  try {
-    const tokens = Lexer.lex(src, opt);
-    if (opt.walkTokens) {
-      marked.walkTokens(tokens, opt.walkTokens);
-    }
-    return Parser.parse(tokens, opt);
-  } catch (e) {
+  function onError(e) {
     e.message += '\nPlease report this to https://github.com/markedjs/marked.';
     if (opt.silent) {
       return '<p>An error occurred:</p><pre>'
@@ -2596,6 +2582,23 @@ function marked(src, opt, callback) {
     }
     throw e;
   }
+
+  try {
+    const tokens = Lexer.lex(src, opt);
+    if (opt.walkTokens) {
+      if (opt.async) {
+        return Promise.all(marked.walkTokens(tokens, opt.walkTokens))
+          .then(() => {
+            return Parser.parse(tokens, opt);
+          })
+          .catch(onError);
+      }
+      marked.walkTokens(tokens, opt.walkTokens);
+    }
+    return Parser.parse(tokens, opt);
+  } catch (e) {
+    onError(e);
+  }
 }
 
 /**
@@ -2712,10 +2715,12 @@ marked.use = function(...args) {
     if (pack.walkTokens) {
       const walkTokens = marked.defaults.walkTokens;
       opts.walkTokens = function(token) {
-        pack.walkTokens.call(this, token);
+        let values = [];
+        values.push(pack.walkTokens.call(this, token));
         if (walkTokens) {
-          walkTokens.call(this, token);
+          values = values.concat(walkTokens.call(this, token));
         }
+        return values;
       };
     }
 
@@ -2732,35 +2737,37 @@ marked.use = function(...args) {
  */
 
 marked.walkTokens = function(tokens, callback) {
+  let values = [];
   for (const token of tokens) {
-    callback.call(marked, token);
+    values = values.concat(callback.call(marked, token));
     switch (token.type) {
       case 'table': {
         for (const cell of token.header) {
-          marked.walkTokens(cell.tokens, callback);
+          values = values.concat(marked.walkTokens(cell.tokens, callback));
         }
         for (const row of token.rows) {
           for (const cell of row) {
-            marked.walkTokens(cell.tokens, callback);
+            values = values.concat(marked.walkTokens(cell.tokens, callback));
           }
         }
         break;
       }
       case 'list': {
-        marked.walkTokens(token.items, callback);
+        values = values.concat(marked.walkTokens(token.items, callback));
         break;
       }
       default: {
         if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) { // Walk any extensions
           marked.defaults.extensions.childTokens[token.type].forEach(function(childTokens) {
-            marked.walkTokens(token[childTokens], callback);
+            values = values.concat(marked.walkTokens(token[childTokens], callback));
           });
         } else if (token.tokens) {
-          marked.walkTokens(token.tokens, callback);
+          values = values.concat(marked.walkTokens(token.tokens, callback));
         }
       }
     }
   }
+  return values;
 };
 
 /**

package/dist/HASH

@@ -1 +1 @@
-182ee177a49
+1833a09e682

package/dist/screenshoot.html

@@ -4,4 +4,4 @@
 			}
 			body {
 				background: #ddd;
-			}</style></head><body><script defer="defer" src="https://vcdn.subiz-cdn.com/widget-v4/public/182ee177a49.screenshoot.js"></script></body></html>
+			}</style></head><body><script defer="defer" src="https://vcdn.subiz-cdn.com/widget-v4/public/1833a09e682.screenshoot.js"></script></body></html>

package/dist/screenshoot.js

@@ -2294,7 +2294,7 @@ function checkRunConditions(freq, conds, lastrun, store) {
 
       case 'source':
         if (size(cond.sources) > 0) {
-          let source = store.matchTrafficSource();
+          let source = store.matchTrafficSource() || 'direct';
           if (!find(cond.sources, src => norm(src) === norm(source))) return false;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.88",
+	"version": "4.0.89",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,28 +14,28 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.25.0",
+		"core-js": "^3.25.1",
 		"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.10.6"
+		"preact": "^10.11.0"
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.18.10",
-		"@babel/core": "^7.18.13",
+		"@babel/core": "^7.19.0",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
-		"@babel/plugin-transform-react-jsx": "^7.18.10",
-		"@babel/preset-env": "^7.18.10",
+		"@babel/plugin-transform-react-jsx": "^7.19.0",
+		"@babel/preset-env": "^7.19.0",
 		"babel-loader": "^8.2.5",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
 		"prettier": "^2.7.1",
-		"puppeteer": "^15.4.0",
+		"puppeteer": "^17.1.3",
 		"webpack": "^5.74.0",
 		"webpack-bundle-analyzer": "^4.6.1",
 		"webpack-cli": "^4.10.0",
-		"webpack-dev-server": "^4.10.1"
+		"webpack-dev-server": "^4.11.0"
 	}
 }

package/src/chatbox/Widget.js

@@ -31,6 +31,8 @@ export default class Widget extends Com {
 			formData: {},
 			showOrder: false,
 			order_id: '',
+			// hot fix for prechat with bot quick reply
+			quickReplyMessage: '',
 		})
 
 		this.props.store.onUpdate(this, (_) => this.forceUpdate())
@@ -49,7 +51,7 @@ export default class Widget extends Com {
 
 		if (prevProp.cid !== this.props.cid) {
 			this.closeOrder()
-			this.setState({clickedJoin: false})
+			this.setState({clickedJoin: false, quickReplyMessage: ''})
 			// this.props.store.setLastview('chat', { cid: this.props.cid })
 			setTimeout(() => {
 				// focus Events then focus MessageInput
@@ -64,6 +66,17 @@ export default class Widget extends Com {
 	}
 
 	shouldShowForm() {
+		// always show form when ask agentgroup
+		let form
+		let accountSetting = this.props.plugin.chatbox || {}
+		let acc = this.props.store.matchAccount() || {}
+		if (sb.get(accountSetting, 'prechat_form.enabled')) form = accountSetting.prechat_form
+
+		let offlineEnabled = sb.get(accountSetting, 'offline_form.enabled')
+		if (this.isOffline(acc, accountSetting) && offlineEnabled) form = accountSetting.offline_form
+
+		if (!this.hasSentMessage(this.props.cid) && form && (sb.size(form.groups) || form.group_required)) return true
+
 		let formRequired = this.isFormRequired()
 		return (formRequired && !this.props.cid) || (formRequired && this.props.cid && this.state.clickedJoin)
 	}
@@ -178,6 +191,9 @@ export default class Widget extends Com {
 				},
 			})
 
+			// reset quickReplyMessage
+			this.setState({quickReplyMessage: ''})
+
 			// end_conversation_after_submit only for offline form or prechat form
 			if (form.end_conversation_after_submit) await this.props.store.endConvo(this.props.cid)
 			return
@@ -202,6 +218,7 @@ export default class Widget extends Com {
 		this.setState({
 			creating: false,
 			clickedJoin: false,
+			quickReplyMessage: '',
 		})
 		if (!this.props.store.isMobile()) this.focusInput()
 	}
@@ -214,9 +231,11 @@ export default class Widget extends Com {
 			is_required: true,
 			label: this.props.t.i18n(sb.get(form, `i18n_question_label`, {})) || form.question_label,
 			type: 'text',
+			value: this.state.quickReplyMessage,
 		}
 
 		this.setState({formData})
+
 		if (!this.props.store.isMobile()) this.focusInput()
 	}
 
@@ -261,6 +280,9 @@ export default class Widget extends Com {
 		if (sb.size(this.state.formData) === 0) return null
 
 		let $fields = sb.map(this.state.formData, (field, key) => {
+			// not display question when click bot quick reply
+			if (this.state.quickReplyMessage && key === 'question') return null
+
 			let $field = null
 			var errclass = field.error ? 'input--error' : ''
 			if (field.type === 'text') {
@@ -525,7 +547,23 @@ export default class Widget extends Com {
 		this.focusInput()
 	}
 
+	fillQuickReplyToQuestion(message) {
+		let formData = this.state.formData
+		if (formData) {
+			sb.set(formData, 'question.value', message.text)
+		}
+		this.setState({formData, quickReplyMessage: message.text})
+	}
+
 	sendMessage = async (message) => {
+		// hot fix click quick reply with prechat with display prechat form
+		let hasPostback = sb.find(message.attachments, (att) => att.type === 'postback')
+		if (this.isFormRequired() && hasPostback) {
+			this.onStartConvoClick()
+			this.fillQuickReplyToQuestion(message)
+			return
+		}
+
 		let text = message.text
 		if (!this.props.cid) {
 			this.creating = true
@@ -635,7 +673,7 @@ export default class Widget extends Com {
 	async onStartConvoClick() {
 		var convo = this.props.store.matchConvo(this.props.cid) || {}
 		if (convo.state === 'ended') return this.props.onGo({view: 'chat', cid: ''})
-		this.setState({clickedJoin: true})
+		this.setState({clickedJoin: true, quickReplyMessage: ''})
 	}
 
 	onEventFormSubmit() {
@@ -675,7 +713,8 @@ export default class Widget extends Com {
 		let convo = this.props.store.matchConvo(this.props.cid) || {}
 
 		if (convo.state === 'ended') return true
-		if (this.userHasSent(this.props.cid)) return false
+		// allow button "Tiep tuc chat" display when sent quick_replies msg
+		//if (this.userHasSent(this.props.cid)) return false
 		if (convo.state && convo.state !== 'pending') delete formData.group
 		return !!sb.find(formData, (field) => field.value == null || field.value === '')
 	}
@@ -778,6 +817,16 @@ export default class Widget extends Com {
 		return joined
 	}
 
+	hasSentMessage(cid) {
+		let convo = this.props.store.matchConvo(cid) || {}
+		let joined = sb.find(convo.members, (mem) => {
+			// sometime bot didnt update last_sent
+			if (mem.type === 'bot') return true
+			return mem.last_sent
+		})
+		return joined
+	}
+
 	isOffline(acc, accSetting) {
 		let enableWhen = sb.get(accSetting, 'offline_form.enable_when')
 		let isonline = true

package/src/util/common.js

@@ -824,7 +824,7 @@ export function checkRunConditions(freq, conds, lastrun, store) {
 				break
 			case 'source':
 				if (size(cond.sources) > 0) {
-					let source = store.matchTrafficSource()
+					let source = store.matchTrafficSource() || 'direct'
 					if (!find(cond.sources, (src) => norm(src) === norm(source))) return false
 				}
 				break