From d1d26b5424a49ef06148115fc0728fd953b0a96d Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete.matsy@gmail.com>
Date: Fri, 9 Feb 2024 22:33:18 +0200
Subject: [PATCH] increase canvas resolution

---
 .../submission_form/initials_step.vue         | 20 +++++++----
 .../submission_form/signature_step.vue        | 36 +++++++++++--------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/app/javascript/submission_form/initials_step.vue b/app/javascript/submission_form/initials_step.vue
index 992ee6fb..8525ae69 100644
--- a/app/javascript/submission_form/initials_step.vue
+++ b/app/javascript/submission_form/initials_step.vue
@@ -84,7 +84,7 @@
     <canvas
       v-show="!modelValue && !computedPreviousValue"
       ref="canvas"
-      class="bg-white border border-base-300 rounded-2xl"
+      class="bg-white border border-base-300 rounded-2xl w-full"
     />
     <input
       v-if="!isDrawInitials && !modelValue && !computedPreviousValue"
@@ -106,6 +106,8 @@ import { IconReload, IconTextSize, IconSignature, IconArrowsDiagonalMinimize2 }
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
 
+const scale = 3
+
 export default {
   name: 'InitialsStep',
   components: {
@@ -171,8 +173,10 @@ export default {
   async mounted () {
     this.$nextTick(() => {
       if (this.$refs.canvas) {
-        this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth
-        this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth / 5
+        this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
+        this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 3) * scale
+
+        this.$refs.canvas.getContext('2d').scale(scale, scale)
       }
 
       this.$refs.textInput?.focus()
@@ -194,8 +198,10 @@ export default {
       this.intersectionObserver = new IntersectionObserver((entries, observer) => {
         entries.forEach(entry => {
           if (entry.isIntersecting) {
-            this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth
-            this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth / 3
+            this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
+            this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 3) * scale
+
+            this.$refs.canvas.getContext('2d').scale(scale, scale)
 
             this.intersectionObserver?.disconnect()
           }
@@ -238,8 +244,8 @@ export default {
       context.font = fontStyle + ' ' + fontWeight + ' ' + fontSize + ' ' + fontFamily
       context.textAlign = 'center'
 
-      context.clearRect(0, 0, canvas.width, canvas.height)
-      context.fillText(e.target.value, canvas.width / 2, canvas.height / 2 + 11)
+      context.clearRect(0, 0, canvas.width / scale, canvas.height / scale)
+      context.fillText(e.target.value, canvas.width / 2 / scale, canvas.height / 2 / scale + 11)
     },
     toggleTextInput () {
       this.remove()
diff --git a/app/javascript/submission_form/signature_step.vue b/app/javascript/submission_form/signature_step.vue
index 4053fa1b..f998ecbd 100644
--- a/app/javascript/submission_form/signature_step.vue
+++ b/app/javascript/submission_form/signature_step.vue
@@ -127,6 +127,8 @@ import AppearsOn from './appears_on'
 
 let isFontLoaded = false
 
+const scale = 3
+
 export default {
   name: 'SignatureStep',
   components: {
@@ -198,8 +200,10 @@ export default {
   async mounted () {
     this.$nextTick(() => {
       if (this.$refs.canvas) {
-        this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth
-        this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth / 3
+        this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
+        this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth * scale / 3
+
+        this.$refs.canvas.getContext('2d').scale(scale, scale)
       }
     })
 
@@ -219,8 +223,10 @@ export default {
       this.intersectionObserver = new IntersectionObserver((entries, observer) => {
         entries.forEach(entry => {
           if (entry.isIntersecting) {
-            this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth
-            this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth / 3
+            this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
+            this.$refs.canvas.height = this.$refs.canvas.parentNode.clientWidth * scale / 3
+
+            this.$refs.canvas.getContext('2d').scale(scale, scale)
 
             this.intersectionObserver?.disconnect()
           }
@@ -276,8 +282,8 @@ export default {
       context.font = fontStyle + ' ' + fontWeight + ' ' + fontSize + ' ' + fontFamily
       context.textAlign = 'center'
 
-      context.clearRect(0, 0, canvas.width, canvas.height)
-      context.fillText(e.target.value, canvas.width / 2, canvas.height / 2 + 11)
+      context.clearRect(0, 0, canvas.width / scale, canvas.height / scale)
+      context.fillText(e.target.value, canvas.width / 2 / scale, canvas.height / 2 / scale + 11)
     },
     toggleTextInput () {
       this.remove()
@@ -313,14 +319,16 @@ export default {
             const context = canvas.getContext('2d')
 
             const aspectRatio = img.width / img.height
+            const canvasWidth = canvas.width / scale
+            const canvasHeight = canvas.height / scale
 
-            let targetWidth = canvas.width
-            let targetHeight = canvas.height
+            let targetWidth = canvasWidth
+            let targetHeight = canvasHeight
 
-            if (canvas.width / canvas.height > aspectRatio) {
-              targetWidth = canvas.height * aspectRatio
+            if (canvasWidth / canvasHeight > aspectRatio) {
+              targetWidth = canvasHeight * aspectRatio
             } else {
-              targetHeight = canvas.width / aspectRatio
+              targetHeight = canvasWidth / aspectRatio
             }
 
             if (targetHeight > targetWidth) {
@@ -329,10 +337,10 @@ export default {
               targetHeight = targetHeight * scale
             }
 
-            const x = (canvas.width - targetWidth) / 2
-            const y = (canvas.height - targetHeight) / 2
+            const x = (canvasWidth - targetWidth) / 2
+            const y = (canvasHeight - targetHeight) / 2
 
-            context.clearRect(0, 0, canvas.width, canvas.height)
+            context.clearRect(0, 0, canvasWidth, canvasHeight)
             context.drawImage(img, x, y, targetWidth, targetHeight)
 
             this.$emit('start')