Merge branch 'main' into wip/mobile

3 files changed, 8 insertions, 13 deletions

diff --git a/ui/lib/components/ActiveChannel.svelte b/ui/lib/components/ActiveChannel.svelte
index 1b23bc1..455043b 100644
--- a/ui/lib/components/ActiveChannel.svelte
+++ b/ui/lib/components/ActiveChannel.svelte
@@ -1,6 +1,5 @@
 <script>
     import { messages } from '$lib/store';
-    import Message from './Message.svelte';
     import MessageRun from './MessageRun.svelte';
 
     export let channel = null;
@@ -26,19 +25,11 @@
             yield [key, chunk];
         }
     }
-
-
-    let container;
-    // TODO: eventually, store scroll height/last unread in channel? scroll there?
-
-    let scroll = (message) => {
-        message.scrollIntoView();
-    }
 </script>
 
-<div class="container" bind:this={container}>
+<div class="container">
     {#each chunkBy(messageList, msg => msg.sender) as [sender, messages]}
-        <div use:scroll>
+        <div>
             <MessageRun {sender} {messages} />
         </div>
     {/each}
diff --git a/ui/lib/components/Message.svelte b/ui/lib/components/Message.svelte
index ef8ea0b..75e4cc9 100644
--- a/ui/lib/components/Message.svelte
+++ b/ui/lib/components/Message.svelte
@@ -3,11 +3,15 @@
 
     export let at;
     export let body;
+
+    let scroll = (message) => {
+        message.scrollIntoView();
+    }
 </script>
 
 <div class="message relative">
     <span class="timestamp chip variant-soft absolute top-0 right-0">{at}</span>
-    <section class="p-1">
+    <section use:scroll class="py-1">
         <SvelteMarkdown source={body} />
     </section>
 </div>
diff --git a/ui/lib/components/MessageRun.svelte b/ui/lib/components/MessageRun.svelte
index 0ecaabc..cbf4f04 100644
--- a/ui/lib/components/MessageRun.svelte
+++ b/ui/lib/components/MessageRun.svelte
@@ -11,7 +11,7 @@
 </script>
 
 <div
-        class="card card-hover m-4 relative"
+        class="card card-hover m-4 px-4 py-1 relative"
         class:own-message={ownMessage}
         class:other-message={!ownMessage}>
     <span class="chip variant-soft sticky top-o left-0">