From 0afcaf19d1758f27daf144cfb708079b9ee72063 Mon Sep 17 00:00:00 2001
From: Jon McClure <jon.r.mcclure@gmail.com>
Date: Sun, 30 Jul 2023 12:30:24 +0100
Subject: [PATCH] #95 SearchInput

---
 src/components/SearchInput/MagnifyingGlass.svelte |  3 ++-
 src/components/SearchInput/SearchInput.svelte     | 15 ++++++++++-----
 src/components/SearchInput/X.svelte               |  5 +++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/components/SearchInput/MagnifyingGlass.svelte b/src/components/SearchInput/MagnifyingGlass.svelte
index fecf0ca6..6032bc91 100644
--- a/src/components/SearchInput/MagnifyingGlass.svelte
+++ b/src/components/SearchInput/MagnifyingGlass.svelte
@@ -11,10 +11,11 @@
 </svg>
 
 <style lang="scss">
+  @use '../../scss/mixins' as *;
   svg {
     vertical-align: middle;
     path {
-      fill: var(--theme-colour-text-secondary);
+      fill: $theme-colour-text-secondary;
     }
   }
 </style>
diff --git a/src/components/SearchInput/SearchInput.svelte b/src/components/SearchInput/SearchInput.svelte
index 85367335..14f2f9b6 100644
--- a/src/components/SearchInput/SearchInput.svelte
+++ b/src/components/SearchInput/SearchInput.svelte
@@ -38,13 +38,18 @@
     on:input="{input}"
     bind:value="{value}"
   />
-  <div class="search--x" class:invisible="{!active}" on:click="{clear}">
+  <div
+    class="search--x"
+    class:invisible="{!active}"
+    on:click="{clear}"
+    on:keyup="{clear}"
+  >
     <X />
   </div>
 </div>
 
 <style lang="scss">
-  @import '../../scss/mixins';
+  @use '../../scss/mixins' as *;
 
   .search {
     position: relative;
@@ -58,7 +63,7 @@
       top: 0.15rem;
       width: 1.5rem;
       height: 1.5rem;
-      fill: var(--theme-colour-brand-rules);
+      fill: $theme-colour-brand-rules;
     }
     .search--input {
       @include font-sans;
@@ -66,7 +71,7 @@
       padding: 0 0 0 2rem;
       font-size: 0.8rem;
       height: 33px;
-      border: 1px solid var(--theme-colour-brand-rules);
+      border: 1px solid $theme-colour-brand-rules;
       background: transparent;
       border-radius: 6px;
       width: 100%;
@@ -77,7 +82,7 @@
       top: 0.15rem;
       width: 1.5rem;
       height: 1.5rem;
-      fill: var(--theme-colour-text-primary);
+      fill: $theme-colour-text-primary;
       cursor: pointer;
       &.invisible {
         display: none;
diff --git a/src/components/SearchInput/X.svelte b/src/components/SearchInput/X.svelte
index 7e041588..6f4a3071 100644
--- a/src/components/SearchInput/X.svelte
+++ b/src/components/SearchInput/X.svelte
@@ -20,13 +20,14 @@
 </svg>
 
 <style lang="scss">
+  @use '../../scss/mixins' as *;
   svg {
     vertical-align: middle;
     path {
-      fill: var(--theme-colour-text-secondary);
+      fill: $theme-colour-text-secondary;
     }
     rect {
-      fill: var(--theme-colour-background, white);
+      fill: $theme-colour-background;
     }
   }
 </style>