mirror of
https://github.com/documenso/documenso.git
synced 2025-11-12 15:53:02 +10:00
feat: add text align option to fields (#1610)
Adds the ability to align text to the left, center or right for relevant fields. Previously text was always centered which can be less desirable. See attached debug document which has left, center and right text alignments set for fields. <img width="614" alt="image" src="https://github.com/user-attachments/assets/361a030e-813d-458b-9c7a-ff4c9fa5e33c" /> N/A - Added text align option - Update the insert in pdf method to support different alignments - Added a debug mode to field insertion - Ran manual tests using the debug mode
This commit is contained in:
committed by
David Nguyen
parent
383b5f78f0
commit
9db42accf3
@ -13,12 +13,14 @@ import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones'
|
|||||||
import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
|
import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
|
||||||
import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
|
import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
|
||||||
import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
|
import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
|
||||||
|
import { ZDateFieldMeta } from '@documenso/lib/types/field-meta';
|
||||||
import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
|
import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
|
||||||
import { trpc } from '@documenso/trpc/react';
|
import { trpc } from '@documenso/trpc/react';
|
||||||
import type {
|
import type {
|
||||||
TRemovedSignedFieldWithTokenMutationSchema,
|
TRemovedSignedFieldWithTokenMutationSchema,
|
||||||
TSignFieldWithTokenMutationSchema,
|
TSignFieldWithTokenMutationSchema,
|
||||||
} from '@documenso/trpc/server/field-router/schema';
|
} from '@documenso/trpc/server/field-router/schema';
|
||||||
|
import { cn } from '@documenso/ui/lib/utils';
|
||||||
import { useToast } from '@documenso/ui/primitives/use-toast';
|
import { useToast } from '@documenso/ui/primitives/use-toast';
|
||||||
|
|
||||||
import { DocumentSigningFieldContainer } from './document-signing-field-container';
|
import { DocumentSigningFieldContainer } from './document-signing-field-container';
|
||||||
@ -54,6 +56,9 @@ export const DocumentSigningDateField = ({
|
|||||||
|
|
||||||
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
||||||
|
|
||||||
|
const safeFieldMeta = ZDateFieldMeta.safeParse(field.fieldMeta);
|
||||||
|
const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
|
||||||
|
|
||||||
const localDateString = convertToLocalSystemFormat(field.customText, dateFormat, timezone);
|
const localDateString = convertToLocalSystemFormat(field.customText, dateFormat, timezone);
|
||||||
|
|
||||||
const isDifferentTime = field.inserted && localDateString !== field.customText;
|
const isDifferentTime = field.inserted && localDateString !== field.customText;
|
||||||
@ -143,9 +148,21 @@ export const DocumentSigningDateField = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{field.inserted && (
|
{field.inserted && (
|
||||||
<p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
|
<div className="flex h-full w-full items-center">
|
||||||
|
<p
|
||||||
|
className={cn(
|
||||||
|
'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
|
||||||
|
{
|
||||||
|
'text-left': parsedFieldMeta?.textAlign === 'left',
|
||||||
|
'text-center':
|
||||||
|
!parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
|
||||||
|
'text-right': parsedFieldMeta?.textAlign === 'right',
|
||||||
|
},
|
||||||
|
)}
|
||||||
|
>
|
||||||
{localDateString}
|
{localDateString}
|
||||||
</p>
|
</p>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</DocumentSigningFieldContainer>
|
</DocumentSigningFieldContainer>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -8,12 +8,14 @@ import { useRevalidator } from 'react-router';
|
|||||||
import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
|
import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
|
||||||
import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
|
import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
|
||||||
import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
|
import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
|
||||||
|
import { ZEmailFieldMeta } from '@documenso/lib/types/field-meta';
|
||||||
import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
|
import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
|
||||||
import { trpc } from '@documenso/trpc/react';
|
import { trpc } from '@documenso/trpc/react';
|
||||||
import type {
|
import type {
|
||||||
TRemovedSignedFieldWithTokenMutationSchema,
|
TRemovedSignedFieldWithTokenMutationSchema,
|
||||||
TSignFieldWithTokenMutationSchema,
|
TSignFieldWithTokenMutationSchema,
|
||||||
} from '@documenso/trpc/server/field-router/schema';
|
} from '@documenso/trpc/server/field-router/schema';
|
||||||
|
import { cn } from '@documenso/ui/lib/utils';
|
||||||
import { useToast } from '@documenso/ui/primitives/use-toast';
|
import { useToast } from '@documenso/ui/primitives/use-toast';
|
||||||
|
|
||||||
import { DocumentSigningFieldContainer } from './document-signing-field-container';
|
import { DocumentSigningFieldContainer } from './document-signing-field-container';
|
||||||
@ -48,6 +50,9 @@ export const DocumentSigningEmailField = ({
|
|||||||
|
|
||||||
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
||||||
|
|
||||||
|
const safeFieldMeta = ZEmailFieldMeta.safeParse(field.fieldMeta);
|
||||||
|
const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
|
||||||
|
|
||||||
const onSign = async (authOptions?: TRecipientActionAuth) => {
|
const onSign = async (authOptions?: TRecipientActionAuth) => {
|
||||||
try {
|
try {
|
||||||
const value = providedEmail ?? '';
|
const value = providedEmail ?? '';
|
||||||
@ -126,9 +131,21 @@ export const DocumentSigningEmailField = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{field.inserted && (
|
{field.inserted && (
|
||||||
<p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
|
<div className="flex h-full w-full items-center">
|
||||||
|
<p
|
||||||
|
className={cn(
|
||||||
|
'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
|
||||||
|
{
|
||||||
|
'text-left': parsedFieldMeta?.textAlign === 'left',
|
||||||
|
'text-center':
|
||||||
|
!parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
|
||||||
|
'text-right': parsedFieldMeta?.textAlign === 'right',
|
||||||
|
},
|
||||||
|
)}
|
||||||
|
>
|
||||||
{field.customText}
|
{field.customText}
|
||||||
</p>
|
</p>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</DocumentSigningFieldContainer>
|
</DocumentSigningFieldContainer>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -10,12 +10,14 @@ import { useRevalidator } from 'react-router';
|
|||||||
import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
|
import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
|
||||||
import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
|
import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
|
||||||
import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
|
import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
|
||||||
|
import { ZNameFieldMeta } from '@documenso/lib/types/field-meta';
|
||||||
import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
|
import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
|
||||||
import { trpc } from '@documenso/trpc/react';
|
import { trpc } from '@documenso/trpc/react';
|
||||||
import type {
|
import type {
|
||||||
TRemovedSignedFieldWithTokenMutationSchema,
|
TRemovedSignedFieldWithTokenMutationSchema,
|
||||||
TSignFieldWithTokenMutationSchema,
|
TSignFieldWithTokenMutationSchema,
|
||||||
} from '@documenso/trpc/server/field-router/schema';
|
} from '@documenso/trpc/server/field-router/schema';
|
||||||
|
import { cn } from '@documenso/ui/lib/utils';
|
||||||
import { Button } from '@documenso/ui/primitives/button';
|
import { Button } from '@documenso/ui/primitives/button';
|
||||||
import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
|
import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
|
||||||
import { Input } from '@documenso/ui/primitives/input';
|
import { Input } from '@documenso/ui/primitives/input';
|
||||||
@ -58,6 +60,9 @@ export const DocumentSigningNameField = ({
|
|||||||
|
|
||||||
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
||||||
|
|
||||||
|
const safeFieldMeta = ZNameFieldMeta.safeParse(field.fieldMeta);
|
||||||
|
const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
|
||||||
|
|
||||||
const [showFullNameModal, setShowFullNameModal] = useState(false);
|
const [showFullNameModal, setShowFullNameModal] = useState(false);
|
||||||
const [localFullName, setLocalFullName] = useState('');
|
const [localFullName, setLocalFullName] = useState('');
|
||||||
|
|
||||||
@ -172,9 +177,21 @@ export const DocumentSigningNameField = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{field.inserted && (
|
{field.inserted && (
|
||||||
<p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
|
<div className="flex h-full w-full items-center">
|
||||||
|
<p
|
||||||
|
className={cn(
|
||||||
|
'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
|
||||||
|
{
|
||||||
|
'text-left': parsedFieldMeta?.textAlign === 'left',
|
||||||
|
'text-center':
|
||||||
|
!parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
|
||||||
|
'text-right': parsedFieldMeta?.textAlign === 'right',
|
||||||
|
},
|
||||||
|
)}
|
||||||
|
>
|
||||||
{field.customText}
|
{field.customText}
|
||||||
</p>
|
</p>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Dialog open={showFullNameModal} onOpenChange={setShowFullNameModal}>
|
<Dialog open={showFullNameModal} onOpenChange={setShowFullNameModal}>
|
||||||
|
|||||||
@ -54,8 +54,9 @@ export const DocumentSigningNumberField = ({
|
|||||||
|
|
||||||
const [showRadioModal, setShowRadioModal] = useState(false);
|
const [showRadioModal, setShowRadioModal] = useState(false);
|
||||||
|
|
||||||
const parsedFieldMeta = field.fieldMeta ? ZNumberFieldMeta.parse(field.fieldMeta) : null;
|
const safeFieldMeta = ZNumberFieldMeta.safeParse(field.fieldMeta);
|
||||||
const isReadOnly = parsedFieldMeta?.readOnly;
|
const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
|
||||||
|
|
||||||
const defaultValue = parsedFieldMeta?.value;
|
const defaultValue = parsedFieldMeta?.value;
|
||||||
const [localNumber, setLocalNumber] = useState(
|
const [localNumber, setLocalNumber] = useState(
|
||||||
parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '0',
|
parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '0',
|
||||||
@ -210,7 +211,7 @@ export const DocumentSigningNumberField = ({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (
|
if (
|
||||||
(!field.inserted && defaultValue && localNumber) ||
|
(!field.inserted && defaultValue && localNumber) ||
|
||||||
(!field.inserted && isReadOnly && defaultValue)
|
(!field.inserted && parsedFieldMeta?.readOnly && defaultValue)
|
||||||
) {
|
) {
|
||||||
void executeActionAuthProcedure({
|
void executeActionAuthProcedure({
|
||||||
onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
|
onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
|
||||||
@ -262,9 +263,21 @@ export const DocumentSigningNumberField = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{field.inserted && (
|
{field.inserted && (
|
||||||
<p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
|
<div className="flex h-full w-full items-center">
|
||||||
|
<p
|
||||||
|
className={cn(
|
||||||
|
'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
|
||||||
|
{
|
||||||
|
'text-left': parsedFieldMeta?.textAlign === 'left',
|
||||||
|
'text-center':
|
||||||
|
!parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
|
||||||
|
'text-right': parsedFieldMeta?.textAlign === 'right',
|
||||||
|
},
|
||||||
|
)}
|
||||||
|
>
|
||||||
{field.customText}
|
{field.customText}
|
||||||
</p>
|
</p>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Dialog open={showRadioModal} onOpenChange={setShowRadioModal}>
|
<Dialog open={showRadioModal} onOpenChange={setShowRadioModal}>
|
||||||
|
|||||||
@ -62,7 +62,8 @@ export const DocumentSigningTextField = ({
|
|||||||
isPending: isRemoveSignedFieldWithTokenLoading,
|
isPending: isRemoveSignedFieldWithTokenLoading,
|
||||||
} = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
|
} = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
|
||||||
|
|
||||||
const parsedFieldMeta = field.fieldMeta ? ZTextFieldMeta.parse(field.fieldMeta) : null;
|
const safeFieldMeta = ZTextFieldMeta.safeParse(field.fieldMeta);
|
||||||
|
const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
|
||||||
|
|
||||||
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading;
|
||||||
const shouldAutoSignField =
|
const shouldAutoSignField =
|
||||||
@ -261,11 +262,23 @@ export const DocumentSigningTextField = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{field.inserted && (
|
{field.inserted && (
|
||||||
<p className="text-muted-foreground dark:text-background/80 flex items-center justify-center gap-x-1 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
|
<div className="flex h-full w-full items-center">
|
||||||
|
<p
|
||||||
|
className={cn(
|
||||||
|
'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
|
||||||
|
{
|
||||||
|
'text-left': parsedFieldMeta?.textAlign === 'left',
|
||||||
|
'text-center':
|
||||||
|
!parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
|
||||||
|
'text-right': parsedFieldMeta?.textAlign === 'right',
|
||||||
|
},
|
||||||
|
)}
|
||||||
|
>
|
||||||
{field.customText.length < 20
|
{field.customText.length < 20
|
||||||
? field.customText
|
? field.customText
|
||||||
: field.customText.substring(0, 15) + '...'}
|
: field.customText.substring(0, 15) + '...'}
|
||||||
</p>
|
</p>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Dialog open={showCustomTextModal} onOpenChange={setShowCustomTextModal}>
|
<Dialog open={showCustomTextModal} onOpenChange={setShowCustomTextModal}>
|
||||||
@ -281,6 +294,10 @@ export const DocumentSigningTextField = ({
|
|||||||
className={cn('mt-2 w-full rounded-md', {
|
className={cn('mt-2 w-full rounded-md', {
|
||||||
'border-2 border-red-300 ring-2 ring-red-200 ring-offset-2 ring-offset-red-200 focus-visible:border-red-400 focus-visible:ring-4 focus-visible:ring-red-200 focus-visible:ring-offset-2 focus-visible:ring-offset-red-200':
|
'border-2 border-red-300 ring-2 ring-red-200 ring-offset-2 ring-offset-red-200 focus-visible:border-red-400 focus-visible:ring-4 focus-visible:ring-red-200 focus-visible:ring-offset-2 focus-visible:ring-offset-red-200':
|
||||||
userInputHasErrors,
|
userInputHasErrors,
|
||||||
|
'text-left': parsedFieldMeta?.textAlign === 'left',
|
||||||
|
'text-center':
|
||||||
|
!parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
|
||||||
|
'text-right': parsedFieldMeta?.textAlign === 'right',
|
||||||
})}
|
})}
|
||||||
value={localText}
|
value={localText}
|
||||||
onChange={handleTextChange}
|
onChange={handleTextChange}
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
import fontkit from '@pdf-lib/fontkit';
|
import fontkit from '@pdf-lib/fontkit';
|
||||||
import { FieldType } from '@prisma/client';
|
import { FieldType } from '@prisma/client';
|
||||||
import type { PDFDocument } from 'pdf-lib';
|
import type { PDFDocument } from 'pdf-lib';
|
||||||
import { RotationTypes, degrees, radiansToDegrees } from 'pdf-lib';
|
import { RotationTypes, degrees, radiansToDegrees, rgb } from 'pdf-lib';
|
||||||
import { P, match } from 'ts-pattern';
|
import { P, match } from 'ts-pattern';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@ -34,6 +34,9 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
const isSignatureField = isSignatureFieldType(field.type);
|
const isSignatureField = isSignatureFieldType(field.type);
|
||||||
|
const isDebugMode =
|
||||||
|
// eslint-disable-next-line turbo/no-undeclared-env-vars
|
||||||
|
process.env.DEBUG_PDF_INSERT === '1' || process.env.DEBUG_PDF_INSERT === 'true';
|
||||||
|
|
||||||
pdf.registerFontkit(fontkit);
|
pdf.registerFontkit(fontkit);
|
||||||
|
|
||||||
@ -81,6 +84,35 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
|
|||||||
const fieldX = pageWidth * (Number(field.positionX) / 100);
|
const fieldX = pageWidth * (Number(field.positionX) / 100);
|
||||||
const fieldY = pageHeight * (Number(field.positionY) / 100);
|
const fieldY = pageHeight * (Number(field.positionY) / 100);
|
||||||
|
|
||||||
|
// Draw debug box if debug mode is enabled
|
||||||
|
if (isDebugMode) {
|
||||||
|
let debugX = fieldX;
|
||||||
|
let debugY = pageHeight - fieldY - fieldHeight; // Invert Y for PDF coordinates
|
||||||
|
|
||||||
|
if (pageRotationInDegrees !== 0) {
|
||||||
|
const adjustedPosition = adjustPositionForRotation(
|
||||||
|
pageWidth,
|
||||||
|
pageHeight,
|
||||||
|
debugX,
|
||||||
|
debugY,
|
||||||
|
pageRotationInDegrees,
|
||||||
|
);
|
||||||
|
|
||||||
|
debugX = adjustedPosition.xPos;
|
||||||
|
debugY = adjustedPosition.yPos;
|
||||||
|
}
|
||||||
|
|
||||||
|
page.drawRectangle({
|
||||||
|
x: debugX,
|
||||||
|
y: debugY,
|
||||||
|
width: fieldWidth,
|
||||||
|
height: fieldHeight,
|
||||||
|
borderColor: rgb(1, 0, 0), // Red
|
||||||
|
borderWidth: 1,
|
||||||
|
rotate: degrees(pageRotationInDegrees),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const font = await pdf.embedFont(
|
const font = await pdf.embedFont(
|
||||||
isSignatureField ? fontCaveat : fontNoto,
|
isSignatureField ? fontCaveat : fontNoto,
|
||||||
isSignatureField ? { features: { calt: false } } : undefined,
|
isSignatureField ? { features: { calt: false } } : undefined,
|
||||||
@ -276,6 +308,7 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
|
|||||||
const meta = Parser ? Parser.safeParse(field.fieldMeta) : null;
|
const meta = Parser ? Parser.safeParse(field.fieldMeta) : null;
|
||||||
|
|
||||||
const customFontSize = meta?.success && meta.data.fontSize ? meta.data.fontSize : null;
|
const customFontSize = meta?.success && meta.data.fontSize ? meta.data.fontSize : null;
|
||||||
|
const textAlign = meta?.success && meta.data.textAlign ? meta.data.textAlign : 'center';
|
||||||
const longestLineInTextForWidth = field.customText
|
const longestLineInTextForWidth = field.customText
|
||||||
.split('\n')
|
.split('\n')
|
||||||
.sort((a, b) => b.length - a.length)[0];
|
.sort((a, b) => b.length - a.length)[0];
|
||||||
@ -291,7 +324,17 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
|
|||||||
|
|
||||||
textWidth = font.widthOfTextAtSize(longestLineInTextForWidth, fontSize);
|
textWidth = font.widthOfTextAtSize(longestLineInTextForWidth, fontSize);
|
||||||
|
|
||||||
let textX = fieldX + (fieldWidth - textWidth) / 2;
|
// Add padding similar to web display (roughly 0.5rem equivalent in PDF units)
|
||||||
|
const padding = 8; // PDF points, roughly equivalent to 0.5rem
|
||||||
|
|
||||||
|
// Calculate X position based on text alignment with padding
|
||||||
|
let textX = fieldX + padding; // Left alignment starts after padding
|
||||||
|
if (textAlign === 'center') {
|
||||||
|
textX = fieldX + (fieldWidth - textWidth) / 2; // Center alignment ignores padding
|
||||||
|
} else if (textAlign === 'right') {
|
||||||
|
textX = fieldX + fieldWidth - textWidth - padding; // Right alignment respects right padding
|
||||||
|
}
|
||||||
|
|
||||||
let textY = fieldY + (fieldHeight - textHeight) / 2;
|
let textY = fieldY + (fieldHeight - textHeight) / 2;
|
||||||
|
|
||||||
// Invert the Y axis since PDFs use a bottom-left coordinate system
|
// Invert the Y axis since PDFs use a bottom-left coordinate system
|
||||||
|
|||||||
@ -10,9 +10,14 @@ export const ZBaseFieldMeta = z.object({
|
|||||||
|
|
||||||
export type TBaseFieldMeta = z.infer<typeof ZBaseFieldMeta>;
|
export type TBaseFieldMeta = z.infer<typeof ZBaseFieldMeta>;
|
||||||
|
|
||||||
|
export const ZFieldTextAlignSchema = z.enum(['left', 'center', 'right']);
|
||||||
|
|
||||||
|
export type TFieldTextAlignSchema = z.infer<typeof ZFieldTextAlignSchema>;
|
||||||
|
|
||||||
export const ZInitialsFieldMeta = ZBaseFieldMeta.extend({
|
export const ZInitialsFieldMeta = ZBaseFieldMeta.extend({
|
||||||
type: z.literal('initials'),
|
type: z.literal('initials'),
|
||||||
fontSize: z.number().min(8).max(96).optional(),
|
fontSize: z.number().min(8).max(96).optional(),
|
||||||
|
textAlign: ZFieldTextAlignSchema.optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type TInitialsFieldMeta = z.infer<typeof ZInitialsFieldMeta>;
|
export type TInitialsFieldMeta = z.infer<typeof ZInitialsFieldMeta>;
|
||||||
@ -20,6 +25,7 @@ export type TInitialsFieldMeta = z.infer<typeof ZInitialsFieldMeta>;
|
|||||||
export const ZNameFieldMeta = ZBaseFieldMeta.extend({
|
export const ZNameFieldMeta = ZBaseFieldMeta.extend({
|
||||||
type: z.literal('name'),
|
type: z.literal('name'),
|
||||||
fontSize: z.number().min(8).max(96).optional(),
|
fontSize: z.number().min(8).max(96).optional(),
|
||||||
|
textAlign: ZFieldTextAlignSchema.optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type TNameFieldMeta = z.infer<typeof ZNameFieldMeta>;
|
export type TNameFieldMeta = z.infer<typeof ZNameFieldMeta>;
|
||||||
@ -27,6 +33,7 @@ export type TNameFieldMeta = z.infer<typeof ZNameFieldMeta>;
|
|||||||
export const ZEmailFieldMeta = ZBaseFieldMeta.extend({
|
export const ZEmailFieldMeta = ZBaseFieldMeta.extend({
|
||||||
type: z.literal('email'),
|
type: z.literal('email'),
|
||||||
fontSize: z.number().min(8).max(96).optional(),
|
fontSize: z.number().min(8).max(96).optional(),
|
||||||
|
textAlign: ZFieldTextAlignSchema.optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type TEmailFieldMeta = z.infer<typeof ZEmailFieldMeta>;
|
export type TEmailFieldMeta = z.infer<typeof ZEmailFieldMeta>;
|
||||||
@ -34,6 +41,7 @@ export type TEmailFieldMeta = z.infer<typeof ZEmailFieldMeta>;
|
|||||||
export const ZDateFieldMeta = ZBaseFieldMeta.extend({
|
export const ZDateFieldMeta = ZBaseFieldMeta.extend({
|
||||||
type: z.literal('date'),
|
type: z.literal('date'),
|
||||||
fontSize: z.number().min(8).max(96).optional(),
|
fontSize: z.number().min(8).max(96).optional(),
|
||||||
|
textAlign: ZFieldTextAlignSchema.optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type TDateFieldMeta = z.infer<typeof ZDateFieldMeta>;
|
export type TDateFieldMeta = z.infer<typeof ZDateFieldMeta>;
|
||||||
@ -43,6 +51,7 @@ export const ZTextFieldMeta = ZBaseFieldMeta.extend({
|
|||||||
text: z.string().optional(),
|
text: z.string().optional(),
|
||||||
characterLimit: z.number().optional(),
|
characterLimit: z.number().optional(),
|
||||||
fontSize: z.number().min(8).max(96).optional(),
|
fontSize: z.number().min(8).max(96).optional(),
|
||||||
|
textAlign: ZFieldTextAlignSchema.optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type TTextFieldMeta = z.infer<typeof ZTextFieldMeta>;
|
export type TTextFieldMeta = z.infer<typeof ZTextFieldMeta>;
|
||||||
@ -54,6 +63,7 @@ export const ZNumberFieldMeta = ZBaseFieldMeta.extend({
|
|||||||
minValue: z.number().optional(),
|
minValue: z.number().optional(),
|
||||||
maxValue: z.number().optional(),
|
maxValue: z.number().optional(),
|
||||||
fontSize: z.number().min(8).max(96).optional(),
|
fontSize: z.number().min(8).max(96).optional(),
|
||||||
|
textAlign: ZFieldTextAlignSchema.optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type TNumberFieldMeta = z.infer<typeof ZNumberFieldMeta>;
|
export type TNumberFieldMeta = z.infer<typeof ZNumberFieldMeta>;
|
||||||
|
|||||||
@ -69,21 +69,25 @@ const getDefaultState = (fieldType: FieldType): FieldMeta => {
|
|||||||
return {
|
return {
|
||||||
type: 'initials',
|
type: 'initials',
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
|
textAlign: 'left',
|
||||||
};
|
};
|
||||||
case FieldType.NAME:
|
case FieldType.NAME:
|
||||||
return {
|
return {
|
||||||
type: 'name',
|
type: 'name',
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
|
textAlign: 'left',
|
||||||
};
|
};
|
||||||
case FieldType.EMAIL:
|
case FieldType.EMAIL:
|
||||||
return {
|
return {
|
||||||
type: 'email',
|
type: 'email',
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
|
textAlign: 'left',
|
||||||
};
|
};
|
||||||
case FieldType.DATE:
|
case FieldType.DATE:
|
||||||
return {
|
return {
|
||||||
type: 'date',
|
type: 'date',
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
|
textAlign: 'left',
|
||||||
};
|
};
|
||||||
case FieldType.TEXT:
|
case FieldType.TEXT:
|
||||||
return {
|
return {
|
||||||
@ -95,6 +99,7 @@ const getDefaultState = (fieldType: FieldType): FieldMeta => {
|
|||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
required: false,
|
required: false,
|
||||||
readOnly: false,
|
readOnly: false,
|
||||||
|
textAlign: 'left',
|
||||||
};
|
};
|
||||||
case FieldType.NUMBER:
|
case FieldType.NUMBER:
|
||||||
return {
|
return {
|
||||||
@ -108,6 +113,7 @@ const getDefaultState = (fieldType: FieldType): FieldMeta => {
|
|||||||
required: false,
|
required: false,
|
||||||
readOnly: false,
|
readOnly: false,
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
|
textAlign: 'left',
|
||||||
};
|
};
|
||||||
case FieldType.RADIO:
|
case FieldType.RADIO:
|
||||||
return {
|
return {
|
||||||
|
|||||||
@ -6,6 +6,13 @@ import { validateFields as validateDateFields } from '@documenso/lib/advanced-fi
|
|||||||
import { type TDateFieldMeta as DateFieldMeta } from '@documenso/lib/types/field-meta';
|
import { type TDateFieldMeta as DateFieldMeta } from '@documenso/lib/types/field-meta';
|
||||||
import { Input } from '@documenso/ui/primitives/input';
|
import { Input } from '@documenso/ui/primitives/input';
|
||||||
import { Label } from '@documenso/ui/primitives/label';
|
import { Label } from '@documenso/ui/primitives/label';
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from '@documenso/ui/primitives/select';
|
||||||
|
|
||||||
type DateFieldAdvancedSettingsProps = {
|
type DateFieldAdvancedSettingsProps = {
|
||||||
fieldState: DateFieldMeta;
|
fieldState: DateFieldMeta;
|
||||||
@ -67,6 +74,27 @@ export const DateFieldAdvancedSettings = ({
|
|||||||
max={96}
|
max={96}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Label>
|
||||||
|
<Trans>Text Align</Trans>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
value={fieldState.textAlign}
|
||||||
|
onValueChange={(value) => handleInput('textAlign', value)}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="bg-background mt-2">
|
||||||
|
<SelectValue placeholder="Select text align" />
|
||||||
|
</SelectTrigger>
|
||||||
|
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="left">Left</SelectItem>
|
||||||
|
<SelectItem value="center">Center</SelectItem>
|
||||||
|
<SelectItem value="right">Right</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -6,6 +6,13 @@ import { validateFields as validateEmailFields } from '@documenso/lib/advanced-f
|
|||||||
import { type TEmailFieldMeta as EmailFieldMeta } from '@documenso/lib/types/field-meta';
|
import { type TEmailFieldMeta as EmailFieldMeta } from '@documenso/lib/types/field-meta';
|
||||||
import { Input } from '@documenso/ui/primitives/input';
|
import { Input } from '@documenso/ui/primitives/input';
|
||||||
import { Label } from '@documenso/ui/primitives/label';
|
import { Label } from '@documenso/ui/primitives/label';
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from '@documenso/ui/primitives/select';
|
||||||
|
|
||||||
type EmailFieldAdvancedSettingsProps = {
|
type EmailFieldAdvancedSettingsProps = {
|
||||||
fieldState: EmailFieldMeta;
|
fieldState: EmailFieldMeta;
|
||||||
@ -49,6 +56,27 @@ export const EmailFieldAdvancedSettings = ({
|
|||||||
max={96}
|
max={96}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Label>
|
||||||
|
<Trans>Text Align</Trans>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
value={fieldState.textAlign}
|
||||||
|
onValueChange={(value) => handleInput('textAlign', value)}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="bg-background mt-2">
|
||||||
|
<SelectValue placeholder="Select text align" />
|
||||||
|
</SelectTrigger>
|
||||||
|
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="left">Left</SelectItem>
|
||||||
|
<SelectItem value="center">Center</SelectItem>
|
||||||
|
<SelectItem value="right">Right</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -7,6 +7,8 @@ import { type TInitialsFieldMeta as InitialsFieldMeta } from '@documenso/lib/typ
|
|||||||
import { Input } from '@documenso/ui/primitives/input';
|
import { Input } from '@documenso/ui/primitives/input';
|
||||||
import { Label } from '@documenso/ui/primitives/label';
|
import { Label } from '@documenso/ui/primitives/label';
|
||||||
|
|
||||||
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../../select';
|
||||||
|
|
||||||
type InitialsFieldAdvancedSettingsProps = {
|
type InitialsFieldAdvancedSettingsProps = {
|
||||||
fieldState: InitialsFieldMeta;
|
fieldState: InitialsFieldMeta;
|
||||||
handleFieldChange: (key: keyof InitialsFieldMeta, value: string | boolean) => void;
|
handleFieldChange: (key: keyof InitialsFieldMeta, value: string | boolean) => void;
|
||||||
@ -49,6 +51,27 @@ export const InitialsFieldAdvancedSettings = ({
|
|||||||
max={96}
|
max={96}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Label>
|
||||||
|
<Trans>Text Align</Trans>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
value={fieldState.textAlign}
|
||||||
|
onValueChange={(value) => handleInput('textAlign', value)}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="bg-background mt-2">
|
||||||
|
<SelectValue placeholder="Select text align" />
|
||||||
|
</SelectTrigger>
|
||||||
|
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="left">Left</SelectItem>
|
||||||
|
<SelectItem value="center">Center</SelectItem>
|
||||||
|
<SelectItem value="right">Right</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -6,6 +6,13 @@ import { validateFields as validateNameFields } from '@documenso/lib/advanced-fi
|
|||||||
import { type TNameFieldMeta as NameFieldMeta } from '@documenso/lib/types/field-meta';
|
import { type TNameFieldMeta as NameFieldMeta } from '@documenso/lib/types/field-meta';
|
||||||
import { Input } from '@documenso/ui/primitives/input';
|
import { Input } from '@documenso/ui/primitives/input';
|
||||||
import { Label } from '@documenso/ui/primitives/label';
|
import { Label } from '@documenso/ui/primitives/label';
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from '@documenso/ui/primitives/select';
|
||||||
|
|
||||||
type NameFieldAdvancedSettingsProps = {
|
type NameFieldAdvancedSettingsProps = {
|
||||||
fieldState: NameFieldMeta;
|
fieldState: NameFieldMeta;
|
||||||
@ -49,6 +56,27 @@ export const NameFieldAdvancedSettings = ({
|
|||||||
max={96}
|
max={96}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Label>
|
||||||
|
<Trans>Text Align</Trans>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
value={fieldState.textAlign}
|
||||||
|
onValueChange={(value) => handleInput('textAlign', value)}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="bg-background mt-2">
|
||||||
|
<SelectValue placeholder="Select text align" />
|
||||||
|
</SelectTrigger>
|
||||||
|
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="left">Left</SelectItem>
|
||||||
|
<SelectItem value="center">Center</SelectItem>
|
||||||
|
<SelectItem value="right">Right</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -134,6 +134,27 @@ export const NumberFieldAdvancedSettings = ({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Label>
|
||||||
|
<Trans>Text Align</Trans>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
value={fieldState.textAlign}
|
||||||
|
onValueChange={(value) => handleInput('textAlign', value)}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="bg-background mt-2">
|
||||||
|
<SelectValue placeholder="Select text align" />
|
||||||
|
</SelectTrigger>
|
||||||
|
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="left">Left</SelectItem>
|
||||||
|
<SelectItem value="center">Center</SelectItem>
|
||||||
|
<SelectItem value="right">Right</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="mt-2 flex flex-col gap-4">
|
<div className="mt-2 flex flex-col gap-4">
|
||||||
<div className="flex flex-row items-center gap-2">
|
<div className="flex flex-row items-center gap-2">
|
||||||
<Switch
|
<Switch
|
||||||
|
|||||||
@ -6,6 +6,13 @@ import { validateTextField } from '@documenso/lib/advanced-fields-validation/val
|
|||||||
import { type TTextFieldMeta as TextFieldMeta } from '@documenso/lib/types/field-meta';
|
import { type TTextFieldMeta as TextFieldMeta } from '@documenso/lib/types/field-meta';
|
||||||
import { Input } from '@documenso/ui/primitives/input';
|
import { Input } from '@documenso/ui/primitives/input';
|
||||||
import { Label } from '@documenso/ui/primitives/label';
|
import { Label } from '@documenso/ui/primitives/label';
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from '@documenso/ui/primitives/select';
|
||||||
import { Switch } from '@documenso/ui/primitives/switch';
|
import { Switch } from '@documenso/ui/primitives/switch';
|
||||||
import { Textarea } from '@documenso/ui/primitives/textarea';
|
import { Textarea } from '@documenso/ui/primitives/textarea';
|
||||||
|
|
||||||
@ -113,6 +120,27 @@ export const TextFieldAdvancedSettings = ({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<Label>
|
||||||
|
<Trans>Text Align</Trans>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
value={fieldState.textAlign}
|
||||||
|
onValueChange={(value) => handleInput('textAlign', value)}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="bg-background mt-2">
|
||||||
|
<SelectValue placeholder="Select text align" />
|
||||||
|
</SelectTrigger>
|
||||||
|
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="left">Left</SelectItem>
|
||||||
|
<SelectItem value="center">Center</SelectItem>
|
||||||
|
<SelectItem value="right">Right</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="mt-4 flex flex-col gap-4">
|
<div className="mt-4 flex flex-col gap-4">
|
||||||
<div className="flex flex-row items-center gap-2">
|
<div className="flex flex-row items-center gap-2">
|
||||||
<Switch
|
<Switch
|
||||||
|
|||||||
Reference in New Issue
Block a user