form-craft-package 1.10.6 → 1.10.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-craft-package",
-  "version": "1.10.6",
+  "version": "1.10.7",
   "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/components/form/layout-renderer/3-element/6-signature.tsx

@@ -56,22 +56,20 @@ function LayoutRenderer_Signature({
 
   const cacheSignatureVector = () => {
     const pad = sigCanvasRef.current
-    if (!pad) return
-    if (pad.isEmpty()) {
-      padVectorRef.current = null
-      return
-    }
+    if (!pad || pad.isEmpty()) return
     const data = pad.toData()
-    padVectorRef.current = data.length ? data : null
+    if (data.length) padVectorRef.current = data
   }
 
   const restoreSignatureVector = () => {
     const pad = sigCanvasRef.current
     const data = padVectorRef.current
-    if (!pad || !data?.length || isRestoringRef.current) return
+    const dataUrl = savedSignatureBlobNameRef.current
+    if (!pad || isRestoringRef.current || (!data?.length && !dataUrl)) return
     isRestoringRef.current = true
     try {
-      pad.fromData(data)
+      if (data?.length) pad.fromData(data)
+      else if (dataUrl) pad.fromDataURL(dataUrl)
     } finally {
       isRestoringRef.current = false
     }
@@ -115,6 +113,11 @@ function LayoutRenderer_Signature({
 
   const shouldBindPad = isNewFormDataPage(formDataId) && !isGeneratingPdf
 
+  useEffect(() => {
+    if (!shouldBindPad || !isReady) return
+    scheduleVectorRestore()
+  }, [isReady, shouldBindPad])
+
   useEffect(() => {
     if (!shouldBindPad || typeof window === 'undefined') return
     let raf = 0
@@ -135,7 +138,7 @@ function LayoutRenderer_Signature({
       if (existing?.length) {
         padVectorRef.current = existing
         sigCanvasRef.current?.fromData(existing)
-      }
+      } else scheduleVectorRestore()
     }
     raf = window.requestAnimationFrame(init)
     return () => window.cancelAnimationFrame(raf)
@@ -210,8 +213,16 @@ function LayoutRenderer_Signature({
                   sigCanvasRef.current?.clear()
                   savedSignatureBlobNameRef.current = ''
                   padVectorRef.current = null
-                  if (fieldKeyJoined)
-                    formRef?.setFieldsValue({ [FormPreservedItemKeys.SignatureFields]: { [fieldKeyJoined]: null } })
+                  if (fieldKeyJoined) {
+                    const existing =
+                      (formRef?.getFieldValue(FormPreservedItemKeys.SignatureFields) as Record<
+                        string,
+                        string | null
+                      >) || {}
+                    formRef?.setFieldsValue({
+                      [FormPreservedItemKeys.SignatureFields]: { ...existing, [fieldKeyJoined]: null },
+                    })
+                  }
                 }}
               >
                 {clearBtnLabel || 'Clear'}
@@ -238,10 +249,14 @@ function LayoutRenderer_Signature({
             const sigBase64 = sigCanvasRef.current?.toDataURL()
             if (sigBase64 && fieldKeyJoined) {
               savedSignatureBlobNameRef.current = sigBase64
-              formRef?.setFieldsValue({ [FormPreservedItemKeys.SignatureFields]: { [fieldKeyJoined]: sigBase64 } })
+              const existing =
+                (formRef?.getFieldValue(FormPreservedItemKeys.SignatureFields) as Record<string, string | null>) || {}
+              formRef?.setFieldsValue({
+                [FormPreservedItemKeys.SignatureFields]: { ...existing, [fieldKeyJoined]: sigBase64 },
+              })
             }
-          }}
-        />
+          }}
+        />
       ) : savedSignatureBlobName ? (
         errorOccured ? (
           <span className="font-bold italic text-danger">