@opensite/ui 1.8.2 → 1.8.4

package/dist/contact-photography.cjs

@@ -9,7 +9,6 @@ var classVarianceAuthority = require('class-variance-authority');
 var jsxRuntime = require('react/jsx-runtime');
 var img = require('@page-speed/img');
 var inputs = require('@page-speed/forms/inputs');
-var LabelPrimitive = require('@radix-ui/react-label');
 var integration = require('@page-speed/forms/integration');
 
 function _interopNamespace(e) {
@@ -31,7 +30,6 @@ function _interopNamespace(e) {
 }
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
-var LabelPrimitive__namespace = /*#__PURE__*/_interopNamespace(LabelPrimitive);
 
 // components/blocks/contact/contact-photography.tsx
 function cn(...inputs) {
@@ -410,6 +408,7 @@ var Pressable = React__namespace.forwardRef(
       rel,
       linkType,
       isInternal,
+      isExternal,
       handleClick
     } = navigation;
     const shouldRenderLink = normalizedHref && linkType !== "none";
@@ -485,22 +484,6 @@ var Pressable = React__namespace.forwardRef(
   }
 );
 Pressable.displayName = "Pressable";
-function Label({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    LabelPrimitive__namespace.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
-    }
-  );
-}
 function DynamicFormField({
   field,
   className,
@@ -509,190 +492,199 @@ function DynamicFormField({
   onFileRemove,
   isUploading = false
 }) {
-  const fieldId = `field-${field.name}`;
-  return /* @__PURE__ */ jsxRuntime.jsx(forms.Field, { name: field.name, children: ({ field: formField, meta }) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn("space-y-2", className), children: [
-    field.type !== "checkbox" && /* @__PURE__ */ jsxRuntime.jsxs(Label, { htmlFor: fieldId, children: [
-      field.label,
-      field.required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-destructive ml-1", children: "*" })
-    ] }),
-    (field.type === "text" || field.type === "email" || field.type === "tel" || field.type === "search" || field.type === "password" || field.type === "url") && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.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__ */ jsxRuntime.jsx(
-      inputs.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__ */ jsxRuntime.jsx(
-      inputs.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__ */ jsxRuntime.jsx(
-      inputs.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__ */ jsxRuntime.jsx(
-      inputs.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,
-        multiple: true
-      }
-    ),
-    field.type === "radio" && field.options && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.Radio,
-      {
-        ...formField,
-        id: fieldId,
-        options: field.options,
-        disabled: field.disabled,
-        layout: field.layout || "stacked",
-        error: meta.touched && !!meta.error,
-        "aria-label": field.label
-      }
-    ),
-    field.type === "checkbox" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-start space-x-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(
-        inputs.Checkbox,
-        {
-          ...formField,
-          id: fieldId,
-          value: formField.value === true || formField.value === "true",
-          onChange: (checked) => formField.onChange(checked),
-          disabled: field.disabled,
-          error: meta.touched && !!meta.error,
-          "aria-label": field.label
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsxs(
-        Label,
-        {
-          htmlFor: fieldId,
-          className: "font-normal cursor-pointer leading-relaxed",
-          children: [
-            field.label,
-            field.required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-destructive ml-1", children: "*" })
-          ]
-        }
-      )
-    ] }),
-    field.type === "checkbox-group" && field.options && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.CheckboxGroup,
-      {
-        ...formField,
-        id: fieldId,
-        options: field.options,
-        disabled: field.disabled,
-        layout: field.layout || "stacked",
-        error: meta.touched && !!meta.error,
-        "aria-label": field.label
-      }
-    ),
-    (field.type === "date-picker" || field.type === "date") && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.DatePicker,
-      {
-        ...formField,
-        id: fieldId,
-        placeholder: field.placeholder,
-        error: meta.touched && !!meta.error,
-        disabled: field.disabled,
-        "aria-label": field.label
-      }
-    ),
-    field.type === "date-range" && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.DateRangePicker,
-      {
-        ...formField,
-        id: fieldId,
-        error: meta.touched && !!meta.error,
-        disabled: field.disabled,
-        "aria-label": field.label
-      }
-    ),
-    field.type === "time" && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.TimePicker,
-      {
-        ...formField,
-        id: fieldId,
-        placeholder: field.placeholder,
-        error: meta.touched && !!meta.error,
-        disabled: field.disabled,
-        "aria-label": field.label
-      }
-    ),
-    field.type === "file" && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.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);
+  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__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    field.label,
+    field.required ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-destructive ml-1", children: "*" }) : null
+  ] });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    forms.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__ */ jsxRuntime.jsxs("div", { children: [
+        (field.type === "text" || field.type === "email" || field.type === "tel" || field.type === "search" || field.type === "password" || field.type === "url") && /* @__PURE__ */ jsxRuntime.jsx(
+          inputs.TextInput,
+          {
+            ...formField,
+            id: fieldId,
+            type: field.type,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
           }
-        },
-        onFileRemove,
-        "aria-label": field.label
-      }
-    ),
-    field.type === "rich-text" && /* @__PURE__ */ jsxRuntime.jsx(
-      inputs.RichTextEditor,
-      {
-        ...formField,
-        id: fieldId,
-        placeholder: field.placeholder,
-        error: meta.touched && !!meta.error,
-        disabled: field.disabled,
-        "aria-label": field.label
-      }
-    )
-  ] }) });
+        ),
+        field.type === "number" && /* @__PURE__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.DatePicker,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "date-range" && /* @__PURE__ */ jsxRuntime.jsx(
+          inputs.DateRangePicker,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "time" && /* @__PURE__ */ jsxRuntime.jsx(
+          inputs.TimePicker,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        ),
+        field.type === "file" && /* @__PURE__ */ jsxRuntime.jsx(
+          inputs.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__ */ jsxRuntime.jsx(
+          inputs.RichTextEditor,
+          {
+            ...formField,
+            id: fieldId,
+            placeholder: field.placeholder,
+            error: meta.touched && !!meta.error,
+            disabled: field.disabled,
+            "aria-label": field.label
+          }
+        )
+      ] })
+    }
+  );
 }
 
 // lib/form-field-types.ts
@@ -824,8 +816,36 @@ function useContactForm(options) {
     resetOnSuccess = true,
     uploadTokens = []
   } = options;
-  const [isSubmitted, setIsSubmitted] = React.useState(false);
   const [submissionError, setSubmissionError] = React.useState(null);
+  const submissionConfig = formConfig?.submissionConfig;
+  const redirectUrl = submissionConfig?.redirectUrl;
+  const redirectNavigation = useNavigation({ href: redirectUrl });
+  const resetSubmissionState = React.useCallback(() => {
+    setSubmissionError(null);
+  }, []);
+  const performRedirect = React.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 = forms.useForm({
     initialValues: React.useMemo(
       () => generateInitialValues(formFields),
@@ -836,7 +856,7 @@ function useContactForm(options) {
       [formFields]
     ),
     onSubmit: async (values, helpers) => {
-      setSubmissionError(null);
+      resetSubmissionState();
       const shouldAutoSubmit = Boolean(formConfig?.endpoint);
       if (!shouldAutoSubmit && !onSubmit) {
         return;
@@ -856,12 +876,21 @@ function useContactForm(options) {
           await onSubmit(submissionValues);
         }
         if (shouldAutoSubmit || onSubmit) {
-          setIsSubmitted(true);
+          try {
+            await submissionConfig?.handleFormSubmission?.({
+              formData: submissionValues,
+              responseData: result
+            });
+          } catch (callbackError) {
+            console.error("handleFormSubmission callback failed:", callbackError);
+          }
           if (resetOnSuccess) {
             helpers.resetForm();
           }
           onSuccess?.(result);
-          setTimeout(() => setIsSubmitted(false), 1e4);
+          if (submissionConfig?.behavior === "redirect" && submissionConfig.redirectUrl) {
+            performRedirect();
+          }
         }
       } catch (error) {
         if (error instanceof PageSpeedFormSubmissionError && error.formErrors) {
@@ -876,9 +905,10 @@ function useContactForm(options) {
   const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
   return {
     form,
-    isSubmitted,
+    isSubmitted: form.status === "success",
     submissionError,
-    formMethod
+    formMethod,
+    resetSubmissionState
   };
 }
 
@@ -1264,38 +1294,6 @@ function PatternBackground({
     }
   );
 }
-var FormFeedback = ({
-  isSubmitted,
-  successMessageClassName,
-  successMessage,
-  submissionError,
-  errorMessageClassName
-}) => {
-  if (!isSubmitted && !submissionError) return null;
-  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    isSubmitted && !submissionError && /* @__PURE__ */ jsxRuntime.jsx(
-      "div",
-      {
-        className: cn(
-          "mb-6 p-4 bg-primary/10 border border-primary rounded-md",
-          successMessageClassName
-        ),
-        children: typeof successMessage === "string" ? /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-primary-foreground/90 text-center", children: successMessage }) : successMessage
-      }
-    ),
-    submissionError && /* @__PURE__ */ jsxRuntime.jsx(
-      "div",
-      {
-        className: cn(
-          "mb-6 p-4 bg-destructive/10 border border-destructive rounded-md",
-          errorMessageClassName
-        ),
-        children: typeof submissionError === "string" ? /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-destructive text-center", children: submissionError }) : submissionError
-      }
-    )
-  ] });
-};
-var form_feedback_default = FormFeedback;
 var DEFAULT_FORM_FIELDS = [
   {
     name: "first_name",
@@ -1377,7 +1375,7 @@ function ContactPhotography({
     removeFile,
     resetUpload
   } = useFileUpload({ onError });
-  const { form, isSubmitted, submissionError, formMethod } = useContactForm({
+  const { form, submissionError, formMethod, resetSubmissionState } = useContactForm({
     formFields,
     formConfig,
     onSubmit,
@@ -1467,22 +1465,21 @@ function ContactPhotography({
               children: description
             }
           ) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: descriptionClassName, children: description })),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            form_feedback_default,
-            {
-              isSubmitted,
-              successMessageClassName,
-              successMessage,
-              submissionError,
-              errorMessageClassName
-            }
-          ),
           /* @__PURE__ */ jsxRuntime.jsxs(
             forms.Form,
             {
               form,
               action: formConfig?.endpoint,
               method: formMethod,
+              submissionError,
+              successMessage,
+              successMessageClassName,
+              errorMessageClassName,
+              submissionConfig: formConfig?.submissionConfig,
+              onNewSubmission: () => {
+                resetUpload();
+                resetSubmissionState();
+              },
               className: cn("space-y-4", formClassName),
               children: [
                 /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-12 gap-6", children: formFields.map((field) => /* @__PURE__ */ jsxRuntime.jsx(

package/dist/contact-photography.d.cts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { F as FormFieldConfig } from './form-field-types-flMXhIjG.cjs';
-import { P as PageSpeedFormConfig } from './forms-nGgHUTBw.cjs';
+import { P as PageSpeedFormConfig } from './forms-CStlFhnh.cjs';
 import { f as SectionBackground, s as PatternName } from './community-initiatives-k1_FqqBQ.cjs';
 import { A as ActionConfig, O as OptixFlowConfig } from './blocks-rgCERYOC.cjs';
 import '@page-speed/forms/integration';

package/dist/contact-photography.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { F as FormFieldConfig } from './form-field-types-flMXhIjG.js';
-import { P as PageSpeedFormConfig } from './forms-nGgHUTBw.js';
+import { P as PageSpeedFormConfig } from './forms-CStlFhnh.js';
 import { f as SectionBackground, s as PatternName } from './community-initiatives-AwBlQu1a.js';
 import { A as ActionConfig, O as OptixFlowConfig } from './blocks-ClXAGlHQ.js';
 import '@page-speed/forms/integration';