The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: element visible race condition (#1996)
Lucas Smith4012022f5562
diff --git a/apps/remix/app/components/embed/authoring/configure-fields-view.tsx b/apps/remix/app/components/embed/authoring/configure-fields-view.tsxindex 60b732a76..21faee750 100644--- a/apps/remix/app/components/embed/authoring/configure-fields-view.tsx+++ b/apps/remix/app/components/embed/authoring/configure-fields-view.tsx@@ -172,6 +172,8 @@ export const ConfigureFieldsView = ({name: 'fields',});+ const highestPageNumber = Math.max(...localFields.map((field) => field.pageNumber));+const onFieldCopy = useCallback((event?: KeyboardEvent | null, options?: { duplicate?: boolean; duplicateAll?: boolean }) => {const { duplicate = false, duplicateAll = false } = options ?? {};@@ -540,7 +542,9 @@ export const ConfigureFieldsView = ({<div><PDFViewer documentData={normalizedDocumentData} />- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible+ target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}+ >{localFields.map((field, index) => {const recipientIndex = recipients.findIndex((r) => r.id === field.recipientId,diff --git a/apps/remix/app/components/embed/embed-direct-template-client-page.tsx b/apps/remix/app/components/embed/embed-direct-template-client-page.tsxindex 09f6a91d2..8b883a36b 100644--- a/apps/remix/app/components/embed/embed-direct-template-client-page.tsx+++ b/apps/remix/app/components/embed/embed-direct-template-client-page.tsx@@ -91,6 +91,8 @@ export const EmbedDirectTemplateClientPage = ({localFields.filter((field) => field.inserted),];+ const highestPendingPageNumber = Math.max(...pendingFields.map((field) => field.page));+const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);const { mutateAsync: createDocumentFromDirectTemplate, isPending: isSubmitting } =@@ -442,7 +444,9 @@ export const EmbedDirectTemplateClientPage = ({</div></div>- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible+ target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPendingPageNumber}"]`}+ >{showPendingFieldTooltip && pendingFields.length > 0 && (<FieldToolTip key={pendingFields[0].id} field={pendingFields[0]} color="warning"><Trans>Click to insert field</Trans>diff --git a/apps/remix/app/components/embed/embed-document-fields.tsx b/apps/remix/app/components/embed/embed-document-fields.tsxindex 561fdf4cb..ea14b3f1f 100644--- a/apps/remix/app/components/embed/embed-document-fields.tsx+++ b/apps/remix/app/components/embed/embed-document-fields.tsx@@ -50,8 +50,10 @@ export const EmbedDocumentFields = ({onSignField,onUnsignField,}: EmbedDocumentFieldsProps) => {+ const highestPageNumber = Math.max(...fields.map((field) => field.page));+return (- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}>{fields.map((field) =>match(field.type).with(FieldType.SIGNATURE, () => (diff --git a/apps/remix/app/components/embed/embed-document-signing-page.tsx b/apps/remix/app/components/embed/embed-document-signing-page.tsxindex ef2eedc1c..d7d8a0713 100644--- a/apps/remix/app/components/embed/embed-document-signing-page.tsx+++ b/apps/remix/app/components/embed/embed-document-signing-page.tsx@@ -106,6 +106,8 @@ export const EmbedSignDocumentClientPage = ({fields.filter((field) => field.inserted),];+ const highestPendingPageNumber = Math.max(...pendingFields.map((field) => field.page));+const { mutateAsync: completeDocumentWithToken, isPending: isSubmitting } =trpc.recipient.completeDocumentWithToken.useMutation();@@ -465,7 +467,9 @@ export const EmbedSignDocumentClientPage = ({</div></div>- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible+ target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPendingPageNumber}"]`}+ >{showPendingFieldTooltip && pendingFields.length > 0 && (<FieldToolTip key={pendingFields[0].id} field={pendingFields[0]} color="warning"><Trans>Click to insert field</Trans>diff --git a/apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx b/apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsxindex 37abdcce3..5867a1a2a 100644--- a/apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx+++ b/apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx@@ -92,6 +92,8 @@ export const MultiSignDocumentSigningView = ({[],];+ const highestPendingPageNumber = Math.max(...pendingFields.map((field) => field.page));+const uninsertedFields = document?.fields.filter((field) => !field.inserted) ?? [];const onSignField = async (payload: TSignFieldWithTokenMutationSchema) => {@@ -357,7 +359,9 @@ export const MultiSignDocumentSigningView = ({</div>{hasDocumentLoaded && (- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible+ target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPendingPageNumber}"]`}+ >{showPendingFieldTooltip && pendingFields.length > 0 && (<FieldToolTipkey={pendingFields[0].id}diff --git a/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx b/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsxindex da38f51c4..8f78ae754 100644--- a/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx+++ b/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx@@ -79,6 +79,8 @@ export const DirectTemplateSigningForm = ({const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);const [isSubmitting, setIsSubmitting] = useState(false);+ const highestPageNumber = Math.max(...localFields.map((field) => field.page));+const fieldsRequiringValidation = useMemo(() => {return localFields.filter((field) => isFieldUnsignedAndRequired(field));}, [localFields]);@@ -221,7 +223,9 @@ export const DirectTemplateSigningForm = ({<DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} /><DocumentFlowFormContainerContent>- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible+ target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}+ >{validateUninsertedFields && uninsertedFields[0] && (<FieldToolTip key={uninsertedFields[0].id} field={uninsertedFields[0]} color="warning"><Trans>Click to insert field</Trans>diff --git a/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx b/apps/remix/app/components/general/document-signing/document-signing-page-view.tsxindex a1bf3d24e..cbbdc7926 100644--- a/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx@@ -78,6 +78,8 @@ export const DocumentSigningPageView = ({const targetSigner =recipient.role === RecipientRole.ASSISTANT && selectedSigner ? selectedSigner : null;+ const highestPageNumber = Math.max(...fields.map((field) => field.page));+return (<DocumentSigningRecipientProvider recipient={recipient} targetSigner={targetSigner}><div className="mx-auto w-full max-w-screen-xl sm:px-6">@@ -224,7 +226,9 @@ export const DocumentSigningPageView = ({<DocumentSigningAutoSign recipient={recipient} fields={fields} />)}- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible+ target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}+ >{fields.filter((field) =>diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsxindex 75592696c..84c9c6883 100644--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx@@ -67,6 +67,7 @@ export async function loader({ params, request }: Route.LoaderArgs) {const documentVisibility = document?.visibility;const currentTeamMemberRole = team.currentTeamRole;const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);+let canAccessDocument = true;if (!isRecipient && document?.userId !== user.id) {diff --git a/packages/ui/components/document/document-read-only-fields.tsx b/packages/ui/components/document/document-read-only-fields.tsxindex 0786357d1..d1c96f8a9 100644--- a/packages/ui/components/document/document-read-only-fields.tsx+++ b/packages/ui/components/document/document-read-only-fields.tsx@@ -95,8 +95,10 @@ export const DocumentReadOnlyFields = ({setHiddenFieldIds((prev) => ({ ...prev, [fieldId]: true }));};+ const highestPageNumber = Math.max(...fields.map((field) => field.page));+return (- <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>+ <ElementVisible target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}>{fields.map((field) =>!hiddenFieldIds[field.secondaryId] && (