From ab6dd05b6e54ca52ea10724e05bf07e7ed261f49 Mon Sep 17 00:00:00 2001
From: lew <lew@ily.rs>
Date: Fri, 10 Apr 2026 02:24:55 +0100
Subject: [PATCH] refactor: collapsible drawing form with add/discard UX

---
 src/render.rs | 111 +++++++++++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/src/render.rs b/src/render.rs
index 44ee119..28aacc6 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -41,46 +41,67 @@ pub fn render_form(config: &Config) -> String {
 
     let drawing_section = if config.enable_drawings {
         format!(
-            r##"<label class="guestbook-label">{label}</label>
-<canvas class="guestbook-canvas" width="{w}" height="{h}"></canvas>
-<span class="guestbook-canvas-tools"><span class="guestbook-swatch active" data-c="#000" style="background:#000"></span><span class="guestbook-swatch" data-c="#e03131" style="background:#e03131"></span><span class="guestbook-swatch" data-c="#2f9e44" style="background:#2f9e44"></span><span class="guestbook-swatch" data-c="#1971c2" style="background:#1971c2"></span> <input type="range" class="guestbook-size-slider" min="1" max="20" value="5"> | <a href="#" class="guestbook-undo">undo</a> | <a href="#" class="guestbook-canvas-reset">reset</a></span><input type="hidden" name="drawing"><script>(function(){{
-  var c=document.querySelector('.guestbook-canvas'),
-      x=c.getContext('2d'),
-      d=false,lx,ly,h=[],col='#000',sz=5;
-  x.strokeStyle=col;x.lineWidth=sz;x.lineCap='round';x.lineJoin='round';
-  function pos(e){{var r=c.getBoundingClientRect();
-    return[e.clientX-r.left,e.clientY-r.top]}}
-  function tpos(e){{var r=c.getBoundingClientRect(),t=e.touches[0];
-    return[t.clientX-r.left,t.clientY-r.top]}}
-  function save(){{if(h.length>=20)h.shift();
-    h.push(x.getImageData(0,0,c.width,c.height))}}
+            r##"<span class="guestbook-drawing-wrap"><span class="guestbook-drawing-inline"><a href="#" class="guestbook-drawing-toggle">add a drawing</a></span>
+<span class="guestbook-drawing-content"></span></span><input type="hidden" name="drawing"><script>(function(){{
+  var inl=document.querySelector('.guestbook-drawing-inline'),
+      cnt=document.querySelector('.guestbook-drawing-content'),
+      hid=document.querySelector('[name=drawing]'),
+      c,x,d=false,lx,ly,h=[],col='#000',sz=5;
+  function pos(e){{var r=c.getBoundingClientRect();return[e.clientX-r.left,e.clientY-r.top]}}
+  function tpos(e){{var r=c.getBoundingClientRect(),t=e.touches[0];return[t.clientX-r.left,t.clientY-r.top]}}
+  function save(){{if(h.length>=20)h.shift();h.push(x.getImageData(0,0,c.width,c.height))}}
   function dot(px,py){{x.beginPath();x.arc(px,py,sz/2,0,Math.PI*2);x.fillStyle=col;x.fill()}}
-  c.addEventListener('mousedown',function(e){{save();d=true;var p=pos(e);lx=p[0];ly=p[1];dot(lx,ly)}});
-  c.addEventListener('mousemove',function(e){{if(!d)return;var p=pos(e);
-    x.beginPath();x.moveTo(lx,ly);x.lineTo(p[0],p[1]);x.stroke();lx=p[0];ly=p[1]}});
-  c.addEventListener('mouseup',function(){{d=false}});
-  c.addEventListener('mouseleave',function(){{d=false}});
-  c.addEventListener('touchstart',function(e){{e.preventDefault();save();var p=tpos(e);lx=p[0];ly=p[1];dot(lx,ly)}});
-  c.addEventListener('touchmove',function(e){{e.preventDefault();var p=tpos(e);
-    x.beginPath();x.moveTo(lx,ly);x.lineTo(p[0],p[1]);x.stroke();lx=p[0];ly=p[1]}});
-  var sw=document.querySelectorAll('.guestbook-swatch');
-  sw.forEach(function(s){{s.addEventListener('click',function(){{
-    sw.forEach(function(el){{el.classList.remove('active')}});
-    s.classList.add('active');col=s.getAttribute('data-c');x.strokeStyle=col}})}});
-  document.querySelector('.guestbook-size-slider').addEventListener('input',function(e){{
-    sz=parseInt(e.target.value);x.lineWidth=sz}});
-  document.querySelector('.guestbook-undo').addEventListener('click',function(e){{
-    e.preventDefault();if(h.length)x.putImageData(h.pop(),0,0)}});
-  document.querySelector('.guestbook-canvas-reset').addEventListener('click',function(e){{
-    e.preventDefault();h=[];x.clearRect(0,0,c.width,c.height)}});
-  c.closest('form').addEventListener('submit',function(){{
-    var px=new Uint32Array(x.getImageData(0,0,c.width,c.height).data.buffer);
-    if(px.some(function(v){{return v!==0}})){{
-      c.closest('form').querySelector('[name=drawing]').value=c.toDataURL('image/png');
-    }}
-  }});
+  function bindCanvas(){{
+    x=c.getContext('2d');x.strokeStyle=col;x.lineWidth=sz;x.lineCap='round';x.lineJoin='round';
+    c.addEventListener('mousedown',function(e){{save();d=true;var p=pos(e);lx=p[0];ly=p[1];dot(lx,ly)}});
+    c.addEventListener('mousemove',function(e){{if(!d)return;var p=pos(e);x.beginPath();x.moveTo(lx,ly);x.lineTo(p[0],p[1]);x.stroke();lx=p[0];ly=p[1]}});
+    c.addEventListener('mouseup',function(){{d=false}});
+    c.addEventListener('mouseleave',function(){{d=false}});
+    c.addEventListener('touchstart',function(e){{e.preventDefault();save();var p=tpos(e);lx=p[0];ly=p[1];dot(lx,ly)}});
+    c.addEventListener('touchmove',function(e){{e.preventDefault();var p=tpos(e);x.beginPath();x.moveTo(lx,ly);x.lineTo(p[0],p[1]);x.stroke();lx=p[0];ly=p[1]}});
+  }}
+  function showCanvas(){{
+    inl.innerHTML='';
+    var sw=[{{c:'#000'}},{{c:'#e03131'}},{{c:'#2f9e44'}},{{c:'#1971c2'}}];
+    sw.forEach(function(s,i){{
+      var sp=document.createElement('span');
+      sp.className='guestbook-swatch'+(i===0?' active':'');
+      sp.setAttribute('data-c',s.c);sp.style.background=s.c;
+      sp.addEventListener('click',function(){{
+        inl.querySelectorAll('.guestbook-swatch').forEach(function(el){{el.classList.remove('active')}});
+        sp.classList.add('active');col=s.c;x.strokeStyle=col;
+      }});
+      inl.appendChild(sp);
+    }});
+    var sl=document.createElement('input');
+    sl.type='range';sl.className='guestbook-size-slider';sl.min='1';sl.max='20';sl.value='5';
+    sl.addEventListener('input',function(){{sz=parseInt(sl.value);x.lineWidth=sz}});
+    inl.appendChild(document.createTextNode(' '));inl.appendChild(sl);
+    inl.appendChild(document.createTextNode(' | '));
+    var undo=document.createElement('a');undo.href='#';undo.textContent='undo';
+    undo.addEventListener('click',function(e){{e.preventDefault();if(h.length)x.putImageData(h.pop(),0,0)}});
+    inl.appendChild(undo);
+    inl.appendChild(document.createTextNode(' | '));
+    var disc=document.createElement('a');disc.href='#';disc.textContent='discard';
+    disc.addEventListener('click',function(e){{
+      e.preventDefault();h=[];col='#000';sz=5;d=false;cnt.innerHTML='';hid.value='';setInit();
+    }});
+    inl.appendChild(disc);
+    c=document.createElement('canvas');c.className='guestbook-canvas';c.width={w};c.height={h};
+    cnt.innerHTML='';cnt.appendChild(c);bindCanvas();
+    c.closest('form').addEventListener('submit',function(){{
+      var px=new Uint32Array(x.getImageData(0,0,c.width,c.height).data.buffer);
+      if(px.some(function(v){{return v!==0}})){{hid.value=c.toDataURL('image/png')}}
+    }});
+  }}
+  function setInit(){{
+    inl.innerHTML='';
+    var a=document.createElement('a');a.href='#';a.textContent='add a drawing';
+    a.addEventListener('click',function(e){{e.preventDefault();showCanvas()}});
+    inl.appendChild(a);
+  }}
+  inl.querySelector('a').addEventListener('click',function(e){{e.preventDefault();showCanvas()}});
 }})();</script>"##,
-            label = config.label_drawing,
             w = config.canvas_width,
             h = config.canvas_height,
         )
@@ -97,8 +118,7 @@ pub fn render_form(config: &Config) -> String {
 <label class="guestbook-label">{label_message}</label>
 <textarea class="guestbook-textarea" name="message" style="width:{tw}px;height:{th}px" required></textarea>
 {captcha_section}
-{drawing_section}<input name="url" style="display:none" tabindex="-1" autocomplete="off">
-<button class="guestbook-button" type="submit">{button}</button>
+{drawing_section}<input name="url" style="display:none" tabindex="-1" autocomplete="off"><button class="guestbook-button" type="submit">{button}</button>
 </form>"#,
         prompt = config.form_prompt,
         label_name = config.label_name,
@@ -430,21 +450,20 @@ mod tests {
     }
 
     #[test]
-    fn test_render_form_shows_canvas_when_drawings_enabled() {
+    fn test_render_form_shows_drawing_toggle_when_enabled() {
         let mut config = test_config();
         config.enable_drawings = true;
         let form = render_form(&config);
-        assert!(form.contains("<canvas"));
-        assert!(form.contains("class=\"guestbook-canvas\""));
+        assert!(form.contains("add a drawing"));
+        assert!(form.contains("guestbook-drawing-toggle"));
         assert!(form.contains("name=\"drawing\""));
-        assert!(form.contains("reset"));
     }
 
     #[test]
-    fn test_render_form_hides_canvas_when_drawings_disabled() {
+    fn test_render_form_hides_drawing_when_disabled() {
         let config = test_config();
         let form = render_form(&config);
-        assert!(!form.contains("<canvas"));
+        assert!(!form.contains("add a drawing"));
         assert!(!form.contains("name=\"drawing\""));
     }