From 94dc7b91952b4bf925681a441f2debf0a78455e1 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Mon, 26 Dec 2022 13:10:05 -0800
Subject: [PATCH] Fix fallthrough on user badge click on alerts page

---
 src/partials/Badge.svelte | 3 ++-
 src/partials/Like.svelte  | 6 ++++--
 src/util/html.js          | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/partials/Badge.svelte b/src/partials/Badge.svelte
index d70d7aa4..64d51b15 100644
--- a/src/partials/Badge.svelte
+++ b/src/partials/Badge.svelte
@@ -1,5 +1,6 @@
 <script>
   import {Link} from 'svelte-routing'
+  import {killEvent} from 'src/util/html'
 
   export let person
 </script>
@@ -7,7 +8,7 @@
 <Link
   to={`/people/${person.pubkey}/notes`}
   class="flex gap-2 items-center relative z-10"
-  on:click={e => e.stopPropagation()}>
+  on:click={killEvent}>
   <div
     class="overflow-hidden w-4 h-4 rounded-full bg-cover bg-center shrink-0 border border-solid border-white"
     style="background-image: url({person.picture})" />
diff --git a/src/partials/Like.svelte b/src/partials/Like.svelte
index 445e28fc..9c3bc2d7 100644
--- a/src/partials/Like.svelte
+++ b/src/partials/Like.svelte
@@ -3,6 +3,7 @@
   import {ellipsize, quantify} from 'hurdak/src/core'
   import Badge from "src/partials/Badge.svelte"
   import {formatTimestamp} from 'src/util/misc'
+  import {killEvent} from 'src/util/html'
   import {modal} from 'src/state/app'
 
   export let note
@@ -10,13 +11,13 @@
   let isOpen = false
 
   const openPopover = e => {
-    e.stopPropagation()
+    killEvent(e)
 
     isOpen = true
   }
 
   const closePopover = e => {
-    e.stopPropagation()
+    killEvent(e)
 
     isOpen = false
   }
@@ -33,6 +34,7 @@
     {#if isOpen}
     <div transition:fly={{y: 20}} class="fixed inset-0 z-10" on:click={closePopover} />
     <div
+      on:click={killEvent}
       transition:fly={{y: 20}}
       class="absolute top-0 mt-8 py-2 px-4 rounded border border-solid border-medium
              bg-dark grid grid-cols-3 gap-y-2 gap-x-4 z-20">
diff --git a/src/util/html.js b/src/util/html.js
index 76a1b5b7..6e1968ed 100644
--- a/src/util/html.js
+++ b/src/util/html.js
@@ -68,3 +68,9 @@ export const escapeHtml = html => {
 
   return div.innerHTML
 }
+
+export const killEvent = e => {
+  e.preventDefault()
+  e.stopPropagation()
+  e.stopImmediatePropagation()
+}