cleanup

Valexr · Apr 27, 2024 · 8dde4cd · 8dde4cd
1 parent ebf794a
commit 8dde4cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -33,7 +33,6 @@ type Slide = {
 }
 
 type Counter = {
-    // [x: string]: any;
     id: number,
     title: string,
     quote: Quote,

diff --git a/src/lib/components/Counter.svelte b/src/lib/components/Counter.svelte
@@ -7,13 +7,16 @@
 
     let type: keyof Translate;
 
-    function length(counter: Counter) {
+    function length(counter: Counter, type: keyof Translate) {
         const { id, title, quote, start, full, ...rest } = counter;
-        return Object.values(rest).filter((r) => r).length;
+        const values = Object.values(rest)
+            .filter((r) => r)
+            .join("");
+        return !type ? values.length : String(full[type]).length;
     }
 </script>
 
-<ul style="--county-length: {length(counter)}">
+<ul style="--county-length: {length(counter, type)}">
     {#if type === "months"}
         <County name="months" value={counter.full.months} bind:type />
     {:else if type === "weeks"}