@opensite/ui 1.9.8 → 2.0.0

package/dist/contact-event.js

@@ -1,18 +1,14 @@
 "use client";
 import * as React from 'react';
-import React__default from 'react';
-import { useForm, Form, Field } from '@page-speed/forms';
-import { TextInput as TextInput$1, TextArea as TextArea$1 } from '@page-speed/forms/inputs';
+import React__default, { useMemo } from 'react';
+import { Form } from '@page-speed/forms';
+import { useFileUpload, useContactForm, getColumnSpanClass, DynamicFormField } from '@page-speed/forms/integration';
 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 LabelPrimitive from '@radix-ui/react-label';
-import { submitPageSpeedForm, PageSpeedFormSubmissionError } from '@page-speed/forms/integration';
 
 // components/blocks/contact/contact-event.tsx
-var TextInput = TextInput$1;
-var TextArea = TextArea$1;
 function cn(...inputs) {
   return twMerge(clsx(inputs));
 }
@@ -457,22 +453,6 @@ function CardContent({ className, ...props }) {
     }
   );
 }
-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
-    }
-  );
-}
 var maxWidthStyles = {
   sm: "max-w-screen-sm",
   md: "max-w-screen-md",
@@ -848,14 +828,60 @@ var Section = React__default.forwardRef(
   }
 );
 Section.displayName = "Section";
+var DEFAULT_FORM_FIELDS = [
+  {
+    name: "first_name",
+    type: "text",
+    label: "First Name",
+    placeholder: "John",
+    required: true,
+    columnSpan: 6
+  },
+  {
+    name: "last_name",
+    type: "text",
+    label: "Last Name",
+    placeholder: "Doe",
+    required: true,
+    columnSpan: 6
+  },
+  {
+    name: "email",
+    type: "email",
+    label: "Email",
+    placeholder: "john@example.com",
+    required: true,
+    columnSpan: 12
+  },
+  {
+    name: "phone",
+    type: "tel",
+    label: "Phone",
+    placeholder: "+1 (555) 000-0000",
+    required: true,
+    columnSpan: 12
+  },
+  {
+    name: "message",
+    type: "textarea",
+    label: "Message",
+    placeholder: "Your message...",
+    required: true,
+    rows: 4,
+    columnSpan: 12
+  }
+];
 function ContactEvent({
   heading,
   description,
-  buttonText,
+  buttonText = "Submit",
   buttonIcon,
   actions,
   actionsSlot,
+  formFields = DEFAULT_FORM_FIELDS,
+  successMessage = "Thank you! Your message has been sent successfully.",
   className,
+  containerClassName = "px-6 sm:px-6 md:px-8 lg:px-8",
   headerClassName,
   headingClassName,
   descriptionClassName,
@@ -863,66 +889,38 @@ function ContactEvent({
   cardContentClassName,
   formClassName,
   submitClassName,
-  background,
-  spacing = "py-8 md:py-32",
-  containerClassName = "px-6 sm:px-6 md:px-8 lg:px-8",
+  successMessageClassName,
+  errorMessageClassName,
+  background = "white",
+  spacing = "xl",
   pattern,
-  patternOpacity,
+  patternOpacity = 0.1,
   formConfig,
   onSubmit,
   onSuccess,
   onError
 }) {
-  const form = useForm({
-    initialValues: {
-      first_name: "",
-      last_name: "",
-      email: "",
-      phone: "",
-      message: ""
-    },
-    validationSchema: {
-      first_name: (value) => !value ? "First name is required" : void 0,
-      last_name: (value) => !value ? "Last 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 is required" : void 0,
-      message: (value) => !value ? "Message is required" : void 0
+  const {
+    uploadTokens,
+    uploadProgress,
+    isUploading,
+    uploadFiles,
+    removeFile,
+    resetUpload
+  } = useFileUpload({ onError });
+  const { form, submissionError, formMethod, resetSubmissionState } = useContactForm({
+    formFields,
+    formConfig,
+    onSubmit,
+    onSuccess: (data) => {
+      resetUpload();
+      onSuccess?.(data);
     },
-    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;
-      }
-    }
+    onError,
+    resetOnSuccess: formConfig?.resetOnSuccess !== false,
+    uploadTokens
   });
-  const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
-  const actionsContent = React.useMemo(() => {
+  const actionsContent = useMemo(() => {
     if (actionsSlot) return actionsSlot;
     if (actions && actions.length > 0) {
       return actions.map((action, index) => {
@@ -959,9 +957,9 @@ function ContactEvent({
       spacing,
       pattern,
       patternOpacity,
-      className,
+      className: cn("py-12", className),
       containerClassName,
-      children: /* @__PURE__ */ jsxs("div", { className: "relative", children: [
+      children: /* @__PURE__ */ jsxs("div", { className: "mx-auto max-w-4xl", children: [
         /* @__PURE__ */ jsxs("div", { className: cn("mb-10 text-center", headerClassName), children: [
           heading && (typeof heading === "string" ? /* @__PURE__ */ jsx(
             "h2",
@@ -988,80 +986,42 @@ function ContactEvent({
           Form,
           {
             form,
-            action: formConfig?.endpoint,
-            method: formMethod,
-            className: cn("space-y-4", formClassName),
+            notificationConfig: {
+              submissionError,
+              successMessage
+            },
+            styleConfig: {
+              formClassName: cn("space-y-4", formClassName),
+              successMessageClassName,
+              errorMessageClassName
+            },
+            formConfig: {
+              endpoint: formConfig?.endpoint,
+              method: formMethod,
+              submissionConfig: formConfig?.submissionConfig
+            },
+            onNewSubmission: () => {
+              resetUpload();
+              resetSubmissionState();
+            },
             children: [
-              /* @__PURE__ */ jsxs("div", { className: "grid gap-4 sm:grid-cols-2", children: [
-                /* @__PURE__ */ jsx(Field, { name: "first_name", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsx(Label, { htmlFor: "first-name", children: "First Name" }),
-                  /* @__PURE__ */ jsx(
-                    TextInput,
-                    {
-                      ...field,
-                      id: "first-name",
-                      placeholder: "John",
-                      error: meta.touched && !!meta.error,
-                      "aria-label": "First Name"
-                    }
-                  )
-                ] }) }),
-                /* @__PURE__ */ jsx(Field, { name: "last_name", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsx(Label, { htmlFor: "last-name", children: "Last Name" }),
-                  /* @__PURE__ */ jsx(
-                    TextInput,
+              /* @__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,
-                      id: "last-name",
-                      placeholder: "Doe",
-                      error: meta.touched && !!meta.error,
-                      "aria-label": "Last Name"
+                      field,
+                      uploadProgress,
+                      onFileUpload: uploadFiles,
+                      onFileRemove: removeFile,
+                      isUploading
                     }
                   )
-                ] }) })
-              ] }),
-              /* @__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: "message", children: ({ field, meta }) => /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                /* @__PURE__ */ jsx(Label, { htmlFor: "message", children: "Message" }),
-                /* @__PURE__ */ jsx(
-                  TextArea,
-                  {
-                    ...field,
-                    id: "message",
-                    placeholder: "Your message...",
-                    rows: 4,
-                    error: meta.touched && !!meta.error,
-                    "aria-label": "Message"
-                  }
-                )
-              ] }) }),
+                },
+                field.name
+              )) }),
               actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxs(
                 Pressable,
                 {

package/dist/contact-feedback.cjs

@@ -3,13 +3,11 @@
 
 var React = require('react');
 var forms = require('@page-speed/forms');
-var inputs = require('@page-speed/forms/inputs');
+var integration = require('@page-speed/forms/integration');
 var clsx = require('clsx');
 var tailwindMerge = require('tailwind-merge');
 var classVarianceAuthority = require('class-variance-authority');
 var jsxRuntime = require('react/jsx-runtime');
-var LabelPrimitive = require('@radix-ui/react-label');
-var integration = require('@page-speed/forms/integration');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -30,11 +28,8 @@ function _interopNamespace(e) {
 }
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
-var LabelPrimitive__namespace = /*#__PURE__*/_interopNamespace(LabelPrimitive);
 
 // components/blocks/contact/contact-feedback.tsx
-var TextInput = inputs.TextInput;
-var TextArea = inputs.TextArea;
 function cn(...inputs) {
   return tailwindMerge.twMerge(clsx.clsx(inputs));
 }
@@ -479,22 +474,6 @@ function CardContent({ className, ...props }) {
     }
   );
 }
-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
-    }
-  );
-}
 var maxWidthStyles = {
   sm: "max-w-screen-sm",
   md: "max-w-screen-md",
@@ -870,14 +849,60 @@ var Section = React__namespace.default.forwardRef(
   }
 );
 Section.displayName = "Section";
+var DEFAULT_FORM_FIELDS = [
+  {
+    name: "first_name",
+    type: "text",
+    label: "First Name",
+    placeholder: "John",
+    required: true,
+    columnSpan: 6
+  },
+  {
+    name: "last_name",
+    type: "text",
+    label: "Last Name",
+    placeholder: "Doe",
+    required: true,
+    columnSpan: 6
+  },
+  {
+    name: "email",
+    type: "email",
+    label: "Email",
+    placeholder: "john@example.com",
+    required: true,
+    columnSpan: 12
+  },
+  {
+    name: "phone",
+    type: "tel",
+    label: "Phone",
+    placeholder: "+1 (555) 000-0000",
+    required: true,
+    columnSpan: 12
+  },
+  {
+    name: "message",
+    type: "textarea",
+    label: "Message",
+    placeholder: "Your message...",
+    required: true,
+    rows: 4,
+    columnSpan: 12
+  }
+];
 function ContactFeedback({
   heading,
   description,
-  buttonText,
+  buttonText = "Submit",
   buttonIcon,
   actions,
   actionsSlot,
+  formFields = DEFAULT_FORM_FIELDS,
+  successMessage = "Thank you! Your message has been sent successfully.",
   className,
+  containerClassName = "px-6 sm:px-6 md:px-8 lg:px-8",
   headerClassName,
   headingClassName,
   descriptionClassName,
@@ -885,60 +910,38 @@ function ContactFeedback({
   cardContentClassName,
   formClassName,
   submitClassName,
-  background,
-  spacing = "py-8 md:py-32",
-  containerClassName = "px-6 sm:px-6 md:px-8 lg:px-8",
+  successMessageClassName,
+  errorMessageClassName,
+  background = "white",
+  spacing = "xl",
   pattern,
-  patternOpacity,
+  patternOpacity = 0.1,
   formConfig,
   onSubmit,
   onSuccess,
   onError
 }) {
-  const form = forms.useForm({
-    initialValues: {
-      email: "",
-      feedback: ""
+  const {
+    uploadTokens,
+    uploadProgress,
+    isUploading,
+    uploadFiles,
+    removeFile,
+    resetUpload
+  } = integration.useFileUpload({ onError });
+  const { form, submissionError, formMethod, resetSubmissionState } = integration.useContactForm({
+    formFields,
+    formConfig,
+    onSubmit,
+    onSuccess: (data) => {
+      resetUpload();
+      onSuccess?.(data);
     },
-    validationSchema: {
-      email: (value) => {
-        if (!value) return "Email is required";
-        if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value))
-          return "Please enter a valid email address";
-        return void 0;
-      },
-      feedback: (value) => !value ? "Feedback is required" : void 0
-    },
-    onSubmit: async (values, helpers) => {
-      const shouldAutoSubmit = Boolean(formConfig?.endpoint);
-      if (!shouldAutoSubmit && !onSubmit) {
-        return;
-      }
-      try {
-        let result;
-        if (shouldAutoSubmit) {
-          result = await integration.submitPageSpeedForm(values, formConfig);
-        }
-        if (onSubmit) {
-          await onSubmit(values);
-        }
-        if (shouldAutoSubmit || onSubmit) {
-          if (formConfig?.resetOnSuccess !== false) {
-            helpers.resetForm();
-          }
-          onSuccess?.(result);
-        }
-      } catch (error) {
-        if (error instanceof integration.PageSpeedFormSubmissionError && error.formErrors) {
-          helpers.setErrors(error.formErrors);
-        }
-        onError?.(error);
-        throw error;
-      }
-    }
+    onError,
+    resetOnSuccess: formConfig?.resetOnSuccess !== false,
+    uploadTokens
   });
-  const formMethod = formConfig?.method?.toLowerCase() === "get" ? "get" : "post";
-  const actionsContent = React__namespace.useMemo(() => {
+  const actionsContent = React.useMemo(() => {
     if (actionsSlot) return actionsSlot;
     if (actions && actions.length > 0) {
       return actions.map((action, index) => {
@@ -975,9 +978,9 @@ function ContactFeedback({
       spacing,
       pattern,
       patternOpacity,
-      className,
+      className: cn("py-12", className),
       containerClassName,
-      children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative", children: [
+      children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mx-auto max-w-4xl", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn("mb-10 text-center", headerClassName), children: [
           heading && (typeof heading === "string" ? /* @__PURE__ */ jsxRuntime.jsx(
             "h2",
@@ -1004,38 +1007,42 @@ function ContactFeedback({
           forms.Form,
           {
             form,
-            action: formConfig?.endpoint,
-            method: formMethod,
-            className: cn("space-y-4", formClassName),
+            notificationConfig: {
+              submissionError,
+              successMessage
+            },
+            styleConfig: {
+              formClassName: cn("space-y-4", formClassName),
+              successMessageClassName,
+              errorMessageClassName
+            },
+            formConfig: {
+              endpoint: formConfig?.endpoint,
+              method: formMethod,
+              submissionConfig: formConfig?.submissionConfig
+            },
+            onNewSubmission: () => {
+              resetUpload();
+              resetSubmissionState();
+            },
             children: [
-              /* @__PURE__ */ jsxRuntime.jsx(forms.Field, { name: "email", children: ({ field, meta }) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-2", children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: "email", children: "Email" }),
-                /* @__PURE__ */ jsxRuntime.jsx(
-                  TextInput,
-                  {
-                    ...field,
-                    id: "email",
-                    type: "email",
-                    placeholder: "your@email.com",
-                    error: meta.touched && !!meta.error,
-                    "aria-label": "Email"
-                  }
-                )
-              ] }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(forms.Field, { name: "feedback", children: ({ field, meta }) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-2", children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Label, { htmlFor: "feedback", children: "Feedback" }),
-                /* @__PURE__ */ jsxRuntime.jsx(
-                  TextArea,
-                  {
-                    ...field,
-                    id: "feedback",
-                    placeholder: "Tell us what you think...",
-                    rows: 6,
-                    error: meta.touched && !!meta.error,
-                    "aria-label": "Feedback"
-                  }
-                )
-              ] }) }),
+              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-12 gap-6", children: formFields.map((field) => /* @__PURE__ */ jsxRuntime.jsx(
+                "div",
+                {
+                  className: integration.getColumnSpanClass(field.columnSpan),
+                  children: /* @__PURE__ */ jsxRuntime.jsx(
+                    integration.DynamicFormField,
+                    {
+                      field,
+                      uploadProgress,
+                      onFileUpload: uploadFiles,
+                      onFileRemove: removeFile,
+                      isUploading
+                    }
+                  )
+                },
+                field.name
+              )) }),
               actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxRuntime.jsxs(
                 Pressable,
                 {