🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
Merge pull request #2860 from nxglabs/sync-to-public_repo-41027112487
raktima-opensignlabse06f13c29e28
diff --git a/apps/OpenSign/package-lock.json b/apps/OpenSign/package-lock.jsonindex 9931f09b4..5246b4666 100644--- a/apps/OpenSign/package-lock.json+++ b/apps/OpenSign/package-lock.json@@ -120,17 +120,6 @@"node": "18 || 20 || 22"}},- "../..": {- "name": "opensign",- "version": "2.37.0",- "extraneous": true,- "license": "AGPL-3.0",- "devDependencies": {- "husky": "^9.1.7",- "lint-staged": "^16.3.3",- "prettier": "^3.8.1"- }- },"node_modules/@adobe/css-tools": {"version": "4.5.0","dev": true,diff --git a/apps/OpenSign/public/locales/de/translation.json b/apps/OpenSign/public/locales/de/translation.jsonindex 7e1f48f15..d068f0e5b 100644--- a/apps/OpenSign/public/locales/de/translation.json+++ b/apps/OpenSign/public/locales/de/translation.json@@ -1,4 +1,8 @@{+ "undo": "Rückgängig",+ "redo": "Wiederholen",+ "undo-widget": "Hinzufügen oder Entfernen eines Feldes rückgängig machen",+ "redo-widget": "Hinzufügen oder Entfernen eines Feldes wiederholen","header-news": "Neue Funktion: Qualifizierte elektronische Signaturen jetzt verfügbar","header-news-btn": "Jetzt ausprobieren","sandbox-news": "Dies ist eine Sandbox-Umgebung. Bitte nicht für produktive Zwecke verwenden.",diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.jsonindex e5af175d9..3e15c9f24 100644--- a/apps/OpenSign/public/locales/en/translation.json+++ b/apps/OpenSign/public/locales/en/translation.json@@ -1,4 +1,8 @@{+ "undo": "Undo",+ "redo": "Redo",+ "undo-widget": "Undo widget addition or removal",+ "redo-widget": "Redo widget addition or removal","header-news": "New Feature: Qualified Electronics Signatures now available","header-news-btn": "Try it now","sandbox-news": "This is a sandbox environment. Please do not use it for production purposes.",diff --git a/apps/OpenSign/public/locales/es/translation.json b/apps/OpenSign/public/locales/es/translation.jsonindex b681102ab..854bece56 100644--- a/apps/OpenSign/public/locales/es/translation.json+++ b/apps/OpenSign/public/locales/es/translation.json@@ -1,4 +1,8 @@{+ "undo": "Deshacer",+ "redo": "Rehacer",+ "undo-widget": "Deshacer la adición o eliminación de un campo",+ "redo-widget": "Rehacer la adición o eliminación de un campo","header-news": "Nueva función: Firmas electrónicas cualificadas ya disponibles","header-news-btn": "Pruébalo ahora","sandbox-news": "Este es un entorno sandbox. Por favor, no lo utilice con fines de producción.",diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.jsonindex 3d1338491..d95372326 100644--- a/apps/OpenSign/public/locales/fr/translation.json+++ b/apps/OpenSign/public/locales/fr/translation.json@@ -1,4 +1,8 @@{+ "undo": "Annuler",+ "redo": "Rétablir",+ "undo-widget": "Annuler l’ajout ou la suppression d’un champ",+ "redo-widget": "Rétablir l’ajout ou la suppression d’un champ","header-news": "Nouvelle fonctionnalité : Les signatures électroniques qualifiées sont désormais disponibles","header-news-btn": "Essayer maintenant","sandbox-news": "Ceci est un environnement sandbox. Veuillez ne pas l'utiliser à des fins de production.",diff --git a/apps/OpenSign/public/locales/hi/translation.json b/apps/OpenSign/public/locales/hi/translation.jsonindex 1cb636a79..1701d993c 100644--- a/apps/OpenSign/public/locales/hi/translation.json+++ b/apps/OpenSign/public/locales/hi/translation.json@@ -1,4 +1,8 @@{+ "undo": "पूर्ववत करें",+ "redo": "फिर से करें",+ "undo-widget": "फ़ील्ड जोड़ना या हटाना पूर्ववत करें",+ "redo-widget": "फ़ील्ड जोड़ना या हटाना फिर से करें","header-news": "नई सुविधा: योग्य इलेक्ट्रॉनिक हस्ताक्षर अब उपलब्ध हैं","header-news-btn": "अभी आज़माएँ","sandbox-news": "यह एक सैंडबॉक्स वातावरण है। कृपया इसे उत्पादन उद्देश्यों के लिए उपयोग न करें।",diff --git a/apps/OpenSign/public/locales/it/translation.json b/apps/OpenSign/public/locales/it/translation.jsonindex f476a8df0..6483b716f 100644--- a/apps/OpenSign/public/locales/it/translation.json+++ b/apps/OpenSign/public/locales/it/translation.json@@ -1,4 +1,8 @@{+ "undo": "Annulla",+ "redo": "Ripeti",+ "undo-widget": "Annulla l’aggiunta o la rimozione di un campo",+ "redo-widget": "Ripeti l’aggiunta o la rimozione di un campo","header-news": "Nuova funzionalità: Firme elettroniche qualificate ora disponibili","header-news-btn": "Provalo ora","sandbox-news": "Questo è un ambiente sandbox. Si prega di non utilizzarlo per scopi di produzione.",diff --git a/apps/OpenSign/public/locales/kr/translation.json b/apps/OpenSign/public/locales/kr/translation.jsonindex 6f22b99d8..327a68a69 100644--- a/apps/OpenSign/public/locales/kr/translation.json+++ b/apps/OpenSign/public/locales/kr/translation.json@@ -1,4 +1,8 @@{+ "undo": "실행 취소",+ "redo": "다시 실행",+ "undo-widget": "필드 추가 또는 삭제 실행 취소",+ "redo-widget": "필드 추가 또는 삭제 다시 실행","header-news": "새로운 기능: 적격 전자 서명을 이제 사용할 수 있습니다","header-news-btn": "지금 사용해 보기","sandbox-news": "이것은 샌드박스 모드입니다. 운영 환경에서는 사용하지 마십시오.",diff --git a/apps/OpenSign/src/components/pdf/PdfHeader.jsx b/apps/OpenSign/src/components/pdf/PdfHeader.jsxindex e63aae10a..da6969ffb 100644--- a/apps/OpenSign/src/components/pdf/PdfHeader.jsx+++ b/apps/OpenSign/src/components/pdf/PdfHeader.jsx@@ -1,4 +1,5 @@-import React, { useRef, useState } from "react";+import React, { useEffect, useRef, useState } from "react";+import WidgetHistoryControls from "./WidgetHistoryControls";import PrevNext from "./PrevNext";import {base64ToArrayBuffer,@@ -30,6 +31,17 @@ function Header(props) {const [isDeletePage, setIsDeletePage] = useState(false);const [isReorderModal, setIsReorderModal] = useState(false);const mergePdfInputRef = useRef(null);+ const clearWidgetHistory = props.widgetHistory?.clear;+ useEffect(() => {+ clearWidgetHistory?.();+ }, [props.pdfArrayBuffer, clearWidgetHistory]);+ const widgetHistoryControls = props.widgetHistory &&+ !props.isCompleted &&+ !props.alreadySign &&+ !props.isSigned &&+ !props.isMailSend && (+ <WidgetHistoryControls history={props.widgetHistory} />+ );const enabledBackBtn = props?.disabledBackBtn === true ? false : true;const isViewerSigner = false;const finishLabel = t("finish");@@ -394,6 +406,16 @@ function Header(props) {</DropdownMenu.Item>{!props?.isDisablePdfEditTools && (<>+ {props.widgetHistory &&+ !props.isCompleted &&+ !props.alreadySign &&+ !props.isSigned &&+ !props.isMailSend && (+ <WidgetHistoryControls+ history={props.widgetHistory}+ asMenuItems+ />+ )}<DropdownMenu.ItemclassName="DropdownMenuItem"onClick={() => mergePdfInputRef.current.click()}@@ -497,12 +519,13 @@ function Header(props) {props?.isPlaceholder ? "os-pdf-header-placeholder" : ""} flex flex-wrap justify-between items-center w-full gap-y-1 ml-1`}>- <div className="os-pdf-header-pages">+ <div className="os-pdf-header-pages flex items-center gap-1"><PrevNextpageNumber={props?.pageNumber}allPages={props?.allPages}changePage={props?.changePage}/>+ <div className="hidden">{widgetHistoryControls}</div></div>{props?.isPlaceholder ? (<>diff --git a/apps/OpenSign/src/components/pdf/Placeholder.jsx b/apps/OpenSign/src/components/pdf/Placeholder.jsxindex dcad057e9..49a7103d2 100644--- a/apps/OpenSign/src/components/pdf/Placeholder.jsx+++ b/apps/OpenSign/src/components/pdf/Placeholder.jsx@@ -762,6 +762,8 @@ function Placeholder(props) {props.pos.type === textWidget ? (<spanreadOnly+ data-widget-key={props.pos.key}+ data-widget-signer-id={props.data?.Id}onClick={(e) => {// Prevent the click from bubbling up to the Document onClick handler// which would immediately clear currWidgetsDetails and make the@@ -793,7 +795,7 @@ function Placeholder(props) {height: props.pos?.Height,whiteSpace: "pre-wrap",overflow: "visible",- outline: "none",+ outline: props.isAreaSelected ? "2px solid #6b7280" : "none",border: "none"}}>@@ -804,6 +806,8 @@ function Placeholder(props) {) : (<Rndid={props.pos.key}+ data-widget-key={props.pos.key}+ data-widget-signer-id={props.data?.Id}scale={props.scale}data-tut={props.pos.key === props.unSignedWidgetId ? "IsSigned" : ""}key={props.pos.key}@@ -847,6 +851,7 @@ function Placeholder(props) {className="signYourselfBlock"style={{border: "1.5px solid #007bff",+ outline: props.isAreaSelected ? "2px solid #6b7280" : undefined,borderRadius: "2px",cursor: getCursor(),zIndex:diff --git a/apps/OpenSign/src/components/pdf/PrevNext.jsx b/apps/OpenSign/src/components/pdf/PrevNext.jsxindex b1f3bcdc8..0e5824d55 100644--- a/apps/OpenSign/src/components/pdf/PrevNext.jsx+++ b/apps/OpenSign/src/components/pdf/PrevNext.jsx@@ -13,7 +13,7 @@ function PrevNext({ pageNumber, allPages, changePage }) {}return (- <div className="flex items-center">+ <div className="flex shrink-0 items-center"><buttonclassName="op-btn op-btn-neutral op-btn-xs md:op-btn-sm font-semibold text-xs"disabled={pageNumber <= 1}@@ -23,7 +23,7 @@ function PrevNext({ pageNumber, allPages, changePage }) {<i className="fa-light fa-chevron-up" aria-hidden="true"></i></span></button>- <span className="text-xs text-base-content font-medium mx-2 2xl:text-[20px]">+ <span className="whitespace-nowrap text-xs text-base-content font-medium mx-2 2xl:text-[20px]">{pageNumber || (allPages ? 1 : "--")} {t("of")} {allPages || "--"}</span><buttondiff --git a/apps/OpenSign/src/components/pdf/RenderPdf.jsx b/apps/OpenSign/src/components/pdf/RenderPdf.jsxindex 020fa04af..5941a60a9 100644--- a/apps/OpenSign/src/components/pdf/RenderPdf.jsx+++ b/apps/OpenSign/src/components/pdf/RenderPdf.jsx@@ -32,6 +32,7 @@ import DragGuidelinesLayer from "./DragGridLinesLayer";import { useDrop } from "react-dnd";import WidgetsDragPreview from "./WidgetsDragPreview";import { useScroll } from "../../context/ScrollPdfContext";+import useWidgetAreaSelection from "../../hook/useWidgetAreaSelection";function RenderPdf(props) {const { t } = useTranslation();@@ -131,6 +132,26 @@ function RenderPdf(props) {const scrollTriggerId = useSelector((state) => state.widget.scrollTriggerId);const isOpen = useSelector((state) => state.sidebar.isOpen);const pdfContainerRef = useRef(null);+ const usesFlatWidgetPositions = props.isSignYourself && !props.isSelfSign;+ const widgetAreaSelection = useWidgetAreaSelection({+ enabled: Boolean(+ !isMobile &&+ !props.pdfRequest &&+ !props.pdfDetails?.[0]?.IsCompleted &&+ !props.isDragging &&+ props.handleDeleteWidget &&+ (props.placeholder || props.isSelfSign || props.isSignYourself) &&+ (usesFlatWidgetPositions ? props.setXyPosition : props.setSignerPos)+ ),+ containerRef: pdfContainerRef,+ positions: usesFlatWidgetPositions ? props.xyPosition : props.signerPos,+ setPositions: usesFlatWidgetPositions+ ? props.setXyPosition+ : props.setSignerPos,+ nested: !usesFlatWidgetPositions,+ scale: props.scale || 1,+ clearActiveWidget: props.setCurrWidgetsDetails+ });const mobileHeight = useMobilePdfHeight(scrollRef,scaledHeight,@@ -139,8 +160,17 @@ function RenderPdf(props) {useEffect(() => {const canCopyWidgets =- props.placeholder || props.isSelfSign || props.isSignYourself;- if (!canCopyWidgets || !props.setSignerPos) return undefined;+ props.placeholder ||+ props.isSelfSign ||+ (props.isSignYourself && !props.pdfDetails?.[0]?.IsCompleted);+ const widgetPositions = props.isSignYourself+ ? props.xyPosition+ : props.signerPos;+ const setWidgetPositions = props.isSignYourself+ ? props.setXyPosition+ : props.setSignerPos;+ if ((!canCopyWidgets && !props.handleDeleteWidget) || !setWidgetPositions)+ return undefined;const isTextInput = (target) => {const element = target instanceof Element ? target : null;@@ -150,7 +180,7 @@ function RenderPdf(props) {};const findWidget = (key) => {- for (const signer of props.signerPos || []) {+ for (const signer of widgetPositions || []) {if (signer?.placeHolder) {for (const page of signer.placeHolder) {const widget = (page.pos || []).find((item) => item?.key === key);@@ -167,7 +197,24 @@ function RenderPdf(props) {};const handleWidgetClipboard = (event) => {- if (!event.ctrlKey || isTextInput(event.target)) return;+ if (event.defaultPrevented || isTextInput(event.target)) return;++ if (event.key === "Delete" && props.handleDeleteWidget) {+ const selectedKey = props.currWidgetsDetails?.key;+ const location = selectedKey && findWidget(selectedKey);+ if (!location) return;++ event.preventDefault();+ props.handleDeleteWidget(+ selectedKey,+ location.signer?.Id || null,+ location.page?.pageNumber || props.currWidgetsDetails?.pageNumber+ );+ props.setCurrWidgetsDetails?.({});+ return;+ }++ if (!canCopyWidgets || !event.ctrlKey) return;if (event.key.toLowerCase() === "c") {const selectedKey = props.currWidgetsDetails?.key;@@ -201,11 +248,11 @@ function RenderPdf(props) {props.currWidgetsDetails?.signerId ||clipboard.signerId;const selectedSigner = props.uniqueId- ? (props.signerPos || []).find((item) => item?.Id === props.uniqueId)+ ? (widgetPositions || []).find((item) => item?.Id === props.uniqueId): null;const signer =selectedSigner ||- (props.signerPos || []).find(+ (widgetPositions || []).find((item) =>item?.Id === selectedSignerId ||item?.signerObjId === clipboard.signerObjId@@ -255,8 +302,8 @@ function RenderPdf(props) {: page): [...pages, { pageNumber: targetPageNumber, pos: [pastedWidget] }];- props.setSignerPos(- props.signerPos.map((item) =>+ setWidgetPositions(+ widgetPositions.map((item) =>item.Id === signer.Id? { ...item, placeHolder: updatedPages }: item@@ -272,7 +319,7 @@ function RenderPdf(props) {const pasteTarget = pasteTargetRef.current;const targetPageNumber = pasteTarget?.pageNumber || props.pageNumber || 1;- const targetPage = (props.signerPos || []).find(+ const targetPage = (widgetPositions || []).find((page) => page.pageNumber === targetPageNumber);const pastedWidget = {@@ -290,16 +337,16 @@ function RenderPdf(props) {}};const updatedPages = targetPage- ? props.signerPos.map((page) =>+ ? widgetPositions.map((page) =>page.pageNumber === targetPageNumber? { ...page, pos: [...(page.pos || []), pastedWidget] }: page): [- ...(props.signerPos || []),+ ...(widgetPositions || []),{ pageNumber: targetPageNumber, pos: [pastedWidget] }];- props.setSignerPos(updatedPages);+ setWidgetPositions(updatedPages);props.setCurrWidgetsDetails?.({...pastedWidget,pageNumber: targetPageNumber@@ -311,13 +358,18 @@ function RenderPdf(props) {return () => window.removeEventListener("keydown", handleWidgetClipboard);}, [props.currWidgetsDetails,+ props.handleDeleteWidget,props.isSelfSign,props.isSignYourself,props.pageNumber,+ props.pdfDetails,props.placeholder,+ props.setCurrWidgetsDetails,props.setSignerPos,+ props.setXyPosition,props.signerPos,- props.uniqueId+ props.uniqueId,+ props.xyPosition]);// Refs for drawing Text Input widget — avoids re-rendering the full tree on@@ -651,14 +703,15 @@ function RenderPdf(props) {}};- // Handle drawing Text Input widget on PDF+ const canDrawTextWidget =+ (props.placeholder || props.isSignYourself || props.isSelfSign) &&+ !props.pdfDetails?.[0]?.IsCompleted &&+ !(props.isCompleted === true || props.isCompleted?.isCertificate) &&+ !props.currWidgetsDetails?.key &&+ !props.isDragging;+const handlePointerDown = (e) => {- // Only allow drawing in placeholder mode when no widget is selected- if (- !props.placeholder ||- props.currWidgetsDetails?.key ||- props.isDragging- ) {+ if (!canDrawTextWidget) {return;}@@ -779,15 +832,18 @@ function RenderPdf(props) {const widgetWidth = pageWidth / (containerScale * props.scale);const widgetHeight = pageHeight / (containerScale * props.scale);- // Create a Text Input widget at the drawn position+ // Create a text widget at the drawn position.if (props.addPositionOfSignature) {// If drawing on a different page, update pageNumber firstif (drawPageNum !== props.pageNumber && props.setPageNumber) {props.setPageNumber(drawPageNum);}- // Simulate dropping a text input widgetconst type =- props?.roleName === "prefill" ? textWidget : textInputWidget;+ props.isSignYourself ||+ props.isSelfSign ||+ props?.roleName === "prefill"+ ? textWidget+ : textInputWidget;const textInputItem = { text: type, type: "BOX" };const monitor = {@@ -797,6 +853,7 @@ function RenderPdf(props) {};props.addPositionOfSignature(textInputItem, monitor, {+ pageNumber: drawPageNum,customPosition: {xPosition,yPosition,@@ -857,6 +914,11 @@ function RenderPdf(props) {<React.Fragment key={ind}><Placeholderpos={pos}+ isAreaSelected={widgetAreaSelection.isSelected(+ pos.key,+ data.Id,+ pageNum+ )}handleWidgetResize={handleWidgetResize}index={pageNum}xyPosition={props.signerPos}@@ -930,6 +992,11 @@ function RenderPdf(props) {<React.Fragment key={pos.key}><Placeholderpos={pos}+ isAreaSelected={widgetAreaSelection.isSelected(+ pos.key,+ data.Id,+ pageNum+ )}setIsPageCopy={props.setIsPageCopy}handleDeleteWidget={props.handleDeleteWidget}handleTabDrag={props.handleTabDrag}@@ -998,6 +1065,11 @@ function RenderPdf(props) {<Placeholderkey={id}pos={pos}+ isAreaSelected={widgetAreaSelection.isSelected(+ pos.key,+ undefined,+ pageNum+ )}setIsPageCopy={props.setIsPageCopy}handleDeleteWidget={props.handleDeleteWidget}handleTabDrag={props.handleTabDrag}@@ -1097,12 +1169,7 @@ function RenderPdf(props) {}data-pdf-transform-targetstyle={{- cursor:- props.placeholder &&- !props.currWidgetsDetails?.key &&- !props.isDragging- ? "crosshair"- : "default",+ cursor: canDrawTextWidget ? "crosshair" : "default",// ✅ top left so content expands into spacer — scroll handles horizontalwidth: props.containerWH?.width,transform: `scale(${props?.scale || 1})`, // ✅ both platforms@@ -1118,6 +1185,7 @@ function RenderPdf(props) {onPointerDown={handlePointerDown}onPointerMove={handlePointerMove}onPointerUp={handlePointerUp}+ {...widgetAreaSelection.handlers}onPointerLeave={() => {if (isDrawing) {handlePointerUp();@@ -1245,6 +1313,40 @@ function RenderPdf(props) {scale={props?.scale}canvasContainerRef={scrollRef}/>+ <div+ ref={widgetAreaSelection.overlayRef}+ data-widget-selection-area+ style={{+ display: "none",+ position: "absolute",+ border: "1px solid #9ca3af",+ backgroundColor: "rgba(156, 163, 175, 0.2)",+ pointerEvents: "none",+ zIndex: 9999+ }}+ />+ {widgetAreaSelection.selection && (+ <button+ type="button"+ data-widget-selection-delete+ aria-label={`${t("delete")} (${widgetAreaSelection.selection.widgets.length})`}+ className="op-btn op-btn-xs op-btn-error"+ style={{+ position: "absolute",+ left: widgetAreaSelection.selection.left,+ top: Math.max(0, widgetAreaSelection.selection.top - 28),+ zIndex: 10000+ }}+ onPointerDown={(event) => event.stopPropagation()}+ onClick={widgetAreaSelection.deleteSelection}+ >+ <i+ className="fa-light fa-trash-can text-xm"+ aria-hidden="true"+ />+ ({widgetAreaSelection.selection.widgets.length})+ </button>+ )}{/* Drawing rectangle overlay for Text Input widget */}{isDrawing && (<divdiff --git a/apps/OpenSign/src/components/pdf/WidgetHistoryControls.jsx b/apps/OpenSign/src/components/pdf/WidgetHistoryControls.jsxnew file mode 100644index 000000000..3336936aa--- /dev/null+++ b/apps/OpenSign/src/components/pdf/WidgetHistoryControls.jsx@@ -0,0 +1,94 @@+import { useEffect } from "react";+import { useTranslation } from "react-i18next";+import { DropdownMenu } from "radix-ui";++export default function WidgetHistoryControls({ history, asMenuItems = false }) {+ const { t } = useTranslation();+ const { undo, redo, canUndo, canRedo } = history;+ useEffect(() => {+ const onKeyDown = (event) => {+ const key = event.key.toLowerCase();+ const isRedoShortcut =+ (key === "z" && event.shiftKey) || key === "y";+ const isUndoShortcut = key === "z" && !event.shiftKey;+ if (+ event.defaultPrevented ||+ event.isComposing ||+ event.altKey ||+ !(event.ctrlKey || event.metaKey) ||+ (!isUndoShortcut && !isRedoShortcut) ||+ (event.target instanceof Element &&+ event.target.closest(+ 'input, textarea, select, [contenteditable]:not([contenteditable="false"]), [role="textbox"], [role="dialog"], dialog'+ )) ||+ document.querySelector('[role="dialog"], dialog[open], .op-modal')+ ) {+ return;+ }+ if (isRedoShortcut ? canRedo : canUndo) {+ event.preventDefault();+ isRedoShortcut ? redo() : undo();+ }+ };+ document.addEventListener("keydown", onKeyDown);+ return () => document.removeEventListener("keydown", onKeyDown);+ }, [undo, redo, canUndo, canRedo]);++ if (asMenuItems) {+ return (+ <>+ <DropdownMenu.Item+ className="DropdownMenuItem"+ disabled={!canUndo}+ onSelect={undo}+ >+ <div className="flex flex-row">+ <i+ className="fa-light fa-arrow-turn-left text-gray-500 2xl:text-[30px] mr-[3px]"+ aria-hidden="true"+ ></i>+ <span className="font-[500]">{t("undo")}</span>+ </div>+ </DropdownMenu.Item>+ <DropdownMenu.Item+ className="DropdownMenuItem"+ disabled={!canRedo}+ onSelect={redo}+ >+ <div className="flex flex-row">+ <i+ className="fa-light fa-arrow-turn-right text-gray-500 2xl:text-[30px] mr-[3px]"+ aria-hidden="true"+ ></i>+ <span className="font-[500]">{t("redo")}</span>+ </div>+ </DropdownMenu.Item>+ </>+ );+ }++ return (+ <div className="flex items-center gap-1">+ <button+ type="button"+ className="op-btn op-btn-ghost op-btn-sm min-h-[44px] min-w-[44px] disabled:opacity-40"+ aria-label={t("undo-widget")}+ title={t("undo-widget")}+ disabled={!canUndo}+ onClick={undo}+ >+ <i className="fa-light fa-arrow-turn-left" aria-hidden="true" />+ </button>+ <button+ type="button"+ className="op-btn op-btn-ghost op-btn-sm min-h-[44px] min-w-[44px] disabled:opacity-40"+ aria-label={t("redo-widget")}+ title={t("redo-widget")}+ disabled={!canRedo}+ onClick={redo}+ >+ <i className="fa-light fa-arrow-turn-right" aria-hidden="true" />+ </button>+ </div>+ );+}diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.jsindex a121c928d..8de058105 100644--- a/apps/OpenSign/src/constant/Utils.js+++ b/apps/OpenSign/src/constant/Utils.js@@ -21,7 +21,7 @@ import { format, toZonedTime } from "date-fns-tz";import i18n from "../i18n";import { persistBrandPresentation } from "./brandPresentation";import { getRuntimePdfFontUrl } from "./runtimeConfig";-import { resolveMailBrandPresentation } from "./mailBrand";+import { renderMailBrandLogo, resolveMailBrandPresentation } from "./mailBrand";import {applyNumberFormulasToPages,buildDownloadFilename,@@ -2801,8 +2801,7 @@ export const handleCopyNextToWidget = (const getPageNumer = getPlaceHolder?.filter((data) => data.pageNumber === index);- const getXYdata = getPageNumer?.[0]?.pos || [];- getXYdata.push(newposition);+ const getXYdata = [...(getPageNumer?.[0]?.pos || []), newposition];if (getPageNumer && getPageNumer.length > 0) {const newUpdateSignPos = getPlaceHolder.map((obj) => {if (obj.pageNumber === index) {@@ -2822,9 +2821,7 @@ export const handleCopyNextToWidget = (}} else {const getPageNumer = xyPosition?.find((data) => data.pageNumber === index);- const getXYdata = getPageNumer?.pos;-- getXYdata.push(newposition);+ const getXYdata = [...getPageNumer.pos, newposition];const updatePlaceholder = xyPosition.map((obj, ind) => {if (obj?.pageNumber === index) {return { ...obj, pos: getXYdata };@@ -4252,9 +4249,7 @@ function _removeWidgetAnnotations(pdfDoc) {export const mailTemplate = (param) => {const { appName, logoUrl, accentColor } = resolveMailBrandPresentation("");- const logo = logoUrl- ? `<div style='padding:10px'><img src='${logoUrl}' height='50' /></div>`- : "";+ const logo = renderMailBrandLogo({ appName, logoUrl });const subject = `${param.senderName} has requested you to sign "${param.title}"`;const body =diff --git a/apps/OpenSign/src/constant/mailBrand.js b/apps/OpenSign/src/constant/mailBrand.jsindex 1842db672..b80ab5231 100644--- a/apps/OpenSign/src/constant/mailBrand.js+++ b/apps/OpenSign/src/constant/mailBrand.js@@ -37,3 +37,35 @@ export function resolveMailBrandPresentation(storedAppName = "") {return { appName, logoUrl, accentColor };}++export function renderMailBrandLogo({ appName, logoUrl }) {+ if (!logoUrl) return "";+ if (appName === OPEN_SIGN_NAME && logoUrl === OPEN_SIGN_EMAIL_LOGO) {+ return `<table role="presentation" width="600" cellpadding="0" cellspacing="0" border="0" style="width:100%;max-width:600px;background:#ffffff;">+ <tr>+ <td style="padding:10px 14px;background:#ffffff;">+ <table role="presentation" cellpadding="0" cellspacing="0" border="0">+ <tr>+ <td valign="middle" style="padding-right:8px;">+ <table role="presentation" width="53" height="53" cellpadding="0" cellspacing="0" border="0" style="width:53px;height:53px;border:8px solid #0b326b;">+ <tr>+ <td align="center" valign="middle">+ <table role="presentation" width="20" height="20" cellpadding="0" cellspacing="0" border="0" style="width:20px;height:20px;background:#0b326b;">+ <tr><td style="font-size:0;line-height:0;"> </td></tr>+ </table>+ </td>+ </tr>+ </table>+ </td>+ <td valign="middle">+ <div style="font-family:Arial,Helvetica,sans-serif;font-size:35px;line-height:38px;font-weight:700;letter-spacing:-1.5px;color:#080b10;">OpenSign</div>+ <div style="font-family:Arial,Helvetica,sans-serif;font-size:13px;line-height:18px;letter-spacing:.4px;color:#173d72;text-align:center;">Seal the Deal, Openly</div>+ </td>+ </tr>+ </table>+ </td>+ </tr>+</table>`;+ }+ return `<div style='padding:10px'><img src='${logoUrl}' height='50' /></div>`;+}diff --git a/apps/OpenSign/src/hook/useWidgetAreaSelection.js b/apps/OpenSign/src/hook/useWidgetAreaSelection.jsnew file mode 100644index 000000000..01e42aa74--- /dev/null+++ b/apps/OpenSign/src/hook/useWidgetAreaSelection.js@@ -0,0 +1,261 @@+import { useCallback, useEffect, useRef, useState } from "react";+import { handleDeleteWidget } from "../constant/Utils";++const isEditing = (target) =>+ target instanceof Element &&+ target.closest(+ 'input, textarea, select, [contenteditable]:not([contenteditable="false"]), [role="textbox"], [role="dialog"], dialog'+ );++export default function useWidgetAreaSelection({+ enabled,+ containerRef,+ positions,+ setPositions,+ nested,+ scale,+ clearActiveWidget+}) {+ const overlayRef = useRef(null);+ const gestureRef = useRef(null);+ const suppressClickRef = useRef(false);+ const [selection, setSelection] = useState(null);++ const clearSelection = useCallback(() => {+ const gesture = gestureRef.current;+ gestureRef.current = null;+ if (gesture?.target.hasPointerCapture?.(gesture.pointerId)) {+ gesture.target.releasePointerCapture(gesture.pointerId);+ }+ if (overlayRef.current) overlayRef.current.style.display = "none";+ setSelection(null);+ }, []);++ useEffect(() => {+ clearSelection();+ }, [positions, enabled, scale, clearSelection]);++ const deleteSelection = useCallback(() => {+ if (!enabled || !selection?.widgets.length) return;+ // Apply the entire deletion in one update so history/autosave sees one action.+ setPositions((current) => {+ if (nested) {+ return selection.widgets.reduce(+ (updated, entry) =>+ handleDeleteWidget(+ entry.key,+ entry.signerId,+ entry.pageNumber,+ updated+ ),+ current+ );+ }+ return current+ .map((page) => ({+ ...page,+ pos: page.pos.filter(+ (widget) =>+ !selection.widgets.some(+ (entry) =>+ entry.pageNumber === page.pageNumber &&+ entry.key === widget.key+ )+ )+ }))+ .filter((page) => page.pos.length > 0);+ });+ clearActiveWidget?.({});+ clearSelection();+ }, [+ enabled,+ selection,+ nested,+ setPositions,+ clearActiveWidget,+ clearSelection+ ]);++ useEffect(() => {+ if (!enabled) return;+ const onKeyDown = (event) => {+ if (+ event.defaultPrevented ||+ event.isComposing ||+ isEditing(event.target) ||+ document.querySelector('[role="dialog"], dialog[open], .op-modal')+ )+ return;+ if (event.key === "Escape") clearSelection();+ if (event.key === "Delete" && selection?.widgets.length) {+ event.preventDefault();+ deleteSelection();+ }+ };+ const onPointerDown = (event) => {+ if (!containerRef.current?.contains(event.target)) clearSelection();+ };+ window.addEventListener("keydown", onKeyDown);+ window.addEventListener("blur", clearSelection);+ document.addEventListener("pointerdown", onPointerDown);+ return () => {+ window.removeEventListener("keydown", onKeyDown);+ window.removeEventListener("blur", clearSelection);+ document.removeEventListener("pointerdown", onPointerDown);+ };+ }, [enabled, selection, deleteSelection, clearSelection, containerRef]);++ const updateRectangle = (event) => {+ const gesture = gestureRef.current;+ if (!gesture || event.pointerId !== gesture.pointerId) return null;+ const container = containerRef.current.getBoundingClientRect();+ const x = Math.max(+ 0,+ Math.min(container.width, event.clientX - container.left)+ );+ const y = Math.max(+ 0,+ Math.min(container.height, event.clientY - container.top)+ );+ const bounds = {+ left: Math.min(gesture.x, x),+ top: Math.min(gesture.y, y),+ width: Math.abs(x - gesture.x),+ height: Math.abs(y - gesture.y)+ };+ if (overlayRef.current) {+ Object.assign(overlayRef.current.style, {+ display: "block",+ left: `${bounds.left / scale}px`,+ top: `${bounds.top / scale}px`,+ width: `${bounds.width / scale}px`,+ height: `${bounds.height / scale}px`+ });+ }+ return { bounds, container };+ };++ const onPointerDownCapture = (event) => {+ if (!enabled || event.target.closest("[data-widget-selection-delete]"))+ return;+ suppressClickRef.current = false;+ clearSelection();+ if (+ !event.ctrlKey ||+ event.button !== 0 ||+ event.pointerType !== "mouse" ||+ isEditing(event.target) ||+ !event.target.closest("[data-page-number]") ||+ document.querySelector('[role="dialog"], dialog[open], .op-modal')+ )+ return;+ event.preventDefault();+ event.stopPropagation();+ clearActiveWidget?.({});+ const container = containerRef.current.getBoundingClientRect();+ gestureRef.current = {+ x: event.clientX - container.left,+ y: event.clientY - container.top,+ pointerId: event.pointerId,+ target: event.currentTarget+ };+ suppressClickRef.current = true;+ event.currentTarget.setPointerCapture?.(event.pointerId);+ updateRectangle(event);+ };++ const onPointerMoveCapture = (event) => {+ if (!gestureRef.current) return;+ event.preventDefault();+ event.stopPropagation();+ updateRectangle(event);+ };++ const onPointerUpCapture = (event) => {+ const rectangle = updateRectangle(event);+ if (!rectangle) return;+ event.preventDefault();+ event.stopPropagation();+ const { bounds, container } = rectangle;+ const widgets = [];+ if (bounds.width >= 3 && bounds.height >= 3) {+ for (const element of containerRef.current.querySelectorAll(+ "[data-widget-key]"+ )) {+ const rect = element.getBoundingClientRect();+ if (+ rect.width <= 0 ||+ rect.height <= 0 ||+ rect.right <= container.left + bounds.left ||+ rect.left >= container.left + bounds.left + bounds.width ||+ rect.bottom <= container.top + bounds.top ||+ rect.top >= container.top + bounds.top + bounds.height+ )+ continue;+ const pageNumber = Number(+ element.closest("[data-page-number]").dataset.pageNumber+ );+ for (const signer of positions || []) {+ if (nested && String(signer.Id) !== element.dataset.widgetSignerId)+ continue;+ const page = (nested ? signer.placeHolder || [] : [signer]).find(+ (entry) => entry.pageNumber === pageNumber+ );+ const widget = page?.pos.find(+ (entry) => String(entry.key) === element.dataset.widgetKey+ );+ if (widget)+ widgets.push({ key: widget.key, signerId: signer.Id, pageNumber });+ }+ }+ }+ const gesture = gestureRef.current;+ gestureRef.current = null;+ if (gesture.target.hasPointerCapture?.(gesture.pointerId)) {+ gesture.target.releasePointerCapture(gesture.pointerId);+ }+ if (widgets.length) {+ setSelection({+ widgets,+ left: bounds.left / scale,+ top: bounds.top / scale+ });+ } else {+ clearSelection();+ }+ };++ return {+ overlayRef,+ selection,+ clearSelection,+ deleteSelection,+ isSelected: (key, signerId, pageNumber) =>+ Boolean(+ selection?.widgets.some(+ (entry) =>+ entry.key === key &&+ entry.signerId === signerId &&+ entry.pageNumber === pageNumber+ )+ ),+ handlers: {+ onPointerDownCapture,+ onPointerMoveCapture,+ onPointerUpCapture,+ onPointerCancelCapture: clearSelection,+ onLostPointerCapture: () => {+ if (gestureRef.current) clearSelection();+ },+ onClickCapture: (event) => {+ if (!suppressClickRef.current) return;+ suppressClickRef.current = false;+ event.preventDefault();+ event.stopPropagation();+ },+ onMouseDownCapture: (event) => {+ if (gestureRef.current) event.stopPropagation();+ }+ }+ };+}diff --git a/apps/OpenSign/src/hook/useWidgetHistory.js b/apps/OpenSign/src/hook/useWidgetHistory.jsnew file mode 100644index 000000000..4788a14da--- /dev/null+++ b/apps/OpenSign/src/hook/useWidgetHistory.js@@ -0,0 +1,237 @@+import { useCallback, useReducer } from "react";++function widgets(value, nested) {+ return value.flatMap((signer, signerIndex) =>+ (nested ? signer.placeHolder || [] : [signer]).flatMap((page, pageIndex) =>+ (page.pos || []).map((widget, index) => ({+ id: JSON.stringify([+ nested ? signer.Id : null,+ page.pageNumber,+ widget.key+ ]),+ signer,+ signerIndex,+ page,+ pageIndex: nested ? pageIndex : signerIndex,+ widget,+ index+ }))+ )+ );+}++function difference(before, after, nested) {+ const previous = widgets(before, nested);+ const next = widgets(after, nested);+ const previousIds = new Set(previous.map((entry) => entry.id));+ const nextIds = new Set(next.map((entry) => entry.id));+ const nextById = new Map(next.map((entry) => [entry.id, entry]));+ return {+ removed: previous.filter((entry) => !nextIds.has(entry.id)),+ added: next.filter((entry) => !previousIds.has(entry.id)),+ moved: previous.flatMap((entry) => {+ const updated = nextById.get(entry.id);+ if (+ !updated ||+ (entry.widget.xPosition === updated.widget.xPosition &&+ entry.widget.yPosition === updated.widget.yPosition)+ )+ return [];+ return [+ {+ id: entry.id,+ from: {+ xPosition: entry.widget.xPosition,+ yPosition: entry.widget.yPosition+ },+ to: {+ xPosition: updated.widget.xPosition,+ yPosition: updated.widget.yPosition+ }+ }+ ];+ })+ };+}++function applyChange(value, remove, restore, moved, nested) {+ const removeIds = new Set(remove.map((entry) => entry.id));+ const filterPages = (pages, signerId) =>+ pages+ .map((page) => ({+ ...page,+ pos: (page.pos || []).filter(+ (widget) =>+ !removeIds.has(+ JSON.stringify([signerId, page.pageNumber, widget.key])+ )+ )+ }))+ .filter((page) => page.pos.length > 0);+ let result = nested+ ? value+ .map((signer) => {+ if (!signer.placeHolder) return signer;+ const pages = filterPages(signer.placeHolder, signer.Id);+ if (pages.length) return { ...signer, placeHolder: pages };+ const metadata = { ...signer };+ delete metadata.placeHolder;+ return metadata;+ })+ .filter(+ (signer) => signer.Role !== "prefill" || signer.placeHolder?.length+ )+ : filterPages(value, null);++ for (const entry of restore) {+ let pages = result;+ let signerIndex;+ if (nested) {+ signerIndex = result.findIndex((signer) => signer.Id === entry.signer.Id);+ if (signerIndex === -1) {+ result.splice(entry.signerIndex, 0, {+ ...entry.signer,+ placeHolder: []+ });+ signerIndex = result.findIndex(+ (signer) => signer.Id === entry.signer.Id+ );+ }+ pages = [...(result[signerIndex].placeHolder || [])];+ }+ let pageIndex = pages.findIndex(+ (page) => page.pageNumber === entry.page.pageNumber+ );+ if (pageIndex === -1) {+ pages.splice(entry.pageIndex, 0, { ...entry.page, pos: [] });+ pageIndex = pages.findIndex(+ (page) => page.pageNumber === entry.page.pageNumber+ );+ }+ const pos = [...pages[pageIndex].pos];+ pos.splice(entry.index, 0, entry.widget);+ pages[pageIndex] = { ...pages[pageIndex], pos };+ if (nested) {+ result[signerIndex] = { ...result[signerIndex], placeHolder: pages };+ }+ }+ const positions = new Map(moved.map(({ id, position }) => [id, position]));+ const updatePage = (page, signerId) => ({+ ...page,+ pos: (page.pos || []).map((widget) => {+ const position = positions.get(+ JSON.stringify([signerId, page.pageNumber, widget.key])+ );+ return position ? { ...widget, ...position } : widget;+ })+ });+ return nested+ ? result.map((signer) =>+ signer.placeHolder+ ? {+ ...signer,+ placeHolder: signer.placeHolder.map((page) =>+ updatePage(page, signer.Id)+ )+ }+ : signer+ )+ : result.map((page) => updatePage(page, null));+}++function reducer(state, action) {+ if (action.type === "clear") {+ return { ...state, past: [], future: [] };+ }+ if (action.type === "update") {+ const value =+ typeof action.update === "function"+ ? action.update(state.value)+ : action.update;+ const change = difference(state.value, value, state.nested);+ const signerIds = (items) =>+ JSON.stringify(+ items+ .filter((signer) => signer.Role !== "prefill")+ .map((signer) => signer.Id)+ .sort()+ );+ if (+ !action.record &&+ state.nested &&+ signerIds(state.value) !== signerIds(value)+ ) {+ return { ...state, value, past: [], future: [] };+ }+ if (+ !change.added.length &&+ !change.removed.length &&+ !change.moved.length+ ) {+ return { ...state, value };+ }+ return {+ ...state,+ value,+ past: action.record ? [...state.past, change] : [],+ future: []+ };+ }+ const undo = action.type === "undo";+ const source = undo ? state.past : state.future;+ if (!source.length) return state;+ const change = source[source.length - 1];+ const remove = undo ? change.added : change.removed;+ const restore = undo ? change.removed : change.added;+ const moved = change.moved.map(({ id, from, to }) => ({+ id,+ position: undo ? from : to+ }));+ const current = new Map(+ widgets(state.value, state.nested).map((entry) => [entry.id, entry])+ );+ // Keep edits made after insertion when that widget is subsequently redone.+ const refreshed = {+ added: change.added.map((entry) => current.get(entry.id) || entry),+ removed: change.removed.map((entry) => current.get(entry.id) || entry),+ moved: change.moved+ };+ return {+ ...state,+ value: applyChange(state.value, remove, restore, moved, state.nested),+ past: undo ? state.past.slice(0, -1) : [...state.past, refreshed],+ future: undo ? [...state.future, refreshed] : state.future.slice(0, -1)+ };+}++export default function useWidgetHistory(nested = true) {+ const [state, dispatch] = useReducer(reducer, {+ value: [],+ nested,+ past: [],+ future: []+ });+ const setValue = useCallback(+ (update) => dispatch({ type: "update", update, record: false }),+ []+ );+ const recordUpdate = useCallback(+ (update) => dispatch({ type: "update", update, record: true }),+ []+ );+ const undo = useCallback(() => dispatch({ type: "undo" }), []);+ const redo = useCallback(() => dispatch({ type: "redo" }), []);+ const clear = useCallback(() => dispatch({ type: "clear" }), []);+ return [+ state.value,+ setValue,+ recordUpdate,+ {+ undo,+ redo,+ clear,+ canUndo: !!state.past.length,+ canRedo: !!state.future.length+ }+ ];+}diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.jsx b/apps/OpenSign/src/pages/PlaceHolderSign.jsxindex 6eb25cdab..899eba853 100644--- a/apps/OpenSign/src/pages/PlaceHolderSign.jsx+++ b/apps/OpenSign/src/pages/PlaceHolderSign.jsx@@ -10,6 +10,7 @@ import Tour from "../primitives/Tour";import { useLocation, useParams } from "react-router";import SignerListPlace from "../components/pdf/SignerListPlace";import Header from "../components/pdf/PdfHeader";+import useWidgetHistory from "../hook/useWidgetHistory";import ShareButton from "../primitives/ShareButton";import {pdfNewWidthFun,@@ -97,7 +98,8 @@ function PlaceHolderSign() {const [xySignature, setXYSignature] = useState({});const [dragKey, setDragKey] = useState();const [signersdata, setSignersData] = useState([]);- const [signerPos, setSignerPos] = useState([]);+ const [signerPos, setSignerPos, recordWidgetUpdate, widgetHistory] =+ useWidgetHistory();const [isSelectListId, setIsSelectId] = useState();const [isSendAlert, setIsSendAlert] = useState({});const [isSend, setIsSend] = useState(false);@@ -665,19 +667,20 @@ function PlaceHolderSign() {x.Id === uniqueId ? { ...x, placeHolder: updatePlace } : x);- setSignerPos(updatesignerPos);+ recordWidgetUpdate(updatesignerPos);} else {//condition for prefill role to attach prefill widget on multiple page first time there are no any prefill widget existif (roleName === "prefill") {//if condition for prefill role only prefill object exist and placeholder empty then add prefill widget in placeholderif (filterSignerPos) {- const addPrefillData =- filterSignerPos && filterSignerPos?.placeHolder;- addPrefillData.push(placeHolder);+ const addPrefillData = [+ ...(filterSignerPos.placeHolder || []),+ placeHolder+ ];const updatePrefillPos = signerPos.map((x) =>x.Role === "prefill" ? { ...x, placeHolder: addPrefillData } : x);- setSignerPos(updatePrefillPos);+ recordWidgetUpdate(updatePrefillPos);} //else condition if there are no prefill role exist in array then add prefill widget in placeholderelse {const prefillTextWidget = {@@ -688,9 +691,9 @@ function PlaceHolderSign() {Role: "prefill",Id: uniqueId};- const xyPosition = signerPos || [];+ const xyPosition = [...(signerPos || [])];xyPosition.unshift(prefillTextWidget);- setSignerPos(xyPosition);+ recordWidgetUpdate(xyPosition);}} else {//else condition to add placeholder widgets on multiple page first time for signers@@ -701,7 +704,7 @@ function PlaceHolderSign() {? { ...x, placeHolder: [placeHolder] }: x);- setSignerPos(updatesignerPos);+ recordWidgetUpdate(updatesignerPos);}}@@ -794,7 +797,7 @@ function PlaceHolderSign() {}return obj;});- setSignerPos(newUpdateSigner);+ recordWidgetUpdate(newUpdateSigner);}}}@@ -831,7 +834,7 @@ function PlaceHolderSign() {}return obj;});- setSignerPos(newUpdateSigner);+ recordWidgetUpdate(newUpdateSigner);} else {const getRemainPage = filterSignerPos[0].placeHolder.filter((data) => data.pageNumber !== effectivePageNumber@@ -848,7 +851,7 @@ function PlaceHolderSign() {let signerupdate = [];signerupdate = signerPos.filter((data) => data.Id !== Id);signerupdate.push(newUpdatePos[0]);- setSignerPos(signerupdate);+ recordWidgetUpdate(signerupdate);} else {const updatedData = signerPos.filter((item) => !(item.Id === Id && item.Role === "prefill")) // Remove prefill object@@ -861,7 +864,7 @@ function PlaceHolderSign() {}return item;});- setSignerPos(updatedData);+ recordWidgetUpdate(updatedData);}}}@@ -2131,7 +2134,7 @@ function PlaceHolderSign() {isPageCopy={isPageCopy}setIsPageCopy={setIsPageCopy}xyPosition={signerPos}- setXyPosition={setSignerPos}+ setXyPosition={recordWidgetUpdate}allPages={allPages}pageNumber={currWidgetsDetails?.pageNumber || pageNumber}signKey={currWidgetsDetails?.key}@@ -2191,6 +2194,7 @@ function PlaceHolderSign() {{/* pdf header which contain funish back button */}<Header+ widgetHistory={widgetHistory}completeBtnTitle={t("next")}isPlaceholder={true}pageNumber={pageNumber}@@ -2239,7 +2243,7 @@ function PlaceHolderSign() {handleStop={handleStop}setPdfLoad={setPdfLoad}pdfLoad={pdfLoad}- setSignerPos={setSignerPos}+ setSignerPos={recordWidgetUpdate}containerWH={containerWH}setIsResize={setIsResize}isResize={isResize}diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.jsx b/apps/OpenSign/src/pages/SignyourselfPdf.jsxindex c486b9c89..d1128c6ec 100644--- a/apps/OpenSign/src/pages/SignyourselfPdf.jsx+++ b/apps/OpenSign/src/pages/SignyourselfPdf.jsx@@ -43,6 +43,7 @@ import { useParams } from "react-router";import Tour from "../primitives/Tour";import Signedby from "../components/pdf/Signedby";import Header from "../components/pdf/PdfHeader";+import useWidgetHistory from "../hook/useWidgetHistory";import RenderPdf from "../components/pdf/RenderPdf";import PlaceholderCopy from "../components/pdf/PlaceholderCopy";import DropdownWidgetOption from "../components/pdf/DropdownWidgetOption";@@ -93,7 +94,8 @@ function SignYourSelf() {const [pdfDetails, setPdfDetails] = useState([]);const [allPages, setAllPages] = useState(null);const [pdfUrl, setPdfUrl] = useState();- const [xyPosition, setXyPosition] = useState([]);+ const [xyPosition, setXyPosition, recordWidgetUpdate, widgetHistory] =+ useWidgetHistory(false);const [pageNumber, setPageNumber] = useState(1);const [isEmail, setIsEmail] = useState(false);const [signBtnPosition, setSignBtnPosition] = useState([]);@@ -353,18 +355,19 @@ function SignYourSelf() {}};//function for setting position after drop signature button over pdf- const addPositionOfSignature = (item, monitor) => {+ const addPositionOfSignature = (item, monitor, customOptions) => {+ const targetPageNumber = customOptions?.pageNumber ?? pageNumber;setCurrWidgetsDetails({});const key = randomId();let dropData = [];let dropObj = {};let filterDropPos = xyPosition?.filter(- (data) => data.pageNumber === pageNumber+ (data) => data.pageNumber === targetPageNumber);const dragTypeValue = item?.text ? item.text : monitor.type;const containerScale = getContainerScale(pdfOriginalWH,- pageNumber,+ targetPageNumber,containerWH);const widgetWidth =@@ -372,7 +375,27 @@ function SignYourSelf() {const widgetHeight =defaultWidthHeight(dragTypeValue).height * containerScale;//adding and updating drop position in array when user drop signature button in div- if (item === "onclick") {+ if (customOptions?.customPosition) {+ const { xPosition, yPosition, width, height } =+ customOptions.customPosition;+ dropObj = {+ xPosition,+ yPosition,+ key,+ type: dragTypeValue,+ scale: containerScale,+ Width: width,+ Height: height,+ options: addWidgetSelfsignOptions(+ dragTypeValue,+ getWidgetValue,+ owner,+ xyPosition,+ true+ )+ };+ dropData.push(dropObj);+ } else if (item === "onclick") {// Use the current page container (id="container") so that the// height reflects one page, not the entire multi-page document.const containerEl =@@ -459,19 +482,19 @@ function SignYourSelf() {}if (filterDropPos?.length > 0) {const index = xyPosition?.findIndex((object) => {- return object.pageNumber === pageNumber;+ return object.pageNumber === targetPageNumber;});const updateData = filterDropPos?.[0].pos;const newSignPos = updateData.concat(dropData);- const xyPos = { pageNumber, pos: newSignPos };- setXyPosition((prev) => {+ const xyPos = { pageNumber: targetPageNumber, pos: newSignPos };+ recordWidgetUpdate((prev) => {const updated = [...prev];updated.splice(index, 1, xyPos);return updated;});} else {- const xyPos = { pageNumber: pageNumber, pos: dropData };- setXyPosition((prev) => [...prev, xyPos]);+ const xyPos = { pageNumber: targetPageNumber, pos: dropData };+ recordWidgetUpdate((prev) => [...prev, xyPos]);}if (dragTypeValue === "checkbox") {setIsCheckbox(true);@@ -489,7 +512,7 @@ function SignYourSelf() {setFontSize(12);setFontColor("black");}- setCurrWidgetsDetails({ ...dropObj, pageNumber: pageNumber });+ setCurrWidgetsDetails({ ...dropObj, pageNumber: targetPageNumber });};//`handleResend` function is used to resend otp for email verification@@ -858,7 +881,7 @@ function SignYourSelf() {}return obj;});- setXyPosition(newUpdateUrl);+ recordWidgetUpdate(newUpdateUrl);}}}@@ -923,16 +946,16 @@ function SignYourSelf() {return obj;});- setXyPosition(newUpdatePos);+ recordWidgetUpdate(newUpdatePos);} else {const getRemainPage = xyPosition.filter((data) => data.pageNumber !== effectivePageNumber);if (getRemainPage && getRemainPage.length > 0) {- setXyPosition(getRemainPage);+ recordWidgetUpdate(getRemainPage);} else {- setXyPosition([]);+ recordWidgetUpdate([]);}}};@@ -1433,7 +1456,7 @@ function SignYourSelf() {isPageCopy={isPageCopy}setIsPageCopy={setIsPageCopy}xyPosition={xyPosition}- setXyPosition={setXyPosition}+ setXyPosition={recordWidgetUpdate}allPages={allPages}pageNumber={currWidgetsDetails?.pageNumber || pageNumber}signKey={currWidgetsDetails?.key}@@ -1451,6 +1474,7 @@ function SignYourSelf() {/>{/* pdf header which contain funish back button */}<Header+ widgetHistory={widgetHistory}pageNumber={pageNumber}allPages={allPages}changePage={changePage}@@ -1475,13 +1499,10 @@ function SignYourSelf() {signerPos={xyPosition}pdfBase64={pdfBase64Url}/>- <div- ref={divRef}- data-tut="reactourSecond"- className="h-fit"- >+ <div ref={divRef} data-tut="reactourSecond" className="h-fit">{containerWH?.width && (<RenderPdf+ isSignYourself={true}pageNumber={pageNumber}setPageNumber={setPageNumber}pdfOriginalWH={pdfOriginalWH}@@ -1501,7 +1522,7 @@ function SignYourSelf() {pageDetails={pageDetails}pdfLoad={pdfLoad}setPdfLoad={setPdfLoad}- setXyPosition={setXyPosition}+ setXyPosition={recordWidgetUpdate}containerWH={containerWH}setIsPageCopy={setIsPageCopy}setIsCheckbox={setIsCheckbox}diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.jsx b/apps/OpenSign/src/pages/TemplatePlaceholder.jsxindex 2b1d64bd7..e2cec3381 100644--- a/apps/OpenSign/src/pages/TemplatePlaceholder.jsx+++ b/apps/OpenSign/src/pages/TemplatePlaceholder.jsx@@ -8,6 +8,7 @@ import WidgetComponent from "../components/pdf/WidgetComponent";import Tour from "../primitives/Tour";import SignerListPlace from "../components/pdf/SignerListPlace";import Header from "../components/pdf/PdfHeader";+import useWidgetHistory from "../hook/useWidgetHistory";import WidgetNameModal from "../components/pdf/WidgetNameModal";import {copytoData,@@ -93,7 +94,8 @@ const TemplatePlaceholder = () => {const [xySignature, setXYSignature] = useState({});const [dragKey, setDragKey] = useState();const [signersdata, setSignersData] = useState([]);- const [signerPos, setSignerPos] = useState([]);+ const [signerPos, setSignerPos, recordWidgetUpdate, widgetHistory] =+ useWidgetHistory();const [isSelectListId, setIsSelectId] = useState();const [isSendAlert, setIsSendAlert] = useState(false);const [isCreateDocModal, setIsCreateDocModal] = useState(false);@@ -600,7 +602,7 @@ const TemplatePlaceholder = () => {const updatesignerPos = signerPos.map((x) =>x.Id === uniqueId ? { ...x, placeHolder: updatePlace } : x);- setSignerPos(updatesignerPos);+ recordWidgetUpdate(updatesignerPos);} else {//condition for prefill role to attach prefill widget on multiple page first time there are no any prefill widget existif (roleName === "prefill") {@@ -613,7 +615,7 @@ const TemplatePlaceholder = () => {? { ...x, placeHolder: [placeHolder] }: x);- setSignerPos(updatesignerPos);+ recordWidgetUpdate(updatesignerPos);} //else condition if there are no prefill role exist in array then add prefill widget in placeholderelse {const prefillTextWidget = {@@ -624,9 +626,9 @@ const TemplatePlaceholder = () => {Role: "prefill",Id: uniqueId};- const xyPosition = signerPos || [];+ const xyPosition = [...(signerPos || [])];xyPosition.unshift(prefillTextWidget);- setSignerPos(xyPosition);+ recordWidgetUpdate(xyPosition);}} else {//else condition to add placeholder widgets on multiple page first time@@ -637,7 +639,7 @@ const TemplatePlaceholder = () => {? { ...x, placeHolder: [placeHolder] }: x);- setSignerPos(updatesignerPos);+ recordWidgetUpdate(updatesignerPos);}}@@ -742,7 +744,7 @@ const TemplatePlaceholder = () => {}return obj;});- setSignerPos(newUpdateSigner);+ recordWidgetUpdate(newUpdateSigner);}}}@@ -758,7 +760,7 @@ const TemplatePlaceholder = () => {signerPos);if (res) {- setSignerPos(res);+ recordWidgetUpdate(res);}};@@ -2047,7 +2049,7 @@ const TemplatePlaceholder = () => {isPageCopy={isPageCopy}setIsPageCopy={setIsPageCopy}xyPosition={signerPos}- setXyPosition={setSignerPos}+ setXyPosition={recordWidgetUpdate}allPages={allPages}pageNumber={currWidgetsDetails?.pageNumber || pageNumber}signKey={currWidgetsDetails?.key}@@ -2058,6 +2060,7 @@ const TemplatePlaceholder = () => {/>{/* pdf header which contain funish back button */}<Header+ widgetHistory={widgetHistory}completeBtnTitle={t("next")}isPlaceholder={true}pageNumber={pageNumber}@@ -2099,7 +2102,7 @@ const TemplatePlaceholder = () => {handleStop={handleStop}setPdfLoad={setPdfLoad}pdfLoad={pdfLoad}- setSignerPos={setSignerPos}+ setSignerPos={recordWidgetUpdate}containerWH={containerWH}setIsResize={setIsResize}setZIndex={setZIndex}diff --git a/apps/OpenSign/src/utils/acroFieldExtractor.js b/apps/OpenSign/src/utils/acroFieldExtractor.jsindex 7b81e4501..563753750 100644--- a/apps/OpenSign/src/utils/acroFieldExtractor.js+++ b/apps/OpenSign/src/utils/acroFieldExtractor.js@@ -499,6 +499,10 @@ export const getAndClearAcroFields = () => {return null;};+/**+ * Removes empty source controls and embeds prefilled field appearances as+ * static page content so they cannot remain editable in downloaded PDFs.+ */export const clearAcroFields = async (pdfFile) => {const pdfDoc = await PDFDocument.load(pdfFile, { ignoreEncryption: true });const form = pdfDoc.getForm();@@ -506,17 +510,12 @@ export const clearAcroFields = async (pdfFile) => {const populatedFields = fields.filter(isFieldFilled);if (populatedFields.length > 0) {- try {- // Keep pre-filled fields, but remove empty source controls so the- // auto-detected widgets are the only controls for those positions.- fields.forEach((field) => {- if (!isFieldFilled(field)) form.removeField(field);- });- return await pdfDoc.save({ useObjectStreams: false });- } catch {- // Preserve the original PDF if a malformed field cannot be removed.- return pdfFile;- }+ // Remove empty controls before flattening so they do not cover the+ // auto-detected OpenSign widgets with blank backgrounds or borders.+ fields.forEach((field) => {+ if (!isFieldFilled(field)) form.removeField(field);+ });+ form.flatten();}try {@@ -548,7 +547,8 @@ export const clearAcroFields = async (pdfFile) => {try {const annot = pdfDoc.context.lookup(annotRef);const subtype = annot?.get(PDFName.of("Subtype"));- return subtype?.toString() !== "/Widget";+ // pdf-lib may leave references to deleted child widgets.+ return Boolean(annot) && subtype?.toString() !== "/Widget";} catch {return true;}diff --git a/apps/OpenSignServer/Utils.js b/apps/OpenSignServer/Utils.jsindex 24c9ef3b6..f43134b8b 100644--- a/apps/OpenSignServer/Utils.js+++ b/apps/OpenSignServer/Utils.js@@ -262,7 +262,6 @@ function _getWidgetRectServer(widget, pdfDoc) {const y2 = _numberFromPdfObjectServer(rectArr.get(3));if ([x1, y1, x2, y2].some(v => !isFinite(v))) return null;-return {x: Math.min(x1, x2),y: Math.min(y1, y2),diff --git a/apps/OpenSignServer/utils/brandContext.js b/apps/OpenSignServer/utils/brandContext.jsindex 0cdbfff81..d46e410ee 100644--- a/apps/OpenSignServer/utils/brandContext.js+++ b/apps/OpenSignServer/utils/brandContext.js@@ -219,6 +219,37 @@ export function resolveBrandContext({ tenant, deployment, document, env = procesexport function renderEmailLogo(context, { padding = false } = {}) {const logoUrl = parseHttpUrl(context?.assets?.emailLogoUrl);if (!logoUrl) return '';+ if (+ context?.isOpenSign &&+ context?.productName === OPEN_SIGN_NAME &&+ logoUrl === OPEN_SIGN_EMAIL_LOGO+ ) {+ return `<table role="presentation" width="600" cellpadding="0" cellspacing="0" border="0" style="width:100%;max-width:600px;background:#ffffff;">+ <tr>+ <td style="padding:10px 14px;background:#ffffff;">+ <table role="presentation" cellpadding="0" cellspacing="0" border="0">+ <tr>+ <td valign="middle" style="padding-right:8px;">+ <table role="presentation" width="53" height="53" cellpadding="0" cellspacing="0" border="0" style="width:53px;height:53px;border:8px solid #0b326b;">+ <tr>+ <td align="center" valign="middle">+ <table role="presentation" width="20" height="20" cellpadding="0" cellspacing="0" border="0" style="width:20px;height:20px;background:#0b326b;">+ <tr><td style="font-size:0;line-height:0;"> </td></tr>+ </table>+ </td>+ </tr>+ </table>+ </td>+ <td valign="middle">+ <div style="font-family:Arial,Helvetica,sans-serif;font-size:35px;line-height:38px;font-weight:700;letter-spacing:-1.5px;color:#080b10;">OpenSign</div>+ <div style="font-family:Arial,Helvetica,sans-serif;font-size:11px;line-height:18px;letter-spacing:.4px;color:#173d72;text-align:center;">Seal the Deal, Openly</div>+ </td>+ </tr>+ </table>+ </td>+ </tr>+</table>`;+ }const style = padding ? " style='padding:20px'" : '';return `<img src='${escapeHtml(logoUrl)}' height='50'${style}/>`;}