From 0f705c459a9b28b6318638174f58d42ba00e6cfd Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 3 Feb 2025 15:50:19 -0800
Subject: [PATCH] Fix some small issues

---
 src/app/components/LogIn.svelte               |  4 +--
 src/app/editor/index.ts                       |  4 +--
 src/lib/components/Tippy.svelte               | 36 +++++++++++--------
 src/routes/spaces/[relay]/+page.svelte        |  3 +-
 src/routes/spaces/[relay]/[room]/+page.svelte | 28 +++++++--------
 5 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/app/components/LogIn.svelte b/src/app/components/LogIn.svelte
index 6ba6fd63..915af9fb 100644
--- a/src/app/components/LogIn.svelte
+++ b/src/app/components/LogIn.svelte
@@ -28,7 +28,7 @@
   }
 
   const loginWithNip07 = async () => {
-    loading = 'nip07'
+    loading = "nip07"
 
     try {
       const pubkey = await getNip07()?.getPublicKey()
@@ -47,7 +47,7 @@
   }
 
   const loginWithNip55 = async (app: any) => {
-    loading = 'nip55'
+    loading = "nip55"
 
     try {
       const signer = new Nip55Signer(app.packageName)
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index 5c35c9a1..069fde18 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -1,4 +1,4 @@
-import type {Component} from "svelte"
+import {asClassComponent} from "svelte/legacy"
 import type {Writable} from "svelte/store"
 import {derived} from "svelte/store"
 import {createEditor, SvelteNodeViewRenderer} from "svelte-tiptap"
@@ -84,7 +84,7 @@ export const makeEditor = ({
                     editor: (this as any).editor,
                     search: derived(profileSearch, s => s.searchValues),
                     getRelays: (pubkey: string) => ctx.app.router.FromPubkeys([pubkey]).getUrls(),
-                    component: ProfileSuggestion,
+                    component: asClassComponent(ProfileSuggestion),
                   }),
                 ]
               },
diff --git a/src/lib/components/Tippy.svelte b/src/lib/components/Tippy.svelte
index f58e7a6c..3921a80b 100644
--- a/src/lib/components/Tippy.svelte
+++ b/src/lib/components/Tippy.svelte
@@ -4,29 +4,35 @@
   import tippy from "tippy.js"
   import {onMount, mount, unmount} from "svelte"
 
-  let {component, children = undefined, props = {}, params = {}, popover = $bindable(), instance = $bindable(), ...restProps} = $props()
+  let {
+    component,
+    children = undefined,
+    props = {},
+    params = {},
+    popover = $bindable(),
+    instance = $bindable(),
+    ...restProps
+  } = $props()
 
-  let reactiveProps = $derived(props)
+  const reactiveProps = $derived(props)
 
   let element: Element
 
   onMount(() => {
-    if (element) {
-      const target = document.createElement("div")
+    const target = document.createElement("div")
 
-      popover = tippy(element, {
-        content: target,
-        animation: "shift-away",
-        appendTo: document.querySelector(".tippy-target")!,
-        ...params,
-      })
+    popover = tippy(element, {
+      content: target,
+      animation: "shift-away",
+      appendTo: document.querySelector(".tippy-target")!,
+      ...params,
+    })
 
-      instance = mount(component, {target, props: reactiveProps})
+    instance = mount(component, {target, props: reactiveProps})
 
-      return () => {
-        popover?.destroy()
-        unmount(instance)
-      }
+    return () => {
+      popover?.destroy()
+      unmount(instance)
     }
   })
 </script>
diff --git a/src/routes/spaces/[relay]/+page.svelte b/src/routes/spaces/[relay]/+page.svelte
index 761e6c58..4e80f9c3 100644
--- a/src/routes/spaces/[relay]/+page.svelte
+++ b/src/routes/spaces/[relay]/+page.svelte
@@ -143,7 +143,8 @@
             <ChannelName {url} {room} />
           </div>
           {#if $notifications.has(roomPath)}
-            <div class="absolute right-1 top-1 h-2 w-2 rounded-full bg-primary" transition:fade></div>
+            <div class="absolute right-1 top-1 h-2 w-2 rounded-full bg-primary" transition:fade>
+            </div>
           {/if}
         </Link>
       {/each}
diff --git a/src/routes/spaces/[relay]/[room]/+page.svelte b/src/routes/spaces/[relay]/[room]/+page.svelte
index fa9017e6..8645702f 100644
--- a/src/routes/spaces/[relay]/[room]/+page.svelte
+++ b/src/routes/spaces/[relay]/[room]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {onDestroy} from "svelte"
+  import {onMount, onDestroy} from "svelte"
   import {page} from "$app/stores"
   import type {Readable} from "svelte/store"
   import {now} from "@welshman/lib"
@@ -172,20 +172,18 @@
     setTimeout(onScroll, 100)
   }
 
-  $: {
-    if (element) {
-      ;({events, cleanup} = makeFeed({
-        element,
-        relays: [url],
-        feedFilters: [filter],
-        subscriptionFilters: [{kinds: [DELETE, REACTION, MESSAGE], "#h": [room], since: now()}],
-        initialEvents: getEventsForUrl(repository, url, [{...filter, limit: 20}]),
-        onExhausted: () => {
-          loading = false
-        },
-      }))
-    }
-  }
+  onMount(() => {
+    ;({events, cleanup} = makeFeed({
+      element,
+      relays: [url],
+      feedFilters: [filter],
+      subscriptionFilters: [{kinds: [DELETE, REACTION, MESSAGE], "#h": [room], since: now()}],
+      initialEvents: getEventsForUrl(repository, url, [{...filter, limit: 20}]),
+      onExhausted: () => {
+        loading = false
+      },
+    }))
+  })
 
   onDestroy(() => {
     setChecked($page.url.pathname)