@bookinglab/booking-ui-react 1.11.0 → 1.11.1

package/dist/index.js

@@ -233,40 +233,70 @@ function BookingForm({
       if (!settings?.conditional_answers) {
         return true;
       }
-      const conditionEntries = Object.entries(settings.conditional_answers);
-      if (conditionEntries.length === 0) {
-        return true;
-      }
-      return conditionEntries.some(([questionIdStr, expectedAnswer]) => {
-        const questionId = Number(questionIdStr);
+      const conditionalAnswers = settings.conditional_answers;
+      const conditionalQuestion = settings.conditional_question;
+      const buildCandidates = (questionId) => {
         const currentValue = values[String(questionId)];
+        const candidates = /* @__PURE__ */ new Set();
         if (currentValue === void 0 || currentValue === "" || currentValue === null) {
-          return false;
+          return candidates;
         }
-        const normalizedCurrent = typeof currentValue === "object" && currentValue !== null && "id" in currentValue ? currentValue : currentValue;
-        const candidates = /* @__PURE__ */ new Set();
         const addCandidate = (v) => {
           if (v === void 0 || v === null) return;
           const s = String(v).trim();
           if (s) candidates.add(s);
         };
-        const sourceQuestion = questions.find((q) => q.id === questionId);
+        const normalizedCurrent = typeof currentValue === "object" && currentValue !== null && "id" in currentValue ? currentValue : currentValue;
         if (typeof normalizedCurrent === "object" && normalizedCurrent !== null) {
           addCandidate(normalizedCurrent.id);
           addCandidate(normalizedCurrent.name);
         } else {
           addCandidate(normalizedCurrent);
         }
-        if (sourceQuestion?.detail_type === "select" && sourceQuestion.options?.length) {
+        const sourceQuestion = questions.find((q) => q.id === questionId);
+        if ((sourceQuestion?.detail_type === "select" || sourceQuestion?.detail_type === "radio") && sourceQuestion.options?.length) {
           const currentStr = [...candidates][0] ?? "";
           const optionById = sourceQuestion.options.find((o) => String(o.id) === currentStr);
-          const optionByName = sourceQuestion.options.find((o) => String(o.name).trim() === currentStr);
+          const optionByName = sourceQuestion.options.find(
+            (o) => String(o.name).trim() === currentStr
+          );
           const opt = optionById ?? optionByName;
           if (opt) {
             addCandidate(opt.id);
             addCandidate(opt.name);
           }
         }
+        return candidates;
+      };
+      const isTruthyFlag = (v) => {
+        if (v === void 0 || v === null) return true;
+        if (typeof v === "boolean") return v;
+        if (typeof v === "number") return v !== 0;
+        if (typeof v === "string") {
+          const s = v.trim().toLowerCase();
+          return s !== "" && s !== "0" && s !== "false";
+        }
+        return !!v;
+      };
+      if (conditionalQuestion !== void 0 && conditionalQuestion !== null && conditionalQuestion !== "") {
+        const sourceId = Number(conditionalQuestion);
+        if (!Number.isFinite(sourceId)) return true;
+        const candidates = buildCandidates(sourceId);
+        if (candidates.size === 0) return false;
+        const entries = Object.entries(conditionalAnswers);
+        if (entries.length === 0) return true;
+        return entries.some(
+          ([optionKey, flag]) => isTruthyFlag(flag) && candidates.has(String(optionKey).trim())
+        );
+      }
+      const conditionEntries = Object.entries(conditionalAnswers);
+      if (conditionEntries.length === 0) {
+        return true;
+      }
+      return conditionEntries.some(([questionIdStr, expectedAnswer]) => {
+        const questionId = Number(questionIdStr);
+        const candidates = buildCandidates(questionId);
+        if (candidates.size === 0) return false;
         const matchesScalar = (expected) => {
           const expectedStr = String(expected).trim();
           return candidates.has(expectedStr);