From 23623ae15b0aa1bc2f477c20e469324bddc2dc7f Mon Sep 17 00:00:00 2001
From: Joseph Montanaro <jfmonty2@gmail.com>
Date: Sun, 6 Aug 2023 17:26:54 -0700
Subject: [PATCH] use svg animation for spinner

---
 src/ui/Spinner.svelte             | 132 ++++++++----------------------
 src/views/EnterCredentials.svelte |   4 +-
 src/views/Unlock.svelte           |   2 +-
 3 files changed, 36 insertions(+), 102 deletions(-)

diff --git a/src/ui/Spinner.svelte b/src/ui/Spinner.svelte
index 6931b3f..5d2f8cf 100644
--- a/src/ui/Spinner.svelte
+++ b/src/ui/Spinner.svelte
@@ -1,113 +1,47 @@
 <script>
-    export let color = 'base-content';
-    export let thickness = '2px';
+    import { onMount } from 'svelte';
+    export let thickness = 8;
     let classes = '';
     export { classes as class };
 
-    const colorVars = {
-        'primary': 'p',
-        'primary-focus': 'pf',
-        'primary-content': 'pc',
-        'secondary': 's',
-        'secondary-focus': 'sf',
-        'secondary-content': 'sc',
-        'accent': 'a',
-        'accent-focus': 'af',
-        'accent-content': 'ac',
-        'neutral': 'n',
-        'neutral-focus': 'nf',
-        'neutral-content': 'nc',
-        'base-100': 'b1',
-        'base-200': 'b2',
-        'base-300': 'b3',
-        'base-content': 'bc',
-        'info': 'in',
-        'info-content': 'inc',
-        'success': 'su',
-        'success-content': 'suc',
-        'warning': 'wa',
-        'warning-content': 'wac',
-        'error': 'er',
-        'error-content': 'erc',
-    }
+    const radius = (100 - thickness) / 2;
+    // the px are fake, but we need them to satisfy css calc()
+    const circumference = `${2 * Math.PI * radius}px`;
 
-    let arcStyle = `border-width: ${thickness};`;
-    arcStyle += `border-color: hsl(var(--${colorVars[color]})) transparent transparent transparent;`;
+    let spinner;
+    onMount(() => {
+        spinner.style.setProperty('--circumference', circumference);
+    })
 </script>
 
+
+<svg bind:this={spinner} id="spinner" class={classes} viewBox="0 0 100 100" stroke="currentColor">
+    <circle cx="50" cy="50" r={radius} stroke-width={thickness} />
+</svg>
+
+
 <style>
     #spinner {
-        position: relative;
+        --circumference: 289.0265px; 
+    }
 
-        animation: spin;
-        animation-duration: 1.5s;
-        animation-iteration-count: infinite;
-        animation-timing-function: linear;
+    circle {
+        fill: transparent;
+        stroke-dasharray: var(--circumference);
+        transform: rotate(-90deg);
+        transform-origin: center;
+        animation: chase 3s infinite,
+                   spin 1.5s linear infinite;
+    }
+
+    @keyframes chase {
+        0% { stroke-dashoffset: calc(-1 * var(--circumference)); }
+        50% { stroke-dashoffset: calc(-2 * var(--circumference)); }
+        100% { stroke-dashoffset: calc(-3 * var(--circumference)); }
     }
 
     @keyframes spin {
-        50% { transform: rotate(225deg); }
-        100% { transform: rotate(360deg); }
+        50% { transform: rotate(135deg); }
+        100% { transform: rotate(270deg); }
     }
-
-    .arc {
-        position: absolute;
-        top: 0;
-        left: 0;
-        border-radius: 9999px;
-    }
-
-    .arc-top {
-        transform: rotate(-45deg);
-    }
-
-    .arc-right {
-        animation: spin-right;
-        animation-duration: 3s;
-        animation-iteration-count: infinite;
-    }
-
-    .arc-bottom {
-        animation: spin-bottom;
-        animation-duration: 3s;
-        animation-iteration-count: infinite;
-    }
-
-    .arc-left {
-        animation: spin-left;
-        animation-duration: 3s;
-        animation-iteration-count: infinite;
-    }
-
-    @keyframes spin-top {
-        0% { transform: rotate(-45deg); }
-        50% { transform: rotate(315deg); }
-        100% { transform: rotate(-45deg); }
-    }
-
-    @keyframes spin-right {
-        0% { transform: rotate(45deg); }
-        50% { transform: rotate(315deg); }
-        100% { transform: rotate(405deg); }
-    }
-
-    @keyframes spin-bottom {
-        0% { transform: rotate(135deg); }
-        50% { transform: rotate(315deg); }
-        100% { transform: rotate(495deg); }
-    }
-
-    @keyframes spin-left {
-        0% { transform: rotate(225deg); }
-        50% { transform: rotate(315deg); }
-        100% { transform: rotate(585deg); }
-    }
-</style>
-
-
-<div id="spinner" class="w-6 h-6 {classes}">
-    <div class="arc arc-top w-full h-full" style={arcStyle}></div>
-    <div class="arc arc-right w-full h-full" style={arcStyle}></div>
-    <div class="arc arc-bottom w-full h-full" style={arcStyle}></div>
-    <div class="arc arc-left w-full h-full" style={arcStyle}></div>
-</div>
+</style>
\ No newline at end of file
diff --git a/src/views/EnterCredentials.svelte b/src/views/EnterCredentials.svelte
index e62a441..6ecb99d 100644
--- a/src/views/EnterCredentials.svelte
+++ b/src/views/EnterCredentials.svelte
@@ -73,8 +73,8 @@
     <input type="password" placeholder="Re-enter passphrase" bind:value={confirmPassphrase} class="input input-bordered" on:change={confirm} />
 
     <button type="submit" class="btn btn-primary">
-        {#if saving}
-            <Spinner class="w-5 h-5" color="primary-content" thickness="2px"/>
+        {#if saving }
+            <Spinner class="w-5 h-5" thickness="12"/>
         {:else}
             Submit
         {/if}
diff --git a/src/views/Unlock.svelte b/src/views/Unlock.svelte
index 5a14a16..a18624e 100644
--- a/src/views/Unlock.svelte
+++ b/src/views/Unlock.svelte
@@ -69,7 +69,7 @@
 
     <button type="submit" class="btn btn-primary">
         {#if saving}
-            <Spinner class="w-5 h-5" color="primary-content" thickness="2px"/>
+            <Spinner class="w-5 h-5" thickness="12"/>
         {:else}
             Submit
         {/if}