bhl-forms 0.0.64 → 0.0.65

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;
   }),
@@ -11181,6 +11199,32 @@ const fireStepEvent = (formNode) => (stepResult, stepHistory2, stepQueue2) => {
     }
   }
 };
+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);
+        }
+      } else {
+        redirectTo(redirectUrl);
+      }
+    }
+  } catch (err) {
+    const msg = "failed to handleRedirect: " + err.toString();
+    console.warn(msg);
+    rollbar("warning", msg);
+  }
+};
 const textClassification = {
   label: "t-block t-mb-3 t-font-semibold t-text-base formkit-invalid:t-text-red-500",
   inner: `
@@ -15568,6 +15612,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) {