bhl-forms 0.0.64 → 0.0.67

package/dist/bhl-forms.es.js

@@ -4703,9 +4703,28 @@ const postJSON = (url3, data) => __async(this, null, function* () {
   dbg$1("Post resp: " + JSON.stringify(res, null, 2));
   return res;
 });
-const redirect = (url3) => {
+const redirectTo = (url3) => {
   window.location.href = url3;
 };
+const openNewTab = (url3) => {
+  var otherTab = window.open();
+  if (otherTab !== null) {
+    otherTab.opener = null;
+    otherTab.target = "_blank";
+    otherTab.location = url3;
+  }
+  return otherTab;
+};
+const getRedirect = (formData, node) => {
+  if (!node || !node.props.attrs.redirectMap) {
+    return null;
+  }
+  var redirectUrl = keyValOverlap(formData, node.props.attrs.redirectMap);
+  if (redirectUrl && formData) {
+    redirectUrl = strSubUrl(redirectUrl, formData);
+  }
+  return redirectUrl;
+};
 const handleSubmitError = (err, node) => {
   if (err.response) {
     const code = err.response.status;
@@ -5883,13 +5902,13 @@ const dataDefaults = {
     }
     return true;
   },
-  getRedirect: (formData, node) => {
-    if (!node || !node.props.attrs.redirectMap) {
-      return;
+  handleRedirectMap: (formData, node) => {
+    const redirectUrl = getRedirect(formData, node);
+    if (redirectUrl && redirectUrl !== "null") {
+      redirectTo(redirectUrl);
     }
-    return keyValOverlap(formData, node.props.attrs.redirectMap);
   },
-  submit: (postUrl, prepData2 = null, redirectUrl = null) => (formData, node) => __async(this, null, function* () {
+  submit: (postUrl, prepData2 = null, redirect = null) => (formData, node) => __async(this, null, function* () {
     if (prepData2 && prepData2 != "null") {
       if (!(prepData2 instanceof Function)) {
         throw "prepData must be a function";
@@ -5906,14 +5925,13 @@ const dataDefaults = {
     if (abort) {
       return false;
     }
-    if (redirectUrl instanceof Function) {
-      redirectUrl = redirectUrl(formData, node);
-    }
-    if (redirectUrl && redirectUrl !== "null") {
+    if (typeof redirect === "string" && redirect !== "null") {
       if (formData) {
-        redirectUrl = strSubUrl(redirectUrl, formData);
+        redirect = strSubUrl(redirect, formData);
       }
-      redirect(redirectUrl);
+      redirectTo(redirect);
+    } else if (redirect instanceof Function) {
+      redirect(formData, node);
     }
     return true;
   }),
@@ -11020,6 +11038,20 @@ function rollbar(type, msg) {
     }
   }
 }
+function analyticsEvent(event, body) {
+  try {
+    dbg(body);
+    window._analytics.track(event, body, {
+      plugins: {
+        "google-tag-manager": false
+      }
+    });
+  } catch (err) {
+    const msg = "failed to fire event: " + err.toString();
+    console.warn(msg);
+    rollbar("warning", msg);
+  }
+}
 function cookie(name, value, ttl, path, samesite, secure, domain) {
   name = name.replace(/\s/g, "_");
   var isSet2 = arguments.length > 1;
@@ -11061,7 +11093,8 @@ function schemaFromUrl(url3) {
   });
 }
 const getBaseDomain = () => {
-  var parts = window.location.host.split(".");
+  const host = window.location.host.replace("webflow.io", "com");
+  const parts = host.split(".");
   return parts.slice(-2).join(".");
 };
 const flattenObj = (obj) => {
@@ -11158,27 +11191,62 @@ const fireStepEvent = (formNode) => (stepResult, stepHistory2, stepQueue2) => {
     console.warn(msg);
     rollbar("warning", msg);
   }
-  if (typeof window._analytics !== "undefined") {
-    try {
-      const form_id = formNode.attrs.formId || window.location.hostname + "-" + formNode.id;
-      var body = {
-        "form_source": "formkit",
-        "form_id": form_id,
-        "step_count": stepHistory2.value.length,
-        "step_name": stepHistory2.value[stepHistory2.value.length - 1],
-        "step_values": step_values
-      };
-      dbg(body);
-      window._analytics.track("form-step", body, {
-        plugins: {
-          "google-tag-manager": false
+  try {
+    const form_id = formNode.attrs.formId || window.location.hostname + "-" + formNode.id;
+    var body = {
+      "form_source": "formkit",
+      "form_id": form_id,
+      "step_count": stepHistory2.value.length,
+      "step_name": stepHistory2.value[stepHistory2.value.length - 1],
+      "step_values": step_values
+    };
+    analyticsEvent("form-step", body);
+  } catch (err) {
+    const msg = "failed to fire step event: " + err.toString();
+    console.warn(msg);
+    rollbar("warning", msg);
+  }
+};
+const experimentCallback = (form2, variant, fromCache) => {
+  try {
+    var body = {
+      "experiment": form2.experiment.name,
+      "branch": variant.name,
+      "schema": variant.schema,
+      "no_cache": form2.noCache,
+      "from_cache": fromCache
+    };
+    analyticsEvent("form-experiment", body);
+  } catch (err) {
+    const msg = "failed to fire experiment callback: " + err.toString();
+    console.warn(msg);
+    rollbar("warning", msg);
+  }
+};
+const handleRedirect = (formData, node) => {
+  try {
+    var redirectUrl = getRedirect(formData, node);
+    if (redirectUrl && redirectUrl !== "null") {
+      if (node && node.props.attrs.popUnder) {
+        var popUnderUrl = node.props.attrs.popUnder;
+        const res = openNewTab(redirectUrl);
+        if (res !== null) {
+          if (popUnderUrl && formData) {
+            popUnderUrl = strSubUrl(popUnderUrl, formData);
+          }
+          redirectTo(popUnderUrl);
+        } else {
+          dbg("new tab failed");
+          redirectTo(redirectUrl);
         }
-      });
-    } catch (err) {
-      const msg = "failed to fire step event: " + err.toString();
-      console.warn(msg);
-      rollbar("warning", msg);
+      } else {
+        redirectTo(redirectUrl);
+      }
     }
+  } catch (err) {
+    const msg = "failed to handleRedirect: " + err.toString();
+    console.warn(msg);
+    rollbar("warning", msg);
   }
 };
 const textClassification = {
@@ -15538,6 +15606,7 @@ const _sfc_main = {
 };
 const apps = {};
 const defaultSubmitUrl = "https://webhooks." + getBaseDomain() + "/api/v1/form_leads_ext";
+dbg("defaultSubmitUrl:", defaultSubmitUrl);
 const init = () => {
   const classes = generateClasses(theme);
   const forms = window.bhlFormDefs || [];
@@ -15554,7 +15623,11 @@ const init = () => {
         const res = chooseVariant(form2.experiment);
         schema = res.variant.schema;
         if (form2.experimentCallback) {
-          experimentCallback(form2, res.variant, res.fromCache);
+          if (form2.experimentCallback === true) {
+            experimentCallback(form2, res.variant, res.fromCache);
+          } else {
+            form2.experimentCallback(form2, res.variant, res.fromCache);
+          }
         }
       }
       let schemaObj = schema;
@@ -15568,6 +15641,7 @@ const init = () => {
       data.prepData = data.prepData || prepData;
       data.preStepFunc = data.preStepFunc || preStepFunc;
       data.fireStepEvent = data.fireStepEvent || fireStepEvent;
+      data.handleRedirect = data.handleRedirect || handleRedirect;
       data.scrollAnchor = data.scrollAnchor || scrollAnchor;
       data.onEnter = (callback) => (e) => {
         if (e.key === "Enter" || e.keyCode === 13) {