@better-auth-ui/heroui 1.6.3 → 1.6.4

package/src/components/auth/additional-field.tsx

@@ -0,0 +1,554 @@
+import { resolveInputType } from "@better-auth-ui/core"
+import { useAuth } from "@better-auth-ui/react"
+import { Check, Copy } from "@gravity-ui/icons"
+import {
+  Button,
+  Calendar,
+  Checkbox,
+  ComboBox,
+  DateField,
+  DatePicker,
+  FieldError,
+  Input,
+  InputGroup,
+  Label,
+  ListBox,
+  NumberField,
+  Select,
+  Slider,
+  Switch,
+  TextArea,
+  TextField,
+  TimeField,
+  type TimeValue,
+  toast
+} from "@heroui/react"
+import {
+  type CalendarDate,
+  type CalendarDateTime,
+  fromDate,
+  getLocalTimeZone,
+  parseDate,
+  parseDateTime,
+  toCalendarDate,
+  toCalendarDateTime
+} from "@internationalized/date"
+import { useRef, useState } from "react"
+
+import type { AdditionalFieldProps } from "../../lib/auth/auth-plugin"
+
+// Re-exported here so the main entrypoint surface is unchanged.
+export type { AdditionalFieldProps } from "../../lib/auth/auth-plugin"
+
+/** Convert a `defaultValue` into a `CalendarDate` for HeroUI date inputs. */
+function toDateValue(value: unknown): CalendarDate | undefined {
+  if (value instanceof Date) {
+    return toCalendarDate(fromDate(value, getLocalTimeZone()))
+  }
+
+  if (typeof value === "string") {
+    try {
+      return parseDate(value.slice(0, 10))
+    } catch {
+      return undefined
+    }
+  }
+
+  return undefined
+}
+
+/** Convert a `defaultValue` into a `CalendarDateTime` for datetime inputs. */
+function toDateTimeValue(value: unknown): CalendarDateTime | undefined {
+  if (value instanceof Date) {
+    return toCalendarDateTime(fromDate(value, getLocalTimeZone()))
+  }
+
+  if (typeof value === "string") {
+    try {
+      // Strip trailing `Z` or timezone offset for `parseDateTime`.
+      return parseDateTime(value.replace(/(Z|[+-]\d{2}:?\d{2})$/, ""))
+    } catch {
+      return undefined
+    }
+  }
+
+  return undefined
+}
+
+/**
+ * Icon-only copy button used as an `InputGroup.Suffix`. `getValue` is invoked
+ * lazily on click so the button copies the input's *live* value rather than a
+ * stale snapshot — important when paired with editable inputs.
+ */
+function CopyButton({
+  getValue,
+  isDisabled
+}: {
+  getValue: () => string | undefined
+  isDisabled?: boolean
+}) {
+  const { localization } = useAuth()
+  const [copied, setCopied] = useState(false)
+
+  async function handleCopy() {
+    const value = getValue()
+    if (!value) return
+
+    try {
+      await navigator.clipboard.writeText(value)
+      setCopied(true)
+      setTimeout(() => setCopied(false), 1500)
+    } catch (error) {
+      toast.danger(error instanceof Error ? error.message : String(error))
+    }
+  }
+
+  return (
+    <Button
+      isIconOnly
+      aria-label={localization.settings.copyToClipboard}
+      size="sm"
+      variant="ghost"
+      isDisabled={isDisabled}
+      onPress={handleCopy}
+    >
+      {copied ? <Check className="size-4" /> : <Copy className="size-4" />}
+    </Button>
+  )
+}
+
+/** Renders a single additional user field via HeroUI v3 components. */
+export function AdditionalField({
+  name,
+  field,
+  isPending,
+  variant
+}: AdditionalFieldProps) {
+  const { localization } = useAuth()
+  const inputType = resolveInputType(field)
+  const inputVariant = variant === "transparent" ? "primary" : "secondary"
+  // Used by `inputType: "input"` with `copyable: true` so the copy button
+  // reads the input's *live* value rather than a stale `defaultValue`.
+  const inputRef = useRef<HTMLInputElement>(null)
+
+  if (field.render) {
+    return <>{field.render({ name, field, isPending, variant })}</>
+  }
+
+  if (inputType === "hidden") {
+    return (
+      <input
+        type="hidden"
+        name={name}
+        value={
+          field.defaultValue == null
+            ? ""
+            : field.defaultValue instanceof Date
+              ? field.defaultValue.toISOString()
+              : String(field.defaultValue)
+        }
+      />
+    )
+  }
+
+  if (inputType === "textarea") {
+    return (
+      <TextField
+        name={name}
+        defaultValue={
+          field.defaultValue == null ? undefined : String(field.defaultValue)
+        }
+        isDisabled={isPending}
+        isReadOnly={field.readOnly}
+      >
+        <Label>{field.label}</Label>
+
+        <TextArea
+          placeholder={field.placeholder}
+          required={field.required}
+          variant={inputVariant}
+        />
+
+        <FieldError />
+      </TextField>
+    )
+  }
+
+  if (inputType === "number") {
+    const maxFractionDigits = field.formatOptions?.maximumFractionDigits
+
+    return (
+      <NumberField
+        name={name}
+        defaultValue={
+          typeof field.defaultValue === "number"
+            ? field.defaultValue
+            : field.defaultValue != null && field.defaultValue !== ""
+              ? Number(field.defaultValue)
+              : undefined
+        }
+        minValue={field.min}
+        maxValue={field.max}
+        step={
+          field.step ?? (maxFractionDigits ? 1 / 10 ** maxFractionDigits : 1)
+        }
+        formatOptions={field.formatOptions}
+        isDisabled={isPending}
+        isReadOnly={field.readOnly}
+        variant={inputVariant}
+      >
+        <Label>{field.label}</Label>
+
+        <NumberField.Group>
+          <NumberField.DecrementButton />
+          <NumberField.Input
+            placeholder={field.placeholder}
+            required={field.required}
+          />
+          <NumberField.IncrementButton />
+        </NumberField.Group>
+
+        <FieldError />
+      </NumberField>
+    )
+  }
+
+  if (inputType === "slider") {
+    const maxFractionDigits = field.formatOptions?.maximumFractionDigits
+
+    return (
+      <Slider
+        defaultValue={
+          typeof field.defaultValue === "number"
+            ? field.defaultValue
+            : field.defaultValue != null
+              ? Number(field.defaultValue)
+              : undefined
+        }
+        minValue={field.min ?? 0}
+        maxValue={field.max ?? 100}
+        step={
+          field.step ?? (maxFractionDigits ? 1 / 10 ** maxFractionDigits : 1)
+        }
+        formatOptions={field.formatOptions}
+        isDisabled={isPending || field.readOnly}
+        className="flex flex-col gap-2"
+      >
+        <div className="flex items-center justify-between gap-2">
+          <Label>{field.label}</Label>
+          <Slider.Output className="text-sm text-muted" />
+        </div>
+
+        <Slider.Track>
+          <Slider.Fill />
+          <Slider.Thumb name={name} />
+        </Slider.Track>
+      </Slider>
+    )
+  }
+
+  if (inputType === "switch") {
+    return (
+      <Switch
+        name={name}
+        defaultSelected={
+          field.defaultValue === true || field.defaultValue === "true"
+        }
+        isDisabled={isPending}
+        isReadOnly={field.readOnly}
+      >
+        <Switch.Control>
+          <Switch.Thumb />
+        </Switch.Control>
+
+        <Label>{field.label}</Label>
+      </Switch>
+    )
+  }
+
+  if (inputType === "checkbox") {
+    return (
+      <Checkbox
+        name={name}
+        defaultSelected={
+          field.defaultValue === true || field.defaultValue === "true"
+        }
+        isDisabled={isPending}
+        isReadOnly={field.readOnly}
+        isRequired={field.required}
+        variant={inputVariant}
+      >
+        <Checkbox.Control>
+          <Checkbox.Indicator />
+        </Checkbox.Control>
+
+        <Checkbox.Content>
+          <Label>{field.label}</Label>
+        </Checkbox.Content>
+      </Checkbox>
+    )
+  }
+
+  if (inputType === "select") {
+    return (
+      <Select
+        className="[&[data-required=true]>.label]:after:content-none"
+        name={name}
+        defaultValue={
+          field.defaultValue != null ? String(field.defaultValue) : undefined
+        }
+        placeholder={field.placeholder}
+        isDisabled={isPending || field.readOnly}
+        isRequired={field.required}
+        variant={inputVariant}
+        fullWidth
+      >
+        <Label>{field.label}</Label>
+
+        <Select.Trigger>
+          <Select.Value />
+          <Select.Indicator />
+        </Select.Trigger>
+
+        <Select.Popover>
+          <ListBox>
+            {field.options?.map((option) => (
+              <ListBox.Item
+                key={option.value}
+                id={option.value}
+                textValue={
+                  typeof option.label === "string" ? option.label : option.value
+                }
+              >
+                {option.label}
+
+                <ListBox.ItemIndicator />
+              </ListBox.Item>
+            ))}
+          </ListBox>
+        </Select.Popover>
+
+        <FieldError />
+      </Select>
+    )
+  }
+
+  if (inputType === "combobox") {
+    return (
+      <ComboBox
+        className="[&[data-required=true]>.label]:after:content-none"
+        name={name}
+        defaultSelectedKey={
+          field.defaultValue != null ? String(field.defaultValue) : undefined
+        }
+        isDisabled={isPending}
+        isReadOnly={field.readOnly}
+        isRequired={field.required}
+        variant={inputVariant}
+        fullWidth
+      >
+        <Label>{field.label}</Label>
+
+        <ComboBox.InputGroup>
+          <Input placeholder={field.placeholder} />
+          <ComboBox.Trigger />
+        </ComboBox.InputGroup>
+
+        <ComboBox.Popover>
+          <ListBox>
+            {field.options?.map((option) => (
+              <ListBox.Item
+                key={option.value}
+                id={option.value}
+                textValue={
+                  typeof option.label === "string" ? option.label : option.value
+                }
+              >
+                {option.label}
+
+                <ListBox.ItemIndicator />
+              </ListBox.Item>
+            ))}
+          </ListBox>
+        </ComboBox.Popover>
+
+        <FieldError />
+      </ComboBox>
+    )
+  }
+
+  if (inputType === "date" || inputType === "datetime") {
+    const isDateTime = inputType === "datetime"
+    const defaultValue = isDateTime
+      ? toDateTimeValue(field.defaultValue)
+      : toDateValue(field.defaultValue)
+
+    return (
+      <DatePicker
+        className="w-full [&[data-required=true]>.label]:after:content-none"
+        name={name}
+        defaultValue={defaultValue}
+        granularity={isDateTime ? "minute" : "day"}
+        isDisabled={isPending}
+        isReadOnly={field.readOnly}
+        isRequired={field.required}
+      >
+        {({ state }) => (
+          <>
+            <Label>{field.label}</Label>
+
+            <DateField.Group variant={inputVariant} fullWidth>
+              <DateField.Input>
+                {(segment) => <DateField.Segment segment={segment} />}
+              </DateField.Input>
+
+              <DateField.Suffix>
+                <DatePicker.Trigger>
+                  <DatePicker.TriggerIndicator />
+                </DatePicker.Trigger>
+              </DateField.Suffix>
+            </DateField.Group>
+
+            <FieldError />
+
+            <DatePicker.Popover className="flex flex-col gap-3">
+              <Calendar
+                aria-label={
+                  typeof field.label === "string" ? field.label : name
+                }
+              >
+                <Calendar.Header>
+                  <Calendar.YearPickerTrigger>
+                    <Calendar.YearPickerTriggerHeading />
+                    <Calendar.YearPickerTriggerIndicator />
+                  </Calendar.YearPickerTrigger>
+                  <Calendar.NavButton slot="previous" />
+                  <Calendar.NavButton slot="next" />
+                </Calendar.Header>
+
+                <Calendar.Grid>
+                  <Calendar.GridHeader>
+                    {(day) => <Calendar.HeaderCell>{day}</Calendar.HeaderCell>}
+                  </Calendar.GridHeader>
+
+                  <Calendar.GridBody>
+                    {(date) => <Calendar.Cell date={date} />}
+                  </Calendar.GridBody>
+                </Calendar.Grid>
+
+                <Calendar.YearPickerGrid>
+                  <Calendar.YearPickerGridBody>
+                    {({ year }) => <Calendar.YearPickerCell year={year} />}
+                  </Calendar.YearPickerGridBody>
+                </Calendar.YearPickerGrid>
+              </Calendar>
+
+              {isDateTime && (
+                <div className="flex items-center justify-between">
+                  <Label>{localization.settings.time}</Label>
+
+                  <TimeField
+                    aria-label={localization.settings.time}
+                    granularity="minute"
+                    value={state.timeValue}
+                    onChange={(v) => state.setTimeValue(v as TimeValue)}
+                  >
+                    <TimeField.Group variant="secondary">
+                      <TimeField.Input>
+                        {(segment) => <TimeField.Segment segment={segment} />}
+                      </TimeField.Input>
+                    </TimeField.Group>
+                  </TimeField>
+                </div>
+              )}
+            </DatePicker.Popover>
+          </>
+        )}
+      </DatePicker>
+    )
+  }
+
+  // inputType === "input"
+  const hasPrefix = field.prefix != null
+  const hasSuffix = field.suffix != null || field.copyable
+
+  // When `inputType: "input"` is paired with `type: "number"`, restrict the
+  // native input to numbers. `formatOptions.maximumFractionDigits` enables
+  // fractional input via `step`.
+  const isNumeric = field.type === "number"
+  const maxFractionDigits = field.formatOptions?.maximumFractionDigits
+  const nativeInputType = isNumeric ? "number" : undefined
+  const nativeInputMode = isNumeric
+    ? maxFractionDigits
+      ? "decimal"
+      : "numeric"
+    : undefined
+  const nativeStep = maxFractionDigits ? 1 / 10 ** maxFractionDigits : undefined
+
+  if (hasPrefix || hasSuffix) {
+    return (
+      <TextField
+        name={name}
+        defaultValue={
+          field.defaultValue == null ? undefined : String(field.defaultValue)
+        }
+        isDisabled={isPending}
+        isReadOnly={field.readOnly}
+      >
+        <Label>{field.label}</Label>
+
+        <InputGroup variant={inputVariant}>
+          {hasPrefix && <InputGroup.Prefix>{field.prefix}</InputGroup.Prefix>}
+
+          <InputGroup.Input
+            ref={inputRef}
+            placeholder={field.placeholder}
+            required={field.required}
+            type={nativeInputType}
+            inputMode={nativeInputMode}
+            step={nativeStep}
+          />
+
+          {field.copyable ? (
+            <InputGroup.Suffix className="px-0">
+              <CopyButton
+                getValue={() => inputRef.current?.value}
+                isDisabled={isPending}
+              />
+            </InputGroup.Suffix>
+          ) : (
+            field.suffix != null && (
+              <InputGroup.Suffix>{field.suffix}</InputGroup.Suffix>
+            )
+          )}
+        </InputGroup>
+
+        <FieldError />
+      </TextField>
+    )
+  }
+
+  return (
+    <TextField
+      name={name}
+      defaultValue={
+        field.defaultValue == null ? undefined : String(field.defaultValue)
+      }
+      isDisabled={isPending}
+      isReadOnly={field.readOnly}
+    >
+      <Label>{field.label}</Label>
+
+      <Input
+        placeholder={field.placeholder}
+        required={field.required}
+        variant={inputVariant}
+        type={nativeInputType}
+        inputMode={nativeInputMode}
+        step={nativeStep}
+      />
+
+      <FieldError />
+    </TextField>
+  )
+}

package/src/components/auth/auth-provider.tsx

@@ -1,18 +1,17 @@
 import {
+  type AuthClient,
   AuthProvider as AuthProviderPrimitive,
   type AuthProviderProps as AuthProviderPropsPrimitive
 } from "@better-auth-ui/react"
 import { RouterProvider } from "@heroui/react"
-
 import { ErrorToaster } from "./error-toaster"
 
-export type AuthProviderProps = Omit<AuthProviderPropsPrimitive, "Link">
+export type AuthProviderProps<TAuthClient = AuthClient> =
+  AuthProviderPropsPrimitive<TAuthClient>
 
 /**
- * Provides an authentication context by rendering an auth provider with the sonner toast handler injected, forwarding remaining configuration and rendering `children` inside it.
- *
- * @param children - React nodes to render inside the authentication provider
- * @returns A React element that renders an authentication provider configured with the provided props and toast handler
+ * Heroui-flavored `AuthProvider`. Wraps the primitive provider with a
+ * heroui `RouterProvider` and the heroui `ErrorToaster`.
  */
 export function AuthProvider({
   children,