diff --git a/VERSION b/VERSION index d6c9550..c33f5b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.68-beta +0.4.69-beta diff --git a/public/css/coloring.css b/public/css/coloring.css index 82efc26..cdd21c2 100644 --- a/public/css/coloring.css +++ b/public/css/coloring.css @@ -1,39 +1,56 @@ /* Thematische kleurplaten */ -.coloring-app{height:100%;min-height:0;display:flex;flex-direction:column;background:var(--surface);color:var(--ink)} -.coloring-choices,.coloring-tools{display:flex;align-items:center;gap:8px;flex-wrap:wrap;padding:8px 10px;border-bottom:1px solid var(--line);background:color-mix(in srgb,var(--orange) 7%,var(--surface))} +.coloring-app{--coloring-ink:#1c293d;--coloring-detail:#2d3e56;height:100%;min-height:0;display:flex;flex-direction:column;background:linear-gradient(180deg,color-mix(in srgb,var(--orange) 4%,var(--surface)),var(--surface));color:var(--ink)} +.coloring-choices,.coloring-tools{display:flex;align-items:center;gap:8px;flex-wrap:wrap;padding:9px 11px;border-bottom:1px solid color-mix(in srgb,var(--line) 72%,var(--orange));background:linear-gradient(100deg,color-mix(in srgb,var(--orange) 10%,var(--surface)),color-mix(in srgb,var(--purple) 5%,var(--surface)))} .coloring-choices label{display:grid;grid-template-columns:auto minmax(120px,1fr);align-items:center;gap:6px;color:var(--muted);font-size:11px;font-weight:850} -.coloring-choices select{height:34px;max-width:230px;border:1px solid var(--line);border-radius:9px;padding:0 28px 0 9px;background:var(--surface);color:var(--ink);font:inherit;font-weight:750} -.coloring-fit{margin-left:auto;padding:5px 9px;border-radius:999px;background:var(--surface);color:var(--muted);font-size:11px;font-weight:800;white-space:nowrap} -.coloring-tools{gap:6px;background:var(--surface)} -.coloring-tool-buttons,.coloring-palette,.coloring-sizes{display:flex;align-items:center;gap:4px;padding:3px;border-radius:11px;background:var(--surface-2)} -.coloring-tools button{width:36px;height:36px;display:grid;place-items:center;border:0;border-radius:9px;background:transparent;color:var(--ink);font:inherit;font-size:18px;cursor:pointer} -.coloring-tools button:is(:hover,:focus-visible),.coloring-tools button.on{background:var(--surface);box-shadow:0 1px 5px rgba(30,50,90,.18)} +.coloring-choices select{height:36px;max-width:230px;border:1px solid color-mix(in srgb,var(--line) 72%,var(--orange));border-radius:11px;padding:0 30px 0 10px;background:var(--surface);color:var(--ink);box-shadow:0 2px 8px rgba(30,50,90,.07);font:inherit;font-weight:750} +.coloring-fit{margin-left:auto;padding:6px 10px;border:1px solid color-mix(in srgb,var(--line) 75%,var(--orange));border-radius:999px;background:color-mix(in srgb,var(--surface) 92%,var(--orange));color:var(--muted);box-shadow:0 2px 8px rgba(30,50,90,.06);font-size:11px;font-weight:800;white-space:nowrap} +.coloring-tools{gap:7px;background:color-mix(in srgb,var(--surface) 96%,var(--orange))} +.coloring-tool-buttons,.coloring-palette,.coloring-sizes{display:flex;align-items:center;gap:4px;padding:4px;border:1px solid color-mix(in srgb,var(--line) 78%,transparent);border-radius:13px;background:linear-gradient(180deg,color-mix(in srgb,var(--surface-2) 82%,#fff),var(--surface-2));box-shadow:inset 0 1px 0 rgba(255,255,255,.72),0 2px 7px rgba(30,50,90,.06)} +.coloring-tools button{width:36px;height:36px;display:grid;place-items:center;border:0;border-radius:10px;background:transparent;color:var(--ink);font:inherit;font-size:18px;cursor:pointer;transition:transform .14s ease,background .14s ease,box-shadow .14s ease} +.coloring-tools button:is(:hover,:focus-visible){transform:translateY(-1px);background:var(--surface);box-shadow:0 4px 10px rgba(30,50,90,.14)} +.coloring-tools button.on{background:var(--surface);box-shadow:0 2px 7px rgba(30,50,90,.16)} .coloring-tool-buttons button.on{outline:2px solid var(--orange);outline-offset:-2px} -.coloring-color i{width:22px;height:22px;display:block;border:1px solid rgba(38,52,74,.22);border-radius:50%;box-shadow:inset 0 0 0 1px rgba(255,255,255,.18)} -.coloring-color.on{outline:2.5px solid var(--ink);outline-offset:-3px} +.coloring-color i{width:23px;height:23px;display:block;border:1px solid rgba(28,41,61,.25);border-radius:50%;box-shadow:inset 0 2px 3px rgba(255,255,255,.42),inset 0 -2px 3px rgba(28,41,61,.12),0 1px 2px rgba(28,41,61,.12);transition:transform .14s ease} +.coloring-color.on{outline:2.5px solid var(--coloring-ink);outline-offset:-3px}.coloring-color.on i{transform:scale(1.08)} .coloring-size i{display:block;border-radius:50%;background:var(--ink)} .coloring-size.on{outline:2px solid var(--orange);outline-offset:-2px} .coloring-custom{display:flex;align-items:center;gap:5px;color:var(--muted);font-size:10px;font-weight:800} -.coloring-custom input{width:36px;height:36px;padding:3px;border:1px solid var(--line);border-radius:9px;background:var(--surface);cursor:pointer} -.coloring-tools .coloring-reset{margin-left:auto;background:var(--red-soft);color:var(--red)} -.coloring-tools .coloring-done{width:auto;min-width:112px;padding:0 12px;color:#fff;font-size:13px} -.coloring-stage{flex:1;min-height:0;overflow:auto;display:grid;place-items:center;padding:12px;background:linear-gradient(135deg,var(--surface-2),color-mix(in srgb,var(--purple) 5%,var(--surface)))} -.coloring-paper{position:relative;width:min(100%,900px);aspect-ratio:4/3;flex:none;overflow:hidden;border:1px solid var(--line);border-radius:16px;background:#fff;box-shadow:0 10px 28px rgba(30,50,90,.14);isolation:isolate} -.coloring-art,.coloring-paper canvas{position:absolute;inset:0;width:100%;height:100%} -.coloring-art svg{width:100%;height:100%;display:block;background:#fff} -.coloring-art [hidden]{display:none} +.coloring-custom input{width:36px;height:36px;padding:3px;border:1px solid var(--line);border-radius:10px;background:var(--surface);box-shadow:0 2px 7px rgba(30,50,90,.08);cursor:pointer} +.coloring-tools .coloring-reset{margin-left:auto;background:var(--red-soft);color:var(--red);box-shadow:inset 0 0 0 1px color-mix(in srgb,var(--red) 18%,transparent)} +.coloring-tools .coloring-done{width:auto;min-width:112px;padding:0 14px;color:#fff;box-shadow:0 4px 10px color-mix(in srgb,var(--orange) 24%,transparent);font-size:13px} +.coloring-stage{flex:1;min-height:0;overflow:auto;display:grid;place-items:center;padding:18px;background:radial-gradient(circle at 12% 18%,color-mix(in srgb,var(--orange) 13%,transparent),transparent 31%),radial-gradient(circle at 88% 82%,color-mix(in srgb,var(--purple) 10%,transparent),transparent 34%),linear-gradient(145deg,var(--surface-2),color-mix(in srgb,var(--purple) 5%,var(--surface)))} +.coloring-paper{position:relative;width:min(100%,900px);aspect-ratio:4/3;flex:none;overflow:hidden;border:2px solid rgba(255,255,255,.94);border-radius:22px;background:#fff;box-shadow:inset 0 0 0 1px rgba(28,41,61,.12),0 4px 0 rgba(28,41,61,.05),0 20px 46px rgba(30,50,90,.18);isolation:isolate} +.coloring-art,.coloring-paper canvas,.coloring-ink{position:absolute;inset:0;width:100%;height:100%} +.coloring-art{z-index:1}.coloring-paper canvas{z-index:2}.coloring-ink{z-index:3;pointer-events:none} +.coloring-art svg,.coloring-ink svg{width:100%;height:100%;display:block}.coloring-art svg{background:#fff}.coloring-ink svg{position:absolute;inset:0;overflow:visible} +.coloring-art [hidden],.coloring-ink [hidden]{display:none} .coloring-svg-lines{shape-rendering:geometricPrecision} .coloring-svg-lines .coloring-region{paint-order:fill stroke;stroke-opacity:.98} .coloring-svg-lines .coloring-region[data-role="backdrop"]{stroke-width:4.25} .coloring-svg-lines .coloring-region[data-level="2"]{stroke-width:5.9} .coloring-svg-lines .coloring-region[data-level="3"]{stroke-width:5.15} -.coloring-svg-lines .coloring-detail{stroke:#41516a;stroke-width:3.6;stroke-opacity:.9;pointer-events:none} -.coloring-svg-lines .coloring-detail[data-level="3"]{stroke:#526079;stroke-width:3;stroke-opacity:.82} +.coloring-svg-lines .coloring-detail{stroke:var(--coloring-detail);stroke-width:3.6;stroke-opacity:.94;pointer-events:none} +.coloring-svg-lines .coloring-detail[data-level="3"]{stroke-width:3;stroke-opacity:.88} .coloring-svg-lines .coloring-recognition{pointer-events:none} -.coloring-paper canvas{z-index:2;touch-action:none;cursor:crosshair;mix-blend-mode:multiply} +.coloring-ink-halo,.coloring-ink-overlay{pointer-events:none;shape-rendering:geometricPrecision}.coloring-ink-halo{mix-blend-mode:screen}.coloring-ink-overlay{mix-blend-mode:multiply} +.coloring-ink-halo .coloring-region{fill:#000!important;stroke:#fff;stroke-width:10.25;stroke-opacity:.96} +.coloring-ink-halo .coloring-region[data-role="backdrop"]{stroke-width:7.25} +.coloring-ink-halo .coloring-region[data-level="2"]{stroke-width:9.65} +.coloring-ink-halo .coloring-region[data-level="3"]{stroke-width:8.85} +.coloring-ink-halo .coloring-detail{fill:none!important;stroke:#fff!important;stroke-width:7.2;stroke-opacity:.96} +.coloring-ink-halo .coloring-detail[data-level="3"]{stroke-width:6.35} +.coloring-ink-halo .coloring-ink-dot{fill:#fff!important;stroke:#fff!important;stroke-width:4.5} +.coloring-ink-overlay .coloring-region{fill:#fff!important;stroke:var(--coloring-ink);stroke-width:6.5;stroke-opacity:1} +.coloring-ink-overlay .coloring-region[data-role="backdrop"]{stroke-width:4.25} +.coloring-ink-overlay .coloring-region[data-level="2"]{stroke-width:5.9} +.coloring-ink-overlay .coloring-region[data-level="3"]{stroke-width:5.15} +.coloring-ink-overlay .coloring-detail{fill:none!important;stroke:var(--coloring-detail)!important;stroke-width:3.8;stroke-opacity:1} +.coloring-ink-overlay .coloring-detail[data-level="3"]{stroke-width:3.15} +.coloring-ink-overlay .coloring-ink-dot{fill:var(--coloring-ink)!important;stroke:none!important} +.coloring-paper canvas{touch-action:none;cursor:crosshair;mix-blend-mode:multiply} .coloring-app[data-tool="bucket"] .coloring-art{cursor:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30'%3E%3Ctext y='24' font-size='23'%3E%F0%9F%AA%A3%3C/text%3E%3C/svg%3E") 6 24,pointer} .coloring-app[data-tool="bucket"] .coloring-art [data-fillable]{pointer-events:all} -.coloring-app[data-tool="bucket"] .coloring-art [data-fillable]:hover{stroke:#d56a1f;stroke-opacity:1} +.coloring-app[data-tool="bucket"] .coloring-art [data-fillable]:hover{fill-opacity:.82} .coloring-hint{min-height:30px;padding:7px 11px;color:var(--muted);font-size:11px;font-weight:700;text-align:center;background:var(--surface)} .widget[data-widget="coloring"]{--widget-accent:var(--orange)} @@ -47,9 +64,9 @@ .coloring-custom span{display:none}.coloring-custom input{width:32px;height:32px} .coloring-tools .coloring-reset{margin-left:0} .coloring-tools .coloring-done{min-width:90px;font-size:11px} - .coloring-stage{place-items:start center;padding:6px} + .coloring-stage{place-items:start center;padding:8px} .coloring-paper{min-width:360px;border-radius:10px} .coloring-hint{font-size:10px} } @media(pointer:coarse){.coloring-tools button,.coloring-custom input{min-width:40px;min-height:40px}.coloring-choices select{min-height:40px}} -@media(prefers-reduced-motion:reduce){.coloring-app *{scroll-behavior:auto!important}} +@media(prefers-reduced-motion:reduce){.coloring-app *{scroll-behavior:auto!important;transition:none!important}} diff --git a/public/js/core.js b/public/js/core.js index a6a1fe9..07c97f4 100644 --- a/public/js/core.js +++ b/public/js/core.js @@ -2,7 +2,7 @@ "use strict"; /* version — shown until /api/version resolves (or if the fetch fails, e.g. offline). Kept in sync by hand with the VERSION file at the repo root on every release. */ -const VERSION = "0.4.68-beta"; +const VERSION = "0.4.69-beta"; /* Safari en oudere mobiele browsers behandelen 100vh/100% soms als de hoogte achter hun adres- en navigatiebalk. visualViewport geeft de werkelijk zichtbare hoogte; de CSS gebruikt deze pixelwaarde als betrouwbare bron en diff --git a/public/js/widgets/coloring.js b/public/js/widgets/coloring.js index e6f948a..8ae5c8f 100644 --- a/public/js/widgets/coloring.js +++ b/public/js/widgets/coloring.js @@ -353,6 +353,14 @@ function coloringPencilWidth(size,pressure,pointerType){ function coloringSafeColor(value,fallback=COLORING_COLORS[1]){ return /^#[0-9a-f]{6}$/i.test(String(value||""))?String(value).toLowerCase():fallback; } +function coloringInkOverlay(svg,className){ + const overlay=svg.cloneNode(true);overlay.setAttribute("class",`coloring-ink-svg ${className}`); + overlay.querySelectorAll(".coloring-detail[stroke=\"none\"]").forEach(node=>node.classList.add("coloring-ink-dot")); + overlay.querySelectorAll("[data-fillable]").forEach(node=>{ + node.removeAttribute("data-fillable");node.removeAttribute("data-part");node.setAttribute("fill","none"); + }); + return overlay; +} function mountColoring(root,initState,opts={}){ const yearGroup=Math.max(1,Math.min(8,Number(initState&&initState.yearGroup)||4)); @@ -379,11 +387,11 @@ function mountColoring(root,initState,opts={}){ -
+
`; const app=root.querySelector(".coloring-app"),themeSel=root.querySelector(".coloring-theme"),pageSel=root.querySelector(".coloring-page"); - const art=root.querySelector(".coloring-art"),paper=root.querySelector(".coloring-paper"),canvas=root.querySelector("canvas"),ctx=canvas.getContext("2d"); + const art=root.querySelector(".coloring-art"),inkHost=root.querySelector(".coloring-ink"),paper=root.querySelector(".coloring-paper"),canvas=root.querySelector("canvas"),ctx=canvas.getContext("2d"); const toolHost=root.querySelector(".coloring-tool-buttons"),palette=root.querySelector(".coloring-palette"),sizes=root.querySelector(".coloring-sizes"); const custom=root.querySelector(".coloring-custom input"),reset=root.querySelector(".coloring-reset"),done=root.querySelector(".coloring-done"),hint=root.querySelector(".coloring-hint"); const TOOLS=[["pencil","✏️","colorToolPencil"],["bucket","🪣","colorToolBucket"],["eraser","🧽","eraser"]]; @@ -421,6 +429,7 @@ function mountColoring(root,initState,opts={}){ svg.querySelectorAll("[data-fillable][data-part]").forEach(node=>{ const saved=coloringSafeColor(fills[node.dataset.part],"");if(saved)node.setAttribute("fill",saved); }); + inkHost.replaceChildren(coloringInkOverlay(svg,"coloring-ink-halo"),coloringInkOverlay(svg,"coloring-ink-overlay")); if(keepState&&restoreInk){loadInk(restoreInk);restoreInk=null} refreshTools();updateTexts(); } diff --git a/test/coloring.test.js b/test/coloring.test.js index 2e6d45b..9b3fa7d 100644 --- a/test/coloring.test.js +++ b/test/coloring.test.js @@ -96,7 +96,7 @@ test('elk leerjaar heeft zeven herkenbare kleurplaten met diverse thema’s en d assert.equal(api.pagesFor(3,'science').length,1); }); -test('potlood reageert op echte pendruk en bouwt kleur transparant op',async()=>{ +test('potlood reageert op echte pendruk en de bovenste inktlaag houdt lijnen zichtbaar',async()=>{ const {source,api}=await coloringContext(); assert.ok(api.pencilWidth(7,.9,'pen')>api.pencilWidth(7,.2,'pen')); assert.equal(api.pencilWidth(7,0,'mouse'),7); @@ -105,14 +105,23 @@ test('potlood reageert op echte pendruk en bouwt kleur transparant op',async()=> for(const feature of ['getCoalescedEvents','event.pressure','erase?1:.27','quadraticCurveTo','Math.random()'])assert.ok(source.includes(feature),feature); const css=await readFile('public/css/coloring.css','utf8'); assert.match(css,/mix-blend-mode:multiply/); + assert.match(source,/class="coloring-art"><\/div>]+><\/canvas>