@arbidocs/blocks 0.4.166 → 0.4.167

package/dist/document-tools/viewer/index.js

@@ -5,7 +5,7 @@ import '../../chunk-VUNV25KB.js';
 import { useRef, useMemo, useEffect, useState, useCallback } from 'react';
 import { useAnnotationLayer, redactionLogCsv, AnnotationPageOverlay, AnnotationToolbar, FreezeDialog, createMemoryStore } from '@arbidocs/react/annotations';
 import { freezePdfInBrowser } from '@arbidocs/react/annotations/freeze';
-import { useDocumentTools, useIsOnline, createMarkupStore, fetchMarkupPdf, uploadFrozenCopy, redactionLogName, SIGNED_LOCKED_REASON, isLegibleSignatureBox, toAppearance, FIELD_TYPE_LABELS, useSignSignatureRequest, useSavedSignature, useStoreSavedSignature, useDeclineSignatureRequest, fieldsInSigningOrder, MARK_FIELD_TYPES, intentText, useSignerCandidates, useSaveSignatureRequest, useInviteSigners, isEmailSigner, sendBlocker, suggestSignatureFields, splitSuggestions, fieldsFromSuggestions, newFieldId, SIGNATURE_FIELD_TYPES, SigningError, DEFAULT_FIELD_SIZE } from '@arbidocs/react/document-tools';
+import { useDocumentTools, useIsOnline, createMarkupStore, fetchMarkupPdf, uploadFrozenCopy, redactionLogName, SIGNED_LOCKED_REASON, isLegibleSignatureBox, toAppearance, FIELD_TYPE_LABELS, useSignSignatureRequest, useSavedSignature, useStoreSavedSignature, useDeclineSignatureRequest, fieldsInSigningOrder, MARK_FIELD_TYPES, intentText, useSignerCandidates, useSaveSignatureRequest, useInviteSigners, isEmailSigner, sendBlocker, signatureFieldSuggestions, splitSuggestions, fieldsFromSuggestions, newFieldId, SIGNATURE_FIELD_TYPES, SigningError, DEFAULT_FIELD_SIZE, suggestSignatureFields } from '@arbidocs/react/document-tools';
 import { PdfViewer } from '@arbidocs/react/viewers';
 import { Download, X, ArrowRight, ArrowLeft, Check, UserPlus, MailPlus, ScanSearch, Send, PenLine } from 'lucide-react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -929,6 +929,10 @@ function SignatureRequestEditor({
     },
     [people, draft, givenNames]
   );
+  const nameAndEmailOf = (token) => {
+    const name = nameOf(token);
+    return isEmailSigner(token) && name !== token ? `${name} (${token})` : name;
+  };
   const isInvitee = useCallback(
     (token) => isEmailSigner(token) && !members.has(token.toLowerCase()) || draft?.signers.find((s) => s.external_id === token)?.progress === "invited",
     [members, draft]
@@ -961,16 +965,17 @@ function SignatureRequestEditor({
     if (draft || placedOnce.current || candidates.isLoading) return;
     placedOnce.current = true;
     let live = true;
-    void suggestSignatureFields(client, documentId, version).then((found) => {
+    void signatureFieldSuggestions(client, documentId, version).then(({ fields: found, signers: namedSigners }) => {
       if (!live) return;
       const { placed, extras } = splitSuggestions(found ?? []);
-      if (!placed.length) return;
-      const named = Object.fromEntries(
-        placed.flatMap(
+      const named = Object.fromEntries([
+        ...namedSigners.map((s) => [s.email.toLowerCase(), s.name]),
+        ...placed.flatMap(
           (s) => s.signer_email && s.signer_name ? [[s.signer_email.toLowerCase(), s.signer_name]] : []
         )
-      );
+      ]);
       setGivenNames((n) => ({ ...n, ...named }));
+      if (!placed.length) return;
       const added = fieldsFromSuggestions(placed, {}, members);
       setFields((fs) => [...fs, ...added]);
       const assigned = [...new Set(added.map((f) => f.signer))];
@@ -1194,6 +1199,7 @@ function SignatureRequestEditor({
             size: "sm",
             variant: placing === type && current ? "default" : "outline",
             disabled: !current,
+            "aria-pressed": placing === type && !!current,
             onClick: () => setPlacing(placing === type ? null : type),
             "data-testid": `signature-place-${type}`,
             children: FIELD_TYPE_LABELS[type]
@@ -1369,8 +1375,9 @@ function SignatureRequestEditor({
           "data-testid": "signature-invite-confirm",
           children: [
             /* @__PURE__ */ jsxs("p", { children: [
-              "Not in this workspace yet: ",
-              /* @__PURE__ */ jsx("strong", { children: confirmInvite.map(nameOf).join(", ") }),
+              "Not in this workspace yet:",
+              " ",
+              /* @__PURE__ */ jsx("strong", { children: confirmInvite.map(nameAndEmailOf).join(", ") }),
               ".",
               " ",
               me?.role === "owner" ? "They are invited as guests and asked to sign when they join." : "Ask a workspace owner to invite them: they are asked to sign when they join."