mirror of
https://github.com/documenso/documenso.git
synced 2025-11-20 19:51:32 +10:00
fix: resolve logic issues
This commit is contained in:
@ -95,6 +95,14 @@ export const ConfigureFieldsView = ({
|
|||||||
return base64.encode(configData.documentData.data);
|
return base64.encode(configData.documentData.data);
|
||||||
}, [configData.documentData]);
|
}, [configData.documentData]);
|
||||||
|
|
||||||
|
const normalizedEnvelopeItem = useMemo(() => {
|
||||||
|
if (envelopeItem) {
|
||||||
|
return envelopeItem;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { id: '', envelopeId: '' };
|
||||||
|
}, [envelopeItem]);
|
||||||
|
|
||||||
const recipients = useMemo(() => {
|
const recipients = useMemo(() => {
|
||||||
return configData.signers.map<Recipient>((signer, index) => ({
|
return configData.signers.map<Recipient>((signer, index) => ({
|
||||||
id: signer.nativeId || index,
|
id: signer.nativeId || index,
|
||||||
@ -536,55 +544,50 @@ export const ConfigureFieldsView = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
<Form {...form}>
|
<Form {...form}>
|
||||||
{normalizedDocumentData ||
|
<div>
|
||||||
(envelopeItem && (
|
<PDFViewer
|
||||||
<div>
|
presignToken={presignToken}
|
||||||
<PDFViewer
|
overrideData={normalizedDocumentData}
|
||||||
presignToken={presignToken}
|
envelopeItem={normalizedEnvelopeItem}
|
||||||
overrideData={normalizedDocumentData}
|
token={undefined}
|
||||||
envelopeItem={envelopeItem}
|
version="signed"
|
||||||
token={undefined}
|
/>
|
||||||
version="signed"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<ElementVisible
|
<ElementVisible
|
||||||
target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}
|
target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}
|
||||||
>
|
>
|
||||||
{localFields.map((field, index) => {
|
{localFields.map((field, index) => {
|
||||||
const recipientIndex = recipients.findIndex(
|
const recipientIndex = recipients.findIndex((r) => r.id === field.recipientId);
|
||||||
(r) => r.id === field.recipientId,
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FieldItem
|
<FieldItem
|
||||||
key={field.formId}
|
key={field.formId}
|
||||||
field={field}
|
field={field}
|
||||||
minHeight={MIN_HEIGHT_PX}
|
minHeight={MIN_HEIGHT_PX}
|
||||||
minWidth={MIN_WIDTH_PX}
|
minWidth={MIN_WIDTH_PX}
|
||||||
defaultHeight={DEFAULT_HEIGHT_PX}
|
defaultHeight={DEFAULT_HEIGHT_PX}
|
||||||
defaultWidth={DEFAULT_WIDTH_PX}
|
defaultWidth={DEFAULT_WIDTH_PX}
|
||||||
onResize={(node) => onFieldResize(node, index)}
|
onResize={(node) => onFieldResize(node, index)}
|
||||||
onMove={(node) => onFieldMove(node, index)}
|
onMove={(node) => onFieldMove(node, index)}
|
||||||
onRemove={() => remove(index)}
|
onRemove={() => remove(index)}
|
||||||
onDuplicate={() => onFieldCopy(null, { duplicate: true })}
|
onDuplicate={() => onFieldCopy(null, { duplicate: true })}
|
||||||
onDuplicateAllPages={() => onFieldCopy(null, { duplicateAll: true })}
|
onDuplicateAllPages={() => onFieldCopy(null, { duplicateAll: true })}
|
||||||
onFocus={() => setLastActiveField(field)}
|
onFocus={() => setLastActiveField(field)}
|
||||||
onBlur={() => setLastActiveField(null)}
|
onBlur={() => setLastActiveField(null)}
|
||||||
onAdvancedSettings={() => {
|
onAdvancedSettings={() => {
|
||||||
setCurrentField(field);
|
setCurrentField(field);
|
||||||
setShowAdvancedSettings(true);
|
setShowAdvancedSettings(true);
|
||||||
}}
|
}}
|
||||||
recipientIndex={recipientIndex}
|
recipientIndex={recipientIndex}
|
||||||
active={activeFieldId === field.formId}
|
active={activeFieldId === field.formId}
|
||||||
onFieldActivate={() => setActiveFieldId(field.formId)}
|
onFieldActivate={() => setActiveFieldId(field.formId)}
|
||||||
onFieldDeactivate={() => setActiveFieldId(null)}
|
onFieldDeactivate={() => setActiveFieldId(null)}
|
||||||
disabled={selectedRecipient?.id !== field.recipientId}
|
disabled={selectedRecipient?.id !== field.recipientId}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</ElementVisible>
|
</ElementVisible>
|
||||||
</div>
|
</div>
|
||||||
))}
|
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user