bhl-forms 0.0.40 → 0.0.43

package/dist/bhl-forms.es.js

@@ -4431,6 +4431,19 @@ function usePrepop() {
         value = urlParams2.get(node.name);
       }
       if (value) {
+        if (node.props.options) {
+          let found = false;
+          for (var i2 = 0; i2 < node.props.options.length; i2++) {
+            if (node.props.options[i2].value == value) {
+              found = true;
+              break;
+            }
+          }
+          if (!found) {
+            console.debug("Prepop option not found for:", node.name, value);
+            return;
+          }
+        }
         console.debug("Setting prepop value for:", node.name, value);
         node.input(value);
       }
@@ -5333,15 +5346,24 @@ const handleSubmitError = (err, node) => {
   node.setErrors(err.toString());
   return true;
 };
-const keyValOverlap = (o1, o2, multiple = true) => {
+const getKey = (d2, path) => {
+  if (typeof path === "string") {
+    path = path.split(".");
+  }
+  return path.reduce((x2, y) => x2[y], d2);
+};
+const keyValOverlap = (o1, o2) => {
   let result = null;
-  for (var input2 of Object.keys(o1)) {
-    const value = o1[input2];
-    if (o2[input2] && o2[input2][value]) {
-      if (result !== null && !multiple) {
-        throw Error("Multiple values not allowed");
-      }
-      result = o2[input2][value];
+  for (var key of Object.keys(o2)) {
+    if (key === "*") {
+      continue;
+    }
+    const o1_value = getKey(o1, key);
+    if (!o1_value) {
+      continue;
+    }
+    if (o2[key][o1_value]) {
+      result = o2[key][o1_value];
       break;
     }
   }
@@ -5353,12 +5375,6 @@ const keyValOverlap = (o1, o2, multiple = true) => {
   }
   return result;
 };
-const getKey = (d2, path) => {
-  if (typeof path === "string") {
-    path = path.split(".");
-  }
-  return path.reduce((x2, y) => x2[y], d2);
-};
 const strSubUrl = (str, obj) => str.replace(/\${(.*?)}/g, (x2, g2) => encodeURIComponent(getKey(obj, g2)));
 function useSteps() {
   const activeStep2 = ref("");
@@ -5369,6 +5385,19 @@ function useSteps() {
   const lastItem = (x2) => {
     return x2.value[x2.value.length - 1];
   };
+  const findFirstInput = (n2) => {
+    for (var i2 = 0; i2 < n2.children.length; i2++) {
+      const child = n2.children[i2];
+      if ((child.type === "input" || child.type === "list") && !(child.context.type === "hidden")) {
+        return child;
+      }
+      const res = findFirstInput(child);
+      if (res) {
+        return res;
+      }
+    }
+    return null;
+  };
   const firstStep2 = () => {
     if (stepHistory2.value.length > 0) {
       return stepHistory2.value[0];
@@ -5408,9 +5437,9 @@ function useSteps() {
     }
   };
   const getNextStepsFromMap = (node, nextStepMap) => {
-    return keyValOverlap(node.value, nextStepMap, false);
+    return keyValOverlap(node.value, nextStepMap);
   };
-  const setStep2 = ({ nextStep = 1, validate: validate2 = true } = {}) => {
+  const setStep2 = ({ nextStep = 1, validate: validate2 = true, autoFocus = true } = {}) => {
     const node = steps2[activeStep2.value].node;
     if (validate2) {
       node.walk((n2) => {
@@ -5435,6 +5464,17 @@ function useSteps() {
     } else {
       throw Error("Unexpected value for nextStep: " + nextStep);
     }
+    if (autoFocus) {
+      const newNode = steps2[activeStep2.value].node;
+      setTimeout(function() {
+        const firstInput = findFirstInput(newNode);
+        if (!firstInput) {
+          return;
+        }
+        const elem = document.getElementById(firstInput.context.id);
+        elem.focus();
+      }, 400);
+    }
     return true;
   };
   const setNextStep2 = (callback) => {
@@ -5539,7 +5579,7 @@ const dataDefaults = {
     if (!node || !node.props.attrs.redirectMap) {
       return;
     }
-    return keyValOverlap(formData, node.props.attrs.redirectMap, false);
+    return keyValOverlap(formData, node.props.attrs.redirectMap);
   },
   submit: (postUrl, prepData2 = null, redirectUrl = null) => (formData, node) => __async(this, null, function* () {
     if (prepData2 && prepData2 != "null") {