The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
chore: add label for checkbox and radio fields (#1607)
Catalin Pite79d76271034
diff --git a/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx b/apps/remix/app/components/general/document-signing/document-signing-field-container.tsxindex 148117b55..14fe95c44 100644--- a/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx@@ -181,6 +181,23 @@ export const DocumentSigningFieldContainer = ({</button>)}+ {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&+ field.fieldMeta?.label && (+ <div+ className={cn(+ 'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',+ {+ 'bg-foreground/5 border-border border': !field.inserted,+ },+ {+ 'bg-documenso-200 border-primary border': field.inserted,+ },+ )}+ >+ {field.fieldMeta.label}+ </div>+ )}+{children}</FieldRootContainer></div>diff --git a/packages/ui/primitives/document-flow/field-item.tsx b/packages/ui/primitives/document-flow/field-item.tsxindex 3682f84a2..e78cf7429 100644--- a/packages/ui/primitives/document-flow/field-item.tsx+++ b/packages/ui/primitives/document-flow/field-item.tsx@@ -8,6 +8,7 @@ import { match } from 'ts-pattern';import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';import type { TFieldMetaSchema } from '@documenso/lib/types/field-meta';import { ZCheckboxFieldMeta, ZRadioFieldMeta } from '@documenso/lib/types/field-meta';+import { FieldType } from '@documenso/prisma/client';import { useSignerColors } from '../../lib/signer-colors';import { cn } from '../../lib/utils';@@ -174,11 +175,35 @@ export const FieldItem = ({() => hasFieldMetaValues('CHECKBOX', field.fieldMeta, ZCheckboxFieldMeta),[field.fieldMeta],);+const radioHasValues = useMemo(() => hasFieldMetaValues('RADIO', field.fieldMeta, ZRadioFieldMeta),[field.fieldMeta],);+ const hasCheckedValues = (fieldMeta: TFieldMetaSchema, type: FieldType) => {+ if (!fieldMeta || (type !== FieldType.RADIO && type !== FieldType.CHECKBOX)) {+ return false;+ }++ if (type === FieldType.RADIO) {+ const parsed = ZRadioFieldMeta.parse(fieldMeta);+ return parsed.values?.some((value) => value.checked) ?? false;+ }++ if (type === FieldType.CHECKBOX) {+ const parsed = ZCheckboxFieldMeta.parse(fieldMeta);+ return parsed.values?.some((value) => value.checked) ?? false;+ }++ return false;+ };++ const fieldHasCheckedValues = useMemo(+ () => hasCheckedValues(field.fieldMeta, field.type),+ [field.fieldMeta, field.type],+ );+const fixedSize = checkBoxHasValues || radioHasValues;return createPortal(@@ -218,6 +243,21 @@ export const FieldItem = ({onMove?.(d.node);}}>+ {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&+ field.fieldMeta?.label && (+ <div+ className={cn(+ 'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',+ {+ 'bg-foreground/5 border-primary border': !fieldHasCheckedValues,+ 'bg-documenso-200 border-primary border': fieldHasCheckedValues,+ },+ )}+ >+ {field.fieldMeta.label}+ </div>+ )}+<divclassName={cn('relative flex h-full w-full items-center justify-center bg-white',diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsxindex 1e929d69d..708f14927 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx@@ -125,6 +125,18 @@ export const CheckboxFieldAdvancedSettings = ({return (<div className="flex flex-col gap-4">+ <div className="mb-2">+ <Label>+ <Trans>Label</Trans>+ </Label>+ <Input+ id="label"+ className="bg-background mt-2"+ placeholder={_(msg`Field label`)}+ value={fieldState.label}+ onChange={(e) => handleFieldChange('label', e.target.value)}+ />+ </div><div className="flex flex-row items-center gap-x-4"><div className="flex w-2/3 flex-col"><Label>diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsxindex fdd065e0e..cca9aaf8d 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx@@ -1,5 +1,7 @@import { useEffect, useState } from 'react';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';import { Trans } from '@lingui/react/macro';import { ChevronDown, ChevronUp, Trash } from 'lucide-react';@@ -25,6 +27,8 @@ export const RadioFieldAdvancedSettings = ({handleFieldChange,handleErrors,}: RadioFieldAdvancedSettingsProps) => {+ const { _ } = useLingui();+const [showValidation, setShowValidation] = useState(false);const [values, setValues] = useState(fieldState.values ?? [{ id: 1, checked: false, value: 'Default value' }],@@ -100,6 +104,18 @@ export const RadioFieldAdvancedSettings = ({return (<div className="flex flex-col gap-4"><div className="flex flex-col gap-4">+ <div>+ <Label>+ <Trans>Label</Trans>+ </Label>+ <Input+ id="label"+ className="bg-background mt-2"+ placeholder={_(msg`Field label`)}+ value={fieldState.label}+ onChange={(e) => handleFieldChange('label', e.target.value)}+ />+ </div><div className="flex flex-row items-center gap-2"><SwitchclassName="bg-background"