@opensite/ui 1.9.4 → 1.9.6

package/dist/registry.js

@@ -12,8 +12,8 @@ import { usePlatformFromUrl } from '@opensite/hooks/usePlatformFromUrl';
 import * as TabsPrimitive from '@radix-ui/react-tabs';
 import { AnimatePresence, motion, useMotionValue, useMotionTemplate, useSpring, useTransform, useInView, useScroll, useMotionValueEvent } from 'framer-motion';
 import { useForm, Form, Field } from '@page-speed/forms';
-import { TextInput as TextInput$1, Select, TextArea as TextArea$1, MultiSelect, Radio, Checkbox, CheckboxGroup, DatePicker, DateRangePicker, TimePicker, FileInput, RichTextEditor } from '@page-speed/forms/inputs';
-import { serializeForRails, deserializeErrors } from '@page-speed/forms/integration';
+import { TextInput as TextInput$1, Select, TextArea as TextArea$1 } from '@page-speed/forms/inputs';
+import { submitPageSpeedForm, PageSpeedFormSubmissionError, isValidEmail, useContactForm, getColumnSpanClass, DynamicFormField, useFileUpload } from '@page-speed/forms/integration';
 import * as SeparatorPrimitive from '@radix-ui/react-separator';
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
 import * as LabelPrimitive from '@radix-ui/react-label';
@@ -1302,7 +1302,6 @@ var Pressable = React56.forwardRef(
       rel,
       linkType,
       isInternal,
-      isExternal,
       handleClick
     } = navigation;
     const shouldRenderLink = normalizedHref && linkType !== "none";
@@ -6229,369 +6228,6 @@ function FooterAnimatedSocial({
 }
 var TextInput = TextInput$1;
 var TextArea = TextArea$1;
-function useFileUpload(options) {
-  const [uploadTokens, setUploadTokens] = useState([]);
-  const [uploadProgress, setUploadProgress] = useState({});
-  const [isUploading, setIsUploading] = useState(false);
-  const endpoint = options?.endpoint || "https://api.dashtrack.com/contacts/_/contact_form_uploads";
-  const uploadFiles = useCallback(
-    async (files) => {
-      if (files.length === 0) return;
-      setIsUploading(true);
-      try {
-        const tokens = [];
-        for (const file of files) {
-          const formData = new FormData();
-          formData.append("contact_form_upload[file_upload]", file);
-          formData.append("contact_form_upload[title]", file.name);
-          formData.append("contact_form_upload[file_name]", file.name);
-          formData.append("contact_form_upload[file_size]", String(file.size));
-          const response = await fetch(endpoint, {
-            method: "POST",
-            body: formData
-          });
-          if (!response.ok) {
-            throw new Error(`Upload failed: ${response.statusText}`);
-          }
-          const data = await response.json();
-          if (data.contact_form_upload?.token) {
-            tokens.push(`upload_${data.contact_form_upload.token}`);
-          }
-          setUploadProgress((prev) => ({
-            ...prev,
-            [file.name]: 100
-          }));
-        }
-        setUploadTokens(tokens);
-      } catch (error) {
-        console.error("File upload error:", error);
-        options?.onError?.(error);
-      } finally {
-        setIsUploading(false);
-      }
-    },
-    [endpoint, options]
-  );
-  const removeFile = useCallback((file, index) => {
-    setUploadTokens((prev) => prev.filter((_, i) => i !== index));
-    setUploadProgress((prev) => {
-      const newProgress = { ...prev };
-      delete newProgress[file.name];
-      return newProgress;
-    });
-  }, []);
-  const resetUpload = useCallback(() => {
-    setUploadTokens([]);
-    setUploadProgress({});
-  }, []);
-  return {
-    uploadTokens,
-    uploadProgress,
-    isUploading,
-    uploadFiles,
-    removeFile,
-    resetUpload
-  };
-}
-
-// 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 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";
-}
-
-// lib/forms/use-contact-form.ts
-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);
-    this.name = "PageSpeedFormSubmissionError";
-    this.formErrors = options.formErrors;
-    this.status = options.status;
-  }
-};
-var EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-function isValidEmail(value) {
-  return EMAIL_REGEX.test(value);
-}
-function buildUrlWithParams(endpoint, values) {
-  const base = typeof window === "undefined" ? "http://localhost" : window.location.origin;
-  const url = new URL(endpoint, base);
-  Object.entries(values).forEach(([key, value]) => {
-    if (value === void 0 || value === null) {
-      return;
-    }
-    if (Array.isArray(value)) {
-      value.forEach((item) => {
-        if (item !== void 0 && item !== null) {
-          url.searchParams.append(key, String(item));
-        }
-      });
-      return;
-    }
-    url.searchParams.set(key, String(value));
-  });
-  return url.toString();
-}
-function normalizeMethod(method) {
-  return (method || "post").toUpperCase();
-}
-function resolveFormat(config) {
-  if (config?.format) {
-    return config.format;
-  }
-  return config?.apiKey ? "rails" : "json";
-}
-function mergeValues(values, config) {
-  return {
-    ...config?.values ?? {},
-    ...values
-  };
-}
-async function submitPageSpeedForm(values, config) {
-  if (!config?.endpoint) {
-    return null;
-  }
-  const payload = mergeValues(values, config);
-  const method = normalizeMethod(config.method);
-  const format2 = resolveFormat(config);
-  const headers = { ...config.headers ?? {} };
-  if (format2 === "rails") {
-    if (!config.apiKey) {
-      throw new PageSpeedFormSubmissionError(
-        "Missing apiKey for Rails form submission."
-      );
-    }
-    const railsConfig = {
-      apiKey: config.apiKey,
-      contactCategoryToken: config.contactCategoryToken,
-      locationId: config.locationId,
-      websiteId: config.websiteId,
-      websiteFormAssignmentId: config.websiteFormAssignmentId,
-      visitorIpAddress: config.visitorIpAddress
-    };
-    const serialized = serializeForRails(payload, railsConfig);
-    if (serialized.contact.contact_form_upload_tokens) {
-      serialized.contact.contact_form_upload_tokens = serialized.contact.contact_form_upload_tokens.map((token) => token.replace(/^upload_/, ""));
-    }
-    headers["Content-Type"] ?? (headers["Content-Type"] = "application/json");
-    const response2 = await fetch(config.endpoint, {
-      method,
-      headers,
-      body: JSON.stringify(serialized)
-    });
-    const data2 = await response2.json().catch(() => null);
-    if (!response2.ok || data2 && data2.errors) {
-      const errorResponse = {
-        errors: data2?.errors ?? { base: ["Form submission failed"] },
-        status: data2?.status ?? response2.status
-      };
-      const formErrors = deserializeErrors(errorResponse);
-      throw new PageSpeedFormSubmissionError("Form submission failed.", {
-        formErrors,
-        status: errorResponse.status
-      });
-    }
-    return data2;
-  }
-  if (method === "GET") {
-    const url = buildUrlWithParams(config.endpoint, payload);
-    const response2 = await fetch(url, { method, headers });
-    const data2 = await response2.json().catch(() => null);
-    if (!response2.ok) {
-      throw new PageSpeedFormSubmissionError(
-        data2?.message || "Form submission failed.",
-        { status: response2.status }
-      );
-    }
-    return data2;
-  }
-  headers["Content-Type"] ?? (headers["Content-Type"] = "application/json");
-  const response = await fetch(config.endpoint, {
-    method,
-    headers,
-    body: JSON.stringify(payload)
-  });
-  const data = await response.json().catch(() => null);
-  if (!response.ok) {
-    throw new PageSpeedFormSubmissionError(
-      data?.message || "Form submission failed.",
-      { status: response.status }
-    );
-  }
-  return data;
-}
 function FooterNewsletterMinimal({
   heading,
   supportLabel,
@@ -12853,208 +12489,6 @@ function ContactFloatingBanner({
     }
   );
 }
-function DynamicFormField({
-  field,
-  className,
-  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$1, { children: [
-    field.label,
-    field.required ? /* @__PURE__ */ jsx("span", { className: "text-destructive ml-1", children: "*" }) : null
-  ] });
-  return /* @__PURE__ */ jsx(
-    Field,
-    {
-      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$1,
-          {
-            ...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$1,
-          {
-            ...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$1,
-          {
-            ...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
-          }
-        )
-      ] })
-    }
-  );
-}
 var DEFAULT_FORM_FIELDS = [
   {
     name: "name",
@@ -14530,80 +13964,42 @@ function ContactDark({
                 Form,
                 {
                   form,
-                  action: formConfig?.endpoint,
-                  method: formMethod,
-                  submissionError,
-                  successMessage,
-                  successMessageClassName,
-                  errorMessageClassName,
-                  submissionConfig: formConfig?.submissionConfig,
+                  notificationConfig: {
+                    submissionError,
+                    successMessage
+                  },
+                  styleConfig: {
+                    formClassName: cn("space-y-6", formClassName),
+                    successMessageClassName,
+                    errorMessageClassName
+                  },
+                  formConfig: {
+                    endpoint: formConfig?.endpoint,
+                    method: formMethod,
+                    submissionConfig: formConfig?.submissionConfig
+                  },
                   onNewSubmission: () => {
                     resetUpload();
                     resetSubmissionState();
                   },
-                  className: formClassName,
                   children: [
-                    (() => {
-                      const fieldElements = [];
-                      let skip = false;
-                      formFields.forEach((field, index) => {
-                        if (skip) {
-                          skip = false;
-                          return;
-                        }
-                        const nextField = index < formFields.length - 1 ? formFields[index + 1] : null;
-                        const shouldGroupWithNext = field.columnSpan && field.columnSpan <= 6 && nextField?.columnSpan && nextField.columnSpan <= 6 && field.columnSpan + nextField.columnSpan <= 12;
-                        if (shouldGroupWithNext && nextField) {
-                          fieldElements.push(
-                            /* @__PURE__ */ jsxs(
-                              "div",
-                              {
-                                className: "grid grid-cols-1 sm:grid-cols-2 gap-4",
-                                children: [
-                                  /* @__PURE__ */ jsx(
-                                    DynamicFormField,
-                                    {
-                                      field,
-                                      uploadProgress,
-                                      onFileUpload: uploadFiles,
-                                      onFileRemove: removeFile,
-                                      isUploading
-                                    }
-                                  ),
-                                  /* @__PURE__ */ jsx(
-                                    DynamicFormField,
-                                    {
-                                      field: nextField,
-                                      uploadProgress,
-                                      onFileUpload: uploadFiles,
-                                      onFileRemove: removeFile,
-                                      isUploading
-                                    }
-                                  )
-                                ]
-                              },
-                              field.name
-                            )
-                          );
-                          skip = true;
-                        } else {
-                          fieldElements.push(
-                            /* @__PURE__ */ jsx(
-                              DynamicFormField,
-                              {
-                                field,
-                                uploadProgress,
-                                onFileUpload: uploadFiles,
-                                onFileRemove: removeFile,
-                                isUploading
-                              },
-                              field.name
-                            )
-                          );
-                        }
-                      });
-                      return fieldElements;
-                    })(),
+                    /* @__PURE__ */ jsx("div", { className: "grid grid-cols-12 gap-6", children: formFields.map((field) => /* @__PURE__ */ jsx(
+                      "div",
+                      {
+                        className: getColumnSpanClass(field.columnSpan),
+                        children: /* @__PURE__ */ jsx(
+                          DynamicFormField,
+                          {
+                            field,
+                            uploadProgress,
+                            onFileUpload: uploadFiles,
+                            onFileRemove: removeFile,
+                            isUploading
+                          }
+                        )
+                      },
+                      field.name
+                    )) }),
                     actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxs(
                       Pressable,
                       {
@@ -14654,7 +14050,7 @@ function ContactDark({
     }
   );
 }
-function Checkbox2({
+function Checkbox({
   className,
   ...props
 }) {
@@ -14983,7 +14379,7 @@ function ContactDemo({
                 ] }),
                 /* @__PURE__ */ jsx(Field, { name: "updates", children: ({ field }) => /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
                   /* @__PURE__ */ jsx(
-                    Checkbox2,
+                    Checkbox,
                     {
                       id: "updates",
                       checked: field.value,
@@ -15867,80 +15263,42 @@ function ContactFaq({
                   Form,
                   {
                     form,
-                    action: formConfig?.endpoint,
-                    method: formMethod,
-                    submissionError,
-                    successMessage,
-                    successMessageClassName,
-                    errorMessageClassName,
-                    submissionConfig: formConfig?.submissionConfig,
+                    notificationConfig: {
+                      submissionError,
+                      successMessage
+                    },
+                    styleConfig: {
+                      formClassName: cn("space-y-6", formClassName),
+                      successMessageClassName,
+                      errorMessageClassName
+                    },
+                    formConfig: {
+                      endpoint: formConfig?.endpoint,
+                      method: formMethod,
+                      submissionConfig: formConfig?.submissionConfig
+                    },
                     onNewSubmission: () => {
                       resetUpload();
                       resetSubmissionState();
                     },
-                    className: formClassName,
                     children: [
-                      (() => {
-                        const fieldElements = [];
-                        let skip = false;
-                        formFields.forEach((field, index) => {
-                          if (skip) {
-                            skip = false;
-                            return;
-                          }
-                          const nextField = index < formFields.length - 1 ? formFields[index + 1] : null;
-                          const shouldGroupWithNext = field.columnSpan && field.columnSpan <= 6 && nextField?.columnSpan && nextField.columnSpan <= 6 && field.columnSpan + nextField.columnSpan <= 12;
-                          if (shouldGroupWithNext && nextField) {
-                            fieldElements.push(
-                              /* @__PURE__ */ jsxs(
-                                "div",
-                                {
-                                  className: "grid grid-cols-1 sm:grid-cols-2 gap-4",
-                                  children: [
-                                    /* @__PURE__ */ jsx(
-                                      DynamicFormField,
-                                      {
-                                        field,
-                                        uploadProgress,
-                                        onFileUpload: uploadFiles,
-                                        onFileRemove: removeFile,
-                                        isUploading
-                                      }
-                                    ),
-                                    /* @__PURE__ */ jsx(
-                                      DynamicFormField,
-                                      {
-                                        field: nextField,
-                                        uploadProgress,
-                                        onFileUpload: uploadFiles,
-                                        onFileRemove: removeFile,
-                                        isUploading
-                                      }
-                                    )
-                                  ]
-                                },
-                                field.name
-                              )
-                            );
-                            skip = true;
-                          } else {
-                            fieldElements.push(
-                              /* @__PURE__ */ jsx(
-                                DynamicFormField,
-                                {
-                                  field,
-                                  uploadProgress,
-                                  onFileUpload: uploadFiles,
-                                  onFileRemove: removeFile,
-                                  isUploading
-                                },
-                                field.name
-                              )
-                            );
-                          }
-                        });
-                        return fieldElements;
-                      })(),
+                      /* @__PURE__ */ jsx("div", { className: "grid grid-cols-12 gap-6", children: formFields.map((field) => /* @__PURE__ */ jsx(
+                        "div",
+                        {
+                          className: getColumnSpanClass(field.columnSpan),
+                          children: /* @__PURE__ */ jsx(
+                            DynamicFormField,
+                            {
+                              field,
+                              uploadProgress,
+                              onFileUpload: uploadFiles,
+                              onFileRemove: removeFile,
+                              isUploading
+                            }
+                          )
+                        },
+                        field.name
+                      )) }),
                       actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxs(
                         Pressable,
                         {
@@ -18809,6 +18167,7 @@ function ContactPhotography({
   actionsSlot,
   formFields = DEFAULT_FORM_FIELDS8,
   successMessage = "Thank you! Your message has been sent successfully.",
+  containerClassName = "px-6 sm:px-6 md:px-8 lg:px-8",
   className,
   headingClassName,
   descriptionClassName,
@@ -18817,6 +18176,7 @@ function ContactPhotography({
   submitClassName,
   successMessageClassName,
   errorMessageClassName,
+  spacing = "none",
   background,
   pattern,
   patternOpacity,
@@ -18880,152 +18240,95 @@ function ContactPhotography({
     }
     return null;
   }, [actionsSlot, actions]);
-  const bgColorClass = useMemo(() => {
-    switch (background) {
-      case "dark":
-        return "bg-foreground text-background";
-      case "gray":
-        return cn(
-          getNestedCardBg(background),
-          getNestedCardTextColor(background)
-        );
-      case "white":
-        return "bg-background";
-      default:
-        return "bg-background";
-    }
-  }, [background]);
   const desktopOrder = directionConfig.desktop === "mediaRight" ? "lg:flex-row" : "lg:flex-row-reverse";
   const mobileOrder = directionConfig.mobile === "mediaTop" ? "flex-col" : "flex-col-reverse";
-  const contentArea = /* @__PURE__ */ jsxs(
+  const contentArea = /* @__PURE__ */ jsx(
     "div",
     {
       className: cn(
         "relative flex w-full items-center lg:w-1/2",
-        bgColorClass,
         contentClassName
       ),
-      children: [
-        pattern && /* @__PURE__ */ jsx("div", { className: "absolute inset-0 overflow-hidden", children: /* @__PURE__ */ jsx(PatternBackground, { pattern, opacity: patternOpacity }) }),
-        /* @__PURE__ */ jsx("div", { className: "relative z-10 w-full px-8 py-16 sm:px-12 sm:py-20 lg:px-16 lg:py-24 xl:px-24", children: /* @__PURE__ */ jsxs("div", { className: "mx-auto max-w-xl space-y-8", children: [
-          heading && (typeof heading === "string" ? /* @__PURE__ */ jsx(
-            "h2",
-            {
-              className: cn(
-                "text-3xl font-bold leading-tight tracking-tight sm:text-4xl lg:text-5xl",
-                headingClassName
-              ),
-              children: heading
-            }
-          ) : /* @__PURE__ */ jsx("div", { className: headingClassName, children: heading })),
-          description && (typeof description === "string" ? /* @__PURE__ */ jsx(
-            "p",
-            {
-              className: cn(
-                "text-base leading-relaxed opacity-90 sm:text-lg",
-                descriptionClassName
-              ),
-              children: description
-            }
-          ) : /* @__PURE__ */ jsx("div", { className: descriptionClassName, children: description })),
-          /* @__PURE__ */ jsxs(
-            Form,
-            {
-              form,
-              action: formConfig?.endpoint,
-              method: formMethod,
+      children: /* @__PURE__ */ jsx("div", { className: "relative z-10 w-full px-8 py-16 sm:px-12 sm:py-20 lg:px-16 lg:py-24 xl:px-24", children: /* @__PURE__ */ jsxs("div", { className: "mx-auto max-w-xl space-y-8", children: [
+        heading && (typeof heading === "string" ? /* @__PURE__ */ jsx(
+          "h2",
+          {
+            className: cn(
+              "text-3xl font-bold leading-tight tracking-tight sm:text-4xl lg:text-5xl",
+              headingClassName
+            ),
+            children: heading
+          }
+        ) : /* @__PURE__ */ jsx("div", { className: headingClassName, children: heading })),
+        description && (typeof description === "string" ? /* @__PURE__ */ jsx(
+          "p",
+          {
+            className: cn(
+              "text-base leading-relaxed opacity-90 sm:text-lg",
+              descriptionClassName
+            ),
+            children: description
+          }
+        ) : /* @__PURE__ */ jsx("div", { className: descriptionClassName, children: description })),
+        /* @__PURE__ */ jsxs(
+          Form,
+          {
+            form,
+            notificationConfig: {
               submissionError,
-              successMessage,
+              successMessage
+            },
+            styleConfig: {
+              formClassName: cn("space-y-6", formClassName),
               successMessageClassName,
-              errorMessageClassName,
-              submissionConfig: formConfig?.submissionConfig,
-              onNewSubmission: () => {
-                resetUpload();
-                resetSubmissionState();
-              },
-              className: formClassName,
-              children: [
-                (() => {
-                  const fieldElements = [];
-                  let skip = false;
-                  formFields.forEach((field, index) => {
-                    if (skip) {
-                      skip = false;
-                      return;
-                    }
-                    const nextField = index < formFields.length - 1 ? formFields[index + 1] : null;
-                    const shouldGroupWithNext = field.columnSpan && field.columnSpan <= 6 && nextField?.columnSpan && nextField.columnSpan <= 6 && field.columnSpan + nextField.columnSpan <= 12;
-                    if (shouldGroupWithNext && nextField) {
-                      fieldElements.push(
-                        /* @__PURE__ */ jsxs(
-                          "div",
-                          {
-                            className: "grid grid-cols-1 sm:grid-cols-2 gap-4",
-                            children: [
-                              /* @__PURE__ */ jsx(
-                                DynamicFormField,
-                                {
-                                  field,
-                                  uploadProgress,
-                                  onFileUpload: uploadFiles,
-                                  onFileRemove: removeFile,
-                                  isUploading
-                                }
-                              ),
-                              /* @__PURE__ */ jsx(
-                                DynamicFormField,
-                                {
-                                  field: nextField,
-                                  uploadProgress,
-                                  onFileUpload: uploadFiles,
-                                  onFileRemove: removeFile,
-                                  isUploading
-                                }
-                              )
-                            ]
-                          },
-                          field.name
-                        )
-                      );
-                      skip = true;
-                    } else {
-                      fieldElements.push(
-                        /* @__PURE__ */ jsx(
-                          DynamicFormField,
-                          {
-                            field,
-                            uploadProgress,
-                            onFileUpload: uploadFiles,
-                            onFileRemove: removeFile,
-                            isUploading
-                          },
-                          field.name
-                        )
-                      );
+              errorMessageClassName
+            },
+            formConfig: {
+              endpoint: formConfig?.endpoint,
+              method: formMethod,
+              submissionConfig: formConfig?.submissionConfig
+            },
+            onNewSubmission: () => {
+              resetUpload();
+              resetSubmissionState();
+            },
+            children: [
+              /* @__PURE__ */ jsx("div", { className: "grid grid-cols-12 gap-6", children: formFields.map((field) => /* @__PURE__ */ jsx(
+                "div",
+                {
+                  className: getColumnSpanClass(field.columnSpan),
+                  children: /* @__PURE__ */ jsx(
+                    DynamicFormField,
+                    {
+                      field,
+                      uploadProgress,
+                      onFileUpload: uploadFiles,
+                      onFileRemove: removeFile,
+                      isUploading
                     }
-                  });
-                  return fieldElements;
-                })(),
-                actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxs(
-                  Pressable,
-                  {
-                    componentType: "button",
-                    type: "submit",
-                    className: cn("w-full", submitClassName),
-                    size: "lg",
-                    asButton: true,
-                    disabled: form.isSubmitting,
-                    children: [
-                      buttonIcon,
-                      buttonText
-                    ]
-                  }
-                )
-              ]
-            }
-          )
-        ] }) })
-      ]
+                  )
+                },
+                field.name
+              )) }),
+              actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxs(
+                Pressable,
+                {
+                  componentType: "button",
+                  type: "submit",
+                  className: cn("w-full", submitClassName),
+                  size: "lg",
+                  asButton: true,
+                  disabled: form.isSubmitting,
+                  children: [
+                    buttonIcon,
+                    buttonText
+                  ]
+                }
+              )
+            ]
+          }
+        )
+      ] }) })
     }
   );
   const imageArea = imageSrc ? /* @__PURE__ */ jsx("div", { className: "relative h-64 w-full sm:h-96 lg:h-auto lg:w-1/2", children: /* @__PURE__ */ jsx(
@@ -19037,10 +18340,21 @@ function ContactPhotography({
       optixFlowConfig
     }
   ) }) : null;
-  return /* @__PURE__ */ jsx("section", { className: cn("relative w-full overflow-hidden", className), children: /* @__PURE__ */ jsxs("div", { className: cn("flex min-h-screen", mobileOrder, desktopOrder), children: [
-    contentArea,
-    imageArea
-  ] }) });
+  return /* @__PURE__ */ jsx(
+    Section,
+    {
+      background,
+      spacing,
+      pattern,
+      patternOpacity,
+      className,
+      containerClassName,
+      children: /* @__PURE__ */ jsxs("div", { className: cn("flex min-h-screen", mobileOrder, desktopOrder), children: [
+        contentArea,
+        imageArea
+      ] })
+    }
+  );
 }
 function ContactPress({
   heading,
@@ -39768,7 +39082,7 @@ var FilterForm = React56.memo(function FilterForm2({
             children: [
               /* @__PURE__ */ jsx("div", { children: category.label }),
               /* @__PURE__ */ jsx(
-                Checkbox2,
+                Checkbox,
                 {
                   checked: isChecked,
                   onCheckedChange: (checked) => onCategoryChange(category.value, !!checked)
@@ -83742,7 +83056,7 @@ function ListSearchableGrid({
     }
   );
 }
-var { useMemo: useMemo442 } = React56;
+var { useMemo: useMemo441 } = React56;
 function OfferModalNewsletterDiscount({
   title,
   emailPlaceholder,
@@ -83810,7 +83124,7 @@ function OfferModalNewsletterDiscount({
   });
   const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
   const dialogProps = open !== void 0 ? { open, onOpenChange } : { defaultOpen };
-  const renderCloseButton = useMemo442(() => {
+  const renderCloseButton = useMemo441(() => {
     if (closeButtonSlot) return closeButtonSlot;
     if (!closeButtonText) return null;
     return /* @__PURE__ */ jsx("div", { className: "absolute end-1.5 top-1.5", children: /* @__PURE__ */ jsx(DialogClose, { asChild: true, children: /* @__PURE__ */ jsx(
@@ -83824,12 +83138,12 @@ function OfferModalNewsletterDiscount({
       }
     ) }) });
   }, [closeButtonSlot, closeButtonText, closeClassName]);
-  const renderHeader = useMemo442(() => {
+  const renderHeader = useMemo441(() => {
     if (headerSlot) return headerSlot;
     if (!title) return null;
     return /* @__PURE__ */ jsx(DialogHeader, { className: headerClassName, children: typeof title === "string" ? /* @__PURE__ */ jsx(DialogTitle, { className: cn("text-start font-serif text-2xl font-normal leading-snug", titleClassName), children: title }) : /* @__PURE__ */ jsx(DialogTitle, { className: cn("text-start font-serif text-2xl font-normal leading-snug", titleClassName), children: title }) });
   }, [headerSlot, title, headerClassName, titleClassName]);
-  const renderForm = useMemo442(() => {
+  const renderForm = useMemo441(() => {
     if (formSlot) return formSlot;
     return /* @__PURE__ */ jsxs(
       Form,
@@ -83891,7 +83205,7 @@ function OfferModalNewsletterDiscount({
     }
   ) });
 }
-var { useMemo: useMemo443 } = React56;
+var { useMemo: useMemo442 } = React56;
 function OfferModalMembershipImage({
   overline,
   title,
@@ -83968,7 +83282,7 @@ function OfferModalMembershipImage({
   });
   const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
   const dialogProps = open !== void 0 ? { open, onOpenChange } : { defaultOpen };
-  const renderImage = useMemo443(() => {
+  const renderImage = useMemo442(() => {
     if (imageSlot) return imageSlot;
     if (!image) return null;
     return /* @__PURE__ */ jsx("div", { className: cn("max-h-[290px] h-full overflow-hidden max-lg:hidden", imageWrapperClassName), children: /* @__PURE__ */ jsx(
@@ -83981,7 +83295,7 @@ function OfferModalMembershipImage({
       }
     ) });
   }, [imageSlot, image, imageWrapperClassName, imageClassName, optixFlowConfig]);
-  const renderCloseButton = useMemo443(() => {
+  const renderCloseButton = useMemo442(() => {
     if (closeButtonSlot) return closeButtonSlot;
     return /* @__PURE__ */ jsx("div", { className: "absolute -end-px -top-px z-10", children: /* @__PURE__ */ jsx(DialogClose, { asChild: true, children: /* @__PURE__ */ jsx(
       Pressable,
@@ -83997,7 +83311,7 @@ function OfferModalMembershipImage({
       }
     ) }) });
   }, [closeButtonSlot, closeClassName]);
-  const renderForm = useMemo443(() => {
+  const renderForm = useMemo442(() => {
     if (formSlot) return formSlot;
     return /* @__PURE__ */ jsxs(
       Form,
@@ -84060,7 +83374,7 @@ function OfferModalMembershipImage({
       }
     );
   }, [formSlot, form, formConfig, formMethod, emailPlaceholder, inputClassName, submitClassName, buttonText, formClassName]);
-  const renderFooter = useMemo443(() => {
+  const renderFooter = useMemo442(() => {
     if (footerSlot) return footerSlot;
     if (!description) return null;
     return /* @__PURE__ */ jsx(DialogFooter, { className: footerClassName, children: /* @__PURE__ */ jsx(DialogDescription, { className: cn("text-muted-foreground text-center text-xs leading-relaxed", descriptionClassName), children: description }) });
@@ -84180,7 +83494,7 @@ function SheetDescription({
     }
   );
 }
-var { useMemo: useMemo444 } = React56;
+var { useMemo: useMemo443 } = React56;
 function OfferModalSheetNewsletter({
   logo,
   logoSlot,
@@ -84263,7 +83577,7 @@ function OfferModalSheetNewsletter({
   });
   const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
   const sheetProps = open !== void 0 ? { open, onOpenChange } : { defaultOpen };
-  const renderLogo = useMemo444(() => {
+  const renderLogo = useMemo443(() => {
     if (logoSlot) return logoSlot;
     if (!logo) return null;
     const logoSrc = typeof logo.src === "string" ? logo.src : logo.src.light;
@@ -84277,7 +83591,7 @@ function OfferModalSheetNewsletter({
       }
     );
   }, [logoSlot, logo, logoClassName, optixFlowConfig]);
-  const renderHeader = useMemo444(() => {
+  const renderHeader = useMemo443(() => {
     if (headerSlot) return headerSlot;
     return /* @__PURE__ */ jsxs(SheetHeader, { className: cn("gap-8 p-0", headerClassName), children: [
       renderLogo,
@@ -84287,7 +83601,7 @@ function OfferModalSheetNewsletter({
       ] })
     ] });
   }, [headerSlot, renderLogo, headerClassName, title, titleClassName, description, descriptionClassName]);
-  const renderForm = useMemo444(() => {
+  const renderForm = useMemo443(() => {
     if (formSlot) return formSlot;
     return /* @__PURE__ */ jsx(
       Form,
@@ -84335,7 +83649,7 @@ function OfferModalSheetNewsletter({
       }
     );
   }, [formSlot, form, formConfig, formMethod, emailPlaceholder, inputClassName, submitClassName, buttonText, formClassName]);
-  const renderLegal = useMemo444(() => {
+  const renderLegal = useMemo443(() => {
     if (legalSlot) return legalSlot;
     if (!termsUrl || !termsText || !privacyUrl || !privacyText) return null;
     return /* @__PURE__ */ jsxs("p", { className: cn("text-muted-foreground text-xs", legalClassName), children: [
@@ -84349,7 +83663,7 @@ function OfferModalSheetNewsletter({
       "."
     ] });
   }, [legalSlot, termsUrl, termsText, privacyUrl, privacyText, legalClassName]);
-  const renderImage = useMemo444(() => {
+  const renderImage = useMemo443(() => {
     if (imageSlot) return imageSlot;
     if (!image) return null;
     return /* @__PURE__ */ jsx("div", { className: cn("h-1/2 basis-1/2", imageWrapperClassName), children: /* @__PURE__ */ jsx(AspectRatio, { ratio: 1, className: "overflow-hidden", children: /* @__PURE__ */ jsx(
@@ -95716,7 +95030,7 @@ var FilterForm3 = ({ categories, onCategoryChange }) => {
         children: [
           /* @__PURE__ */ jsx("span", { children: category.label }),
           /* @__PURE__ */ jsx(
-            Checkbox2,
+            Checkbox,
             {
               checked: isChecked,
               onCheckedChange: (checked) => handleCheckboxChange(!!checked, category.value)