@usefillo/react 0.5.0 → 0.5.2

package/dist/index.js

@@ -7,7 +7,8 @@ import {
   createClient,
   isField as isField2,
   normalizeFormSchema,
-  normalizeFormTheme
+  normalizeFormTheme,
+  visibleFields as visibleFields2
 } from "@usefillo/core";
 
 // src/context.ts
@@ -130,7 +131,7 @@ function useCodeFormSync(form, client, onError) {
 }
 
 // src/fields.tsx
-import { isField, pipeBlock, validateResponse } from "@usefillo/core";
+import { isField, pipeBlock, validateResponse, visibleFields } from "@usefillo/core";
 import { memo, useEffect as useEffect6, useState as useState5 } from "react";
 
 // src/phone.tsx
@@ -1357,7 +1358,10 @@ function shouldAutoSubmit(field, value, api) {
   })();
   if (!hasDiscreteAnswer) return false;
   if (value === api.data[field.id]) return false;
-  return validateResponse(api.form, { ...api.data, [field.id]: value }).ok;
+  const nextData = { ...api.data, [field.id]: value };
+  const interactive = visibleFields(api.form, nextData).filter((f) => f.kind !== "hidden");
+  if (interactive.length !== 1 || interactive[0]?.id !== field.id) return false;
+  return validateResponse(api.form, nextData).ok;
 }
 function blockHasPiping(block) {
   const has = (s) => typeof s === "string" && s.includes("{{");
@@ -1486,8 +1490,11 @@ function focusFirstInvalid(formEl) {
 function isAutoSubmitBlock(block) {
   return isField2(block) && (block.kind === "select" || block.kind === "dropdown" || block.kind === "checkbox" || block.kind === "rating" || block.kind === "linear_scale");
 }
-function needsExplicitSubmit(blocks) {
-  return blocks.some((block) => isField2(block) && block.kind !== "hidden" && !isAutoSubmitBlock(block));
+function needsExplicitSubmit(visible) {
+  const interactive = visible.filter((b) => !(isField2(b) && b.kind === "hidden"));
+  if (interactive.length === 0) return false;
+  if (interactive.length > 1) return true;
+  return !isAutoSubmitBlock(interactive[0]);
 }
 function FilloForm(props) {
   const { form, formId } = props;
@@ -1623,7 +1630,7 @@ function ResolvedForm(props) {
   }
   const multiPage = api.pageCount > 1;
   const autoSubmit = settings.submitMode === "auto";
-  const showPrimaryButton = !autoSubmit || !api.isLastPage || needsExplicitSubmit(api.blocks);
+  const showPrimaryButton = !autoSubmit || !api.isLastPage || needsExplicitSubmit(visibleFields2(api.form, api.data));
   const showFooter = showPrimaryButton || multiPage && !api.isFirstPage;
   return /* @__PURE__ */ jsx5(FilloContext.Provider, { value: api, children: /* @__PURE__ */ jsx5(FilloInstanceIdContext.Provider, { value: instanceId, children: /* @__PURE__ */ jsxs5(
     "form",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usefillo/react",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Headless React components for embedding Fillo forms natively in your product.",
   "license": "MIT",
   "keywords": [