The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
refactor: replace whole implementation with a state
Ephraim Atta-Duncan1a48d194f7d7
diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsxindex 62daf803b..5de43c411 100644--- a/packages/ui/primitives/document-flow/add-fields.tsx+++ b/packages/ui/primitives/document-flow/add-fields.tsx@@ -22,12 +22,7 @@ import {CommandInput,CommandItem,} from '@documenso/ui/primitives/command';-import {- Popover,- PopoverClose,- PopoverContent,- PopoverTrigger,-} from '@documenso/ui/primitives/popover';+import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover';import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';import { TAddFieldsFormSchema } from './add-fields.types';@@ -107,6 +102,7 @@ export const AddFieldsFormPartial = ({const [selectedField, setSelectedField] = useState<FieldType | null>(null);const [selectedSigner, setSelectedSigner] = useState<Recipient | null>(null);+ const [showRecipientsSelector, setShowRecipientsSelector] = useState(false);const hasSelectedSignerBeenSent = selectedSigner?.sendStatus === SendStatus.SENT;@@ -319,7 +315,7 @@ export const AddFieldsFormPartial = ({))}{!hideRecipients && (- <Popover>+ <Popover open={showRecipientsSelector} onOpenChange={setShowRecipientsSelector}><PopoverTrigger asChild><Buttontype="button"@@ -350,49 +346,48 @@ export const AddFieldsFormPartial = ({{recipients.map((recipient, index) => (<CommandItemkey={index}- className="p-0"- onSelect={() => setSelectedSigner(recipient)}+ className={cn({+ 'text-muted-foreground': recipient.sendStatus === SendStatus.SENT,+ })}+ onSelect={() => {+ setSelectedSigner(recipient);+ setShowRecipientsSelector(false);+ }}>- <PopoverClose- className={cn('flex w-full px-1 py-2', {- 'text-muted-foreground': recipient.sendStatus === SendStatus.SENT,- })}- >- {recipient.sendStatus !== SendStatus.SENT ? (- <Check- aria-hidden={recipient !== selectedSigner}- className={cn('mr-2 h-4 w-4 flex-shrink-0', {- 'opacity-0': recipient !== selectedSigner,- 'opacity-100': recipient === selectedSigner,- })}- />- ) : (- <Tooltip>- <TooltipTrigger>- <Info className="mr-2 h-4 w-4" />- </TooltipTrigger>- <TooltipContent className="max-w-xs">- This document has already been sent to this recipient. You can no- longer edit this recipient.- </TooltipContent>- </Tooltip>- )}-- {recipient.name && (- <span- className="truncate"- title={`${recipient.name} (${recipient.email})`}- >- {recipient.name} ({recipient.email})- </span>- )}-- {!recipient.name && (- <span className="truncate" title={recipient.email}>- {recipient.email}- </span>- )}- </PopoverClose>+ {recipient.sendStatus !== SendStatus.SENT ? (+ <Check+ aria-hidden={recipient !== selectedSigner}+ className={cn('mr-2 h-4 w-4 flex-shrink-0', {+ 'opacity-0': recipient !== selectedSigner,+ 'opacity-100': recipient === selectedSigner,+ })}+ />+ ) : (+ <Tooltip>+ <TooltipTrigger>+ <Info className="mr-2 h-4 w-4" />+ </TooltipTrigger>+ <TooltipContent className="max-w-xs">+ This document has already been sent to this recipient. You can no+ longer edit this recipient.+ </TooltipContent>+ </Tooltip>+ )}++ {recipient.name && (+ <span+ className="truncate"+ title={`${recipient.name} (${recipient.email})`}+ >+ {recipient.name} ({recipient.email})+ </span>+ )}++ {!recipient.name && (+ <span className="truncate" title={recipient.email}>+ {recipient.email}+ </span>+ )}</CommandItem>))}</CommandGroup>diff --git a/packages/ui/primitives/popover.tsx b/packages/ui/primitives/popover.tsxindex 640b3087e..e84f6cc6d 100644--- a/packages/ui/primitives/popover.tsx+++ b/packages/ui/primitives/popover.tsx@@ -10,8 +10,6 @@ const Popover = PopoverPrimitive.Root;const PopoverTrigger = PopoverPrimitive.Trigger;-const PopoverClose = PopoverPrimitive.Close;-const PopoverContent = React.forwardRef<React.ElementRef<typeof PopoverPrimitive.Content>,React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>@@ -32,4 +30,4 @@ const PopoverContent = React.forwardRef<PopoverContent.displayName = PopoverPrimitive.Content.displayName;-export { Popover, PopoverTrigger, PopoverContent, PopoverClose };+export { Popover, PopoverTrigger, PopoverContent };