@opensite/ui 1.8.3 → 1.8.5

package/dist/contact-catering.js

@@ -1,20 +1,15 @@
 "use client";
 import * as React from 'react';
-import React__default from 'react';
-import { useForm, Form, Field } from '@page-speed/forms';
-import { Select, TextInput as TextInput$1, Radio, TextArea as TextArea$1 } from '@page-speed/forms/inputs';
+import React__default, { useMemo, useState, useCallback } from 'react';
+import { Form, useForm, Field } from '@page-speed/forms';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import { cva } from 'class-variance-authority';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
-import * as LabelPrimitive from '@radix-ui/react-label';
-import * as SeparatorPrimitive from '@radix-ui/react-separator';
+import { TextInput, TextArea, Select, MultiSelect, Radio, Checkbox, CheckboxGroup, DatePicker, DateRangePicker, TimePicker, FileInput, RichTextEditor } from '@page-speed/forms/inputs';
 import { serializeForRails, deserializeErrors } from '@page-speed/forms/integration';
 
 // components/blocks/contact/contact-catering.tsx
-var TextInput = TextInput$1;
-var TextArea = TextArea$1;
 function cn(...inputs) {
   return twMerge(clsx(inputs));
 }
@@ -361,6 +356,7 @@ var Pressable = React.forwardRef(
       rel,
       linkType,
       isInternal,
+      isExternal,
       handleClick
     } = navigation;
     const shouldRenderLink = normalizedHref && linkType !== "none";
@@ -436,111 +432,6 @@ var Pressable = React.forwardRef(
   }
 );
 Pressable.displayName = "Pressable";
-var svgCache = /* @__PURE__ */ new Map();
-function DynamicIcon({
-  name,
-  size = 28,
-  color,
-  className,
-  alt
-}) {
-  const [svgContent, setSvgContent] = React.useState(null);
-  const [isLoading, setIsLoading] = React.useState(true);
-  const [error, setError] = React.useState(null);
-  const { url, iconName } = React.useMemo(() => {
-    const separator = name.includes("/") ? "/" : ":";
-    const [prefix, iconName2] = name.split(separator);
-    const baseUrl = `https://icons.opensite.ai/api/icon/${prefix}/${iconName2}?format=svg&width=${size}&height=${size}&key=au382bi7fsh96w9h9xlrnat2jglx`;
-    return {
-      url: baseUrl,
-      iconName: iconName2
-    };
-  }, [name, size]);
-  React.useEffect(() => {
-    let isMounted = true;
-    const fetchSvg = async () => {
-      const cached = svgCache.get(url);
-      if (cached) {
-        if (isMounted) {
-          setSvgContent(cached);
-          setIsLoading(false);
-        }
-        return;
-      }
-      try {
-        setIsLoading(true);
-        setError(null);
-        const response = await fetch(url);
-        if (!response.ok) {
-          throw new Error(`Failed to fetch icon: ${response.status}`);
-        }
-        let svg = await response.text();
-        svg = processSvgForCurrentColor(svg);
-        svgCache.set(url, svg);
-        if (isMounted) {
-          setSvgContent(svg);
-          setIsLoading(false);
-        }
-      } catch (err) {
-        if (isMounted) {
-          setError(err instanceof Error ? err.message : "Failed to load icon");
-          setIsLoading(false);
-        }
-      }
-    };
-    fetchSvg();
-    return () => {
-      isMounted = false;
-    };
-  }, [url]);
-  if (isLoading) {
-    return /* @__PURE__ */ jsx(
-      "span",
-      {
-        className: cn("inline-block", className),
-        style: { width: size, height: size },
-        "aria-hidden": "true"
-      }
-    );
-  }
-  if (error || !svgContent) {
-    return /* @__PURE__ */ jsx(
-      "span",
-      {
-        className: cn("inline-block", className),
-        style: { width: size, height: size },
-        role: "img",
-        "aria-label": alt || iconName
-      }
-    );
-  }
-  return /* @__PURE__ */ jsx(
-    "span",
-    {
-      className: cn("inline-flex items-center justify-center", className),
-      style: {
-        width: size,
-        height: size,
-        color: color || "inherit"
-      },
-      role: "img",
-      "aria-label": alt || iconName,
-      dangerouslySetInnerHTML: { __html: svgContent }
-    }
-  );
-}
-function processSvgForCurrentColor(svg) {
-  let processed = svg;
-  processed = processed.replace(
-    /stroke=["'](#000000|#000|black)["']/gi,
-    'stroke="currentColor"'
-  );
-  processed = processed.replace(
-    /fill=["'](#000000|#000|black)["']/gi,
-    'fill="currentColor"'
-  );
-  return processed;
-}
 function Card({ className, ...props }) {
   return /* @__PURE__ */ jsx(
     "div",
@@ -564,66 +455,386 @@ function CardContent({ className, ...props }) {
     }
   );
 }
-function Checkbox({
+function DynamicFormField({
+  field,
   className,
-  ...props
+  uploadProgress = {},
+  onFileUpload,
+  onFileRemove,
+  isUploading = false
 }) {
+  const fieldId = field.name;
+  const usesGroupLegend = field.type === "radio" || field.type === "checkbox-group";
+  const usesInlineCheckboxLabel = field.type === "checkbox";
+  const shouldRenderFieldLabel = !usesGroupLegend && !usesInlineCheckboxLabel;
+  const checkboxLabel = /* @__PURE__ */ jsxs(Fragment, { children: [
+    field.label,
+    field.required ? /* @__PURE__ */ jsx("span", { className: "text-destructive ml-1", children: "*" }) : null
+  ] });
   return /* @__PURE__ */ jsx(
-    CheckboxPrimitive.Root,
+    Field,
     {
-      "data-slot": "checkbox",
-      className: cn(
-        "peer border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
-        className
-      ),
-      ...props,
-      children: /* @__PURE__ */ jsx(
-        CheckboxPrimitive.Indicator,
-        {
-          "data-slot": "checkbox-indicator",
-          className: "grid place-content-center text-current transition-none",
-          children: /* @__PURE__ */ jsx(DynamicIcon, { name: "lucide/check", size: 14 })
-        }
-      )
+      name: field.name,
+      label: shouldRenderFieldLabel ? field.label : void 0,
+      description: shouldRenderFieldLabel ? field.description : void 0,
+      required: field.required,
+      className: cn("space-y-2", className),
+      children: ({ field: formField, meta }) => /* @__PURE__ */ jsxs("div", { children: [
+        (field.type === "text" || field.type === "email" || field.type === "tel" || field.type === "search" || field.type === "password" || field.type === "url") && /* @__PURE__ */ jsx(
+          TextInput,
+          {
+            ...formField,
+            id: fieldId,
+            type: field.type,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "number" && /* @__PURE__ */ jsx(
+          TextInput,
+          {
+            ...formField,
+            id: fieldId,
+            type: "text",
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "textarea" && /* @__PURE__ */ jsx(
+          TextArea,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            rows: field.rows || 4,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "select" && field.options && /* @__PURE__ */ jsx(
+          Select,
+          {
+            ...formField,
+            id: fieldId,
+            options: field.options,
+            placeholder: field.placeholder || `Select ${field.label.toLowerCase()}`,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "multi-select" && field.options && /* @__PURE__ */ jsx(
+          MultiSelect,
+          {
+            ...formField,
+            id: fieldId,
+            options: field.options,
+            placeholder: field.placeholder || `Select ${field.label.toLowerCase()}`,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "radio" && field.options && /* @__PURE__ */ jsx(
+          Radio,
+          {
+            ...formField,
+            id: fieldId,
+            options: field.options,
+            label: field.label,
+            description: field.description,
+            required: field.required,
+            disabled: field.disabled,
+            layout: field.layout || "stacked",
+            error: meta.touched && !!meta.error,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "checkbox" && /* @__PURE__ */ jsx(
+          Checkbox,
+          {
+            ...formField,
+            id: fieldId,
+            value: formField.value === true || formField.value === "true",
+            onChange: (checked) => formField.onChange(checked),
+            label: checkboxLabel,
+            description: field.description,
+            disabled: field.disabled,
+            required: field.required,
+            error: meta.touched && !!meta.error,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "checkbox-group" && field.options && /* @__PURE__ */ jsx(
+          CheckboxGroup,
+          {
+            ...formField,
+            id: fieldId,
+            options: field.options,
+            label: field.label,
+            description: field.description,
+            required: field.required,
+            disabled: field.disabled,
+            layout: field.layout || "stacked",
+            error: meta.touched && !!meta.error,
+            "aria-label": field.label
+          }
+        ),
+        (field.type === "date-picker" || field.type === "date") && /* @__PURE__ */ jsx(
+          DatePicker,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "date-range" && /* @__PURE__ */ jsx(
+          DateRangePicker,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "time" && /* @__PURE__ */ jsx(
+          TimePicker,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "file" && /* @__PURE__ */ jsx(
+          FileInput,
+          {
+            ...formField,
+            id: fieldId,
+            accept: field.accept,
+            maxSize: field.maxSize || 5 * 1024 * 1024,
+            maxFiles: field.maxFiles || 1,
+            multiple: field.multiple || false,
+            placeholder: field.placeholder || "Choose file(s)...",
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled || isUploading,
+            showProgress: true,
+            uploadProgress,
+            onChange: (files) => {
+              formField.onChange(files);
+              if (files.length > 0 && onFileUpload) {
+                onFileUpload(files);
+              }
+            },
+            onFileRemove,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "rich-text" && /* @__PURE__ */ jsx(
+          RichTextEditor,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        )
+      ] })
     }
   );
 }
-function Label({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsx(
-    LabelPrimitive.Root,
-    {
-      "data-slot": "label",
-      className: cn(
-        "flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
-        className
-      ),
-      ...props
-    }
+
+// lib/form-field-types.ts
+function generateInitialValues(fields) {
+  return fields.reduce(
+    (acc, field) => {
+      if (field.type === "checkbox") {
+        acc[field.name] = false;
+      } else if (field.type === "checkbox-group" || field.type === "multi-select") {
+        acc[field.name] = [];
+      } else if (field.type === "file") {
+        acc[field.name] = [];
+      } else if (field.type === "date-range") {
+        acc[field.name] = { start: null, end: null };
+      } else {
+        acc[field.name] = "";
+      }
+      return acc;
+    },
+    {}
   );
 }
-function Separator({
-  className,
-  orientation = "horizontal",
-  decorative = true,
-  ...props
-}) {
-  return /* @__PURE__ */ jsx(
-    SeparatorPrimitive.Root,
-    {
-      "data-slot": "separator",
-      decorative,
-      orientation,
-      className: cn(
-        "bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",
-        className
-      ),
-      ...props
-    }
+function generateValidationSchema(fields) {
+  return fields.reduce(
+    (acc, field) => {
+      acc[field.name] = (value, allValues) => {
+        if (field.required) {
+          if (!value || typeof value === "string" && !value.trim()) {
+            return `${field.label} is required`;
+          }
+        }
+        if (field.type === "email" && value) {
+          if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) {
+            return "Please enter a valid email address";
+          }
+        }
+        if (field.type === "url" && value) {
+          try {
+            new URL(value);
+          } catch {
+            return "Please enter a valid URL";
+          }
+        }
+        if (field.validator) {
+          return field.validator(value, allValues);
+        }
+        return void 0;
+      };
+      return acc;
+    },
+    {}
   );
 }
+var columnSpanClasses = {
+  1: "col-span-12 md:col-span-1",
+  2: "col-span-12 md:col-span-2",
+  3: "col-span-12 md:col-span-3",
+  4: "col-span-12 md:col-span-4",
+  5: "col-span-12 md:col-span-5",
+  6: "col-span-12 md:col-span-6",
+  7: "col-span-12 md:col-span-7",
+  8: "col-span-12 md:col-span-8",
+  9: "col-span-12 md:col-span-9",
+  10: "col-span-12 md:col-span-10",
+  11: "col-span-12 md:col-span-11",
+  12: "col-span-12"
+};
+function getColumnSpanClass(span) {
+  if (!span || span === 12) return "col-span-12";
+  const clamped = Math.max(1, Math.min(span, 12));
+  return columnSpanClasses[clamped] || "col-span-12";
+}
+function useContactForm(options) {
+  const {
+    formFields,
+    formConfig,
+    onSubmit,
+    onSuccess,
+    onError,
+    resetOnSuccess = true,
+    uploadTokens = []
+  } = options;
+  const [submissionError, setSubmissionError] = useState(null);
+  const submissionConfig = formConfig?.submissionConfig;
+  const redirectUrl = submissionConfig?.redirectUrl;
+  const redirectNavigation = useNavigation({ href: redirectUrl });
+  const resetSubmissionState = useCallback(() => {
+    setSubmissionError(null);
+  }, []);
+  const performRedirect = useCallback(() => {
+    if (!redirectUrl || typeof window === "undefined") {
+      return;
+    }
+    const navigate = () => {
+      if (redirectNavigation.shouldUseRouter && redirectNavigation.normalizedHref) {
+        const handler = window.__opensiteNavigationHandler;
+        if (typeof handler === "function") {
+          try {
+            const handled = handler(redirectNavigation.normalizedHref, void 0);
+            if (handled !== false) {
+              return;
+            }
+          } catch (error) {
+            console.error("Internal redirect handler failed:", error);
+          }
+        }
+      }
+      const destination = redirectNavigation.normalizedHref || redirectUrl;
+      window.location.assign(destination);
+    };
+    window.setTimeout(navigate, 150);
+  }, [redirectNavigation, redirectUrl]);
+  const form = useForm({
+    initialValues: useMemo(
+      () => generateInitialValues(formFields),
+      [formFields]
+    ),
+    validationSchema: useMemo(
+      () => generateValidationSchema(formFields),
+      [formFields]
+    ),
+    onSubmit: async (values, helpers) => {
+      resetSubmissionState();
+      const shouldAutoSubmit = Boolean(formConfig?.endpoint);
+      if (!shouldAutoSubmit && !onSubmit) {
+        return;
+      }
+      try {
+        let result;
+        const submissionValues = {
+          ...values,
+          ...uploadTokens.length > 0 && {
+            contact_form_upload_tokens: uploadTokens
+          }
+        };
+        if (shouldAutoSubmit) {
+          result = await submitPageSpeedForm(submissionValues, formConfig);
+        }
+        if (onSubmit) {
+          await onSubmit(submissionValues);
+        }
+        if (shouldAutoSubmit || onSubmit) {
+          try {
+            await submissionConfig?.handleFormSubmission?.({
+              formData: submissionValues,
+              responseData: result
+            });
+          } catch (callbackError) {
+            console.error("handleFormSubmission callback failed:", callbackError);
+          }
+          if (resetOnSuccess) {
+            helpers.resetForm();
+          }
+          onSuccess?.(result);
+          if (submissionConfig?.behavior === "redirect" && submissionConfig.redirectUrl) {
+            performRedirect();
+          }
+        }
+      } catch (error) {
+        if (error instanceof PageSpeedFormSubmissionError && error.formErrors) {
+          helpers.setErrors(error.formErrors);
+        }
+        const errorMessage = error instanceof Error ? error.message : "Form submission failed";
+        setSubmissionError(errorMessage);
+        onError?.(error);
+      }
+    }
+  });
+  const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
+  return {
+    form,
+    isSubmitted: form.status === "success",
+    submissionError,
+    formMethod,
+    resetSubmissionState
+  };
+}
+
+// lib/forms.ts
 var PageSpeedFormSubmissionError = class extends Error {
   constructor(message, options = {}) {
     super(message);
@@ -1135,19 +1346,19 @@ var SERVICE_STYLES = [
   { value: "cocktail", label: "Cocktail", description: "Passed appetizers" }
 ];
 var CUISINES = [
-  { id: "american", label: "American" },
-  { id: "italian", label: "Italian" },
-  { id: "asian", label: "Asian Fusion" },
-  { id: "mexican", label: "Mexican" },
-  { id: "mediterranean", label: "Mediterranean" },
-  { id: "bbq", label: "BBQ" }
+  { value: "american", label: "American" },
+  { value: "italian", label: "Italian" },
+  { value: "asian", label: "Asian Fusion" },
+  { value: "mexican", label: "Mexican" },
+  { value: "mediterranean", label: "Mediterranean" },
+  { value: "bbq", label: "BBQ" }
 ];
 var DIETARY_OPTIONS = [
-  { id: "vegetarian", label: "Vegetarian options" },
-  { id: "vegan", label: "Vegan options" },
-  { id: "gluten-free", label: "Gluten-free options" },
-  { id: "kosher", label: "Kosher" },
-  { id: "halal", label: "Halal" }
+  { value: "vegetarian", label: "Vegetarian options" },
+  { value: "vegan", label: "Vegan options" },
+  { value: "gluten-free", label: "Gluten-free options" },
+  { value: "kosher", label: "Kosher" },
+  { value: "halal", label: "Halal" }
 ];
 var GUEST_COUNTS = [
   { value: "10-25", label: "10-25 guests" },
@@ -1167,13 +1378,124 @@ var BUDGET_RANGES = [
   { value: "100-150", label: "$100-150 / person" },
   { value: "150+", label: "$150+ / person" }
 ];
+var DEFAULT_FORM_FIELDS = [
+  {
+    name: "eventType",
+    type: "select",
+    label: "Event Type",
+    placeholder: "Select event type",
+    required: true,
+    columnSpan: 6,
+    options: EVENT_TYPES
+  },
+  {
+    name: "eventDate",
+    type: "date",
+    label: "Event Date",
+    placeholder: "Select date",
+    required: true,
+    columnSpan: 6
+  },
+  {
+    name: "guestCount",
+    type: "select",
+    label: "Number of Guests",
+    placeholder: "Select guest count",
+    required: true,
+    columnSpan: 6,
+    options: GUEST_COUNTS
+  },
+  {
+    name: "budget",
+    type: "select",
+    label: "Budget Per Person",
+    placeholder: "Select budget range",
+    required: false,
+    columnSpan: 6,
+    options: BUDGET_RANGES
+  },
+  {
+    name: "serviceStyle",
+    type: "radio",
+    label: "Service Style",
+    required: true,
+    columnSpan: 12,
+    options: SERVICE_STYLES
+  },
+  {
+    name: "cuisinePreferences",
+    type: "checkbox-group",
+    label: "Cuisine Preferences",
+    required: false,
+    columnSpan: 12,
+    options: CUISINES
+  },
+  {
+    name: "dietaryAccommodations",
+    type: "checkbox-group",
+    label: "Dietary Accommodations",
+    required: false,
+    columnSpan: 12,
+    options: DIETARY_OPTIONS
+  },
+  {
+    name: "name",
+    type: "text",
+    label: "Full Name",
+    placeholder: "John Doe",
+    required: true,
+    columnSpan: 12
+  },
+  {
+    name: "email",
+    type: "email",
+    label: "Email Address",
+    placeholder: "john@example.com",
+    required: true,
+    columnSpan: 6
+  },
+  {
+    name: "phone",
+    type: "tel",
+    label: "Phone Number",
+    placeholder: "+1 (555) 000-0000",
+    required: true,
+    columnSpan: 6
+  },
+  {
+    name: "venue",
+    type: "text",
+    label: "Venue / Location",
+    placeholder: "Event venue or address",
+    required: false,
+    columnSpan: 12
+  },
+  {
+    name: "details",
+    type: "textarea",
+    label: "Additional Details",
+    placeholder: "Tell us more about your event...",
+    required: false,
+    rows: 4,
+    columnSpan: 12
+  },
+  {
+    name: "tasting",
+    type: "checkbox",
+    label: "I'm interested in scheduling a tasting",
+    required: false,
+    columnSpan: 12
+  }
+];
 function ContactCatering({
   heading,
   description,
-  buttonText,
+  buttonText = "Request Quote",
   buttonIcon,
   actions,
   actionsSlot,
+  formFields,
+  successMessage = "Thank you for your inquiry! We'll get back to you within 24 hours with a custom proposal.",
   className,
   spacing = "py-8 md:py-32",
   containerClassName = "px-6 sm:px-6 md:px-8 lg:px-8",
@@ -1183,6 +1505,8 @@ function ContactCatering({
   cardClassName,
   cardContentClassName,
   formClassName,
+  successMessageClassName,
+  errorMessageClassName,
   submitClassName,
   background,
   pattern,
@@ -1192,76 +1516,17 @@ function ContactCatering({
   onSuccess,
   onError
 }) {
-  const form = useForm({
-    initialValues: {
-      eventType: "",
-      eventDate: "",
-      guestCount: "",
-      startTime: "",
-      endTime: "",
-      venue: "",
-      serviceStyle: "buffet",
-      cuisinePreferences: [],
-      dietaryAccommodations: [],
-      budget: "",
-      name: "",
-      phone: "",
-      email: "",
-      details: "",
-      tasting: false
-    },
-    validationSchema: {
-      eventType: (value) => !value ? "Please select an event type" : void 0,
-      eventDate: (value) => !value ? "Event date is required" : void 0,
-      guestCount: (value) => !value ? "Please select guest count" : void 0,
-      name: (value) => !value ? "Name is required" : void 0,
-      email: (value) => {
-        if (!value) return "Email is required";
-        if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value))
-          return "Please enter a valid email address";
-        return void 0;
-      },
-      phone: (value) => !value ? "Phone number is required" : void 0
-    },
-    onSubmit: async (values, helpers) => {
-      const shouldAutoSubmit = Boolean(formConfig?.endpoint);
-      if (!shouldAutoSubmit && !onSubmit) {
-        return;
-      }
-      try {
-        let result;
-        if (shouldAutoSubmit) {
-          result = await submitPageSpeedForm(values, formConfig);
-        }
-        if (onSubmit) {
-          await onSubmit(values);
-        }
-        if (shouldAutoSubmit || onSubmit) {
-          if (formConfig?.resetOnSuccess !== false) {
-            helpers.resetForm();
-          }
-          onSuccess?.(result);
-        }
-      } catch (error) {
-        if (error instanceof PageSpeedFormSubmissionError && error.formErrors) {
-          helpers.setErrors(error.formErrors);
-        }
-        onError?.(error);
-        throw error;
-      }
-    }
+  const fields = useMemo(
+    () => formFields || DEFAULT_FORM_FIELDS,
+    [formFields]
+  );
+  const { form, submissionError, formMethod, resetSubmissionState } = useContactForm({
+    formFields: fields,
+    formConfig,
+    onSubmit,
+    onSuccess,
+    onError
   });
-  const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
-  const toggleCuisinePreference = (value) => {
-    const current = form.values.cuisinePreferences;
-    const updated = current.includes(value) ? current.filter((v) => v !== value) : [...current, value];
-    form.setFieldValue("cuisinePreferences", updated);
-  };
-  const toggleDietaryAccommodation = (value) => {
-    const current = form.values.dietaryAccommodations;
-    const updated = current.includes(value) ? current.filter((v) => v !== value) : [...current, value];
-    form.setFieldValue("dietaryAccommodations", updated);
-  };
   const actionsContent = React.useMemo(() => {
     if (actionsSlot) return actionsSlot;
     if (actions && actions.length > 0) {
@@ -1330,256 +1595,22 @@ function ContactCatering({
             form,
             action: formConfig?.endpoint,
             method: formMethod,
-            className: cn("space-y-8", formClassName),
+            submissionError,
+            successMessage,
+            successMessageClassName,
+            errorMessageClassName,
+            submissionConfig: formConfig?.submissionConfig,
+            onNewSubmission: resetSubmissionState,
+            className: cn("space-y-6", formClassName),
             children: [
-              /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
-                /* @__PURE__ */ jsx("h3", { className: "text-lg font-semibold", children: "Event Details" }),
-                /* @__PURE__ */ jsx(Field, { name: "eventType", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsx(Label, { htmlFor: "event-type", children: "Event Type" }),
-                  /* @__PURE__ */ jsxs(
-                    Select,
-                    {
-                      ...field,
-                      id: "event-type",
-                      error: meta.touched && !!meta.error,
-                      "aria-label": "Event Type",
-                      children: [
-                        /* @__PURE__ */ jsx("option", { value: "", children: "Select event type" }),
-                        EVENT_TYPES.map((type) => /* @__PURE__ */ jsx("option", { value: type.value, children: type.label }, type.value))
-                      ]
-                    }
-                  )
-                ] }) }),
-                /* @__PURE__ */ jsxs("div", { className: "grid gap-4 sm:grid-cols-2", children: [
-                  /* @__PURE__ */ jsx(Field, { name: "guestCount", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                    /* @__PURE__ */ jsx(Label, { htmlFor: "guest-count", children: "Number of Guests" }),
-                    /* @__PURE__ */ jsxs(
-                      Select,
-                      {
-                        ...field,
-                        id: "guest-count",
-                        error: meta.touched && !!meta.error,
-                        "aria-label": "Number of Guests",
-                        children: [
-                          /* @__PURE__ */ jsx("option", { value: "", children: "Select guest count" }),
-                          GUEST_COUNTS.map((count) => /* @__PURE__ */ jsx("option", { value: count.value, children: count.label }, count.value))
-                        ]
-                      }
-                    )
-                  ] }) }),
-                  /* @__PURE__ */ jsx(Field, { name: "eventDate", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                    /* @__PURE__ */ jsx(Label, { htmlFor: "event-date", children: "Event Date" }),
-                    /* @__PURE__ */ jsx(
-                      TextInput,
-                      {
-                        ...field,
-                        id: "event-date",
-                        type: "date",
-                        error: meta.touched && !!meta.error,
-                        "aria-label": "Event Date"
-                      }
-                    )
-                  ] }) })
-                ] }),
-                /* @__PURE__ */ jsxs("div", { className: "grid gap-4 sm:grid-cols-2", children: [
-                  /* @__PURE__ */ jsx(Field, { name: "startTime", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                    /* @__PURE__ */ jsx(Label, { htmlFor: "start-time", children: "Start Time" }),
-                    /* @__PURE__ */ jsx(
-                      TextInput,
-                      {
-                        ...field,
-                        id: "start-time",
-                        type: "time",
-                        error: meta.touched && !!meta.error,
-                        "aria-label": "Start Time"
-                      }
-                    )
-                  ] }) }),
-                  /* @__PURE__ */ jsx(Field, { name: "endTime", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                    /* @__PURE__ */ jsx(Label, { htmlFor: "end-time", children: "End Time (Optional)" }),
-                    /* @__PURE__ */ jsx(
-                      TextInput,
-                      {
-                        ...field,
-                        id: "end-time",
-                        type: "time",
-                        error: meta.touched && !!meta.error,
-                        "aria-label": "End Time"
-                      }
-                    )
-                  ] }) })
-                ] }),
-                /* @__PURE__ */ jsx(Field, { name: "venue", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsx(Label, { htmlFor: "venue", children: "Venue / Location" }),
-                  /* @__PURE__ */ jsx(
-                    TextInput,
-                    {
-                      ...field,
-                      id: "venue",
-                      placeholder: "Event venue or location",
-                      error: meta.touched && !!meta.error,
-                      "aria-label": "Venue"
-                    }
-                  )
-                ] }) })
-              ] }),
-              /* @__PURE__ */ jsx(Separator, {}),
-              /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
-                /* @__PURE__ */ jsx("h3", { className: "text-lg font-semibold", children: "Service Preferences" }),
-                /* @__PURE__ */ jsx(Field, { name: "serviceStyle", children: ({ field }) => /* @__PURE__ */ jsx(
-                  Radio,
-                  {
-                    name: "serviceStyle",
-                    label: "Service Style",
-                    value: field.value,
-                    onChange: field.onChange,
-                    options: SERVICE_STYLES,
-                    layout: "stacked",
-                    className: "space-y-2"
-                  }
-                ) }),
-                /* @__PURE__ */ jsxs("div", { className: "space-y-3", children: [
-                  /* @__PURE__ */ jsx(Label, { children: "Cuisine Preferences (Optional)" }),
-                  /* @__PURE__ */ jsx("div", { className: "grid gap-3 sm:grid-cols-2 md:grid-cols-3", children: CUISINES.map((cuisine) => /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-                    /* @__PURE__ */ jsx(
-                      Checkbox,
-                      {
-                        id: cuisine.id,
-                        checked: form.values.cuisinePreferences.includes(
-                          cuisine.id
-                        ),
-                        onCheckedChange: () => toggleCuisinePreference(cuisine.id)
-                      }
-                    ),
-                    /* @__PURE__ */ jsx(
-                      Label,
-                      {
-                        htmlFor: cuisine.id,
-                        className: "cursor-pointer font-normal",
-                        children: cuisine.label
-                      }
-                    )
-                  ] }, cuisine.id)) })
-                ] }),
-                /* @__PURE__ */ jsxs("div", { className: "space-y-3", children: [
-                  /* @__PURE__ */ jsx(Label, { children: "Dietary Accommodations (Optional)" }),
-                  /* @__PURE__ */ jsx("div", { className: "grid gap-3 sm:grid-cols-2", children: DIETARY_OPTIONS.map((option) => /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-                    /* @__PURE__ */ jsx(
-                      Checkbox,
-                      {
-                        id: option.id,
-                        checked: form.values.dietaryAccommodations.includes(
-                          option.id
-                        ),
-                        onCheckedChange: () => toggleDietaryAccommodation(option.id)
-                      }
-                    ),
-                    /* @__PURE__ */ jsx(
-                      Label,
-                      {
-                        htmlFor: option.id,
-                        className: "cursor-pointer font-normal",
-                        children: option.label
-                      }
-                    )
-                  ] }, option.id)) })
-                ] }),
-                /* @__PURE__ */ jsx(Field, { name: "budget", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsx(Label, { htmlFor: "budget", children: "Budget Per Person (Optional)" }),
-                  /* @__PURE__ */ jsxs(
-                    Select,
-                    {
-                      ...field,
-                      id: "budget",
-                      error: meta.touched && !!meta.error,
-                      "aria-label": "Budget Per Person",
-                      children: [
-                        /* @__PURE__ */ jsx("option", { value: "", children: "Select budget range" }),
-                        BUDGET_RANGES.map((range) => /* @__PURE__ */ jsx("option", { value: range.value, children: range.label }, range.value))
-                      ]
-                    }
-                  )
-                ] }) })
-              ] }),
-              /* @__PURE__ */ jsx(Separator, {}),
-              /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
-                /* @__PURE__ */ jsx("h3", { className: "text-lg font-semibold", children: "Your Information" }),
-                /* @__PURE__ */ jsx(Field, { name: "name", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsx(Label, { htmlFor: "name", children: "Full Name" }),
-                  /* @__PURE__ */ jsx(
-                    TextInput,
-                    {
-                      ...field,
-                      id: "name",
-                      placeholder: "John Doe",
-                      error: meta.touched && !!meta.error,
-                      "aria-label": "Full Name"
-                    }
-                  )
-                ] }) }),
-                /* @__PURE__ */ jsxs("div", { className: "grid gap-4 sm:grid-cols-2", children: [
-                  /* @__PURE__ */ jsx(Field, { name: "email", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                    /* @__PURE__ */ jsx(Label, { htmlFor: "email", children: "Email" }),
-                    /* @__PURE__ */ jsx(
-                      TextInput,
-                      {
-                        ...field,
-                        id: "email",
-                        type: "email",
-                        placeholder: "john@example.com",
-                        error: meta.touched && !!meta.error,
-                        "aria-label": "Email"
-                      }
-                    )
-                  ] }) }),
-                  /* @__PURE__ */ jsx(Field, { name: "phone", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                    /* @__PURE__ */ jsx(Label, { htmlFor: "phone", children: "Phone" }),
-                    /* @__PURE__ */ jsx(
-                      TextInput,
-                      {
-                        ...field,
-                        id: "phone",
-                        type: "tel",
-                        placeholder: "+1 (555) 000-0000",
-                        error: meta.touched && !!meta.error,
-                        "aria-label": "Phone"
-                      }
-                    )
-                  ] }) })
-                ] }),
-                /* @__PURE__ */ jsx(Field, { name: "details", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsx(Label, { htmlFor: "details", children: "Additional Details (Optional)" }),
-                  /* @__PURE__ */ jsx(
-                    TextArea,
-                    {
-                      ...field,
-                      id: "details",
-                      placeholder: "Tell us about your menu preferences, budget, or any special requirements...",
-                      rows: 4,
-                      error: meta.touched && !!meta.error,
-                      "aria-label": "Additional Details"
-                    }
-                  )
-                ] }) }),
-                /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-                  /* @__PURE__ */ jsx(
-                    Checkbox,
-                    {
-                      id: "tasting",
-                      checked: form.values.tasting,
-                      onCheckedChange: (checked) => form.setFieldValue("tasting", checked === true)
-                    }
-                  ),
-                  /* @__PURE__ */ jsx(
-                    Label,
-                    {
-                      htmlFor: "tasting",
-                      className: "cursor-pointer font-normal",
-                      children: "I'm interested in scheduling a tasting"
-                    }
-                  )
-                ] })
-              ] }),
+              /* @__PURE__ */ jsx("div", { className: "grid grid-cols-12 gap-6", children: fields.map((field) => /* @__PURE__ */ jsx(
+                "div",
+                {
+                  className: getColumnSpanClass(field.columnSpan),
+                  children: /* @__PURE__ */ jsx(DynamicFormField, { field })
+                },
+                field.name
+              )) }),
               actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxs(
                 Pressable,
                 {
@@ -1589,14 +1620,7 @@ function ContactCatering({
                   asButton: true,
                   disabled: form.isSubmitting,
                   children: [
-                    buttonIcon ?? /* @__PURE__ */ jsx(
-                      DynamicIcon,
-                      {
-                        name: "lucide/utensils",
-                        size: 16,
-                        className: "mr-2"
-                      }
-                    ),
+                    buttonIcon,
                     buttonText
                   ]
                 }