@page-speed/forms 0.5.0 → 0.5.2

package/dist/index.js

@@ -1,9 +1,11 @@
-import * as React3 from 'react';
+import * as React4 from 'react';
 import { useRef, useCallback, useContext } from 'react';
 import { useObservable, useSelector } from '@legendapp/state/react';
 import { useMap } from '@opensite/hooks/useMap';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
+import { cva } from 'class-variance-authority';
+import { Label as Label$1, Slot } from 'radix-ui';
 
 // src/core/useForm.ts
 function useForm(options) {
@@ -249,7 +251,7 @@ function useForm(options) {
     getFieldMeta
   };
 }
-var FormContext = React3.createContext(null);
+var FormContext = React4.createContext(null);
 FormContext.displayName = "FormContext";
 
 // src/core/useField.ts
@@ -317,7 +319,7 @@ function cn(...inputs) {
 // src/core/form-feedback.tsx
 function renderMessage(message, fallbackClassName, className) {
   if (typeof message === "string") {
-    return /* @__PURE__ */ React3.createElement(
+    return /* @__PURE__ */ React4.createElement(
       "p",
       {
         className: cn(
@@ -328,7 +330,7 @@ function renderMessage(message, fallbackClassName, className) {
       message
     );
   }
-  return /* @__PURE__ */ React3.createElement("div", { className: cn(fallbackClassName, className) }, message);
+  return /* @__PURE__ */ React4.createElement("div", { className: cn(fallbackClassName, className) }, message);
 }
 function FormFeedback({
   successMessage,
@@ -339,7 +341,7 @@ function FormFeedback({
   if (!successMessage && !submissionError) {
     return null;
   }
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, successMessage ? /* @__PURE__ */ React3.createElement(
+  return /* @__PURE__ */ React4.createElement(React4.Fragment, null, successMessage ? /* @__PURE__ */ React4.createElement(
     "div",
     {
       className: cn(
@@ -354,7 +356,7 @@ function FormFeedback({
       "text-primary-foreground",
       "text-primary-foreground"
     )
-  ) : null, submissionError ? /* @__PURE__ */ React3.createElement(
+  ) : null, submissionError ? /* @__PURE__ */ React4.createElement(
     "div",
     {
       className: cn(
@@ -372,6 +374,54 @@ function FormFeedback({
   ) : null);
 }
 FormFeedback.displayName = "FormFeedback";
+var buttonVariants = cva(
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 aria-invalid:border-destructive",
+  {
+    variants: {
+      variant: {
+        default: "bg-primary text-primary-foreground hover:bg-primary/90",
+        destructive: "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20",
+        outline: "border border-input bg-transparent shadow-xs hover:bg-accent hover:text-accent-foreground",
+        secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        link: "text-primary underline-offset-4 hover:underline"
+      },
+      size: {
+        default: "h-9 px-4 py-2 has-[>svg]:px-3",
+        xs: "h-6 gap-1 rounded-md px-2 text-xs has-[>svg]:px-1.5 [&_svg:not([class*='size-'])]:size-3",
+        sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
+        lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
+        icon: "size-9",
+        "icon-xs": "size-6 rounded-md [&_svg:not([class*='size-'])]:size-3",
+        "icon-sm": "size-8",
+        "icon-lg": "size-10"
+      }
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default"
+    }
+  }
+);
+function Button({
+  className,
+  variant = "default",
+  size = "default",
+  asChild = false,
+  ...props
+}) {
+  const Comp = asChild ? Slot.Root : "button";
+  return /* @__PURE__ */ React4.createElement(
+    Comp,
+    {
+      "data-slot": "button",
+      "data-variant": variant,
+      "data-size": size,
+      className: cn(buttonVariants({ variant, size, className })),
+      ...props
+    }
+  );
+}
 
 // src/core/Form.tsx
 function Form({
@@ -379,7 +429,7 @@ function Form({
   children,
   className,
   action,
-  method = "post",
+  method,
   noValidate = true,
   submissionConfig,
   successMessage,
@@ -387,9 +437,12 @@ function Form({
   successMessageClassName,
   errorMessageClassName,
   onNewSubmission,
+  notificationConfig,
+  styleConfig,
+  formConfig,
   ...props
 }) {
-  const handleFormSubmit = React3.useCallback(
+  const handleFormSubmit = React4.useCallback(
     async (e) => {
       try {
         await form.handleSubmit(e);
@@ -398,71 +451,102 @@ function Form({
     },
     [form]
   );
-  const behavior = submissionConfig?.behavior || "showConfirmation";
-  const shouldManageSubmissionUi = submissionConfig !== void 0 || successMessage !== void 0 || successMessageClassName !== void 0 || errorMessageClassName !== void 0 || submissionError != null || onNewSubmission !== void 0;
-  const hasSubmissionError = Boolean(submissionError);
+  const resolvedClassName = className ?? styleConfig?.formClassName;
+  const resolvedAction = action ?? formConfig?.endpoint;
+  const resolvedMethod = method ?? formConfig?.method ?? "post";
+  const resolvedSubmissionConfig = submissionConfig ?? formConfig?.submissionConfig;
+  const resolvedSuccessMessage = successMessage ?? notificationConfig?.successMessage;
+  const resolvedSubmissionError = submissionError ?? notificationConfig?.submissionError;
+  const resolvedSuccessMessageClassName = successMessageClassName ?? styleConfig?.successMessageClassName;
+  const resolvedErrorMessageClassName = errorMessageClassName ?? styleConfig?.errorMessageClassName;
+  const behavior = resolvedSubmissionConfig?.behavior || "showConfirmation";
+  const shouldManageSubmissionUi = resolvedSubmissionConfig !== void 0 || resolvedSuccessMessage !== void 0 || resolvedSuccessMessageClassName !== void 0 || resolvedErrorMessageClassName !== void 0 || resolvedSubmissionError != null || onNewSubmission !== void 0;
+  const hasSubmissionError = Boolean(resolvedSubmissionError);
   const isSubmissionSuccessful = shouldManageSubmissionUi && form.status === "success" && !hasSubmissionError;
   const defaultSuccessMessage = behavior === "redirect" ? "Form submitted successfully. Redirecting..." : "Thank you. Your form has been submitted successfully.";
-  const resolvedSuccessMessage = successMessage ?? defaultSuccessMessage;
-  const shouldRenderCustomComponent = isSubmissionSuccessful && behavior === "renderCustomComponent" && Boolean(submissionConfig?.customComponent);
-  const newSubmissionAction = submissionConfig?.newFormSubmissionAction;
+  const finalSuccessMessage = resolvedSuccessMessage ?? defaultSuccessMessage;
+  const shouldRenderCustomComponent = isSubmissionSuccessful && behavior === "renderCustomComponent" && Boolean(resolvedSubmissionConfig?.customComponent);
+  const newSubmissionAction = resolvedSubmissionConfig?.newFormSubmissionAction;
   const showNewSubmissionAction = isSubmissionSuccessful && (typeof newSubmissionAction?.enable === "boolean" ? newSubmissionAction.enable : Boolean(newSubmissionAction?.label));
   const newSubmissionLabel = newSubmissionAction?.label ?? "Submit another response";
-  const handleNewSubmission = React3.useCallback(() => {
+  const handleNewSubmission = React4.useCallback(() => {
     form.resetForm();
     onNewSubmission?.();
   }, [form, onNewSubmission]);
-  return /* @__PURE__ */ React3.createElement(FormContext.Provider, { value: form }, /* @__PURE__ */ React3.createElement(
+  return /* @__PURE__ */ React4.createElement(FormContext.Provider, { value: form }, /* @__PURE__ */ React4.createElement(
     "form",
     {
       onSubmit: handleFormSubmit,
-      action,
-      method,
+      action: resolvedAction,
+      method: resolvedMethod,
       noValidate,
-      className,
+      className: resolvedClassName,
       ...props
     },
-    isSubmissionSuccessful ? /* @__PURE__ */ React3.createElement("div", { className: "space-y-4" }, shouldRenderCustomComponent ? submissionConfig?.customComponent : /* @__PURE__ */ React3.createElement(
+    isSubmissionSuccessful ? /* @__PURE__ */ React4.createElement("div", { className: "space-y-4" }, shouldRenderCustomComponent ? resolvedSubmissionConfig?.customComponent : /* @__PURE__ */ React4.createElement(
       FormFeedback,
       {
-        successMessage: resolvedSuccessMessage,
-        successMessageClassName
+        successMessage: finalSuccessMessage,
+        successMessageClassName: resolvedSuccessMessageClassName
       }
-    ), showNewSubmissionAction ? /* @__PURE__ */ React3.createElement(
-      "button",
+    ), showNewSubmissionAction ? /* @__PURE__ */ React4.createElement(
+      Button,
       {
         type: "button",
-        onClick: handleNewSubmission,
-        className: cn(
-          "inline-flex items-center justify-center whitespace-nowrap rounded-md border border-input bg-transparent px-4 py-2 text-sm font-medium shadow-sm transition-colors",
-          "hover:bg-muted focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-        )
+        variant: "outline",
+        onClick: handleNewSubmission
       },
       newSubmissionLabel
-    ) : null) : /* @__PURE__ */ React3.createElement(React3.Fragment, null, children, submissionError ? /* @__PURE__ */ React3.createElement("div", { className: "mt-4" }, /* @__PURE__ */ React3.createElement(
+    ) : null) : /* @__PURE__ */ React4.createElement(React4.Fragment, null, children, resolvedSubmissionError ? /* @__PURE__ */ React4.createElement("div", { className: "mt-4" }, /* @__PURE__ */ React4.createElement(
       FormFeedback,
       {
-        submissionError,
-        errorMessageClassName
+        submissionError: resolvedSubmissionError,
+        errorMessageClassName: resolvedErrorMessageClassName
       }
     )) : null)
   ));
 }
 Form.displayName = "Form";
-var Field = React3.forwardRef(({ className, ...props }, ref) => {
-  return /* @__PURE__ */ React3.createElement(
-    "div",
+function Label({
+  className,
+  ...props
+}) {
+  return /* @__PURE__ */ React4.createElement(
+    Label$1.Root,
     {
-      ref,
-      "data-slot": "field",
-      className: cn("flex flex-col gap-1.5", className),
+      "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
     }
   );
-});
+}
+
+// src/components/ui/field.tsx
+var Field = React4.forwardRef(
+  ({ className, orientation = "vertical", invalid = false, ...props }, ref) => {
+    return /* @__PURE__ */ React4.createElement(
+      "div",
+      {
+        ref,
+        "data-slot": "field",
+        "data-orientation": orientation,
+        "data-invalid": invalid || void 0,
+        className: cn(
+          "flex",
+          orientation === "horizontal" ? "items-center gap-2" : "flex-col gap-1.5",
+          className
+        ),
+        ...props
+      }
+    );
+  }
+);
 Field.displayName = "Field";
-var FieldGroup = React3.forwardRef(({ className, ...props }, ref) => {
-  return /* @__PURE__ */ React3.createElement(
+var FieldGroup = React4.forwardRef(({ className, ...props }, ref) => {
+  return /* @__PURE__ */ React4.createElement(
     "div",
     {
       ref,
@@ -473,9 +557,9 @@ var FieldGroup = React3.forwardRef(({ className, ...props }, ref) => {
   );
 });
 FieldGroup.displayName = "FieldGroup";
-var FieldLabel = React3.forwardRef(({ className, required, children, ...props }, ref) => {
-  return /* @__PURE__ */ React3.createElement(
-    "label",
+var FieldLabel = React4.forwardRef(({ className, required, children, ...props }, ref) => {
+  return /* @__PURE__ */ React4.createElement(
+    Label,
     {
       ref,
       "data-slot": "field-label",
@@ -487,12 +571,12 @@ var FieldLabel = React3.forwardRef(({ className, required, children, ...props },
       ...props
     },
     children,
-    required && /* @__PURE__ */ React3.createElement("span", { className: "text-destructive ml-1" }, "*")
+    required && /* @__PURE__ */ React4.createElement("span", { className: "text-destructive ml-1" }, "*")
   );
 });
 FieldLabel.displayName = "FieldLabel";
-var FieldDescription = React3.forwardRef(({ className, ...props }, ref) => {
-  return /* @__PURE__ */ React3.createElement(
+var FieldDescription = React4.forwardRef(({ className, ...props }, ref) => {
+  return /* @__PURE__ */ React4.createElement(
     "p",
     {
       ref,
@@ -503,8 +587,8 @@ var FieldDescription = React3.forwardRef(({ className, ...props }, ref) => {
   );
 });
 FieldDescription.displayName = "FieldDescription";
-var FieldError = React3.forwardRef(({ className, ...props }, ref) => {
-  return /* @__PURE__ */ React3.createElement(
+var FieldError = React4.forwardRef(({ className, ...props }, ref) => {
+  return /* @__PURE__ */ React4.createElement(
     "p",
     {
       ref,
@@ -527,7 +611,7 @@ var FieldFeedback = ({
 }) => {
   const errorText = Array.isArray(error) ? error.join(", ") : error;
   if (!errorText || !shouldRenderError) return null;
-  return /* @__PURE__ */ React3.createElement(FieldError, { id: errorId, className: errorClassName }, errorText);
+  return /* @__PURE__ */ React4.createElement(FieldError, { id: errorId, className: errorClassName }, errorText);
 };
 var LabelGroup = ({
   labelHtmlFor,
@@ -544,40 +628,38 @@ var LabelGroup = ({
     variant === "legend" ? "mb-1.5" : "mb-1 block",
     primaryClassName
   );
-  const requiredIndicator = required ? /* @__PURE__ */ React3.createElement("span", { className: "text-destructive pl-0.5", "aria-label": "required" }, "*") : null;
+  const requiredIndicator = required && variant !== "label" ? /* @__PURE__ */ React4.createElement("span", { className: "text-destructive pl-0.5", "aria-label": "required" }, "*") : null;
   let primaryElement = null;
   if (primary) {
     if (variant === "label") {
-      primaryElement = /* @__PURE__ */ React3.createElement(
-        "label",
+      primaryElement = /* @__PURE__ */ React4.createElement(
+        FieldLabel,
         {
           htmlFor: labelHtmlFor,
-          "data-slot": "field-label",
+          required,
           className: primaryClasses
         },
-        primary,
-        requiredIndicator
+        primary
       );
     } else if (variant === "legend") {
-      primaryElement = /* @__PURE__ */ React3.createElement("legend", { "data-slot": "field-legend", className: primaryClasses }, primary, requiredIndicator);
+      primaryElement = /* @__PURE__ */ React4.createElement("legend", { "data-slot": "field-legend", className: primaryClasses }, primary, requiredIndicator);
     } else {
-      primaryElement = /* @__PURE__ */ React3.createElement("div", { "data-slot": "field-label", className: primaryClasses }, primary, requiredIndicator);
+      primaryElement = /* @__PURE__ */ React4.createElement("div", { "data-slot": "field-label", className: primaryClasses }, primary, requiredIndicator);
     }
   }
-  const secondaryElement = secondary ? /* @__PURE__ */ React3.createElement(
-    "p",
+  const secondaryElement = secondary ? /* @__PURE__ */ React4.createElement(
+    FieldDescription,
     {
-      "data-slot": "field-description",
       id: secondaryId,
-      className: cn("text-sm leading-normal font-normal", secondaryClassName)
+      className: cn("leading-normal font-normal", secondaryClassName)
     },
     secondary
   ) : null;
   if (!primaryElement && !secondaryElement) return null;
   if (variant === "legend") {
-    return /* @__PURE__ */ React3.createElement(React3.Fragment, null, primaryElement, secondaryElement);
+    return /* @__PURE__ */ React4.createElement(React4.Fragment, null, primaryElement, secondaryElement);
   }
-  return /* @__PURE__ */ React3.createElement("div", { className: "flex flex-1 flex-col gap-0.5" }, primaryElement, secondaryElement);
+  return /* @__PURE__ */ React4.createElement("div", { className: "flex flex-1 flex-col gap-0.5" }, primaryElement, secondaryElement);
 };
 
 // src/core/Field.tsx
@@ -594,30 +676,40 @@ function Field2({
 }) {
   const fieldState = useField({ name, validate });
   const { meta } = fieldState;
-  const hasError = React3.useMemo(() => {
+  const hasError = React4.useMemo(() => {
     return showError && meta.touched && meta.error ? true : false;
   }, [meta?.touched, meta?.error, showError]);
   const errorId = `${name}-error`;
   const descriptionId = `${name}-description`;
-  return /* @__PURE__ */ React3.createElement("div", { className, "data-field": name }, /* @__PURE__ */ React3.createElement(
-    LabelGroup,
+  return /* @__PURE__ */ React4.createElement(
+    Field,
     {
-      labelHtmlFor: name,
-      required,
-      variant: "label",
-      secondaryId: descriptionId,
-      secondary: description,
-      primary: label
-    }
-  ), /* @__PURE__ */ React3.createElement("div", null, typeof children === "function" ? children(fieldState) : children), /* @__PURE__ */ React3.createElement(
-    FieldFeedback,
-    {
-      errorId,
-      errorClassName,
-      shouldRenderError: hasError,
-      error: meta.error
-    }
-  ));
+      className,
+      "data-field": name,
+      invalid: hasError
+    },
+    /* @__PURE__ */ React4.createElement(
+      LabelGroup,
+      {
+        labelHtmlFor: name,
+        required,
+        variant: "label",
+        secondaryId: descriptionId,
+        secondary: description,
+        primary: label
+      }
+    ),
+    /* @__PURE__ */ React4.createElement("div", { "data-slot": "field-control" }, typeof children === "function" ? children(fieldState) : children),
+    /* @__PURE__ */ React4.createElement(
+      FieldFeedback,
+      {
+        errorId,
+        errorClassName,
+        shouldRenderError: hasError,
+        error: meta.error
+      }
+    )
+  );
 }
 Field2.displayName = "Field";