@subiz/widget-v4 4.0.67 → 4.0.70

package/dist/441.js

@@ -96,6 +96,9 @@ function escape(html, encode) {
 
 const unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
 
+/**
+ * @param {string} html
+ */
 function unescape(html) {
   // explicitly match decimal, hex, and named HTML entities
   return html.replace(unescapeTest, (_, n) => {
@@ -111,8 +114,13 @@ function unescape(html) {
 }
 
 const caret = /(^|[^\[])\^/g;
+
+/**
+ * @param {string | RegExp} regex
+ * @param {string} opt
+ */
 function edit(regex, opt) {
-  regex = regex.source || regex;
+  regex = typeof regex === 'string' ? regex : regex.source;
   opt = opt || '';
   const obj = {
     replace: (name, val) => {
@@ -130,6 +138,12 @@ function edit(regex, opt) {
 
 const nonWordAndColonTest = /[^\w:]/g;
 const originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
+
+/**
+ * @param {boolean} sanitize
+ * @param {string} base
+ * @param {string} href
+ */
 function cleanUrl(sanitize, base, href) {
   if (sanitize) {
     let prot;
@@ -160,6 +174,10 @@ const justDomain = /^[^:]+:\/*[^/]*$/;
 const protocol = /^([^:]+:)[\s\S]*$/;
 const domain = /^([^:]+:\/*[^/]*)[\s\S]*$/;
 
+/**
+ * @param {string} base
+ * @param {string} href
+ */
 function resolveUrl(base, href) {
   if (!baseUrls[' ' + base]) {
     // we can ignore everything in base after the last slash of its path component,
@@ -244,9 +262,14 @@ function splitCells(tableRow, count) {
   return cells;
 }
 
-// Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
-// /c*$/ is vulnerable to REDOS.
-// invert: Remove suffix of non-c chars instead. Default falsey.
+/**
+ * Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+ * /c*$/ is vulnerable to REDOS.
+ *
+ * @param {string} str
+ * @param {string} c
+ * @param {boolean} invert Remove suffix of non-c chars instead. Default falsey.
+ */
 function rtrim(str, c, invert) {
   const l = str.length;
   if (l === 0) {
@@ -268,7 +291,7 @@ function rtrim(str, c, invert) {
     }
   }
 
-  return str.substr(0, l - suffLen);
+  return str.slice(0, l - suffLen);
 }
 
 function findClosingBracket(str, b) {
@@ -300,6 +323,10 @@ function checkSanitizeDeprecation(opt) {
 }
 
 // copied from https://stackoverflow.com/a/5450113/806777
+/**
+ * @param {string} pattern
+ * @param {number} count
+ */
 function repeatString(pattern, count) {
   if (count < 1) {
     return '';
@@ -460,7 +487,7 @@ class Tokenizer {
   blockquote(src) {
     const cap = this.rules.block.blockquote.exec(src);
     if (cap) {
-      const text = cap[0].replace(/^ *> ?/gm, '');
+      const text = cap[0].replace(/^ *>[ \t]?/gm, '');
 
       return {
         type: 'blockquote',
@@ -496,7 +523,7 @@ class Tokenizer {
       }
 
       // Get next list item
-      const itemRegex = new RegExp(`^( {0,3}${bull})((?: [^\\n]*)?(?:\\n|$))`);
+      const itemRegex = new RegExp(`^( {0,3}${bull})((?:[\t ][^\\n]*)?(?:\\n|$))`);
 
       // Check if current bullet point can start a new List Item
       while (src) {
@@ -1083,10 +1110,10 @@ const block = {
   newline: /^(?: *(?:\n|$))+/,
   code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
   fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,
-  hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
+  hr: /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,
   heading: /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,
   blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
-  list: /^( {0,3}bull)( [^\n]+?)?(?:\n|$)/,
+  list: /^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/,
   html: '^ {0,3}(?:' // optional indentation
     + '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
     + '|comment[^\\n]*(\\n+|$)' // (2)
@@ -1240,9 +1267,9 @@ const inline = {
   emStrong: {
     lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
     //        (1) and (2) can only be a Right Delimiter. (3) and (4) can only be Left.  (5) and (6) can be either Left or Right.
-    //        () Skip orphan delim inside strong    (1) #***                (2) a***#, a***                   (3) #***a, ***a                 (4) ***#              (5) #***#                 (6) a***a
-    rDelimAst: /^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,
-    rDelimUnd: /^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/ // ^- Not allowed for _
+    //          () Skip orphan inside strong  () Consume to delim (1) #***                (2) a***#, a***                   (3) #***a, ***a                 (4) ***#              (5) #***#                 (6) a***a
+    rDelimAst: /^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[^*]+(?=[^*])|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,
+    rDelimUnd: /^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[^_]+(?=[^_])|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/ // ^- Not allowed for _
   },
   code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
   br: /^( {2,}|\\)\n(?!\s*$)/,
@@ -1375,6 +1402,7 @@ inline.breaks = merge({}, inline.gfm, {
 
 /**
  * smartypants text replacement
+ * @param {string} text
  */
 function smartypants(text) {
   return text
@@ -1396,6 +1424,7 @@ function smartypants(text) {
 
 /**
  * mangle email addresses
+ * @param {string} text
  */
 function mangle(text) {
   let out = '',
@@ -1483,8 +1512,7 @@ class Lexer {
    */
   lex(src) {
     src = src
-      .replace(/\r\n|\r/g, '\n')
-      .replace(/\t/g, '    ');
+      .replace(/\r\n|\r/g, '\n');
 
     this.blockTokens(src, this.tokens);
 
@@ -1501,8 +1529,13 @@ class Lexer {
    */
   blockTokens(src, tokens = []) {
     if (this.options.pedantic) {
-      src = src.replace(/^ +$/gm, '');
+      src = src.replace(/\t/g, '    ').replace(/^ +$/gm, '');
+    } else {
+      src = src.replace(/^( *)(\t+)/gm, (_, leading, tabs) => {
+        return leading + '    '.repeat(tabs.length);
+      });
     }
+
     let token, lastToken, cutSrc, lastParagraphClipped;
 
     while (src) {
@@ -1898,29 +1931,31 @@ class Renderer {
       + '</code></pre>\n';
   }
 
+  /**
+   * @param {string} quote
+   */
   blockquote(quote) {
-    return '<blockquote>\n' + quote + '</blockquote>\n';
+    return `<blockquote>\n${quote}</blockquote>\n`;
   }
 
   html(html) {
     return html;
   }
 
+  /**
+   * @param {string} text
+   * @param {string} level
+   * @param {string} raw
+   * @param {any} slugger
+   */
   heading(text, level, raw, slugger) {
     if (this.options.headerIds) {
-      return '<h'
-        + level
-        + ' id="'
-        + this.options.headerPrefix
-        + slugger.slug(raw)
-        + '">'
-        + text
-        + '</h'
-        + level
-        + '>\n';
+      const id = this.options.headerPrefix + slugger.slug(raw);
+      return `<h${level} id="${id}">${text}</h${level}>\n`;
     }
+
     // ignore IDs
-    return '<h' + level + '>' + text + '</h' + level + '>\n';
+    return `<h${level}>${text}</h${level}>\n`;
   }
 
   hr() {
@@ -1933,8 +1968,11 @@ class Renderer {
     return '<' + type + startatt + '>\n' + body + '</' + type + '>\n';
   }
 
+  /**
+   * @param {string} text
+   */
   listitem(text) {
-    return '<li>' + text + '</li>\n';
+    return `<li>${text}</li>\n`;
   }
 
   checkbox(checked) {
@@ -1945,12 +1983,19 @@ class Renderer {
       + '> ';
   }
 
+  /**
+   * @param {string} text
+   */
   paragraph(text) {
-    return '<p>' + text + '</p>\n';
+    return `<p>${text}</p>\n`;
   }
 
+  /**
+   * @param {string} header
+   * @param {string} body
+   */
   table(header, body) {
-    if (body) body = '<tbody>' + body + '</tbody>';
+    if (body) body = `<tbody>${body}</tbody>`;
 
     return '<table>\n'
       + '<thead>\n'
@@ -1960,39 +2005,59 @@ class Renderer {
       + '</table>\n';
   }
 
+  /**
+   * @param {string} content
+   */
   tablerow(content) {
-    return '<tr>\n' + content + '</tr>\n';
+    return `<tr>\n${content}</tr>\n`;
   }
 
   tablecell(content, flags) {
     const type = flags.header ? 'th' : 'td';
     const tag = flags.align
-      ? '<' + type + ' align="' + flags.align + '">'
-      : '<' + type + '>';
-    return tag + content + '</' + type + '>\n';
+      ? `<${type} align="${flags.align}">`
+      : `<${type}>`;
+    return tag + content + `</${type}>\n`;
   }
 
-  // span level renderer
+  /**
+   * span level renderer
+   * @param {string} text
+   */
   strong(text) {
-    return '<strong>' + text + '</strong>';
+    return `<strong>${text}</strong>`;
   }
 
+  /**
+   * @param {string} text
+   */
   em(text) {
-    return '<em>' + text + '</em>';
+    return `<em>${text}</em>`;
   }
 
+  /**
+   * @param {string} text
+   */
   codespan(text) {
-    return '<code>' + text + '</code>';
+    return `<code>${text}</code>`;
   }
 
   br() {
     return this.options.xhtml ? '<br/>' : '<br>';
   }
 
+  /**
+   * @param {string} text
+   */
   del(text) {
-    return '<del>' + text + '</del>';
+    return `<del>${text}</del>`;
   }
 
+  /**
+   * @param {string} href
+   * @param {string} title
+   * @param {string} text
+   */
   link(href, title, text) {
     href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
     if (href === null) {
@@ -2006,15 +2071,20 @@ class Renderer {
     return out;
   }
 
+  /**
+   * @param {string} href
+   * @param {string} title
+   * @param {string} text
+   */
   image(href, title, text) {
     href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
     if (href === null) {
       return text;
     }
 
-    let out = '<img src="' + href + '" alt="' + text + '"';
+    let out = `<img src="${href}" alt="${text}"`;
     if (title) {
-      out += ' title="' + title + '"';
+      out += ` title="${title}"`;
     }
     out += this.options.xhtml ? '/>' : '>';
     return out;
@@ -2076,6 +2146,9 @@ class Slugger {
     this.seen = {};
   }
 
+  /**
+   * @param {string} value
+   */
   serialize(value) {
     return value
       .toLowerCase()
@@ -2089,6 +2162,8 @@ class Slugger {
 
   /**
    * Finds the next safe (unique) slug to use
+   * @param {string} originalSlug
+   * @param {boolean} isDryRun
    */
   getNextSafeSlug(originalSlug, isDryRun) {
     let slug = originalSlug;
@@ -2109,8 +2184,9 @@ class Slugger {
 
   /**
    * Convert string to unique id
-   * @param {object} options
-   * @param {boolean} options.dryrun Generates the next unique slug without updating the internal accumulator.
+   * @param {object} [options]
+   * @param {boolean} [options.dryrun] Generates the next unique slug without
+   * updating the internal accumulator.
    */
   slug(value, options = {}) {
     const slug = this.serialize(value);
@@ -2671,6 +2747,7 @@ marked.walkTokens = function(tokens, callback) {
 
 /**
  * Parse Inline
+ * @param {string} src
  */
 marked.parseInline = function(src, opt) {
   // throw error in case of non string input

package/dist/HASH

@@ -1 +1 @@
-17ff367201e
+180455656b6

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/17ff367201e.screenshoot.js"></script></body></html>
+			}</style></head><body><script defer="defer" src="https://vcdn.subiz-cdn.com/widget-v4/public/180455656b6.screenshoot.js"></script></body></html>

package/dist/screenshoot.js

@@ -4181,6 +4181,14 @@ cookie.defaults.path = '/';
 cookie.expiresMultiplier = 60 * 60 * 24;
 cookie.defaults.expires = 3650;
 const MAX_CONVO = 20;
+let ga_client_id = '';
+setTimeout(() => {
+  if (window.gtag) {
+    window.gtag('get', 'UA-XXXXXXXX-Y', 'client_id', clientid => {
+      ga_client_id = clientid;
+    });
+  }
+}, 100);
 const page_loaded = util/* default.Date.now */.Z.Date.now();
 class Store {
   constructor(ApiURL, FileURL, RealtimeURL, inmem, fakeapi, agenttoken) {
@@ -4318,7 +4326,9 @@ class Store {
 
     store_defineProperty(this, "seenQueue", []);
 
-    store_defineProperty(this, "_typing", util/* default.throttle */.Z.throttle(convoid => this.api.sendTyping(convoid), 3000));
+    store_defineProperty(this, "_typing", util/* default.throttle */.Z.throttle(convoid => this.api.sendTyping(convoid), 3000, {
+      trailing: false
+    }));
 
     store_defineProperty(this, "onConvoEvent", (o, cb) => this.pubsub.on2(o, 'events', cb));
 
@@ -5016,6 +5026,7 @@ class Store {
     }
 
     this.kv.put('last_msg_sent', util/* default.Date.now */.Z.Date.now());
+    return ret;
   }
 
   _setConvo(convo) {
@@ -5265,20 +5276,22 @@ const inmemCookie = {
 };
 
 function getGaClientId() {
-  var clientId = '';
-  if (!hasGA()) return clientId;
+  if (ga_client_id) return ga_client_id;
+  if (!hasGA()) return ga_client_id;
+  if (!window.ga) return;
   var allTrackers = window.ga.getAll() || [];
   allTrackers.forEach(function (tracker) {
-    clientId = tracker.get('clientId');
+    ga_client_id = tracker.get('clientId');
   });
-  return clientId;
+  return ga_client_id;
 }
 
-const hasGA = () => !!(window.ga && window.ga.getAll);
+const hasGA = () => !!(window.ga && window.ga.getAll || window.gtag);
 
 function getGaTrackingIds() {
   var trackingIds = [];
   if (!hasGA()) return trackingIds;
+  if (!window.ga) return [];
   const allTrackers = window.ga.getAll() || [];
   allTrackers.forEach(function (tracker) {
     var trackingId = tracker.get('trackingId');
@@ -5297,11 +5310,18 @@ function sendToFBPixel(category, action, label) {
 
 function sendToGA(category, action, label) {
   if (!hasGA()) return;
-  const allTrackers = window.ga.getAll() || [];
-  allTrackers.forEach(function (tracker) {
-    const name = tracker.get('name');
-    window.ga(name + '.send', 'event', category, action, label);
+  if (window.gtag) window.gtag('event', category, {
+    Action: action,
+    Label: label
   });
+
+  if (window.ga) {
+    const allTrackers = window.ga.getAll() || [];
+    allTrackers.forEach(function (tracker) {
+      const name = tracker.get('name');
+      window.ga(name + '.send', 'event', category, action, label);
+    });
+  }
 }
 
 function sendEventToThirdParty(category, action, label) {
@@ -5705,7 +5725,7 @@ util/* default.preloadWebfonts */.Z.preloadWebfonts(['Roboto'], [400, 500]);
 
 class Widget {
   constructor(ApiURL, FileURL, RealtimeURL, inmem, fake, agenttoken) {
-    lib_defineProperty(this, "version", () => '4.4');
+    lib_defineProperty(this, "version", () => '4.5');
 
     lib_defineProperty(this, "setSetting", setting => this.store.setSetting({
       account_setting: setting
@@ -5789,7 +5809,21 @@ class Widget {
   }
 
   async sendMessage(convoid, message) {
-    this.store.sendConvoEvent(convoid, 'message_sent', {
+    if (!convoid) {
+      const {
+        convo,
+        error
+      } = await this.store.startConvo({
+        message: message.text,
+        initial_by: this.store.matchUser().id
+      });
+      if (error) return {
+        error
+      };
+      convoid = convo.id;
+    }
+
+    return this.store.sendConvoEvent(convoid, 'message_sent', {
       message
     });
   }
@@ -5808,11 +5842,11 @@ class Widget {
     this.pluginMgr.hideCurrentGreeting();
   }
 
-  async showWidget(view, convo) {
+  async showWidget(view, cid) {
     await this.domGate.entry();
     this.pluginMgr.showCurrentChatbox({
       view,
-      cid: convo
+      cid: cid
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.67",
+	"version": "4.0.70",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,16 +14,16 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.21.1",
+		"core-js": "^3.22.1",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.2",
 		"less-loader": "^10.2.0",
-		"marked": "^4.0.12",
-		"preact": "^10.7.0"
+		"marked": "^4.0.14",
+		"preact": "^10.7.1"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.17.8",
+		"@babel/core": "^7.17.9",
 		"@babel/plugin-proposal-class-properties": "^7.16.7",
 		"@babel/plugin-transform-react-jsx": "^7.17.3",
 		"@babel/preset-env": "^7.16.11",
@@ -31,10 +31,10 @@
 		"babel-loader": "^8.2.4",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
-		"puppeteer": "^13.5.2",
-		"webpack": "^5.70.0",
+		"puppeteer": "^13.6.0",
+		"webpack": "^5.72.0",
 		"webpack-bundle-analyzer": "^4.5.0",
 		"webpack-cli": "^4.9.2",
-		"webpack-dev-server": "^4.7.4"
+		"webpack-dev-server": "^4.8.1"
 	}
 }

package/src/lib.js

@@ -85,7 +85,15 @@ class Widget {
 	}
 
 	async sendMessage(convoid, message) {
-		this.store.sendConvoEvent(convoid, 'message_sent', {message})
+		if (!convoid) {
+			const {convo, error} = await this.store.startConvo({
+				message: message.text,
+				initial_by: this.store.matchUser().id,
+			})
+			if (error) return {error}
+			convoid = convo.id
+		}
+		return this.store.sendConvoEvent(convoid, 'message_sent', {message})
 	}
 
 	startConvo(req) {
@@ -102,9 +110,10 @@ class Widget {
 		this.pluginMgr.hideCurrentGreeting()
 	}
 
-	async showWidget(view, convo) {
+	// view could be: chat, list, offline_form
+	async showWidget(view, cid) {
 		await this.domGate.entry()
-		this.pluginMgr.showCurrentChatbox({view, cid: convo})
+		this.pluginMgr.showCurrentChatbox({view, cid: cid})
 	}
 
 	async hideWidget() {
@@ -112,7 +121,7 @@ class Widget {
 		this.pluginMgr.hideCurrentChatbox()
 	}
 
-	version = () => '4.4'
+	version = () => '4.5'
 
 	setSetting = (setting) => this.store.setSetting({account_setting: setting})
 	getSetting = (_) => ({account_setting: sb.cloneDeep(this.store.matchAccountSetting())})

package/src/store/store.js

@@ -11,6 +11,15 @@ cookie.expiresMultiplier = 60 * 60 * 24 // days
 cookie.defaults.expires = 3650 // 10 year
 
 const MAX_CONVO = 20
+let ga_client_id = ''
+
+setTimeout(() => {
+	if (window.gtag) {
+		window.gtag('get', 'UA-XXXXXXXX-Y', 'client_id', (clientid) => {
+			ga_client_id = clientid
+		})
+	}
+}, 100)
 
 const page_loaded = sb.Date.now()
 
@@ -740,7 +749,7 @@ export default class Store {
 		this._typing(cid)
 	}
 
-	_typing = sb.throttle((convoid) => this.api.sendTyping(convoid), 3000)
+	_typing = sb.throttle((convoid) => this.api.sendTyping(convoid), 3000, {trailing: false})
 
 	async startConvo(req) {
 		await this.readyGate.entry()
@@ -824,6 +833,7 @@ export default class Store {
 		}
 
 		this.kv.put('last_msg_sent', sb.Date.now())
+		return ret
 	}
 
 	onConvoEvent = (o, cb) => this.pubsub.on2(o, 'events', cb)
@@ -1090,19 +1100,20 @@ const inmemCookie = {
 // getGaClientId returns ID of the client in Google Analytics
 // return empty string if GA is not installed
 function getGaClientId() {
-	var clientId = ''
-	if (!hasGA()) return clientId
+	if (ga_client_id) return ga_client_id
+	if (!hasGA()) return ga_client_id
 
+	if (!window.ga) return
 	var allTrackers = window.ga.getAll() || []
 	allTrackers.forEach(function (tracker) {
-		clientId = tracker.get('clientId')
+		ga_client_id = tracker.get('clientId')
 	})
 
-	return clientId
+	return ga_client_id
 }
 
 // hasGA tells if the website is using Google Analytics or not
-const hasGA = () => !!(window.ga && window.ga.getAll)
+const hasGA = () => !!((window.ga && window.ga.getAll) || window.gtag)
 
 // getGaTrackingIds returns all tracking ids in Google Analytics
 // return empty array if GA is not installed
@@ -1110,6 +1121,7 @@ function getGaTrackingIds() {
 	var trackingIds = []
 	if (!hasGA()) return trackingIds
 
+	if (!window.ga) return []
 	const allTrackers = window.ga.getAll() || []
 	allTrackers.forEach(function (tracker) {
 		var trackingId = tracker.get('trackingId')
@@ -1128,11 +1140,15 @@ function sendToFBPixel(category, action, label) {
 function sendToGA(category, action, label) {
 	if (!hasGA()) return
 
-	const allTrackers = window.ga.getAll() || []
-	allTrackers.forEach(function (tracker) {
-		const name = tracker.get('name')
-		window.ga(name + '.send', 'event', category, action, label)
-	})
+	if (window.gtag) window.gtag('event', category, {Action: action, Label: label})
+
+	if (window.ga) {
+		const allTrackers = window.ga.getAll() || []
+		allTrackers.forEach(function (tracker) {
+			const name = tracker.get('name')
+			window.ga(name + '.send', 'event', category, action, label)
+		})
+	}
 }
 
 function sendEventToThirdParty(category, action, label) {