Skip to content

The Open Source DocuSign Alternative.

feat: add custom text to singleplayer

Ephraim Atta-Duncan11299d3f92b7
diff --git a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx b/apps/marketing/src/app/(marketing)/singleplayer/client.tsx
index e0b55dbf5..9f1ebb289 100644
--- a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx
+++ b/apps/marketing/src/app/(marketing)/singleplayer/client.tsx
@@ -256,6 +256,7 @@ export const SinglePlayerClient = () => {
fields={fields}
onSubmit={onSignSubmit}
requireName={Boolean(fields.find((field) => field.type === 'NAME'))}
+ requireCustomText={Boolean(fields.find((field) => field.type === 'TEXT'))}
requireSignature={Boolean(fields.find((field) => field.type === 'SIGNATURE'))}
/>
</Stepper>
diff --git a/packages/trpc/server/singleplayer-router/helper.ts b/packages/trpc/server/singleplayer-router/helper.ts
index 0ec0ba42d..32d03c0ac 100644
--- a/packages/trpc/server/singleplayer-router/helper.ts
+++ b/packages/trpc/server/singleplayer-router/helper.ts
@@ -22,6 +22,7 @@ export const mapField = (
.with(FieldType.DATE, () => DateTime.now().toFormat('yyyy-MM-dd hh:mm a'))
.with(FieldType.EMAIL, () => signer.email)
.with(FieldType.NAME, () => signer.name)
+ .with(FieldType.TEXT, () => signer.customText)
.otherwise(() => '');
return {
diff --git a/packages/trpc/server/singleplayer-router/schema.ts b/packages/trpc/server/singleplayer-router/schema.ts
index 9fa56e7b1..412429fca 100644
--- a/packages/trpc/server/singleplayer-router/schema.ts
+++ b/packages/trpc/server/singleplayer-router/schema.ts
@@ -12,6 +12,7 @@ export const ZCreateSinglePlayerDocumentMutationSchema = z.object({
email: z.string().email().min(1),
name: z.string(),
signature: z.string(),
+ customText: z.string(),
}),
fields: z.array(
z.object({
diff --git a/packages/ui/primitives/document-flow/add-signature.tsx b/packages/ui/primitives/document-flow/add-signature.tsx
index 5accdca16..a90b46917 100644
--- a/packages/ui/primitives/document-flow/add-signature.tsx
+++ b/packages/ui/primitives/document-flow/add-signature.tsx
@@ -23,6 +23,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '
import { Input } from '../input';
import { SignaturePad } from '../signature-pad';
import { useStep } from '../stepper';
+import { Textarea } from '../textarea';
import type { TAddSignatureFormSchema } from './add-signature.types';
import { ZAddSignatureFormSchema } from './add-signature.types';
import {
@@ -44,6 +45,7 @@ export type AddSignatureFormProps = {
onSubmit: (_data: TAddSignatureFormSchema) => Promise<void> | void;
requireName?: boolean;
+ requireCustomText?: boolean;
requireSignature?: boolean;
};
@@ -54,6 +56,7 @@ export const AddSignatureFormPartial = ({
onSubmit,
requireName = false,
+ requireCustomText = false,
requireSignature = true,
}: AddSignatureFormProps) => {
const { currentStep, totalSteps } = useStep();
@@ -70,6 +73,14 @@ export const AddSignatureFormPartial = ({
});
}
+ if (requireCustomText && val.customText.length === 0) {
+ ctx.addIssue({
+ path: ['customText'],
+ code: 'custom',
+ message: 'Text is required',
+ });
+ }
+
if (requireSignature && val.signature.length === 0) {
ctx.addIssue({
path: ['signature'],
@@ -85,6 +96,7 @@ export const AddSignatureFormPartial = ({
name: '',
email: '',
signature: '',
+ customText: '',
},
});
@@ -131,6 +143,11 @@ export const AddSignatureFormPartial = ({
return !form.formState.errors.email;
}
+ if (fieldType === FieldType.TEXT) {
+ await form.trigger('customText');
+ return !form.formState.errors.customText;
+ }
+
return true;
};
@@ -154,6 +171,11 @@ export const AddSignatureFormPartial = ({
customText: form.getValues('name'),
inserted: true,
}))
+ .with(FieldType.TEXT, () => ({
+ ...field,
+ customText: form.getValues('customText'),
+ inserted: true,
+ }))
.with(FieldType.SIGNATURE, () => {
const value = form.getValues('signature');
@@ -302,6 +324,29 @@ export const AddSignatureFormPartial = ({
)}
/>
)}
+
+ {requireCustomText && (
+ <FormField
+ control={form.control}
+ name="customText"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel required={requireCustomText}>Custom Text</FormLabel>
+ <FormControl>
+ <Textarea
+ className="bg-background h-44"
+ {...field}
+ onChange={(value) => {
+ onFormValueChange(FieldType.TEXT);
+ field.onChange(value);
+ }}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ )}
</div>
</DocumentFlowFormContainerContent>
@@ -330,7 +375,7 @@ export const AddSignatureFormPartial = ({
<ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
{localFields.map((field) =>
match(field.type)
- .with(FieldType.DATE, FieldType.EMAIL, FieldType.NAME, () => {
+ .with(FieldType.DATE, FieldType.TEXT, FieldType.EMAIL, FieldType.NAME, () => {
return (
<SinglePlayerModeCustomTextField
onClick={insertField(field)}
diff --git a/packages/ui/primitives/document-flow/add-signature.types.ts b/packages/ui/primitives/document-flow/add-signature.types.ts
index 936604ebf..380091acf 100644
--- a/packages/ui/primitives/document-flow/add-signature.types.ts
+++ b/packages/ui/primitives/document-flow/add-signature.types.ts
@@ -6,6 +6,7 @@ export const ZAddSignatureFormSchema = z.object({
.min(1, { message: 'Email is required' })
.email({ message: 'Invalid email address' }),
name: z.string(),
+ customText: z.string(),
signature: z.string(),
});
diff --git a/packages/ui/primitives/document-flow/add-subject.tsx b/packages/ui/primitives/document-flow/add-subject.tsx
index 40e42e3b3..bfc7f3fc5 100644
--- a/packages/ui/primitives/document-flow/add-subject.tsx
+++ b/packages/ui/primitives/document-flow/add-subject.tsx
@@ -226,7 +226,7 @@ export const AddSubjectFormPartial = ({
</>
)}
- <div className="flex flex-col">
+ <div className="mt-2 flex flex-col">
<div className="flex flex-col gap-y-4">
<div>
<Label htmlFor="redirectUrl" className="flex items-center">
diff --git a/packages/ui/primitives/document-flow/single-player-mode-fields.tsx b/packages/ui/primitives/document-flow/single-player-mode-fields.tsx
index 7cecd7131..2ef115e4b 100644
--- a/packages/ui/primitives/document-flow/single-player-mode-fields.tsx
+++ b/packages/ui/primitives/document-flow/single-player-mode-fields.tsx
@@ -172,6 +172,7 @@ export function SinglePlayerModeCustomTextField({
.with(FieldType.DATE, () => 'Date')
.with(FieldType.NAME, () => 'Name')
.with(FieldType.EMAIL, () => 'Email')
+ .with(FieldType.TEXT, () => 'Text')
.with(FieldType.SIGNATURE, FieldType.FREE_SIGNATURE, () => 'Signature')
.otherwise(() => '')}
</button>
diff --git a/packages/ui/primitives/template-flow/add-template-fields.tsx b/packages/ui/primitives/template-flow/add-template-fields.tsx
index bb9c304d9..a72f94d50 100644
--- a/packages/ui/primitives/template-flow/add-template-fields.tsx
+++ b/packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -511,6 +511,28 @@ export const AddTemplateFieldsFormPartial = ({
</CardContent>
</Card>
</button>
+
+ <button
+ type="button"
+ className="group h-full w-full"
+ onClick={() => setSelectedField(FieldType.TEXT)}
+ onMouseDown={() => setSelectedField(FieldType.TEXT)}
+ data-selected={selectedField === FieldType.TEXT ? true : undefined}
+ >
+ <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer group-disabled:opacity-50">
+ <CardContent className="flex flex-col items-center justify-center px-6 py-4">
+ <p
+ className={cn(
+ 'text-muted-foreground group-data-[selected]:text-foreground text-xl font-medium',
+ )}
+ >
+ {'Text'}
+ </p>
+
+ <p className="text-muted-foreground mt-2 text-xs">Custom Text</p>
+ </CardContent>
+ </Card>
+ </button>
</div>
</div>
</div>