bhl-forms 0.0.40 → 0.0.43

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

@@ -9021,6 +9021,19 @@ function usePrepop() {
         value = urlParams2.get(node2.name);
       }
       if (value) {
+        if (node2.props.options) {
+          var found = false;
+          for (var i2 = 0; i2 < node2.props.options.length; i2++) {
+            if (node2.props.options[i2].value == value) {
+              found = true;
+              break;
+            }
+          }
+          if (!found) {
+            console.debug("Prepop option not found for:", node2.name, value);
+            return;
+          }
+        }
         console.debug("Setting prepop value for:", node2.name, value);
         node2.input(value);
       }
@@ -10004,16 +10017,24 @@ var handleSubmitError = (err, node2) => {
   node2.setErrors(err.toString());
   return true;
 };
-var keyValOverlap = function keyValOverlap2(o1, o2) {
-  var multiple = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : true;
+var getKey = (d2, path) => {
+  if (typeof path === "string") {
+    path = path.split(".");
+  }
+  return path.reduce((x2, y) => x2[y], d2);
+};
+var keyValOverlap = (o1, o2) => {
   var result = null;
-  for (var input2 of Object.keys(o1)) {
-    var 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;
+    }
+    var o1_value = getKey(o1, key);
+    if (!o1_value) {
+      continue;
+    }
+    if (o2[key][o1_value]) {
+      result = o2[key][o1_value];
       break;
     }
   }
@@ -10025,12 +10046,6 @@ var keyValOverlap = function keyValOverlap2(o1, o2) {
   }
   return result;
 };
-var getKey = (d2, path) => {
-  if (typeof path === "string") {
-    path = path.split(".");
-  }
-  return path.reduce((x2, y) => x2[y], d2);
-};
 var strSubUrl = (str, obj) => str.replace(/\${(.*?)}/g, (x2, g2) => encodeURIComponent(getKey(obj, g2)));
 function useSteps() {
   var activeStep2 = ref("");
@@ -10041,6 +10056,19 @@ function useSteps() {
   var lastItem = (x2) => {
     return x2.value[x2.value.length - 1];
   };
+  var findFirstInput = (n2) => {
+    for (var i2 = 0; i2 < n2.children.length; i2++) {
+      var child = n2.children[i2];
+      if ((child.type === "input" || child.type === "list") && !(child.context.type === "hidden")) {
+        return child;
+      }
+      var res = findFirstInput(child);
+      if (res) {
+        return res;
+      }
+    }
+    return null;
+  };
   var firstStep2 = () => {
     if (stepHistory2.value.length > 0) {
       return stepHistory2.value[0];
@@ -10081,12 +10109,13 @@ function useSteps() {
     }
   };
   var getNextStepsFromMap = (node2, nextStepMap) => {
-    return keyValOverlap(node2.value, nextStepMap, false);
+    return keyValOverlap(node2.value, nextStepMap);
   };
   var setStep2 = function setStep22() {
     var {
       nextStep = 1,
-      validate: validate2 = true
+      validate: validate2 = true,
+      autoFocus = true
     } = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     var node2 = steps2[activeStep2.value].node;
     if (validate2) {
@@ -10112,6 +10141,17 @@ function useSteps() {
     } else {
       throw Error("Unexpected value for nextStep: " + nextStep);
     }
+    if (autoFocus) {
+      var newNode = steps2[activeStep2.value].node;
+      setTimeout(function() {
+        var firstInput = findFirstInput(newNode);
+        if (!firstInput) {
+          return;
+        }
+        var elem = document.getElementById(firstInput.context.id);
+        elem.focus();
+      }, 400);
+    }
     return true;
   };
   var setNextStep2 = (callback) => {
@@ -10257,7 +10297,7 @@ var dataDefaults = {
     if (!node2 || !node2.props.attrs.redirectMap) {
       return;
     }
-    return keyValOverlap(formData, node2.props.attrs.redirectMap, false);
+    return keyValOverlap(formData, node2.props.attrs.redirectMap);
   },
   submit: function submit(postUrl) {
     var prepData2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;