bhl-forms 0.0.63 → 0.0.66

package/dist/bhl-forms.modern.es.js

@@ -9353,9 +9353,28 @@ var postJSON = /* @__PURE__ */ function() {
     return _ref.apply(this, arguments);
   };
 }();
-var redirect = (url3) => {
+var redirectTo = (url3) => {
   window.location.href = url3;
 };
+var openNewTab = (url3) => {
+  var otherTab = window.open();
+  if (otherTab !== null) {
+    otherTab.opener = null;
+    otherTab.target = "_blank";
+    otherTab.location = url3;
+  }
+  return otherTab;
+};
+var getRedirect = (formData, node2) => {
+  if (!node2 || !node2.props.attrs.redirectMap) {
+    return null;
+  }
+  var redirectUrl = keyValOverlap(formData, node2.props.attrs.redirectMap);
+  if (redirectUrl && formData) {
+    redirectUrl = strSubUrl(redirectUrl, formData);
+  }
+  return redirectUrl;
+};
 var handleSubmitError = (err, node2) => {
   if (err.response) {
     var code = err.response.status;
@@ -10649,15 +10668,15 @@ var dataDefaults = {
     }
     return true;
   },
-  getRedirect: (formData, node2) => {
-    if (!node2 || !node2.props.attrs.redirectMap) {
-      return;
+  handleRedirectMap: (formData, node2) => {
+    var redirectUrl = getRedirect(formData, node2);
+    if (redirectUrl && redirectUrl !== "null") {
+      redirectTo(redirectUrl);
     }
-    return keyValOverlap(formData, node2.props.attrs.redirectMap);
   },
   submit: function submit(postUrl) {
     var prepData2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
-    var redirectUrl = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
+    var redirect = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
     return /* @__PURE__ */ function() {
       var _ref6 = _asyncToGenerator(function* (formData, node2) {
         if (prepData2 && prepData2 != "null") {
@@ -10676,14 +10695,13 @@ var dataDefaults = {
         if (abort) {
           return false;
         }
-        if (redirectUrl instanceof Function) {
-          redirectUrl = redirectUrl(formData, node2);
-        }
-        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, node2);
         }
         return true;
       });
@@ -17854,7 +17872,8 @@ function _schemaFromUrl() {
   return _schemaFromUrl.apply(this, arguments);
 }
 var getBaseDomain = () => {
-  var parts = window.location.host.split(".");
+  var host = window.location.host.replace("webflow.io", "com");
+  var parts = host.split(".");
   return parts.slice(-2).join(".");
 };
 var flattenObj = (obj) => {
@@ -17974,6 +17993,32 @@ var fireStepEvent = (formNode) => (stepResult, stepHistory2, stepQueue2) => {
     }
   }
 };
+var handleRedirect = (formData, node2) => {
+  try {
+    var redirectUrl = getRedirect(formData, node2);
+    if (redirectUrl && redirectUrl !== "null") {
+      if (node2 && node2.props.attrs.popUnder) {
+        var popUnderUrl = node2.props.attrs.popUnder;
+        var res = openNewTab(redirectUrl);
+        if (res !== null) {
+          if (popUnderUrl && formData) {
+            popUnderUrl = strSubUrl(popUnderUrl, formData);
+          }
+          redirectTo(popUnderUrl);
+        } else {
+          dbg("new tab failed");
+          redirectTo(redirectUrl);
+        }
+      } else {
+        redirectTo(redirectUrl);
+      }
+    }
+  } catch (err) {
+    var msg = "failed to handleRedirect: " + err.toString();
+    console.warn(msg);
+    rollbar("warning", msg);
+  }
+};
 var textClassification = {
   label: "t-block t-mb-3 t-font-semibold t-text-base formkit-invalid:t-text-red-500",
   inner: "\n    t-max-w-lg\n    t-border\n    t-border-gray-400\n    formkit-invalid:t-border-red-500\n    t-rounded t-mb-1\n    t-overflow-hidden\n    focus-within:t-border-blue-500\n  ",
@@ -18040,7 +18085,7 @@ var theme = {
   tel: textClassification,
   text: textClassification,
   textarea: _objectSpread2(_objectSpread2({}, textClassification), {}, {
-    input: "t-block t-w-full t-h-40 t-px-3 t-pt-1 t-border-none t-text-base t-font-sans t-text-gray-700 t-placeholder-gray-400 placeholder:t-text-base placeholder:t-font-sans focus:t-shadow-outline"
+    input: "t-block t-w-full t-h-40 t-px-3 t-pt-1 t-border-none t-text-base t-text-gray-700 t-placeholder-gray-400 placeholder:t-text-base focus:t-shadow-outline"
   }),
   time: textClassification,
   url: textClassification,
@@ -22308,6 +22353,7 @@ const _sfc_main = {
 };
 var apps = {};
 var defaultSubmitUrl = "https://webhooks." + getBaseDomain() + "/api/v1/form_leads_ext";
+dbg("defaultSubmitUrl:", defaultSubmitUrl);
 var init = () => {
   var classes = generateClasses(theme);
   var forms = window.bhlFormDefs || [];
@@ -22338,6 +22384,7 @@ var init = () => {
       data2.prepData = data2.prepData || prepData;
       data2.preStepFunc = data2.preStepFunc || preStepFunc;
       data2.fireStepEvent = data2.fireStepEvent || fireStepEvent;
+      data2.handleRedirect = data2.handleRedirect || handleRedirect;
       data2.scrollAnchor = data2.scrollAnchor || scrollAnchor;
       data2.onEnter = (callback) => (e2) => {
         if (e2.key === "Enter" || e2.keyCode === 13) {