From 506276f5947702a87108cd154ff565c2e8027273 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 4 Feb 2025 19:37:59 -0800
Subject: [PATCH] Fix suggestions component

---
 src/app/components/ChatStart.svelte          |  4 +-
 src/app/components/ProfileMultiSelect.svelte | 19 ++---
 src/app/editor/ProfileSuggestion.svelte      |  3 +-
 src/app/editor/index.ts                      |  4 +-
 src/lib/components/SearchSelect.svelte       | 83 --------------------
 src/lib/components/Suggestions.svelte        | 82 +++++++++----------
 6 files changed, 57 insertions(+), 138 deletions(-)
 delete mode 100644 src/lib/components/SearchSelect.svelte

diff --git a/src/app/components/ChatStart.svelte b/src/app/components/ChatStart.svelte
index 56fbdaab..dcda9e64 100644
--- a/src/app/components/ChatStart.svelte
+++ b/src/app/components/ChatStart.svelte
@@ -28,9 +28,7 @@
   </ModalHeader>
   <Field>
     {#snippet input()}
-      <div>
-        <ProfileMultiSelect autofocus bind:value={pubkeys} />
-      </div>
+      <ProfileMultiSelect autofocus bind:value={pubkeys} />
     {/snippet}
   </Field>
   <ModalFooter>
diff --git a/src/app/components/ProfileMultiSelect.svelte b/src/app/components/ProfileMultiSelect.svelte
index 03de2f85..ecd6d9d4 100644
--- a/src/app/components/ProfileMultiSelect.svelte
+++ b/src/app/components/ProfileMultiSelect.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {derived} from "svelte/store"
+  import {writable} from "svelte/store"
   import {type Instance} from "tippy.js"
   import {append, remove, uniq} from "@welshman/lib"
   import {profileSearch} from "@welshman/app"
@@ -19,15 +19,12 @@
 
   let {value = $bindable(), autofocus = false}: Props = $props()
 
-  let term = $state("")
-  let input: Element | undefined = $state()
-  let popover: Instance | undefined = $state()
-  let instance: any = $state()
+  const term = writable("")
 
-  const search = derived(profileSearch, $profileSearch => $profileSearch.searchValues)
+  const search = (term: string) => $profileSearch.searchValues(term)
 
   const selectPubkey = (pubkey: string) => {
-    term = ""
+    term.set("")
     popover?.hide()
     value = uniq(append(pubkey, value))
   }
@@ -42,8 +39,12 @@
     }
   }
 
+  let input: Element | undefined = $state()
+  let popover: Instance | undefined = $state()
+  let instance: any = $state()
+
   $effect(() => {
-    if (term) {
+    if ($term) {
       popover?.show()
     } else {
       popover?.hide()
@@ -73,7 +74,7 @@
       class="grow"
       type="text"
       placeholder="Search for profiles..."
-      bind:value={term}
+      bind:value={$term}
       onkeydown={onKeyDown} />
   </label>
   <Tippy
diff --git a/src/app/editor/ProfileSuggestion.svelte b/src/app/editor/ProfileSuggestion.svelte
index d07c356e..8aeae37a 100644
--- a/src/app/editor/ProfileSuggestion.svelte
+++ b/src/app/editor/ProfileSuggestion.svelte
@@ -10,8 +10,9 @@
   import WotScore from "@lib/components/WotScore.svelte"
   import ProfileCircle from "@app/components/ProfileCircle.svelte"
 
-  const {pubkey} = $props()
+  const {value} = $props()
 
+  const pubkey = value
   const profileDisplay = deriveProfileDisplay(pubkey)
   const handle = deriveHandleForPubkey(pubkey)
   const score = deriveUserWotScore(pubkey)
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index 5d033edc..ccb64a8e 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -85,10 +85,10 @@ export const makeEditor = ({
                     editor: (this as any).editor,
                     search: (term: string) => get(profileSearch).searchValues(term),
                     getRelays: (pubkey: string) => ctx.app.router.FromPubkeys([pubkey]).getUrls(),
-                    createSuggestion: (pubkey: string) => {
+                    createSuggestion: (value: string) => {
                       const target = document.createElement("div")
 
-                      mount(ProfileSuggestion, {target, props: {pubkey}})
+                      mount(ProfileSuggestion, {target, props: {value}})
 
                       return target
                     },
diff --git a/src/lib/components/SearchSelect.svelte b/src/lib/components/SearchSelect.svelte
deleted file mode 100644
index 4e3912d2..00000000
--- a/src/lib/components/SearchSelect.svelte
+++ /dev/null
@@ -1,83 +0,0 @@
-<script lang="ts">
-  import type {Snippet} from "svelte"
-  import {readable} from "svelte/store"
-  import {type Instance} from "tippy.js"
-  import {identity} from "@welshman/lib"
-  import {createSearch} from "@welshman/app"
-  import Suggestions from "@lib/components/Suggestions.svelte"
-  import SuggestionString from "@lib/components/SuggestionString.svelte"
-  import Icon from "@lib/components/Icon.svelte"
-  import Tippy from "@lib/components/Tippy.svelte"
-
-  interface Props {
-    value: string
-    options: string[]
-    before?: Snippet
-    allowCreate?: boolean
-    class?: string
-  }
-
-  let {value, options, before, allowCreate = false, ...restProps}: Props = $props()
-  let input: Element | undefined = $state()
-  let popover: Instance | undefined = $state()
-  let instance: any = $state()
-
-  const search = readable(
-    createSearch(options, {
-      getValue: identity,
-      fuseOptions: {keys: [""]},
-    }).searchValues,
-  )
-
-  const select = (newValue: string) => {
-    popover?.hide()
-    value = newValue
-  }
-
-  const onKeyDown = (e: Event) => {
-    if (instance?.onKeyDown(e)) {
-      e.preventDefault()
-    }
-  }
-
-  const onFocus = () => {
-    popover?.show()
-  }
-
-  const onBlur = () => {
-    popover?.hide()
-  }
-</script>
-
-<div class={restProps.class}>
-  <label class="input input-bordered flex w-full items-center gap-3" bind:this={input}>
-    {@render before?.()}
-    <input
-      class="grow"
-      type="text"
-      bind:value
-      onkeydown={onKeyDown}
-      onfocus={onFocus}
-      onblur={onBlur} />
-    <Icon icon="alt-arrow-down" class="cursor-pointer" />
-  </label>
-  <Tippy
-    bind:popover
-    bind:instance
-    component={Suggestions}
-    props={{
-      search,
-      select,
-      allowCreate,
-      term: value,
-      component: SuggestionString,
-      class: "rounded-box",
-      style: `left: 4px; width: ${input?.clientWidth + 12}px`,
-    }}
-    params={{
-      trigger: "manual",
-      interactive: true,
-      maxWidth: "none",
-      getReferenceClientRect: () => input!.getBoundingClientRect(),
-    }} />
-</div>
diff --git a/src/lib/components/Suggestions.svelte b/src/lib/components/Suggestions.svelte
index 63c43565..f85132b2 100644
--- a/src/lib/components/Suggestions.svelte
+++ b/src/lib/components/Suggestions.svelte
@@ -1,23 +1,17 @@
-<svelte:options accessors />
-
 <script lang="ts">
   import {fly} from "svelte/transition"
   import {throttle, clamp} from "@welshman/lib"
+  import {preventDefault, stopPropagation} from "@lib/html"
 
-  export let term
-  export let search
-  export let select
-  export let component
-  export let allowCreate = false
+  const {term, search, select, component: Component, allowCreate = false} = $props()
 
-  let index = 0
-  let element: Element
-  let items: string[] = []
+  let index = $state(0)
+  let items: string[] = $state([])
 
-  $: populateItems(term)
+  $inspect(items)
 
   const populateItems = throttle(300, term => {
-    items = $search(term).slice(0, 5)
+    items = search(term).slice(0, 5)
   })
 
   const setIndex = (newIndex: number, block: any) => {
@@ -31,14 +25,14 @@
       if (value) {
         select(value)
         return true
-      } else if (term && allowCreate) {
-        select(term)
+      } else if ($term && allowCreate) {
+        select($term)
         return true
       }
     }
 
-    if (e.code === "Space" && term && allowCreate) {
-      select(term)
+    if (e.code === "Space" && $term && allowCreate) {
+      select($term)
       return true
     }
 
@@ -54,31 +48,39 @@
       return true
     }
   }
+
+  const onmousedown = (e: Event) => {
+    e.preventDefault()
+    e.stopPropagation()
+  }
+
+  $effect(() => {
+    populateItems($term)
+  })
 </script>
 
-{#if term}
-  <div bind:this={element} transition:fly|local={{duration: 200}} class="tiptap-suggestions">
-    <div class="tiptap-suggestions__content">
-      {#if term && allowCreate && !items.includes(term)}
-        <button
-          class="tiptap-suggestions__create"
-          on:mousedown|preventDefault|stopPropagation
-          on:click|preventDefault|stopPropagation={() => select(term)}>
-          Use "<svelte:component this={component} value={term} />"
-        </button>
-      {/if}
-      {#each items as value, i (value)}
-        <button
-          class="tiptap-suggestions__item"
-          class:tiptap-suggestions__selected={index === i}
-          on:mousedown|preventDefault|stopPropagation
-          on:click|preventDefault|stopPropagation={() => select(value)}>
-          <svelte:component this={component} {value} />
-        </button>
-      {/each}
-    </div>
-    {#if items.length === 0}
-      <div class="tiptap-suggestions__empty">No results</div>
+<div transition:fly|local={{duration: 200}} class="tiptap-suggestions">
+  <div class="tiptap-suggestions__content">
+    {#if $term && allowCreate && !items.includes($term)}
+      <button
+        class="tiptap-suggestions__create"
+        {onmousedown}
+        onclick={stopPropagation(preventDefault(() => select($term)))}>
+        Use "<Component value={$term}></Component>"
+      </button>
     {/if}
+    {#each items as value, i (value)}
+      <button
+        aria-label={value}
+        class="tiptap-suggestions__item"
+        class:tiptap-suggestions__selected={index === i}
+        {onmousedown}
+        onclick={stopPropagation(preventDefault(() => select(value)))}>
+        <Component {value}></Component>
+      </button>
+    {/each}
   </div>
-{/if}
+  {#if items.length === 0}
+    <div class="tiptap-suggestions__empty">No results</div>
+  {/if}
+</div>