diff --git a/src/app.css b/src/app.css index 27d4e197..e283ad25 100644 --- a/src/app.css +++ b/src/app.css @@ -403,14 +403,10 @@ body.keyboard-open .hide-on-keyboard { /* chat view */ .chat__compose { - @apply left-content bottom-sai right-sai fixed z-compose; + @apply relative z-compose mb-14 flex-grow md:mb-0; } -.chat__compose-zone { - @apply left-content bottom-sai right-sai fixed z-compose; -} - -.chat__compose-zone .chat__compose-inner { +.chat__compose .chat__compose-inner { @apply min-w-0; } diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte index 26e84db8..6cc312b2 100644 --- a/src/app/components/Chat.svelte +++ b/src/app/components/Chat.svelte @@ -196,8 +196,6 @@ let compose: ChatCompose | undefined = $state() let parent: TrustedEvent | undefined = $state() let eventToEdit: TrustedEvent | undefined = $state() - let chatCompose: HTMLElement | undefined = $state() - let dynamicPadding: HTMLElement | undefined = $state() const elements = $derived.by(() => { const elements = [] @@ -233,20 +231,6 @@ for (const pubkey of others) { loadMessagingRelayList(pubkey) } - - const observer = new ResizeObserver(() => { - if (dynamicPadding && chatCompose) { - dynamicPadding.style.minHeight = `${chatCompose.offsetHeight}px` - } - }) - - observer.observe(chatCompose!) - observer.observe(dynamicPadding!) - - return () => { - observer.unobserve(chatCompose!) - observer.unobserve(dynamicPadding!) - } }) setTimeout(() => { @@ -294,7 +278,6 @@ -
{#if missingRelayLists.length > 0}
@@ -335,9 +318,10 @@ {@render info?.()}

+
-
+
{#if parent} diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index 80003124..32638e94 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -68,10 +68,10 @@
+ class="hide-on-keyboard fixed bottom-0 left-0 right-0 z-nav h-[var(--saib)] bg-base-100 md:hidden">
+ class="hide-on-keyboard border-top bottom-sai fixed left-0 right-0 z-nav h-14 border border-base-200 bg-base-100 md:hidden">
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte index fc9b7b16..af74cbe7 100644 --- a/src/routes/spaces/[relay]/[h]/+page.svelte +++ b/src/routes/spaces/[relay]/[h]/+page.svelte @@ -232,8 +232,6 @@ let share = $state(popKey("share")) let parent: TrustedEvent | undefined = $state() let element: HTMLElement | undefined = $state() - let chatCompose: HTMLElement | undefined = $state() - let dynamicPadding: HTMLElement | undefined = $state() let newMessagesSeen = false let showFixedNewMessages = $state(false) let showScrollButton = $state(false) @@ -344,22 +342,9 @@ const onEditPrevious = () => ifLet($events.toReversed().find(canEditEvent), onEditEvent) onMount(() => { - const observer = new ResizeObserver(() => { - if (dynamicPadding && chatCompose) { - dynamicPadding!.style.minHeight = `${chatCompose!.offsetHeight}px` - } - }) - - observer.observe(chatCompose!) - observer.observe(dynamicPadding!) - start() - return () => { - cleanup() - observer.unobserve(chatCompose!) - observer.unobserve(dynamicPadding!) - } + return cleanup }) @@ -377,7 +362,6 @@ -
{#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
@@ -444,11 +428,10 @@ {/if}

{/if} +
-
+
{#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted} diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte index 6e309c13..3ae0b338 100644 --- a/src/routes/spaces/[relay]/chat/+page.svelte +++ b/src/routes/spaces/[relay]/chat/+page.svelte @@ -163,8 +163,6 @@ let share = $state(popKey("share")) let parent: TrustedEvent | undefined = $state() let element: HTMLElement | undefined = $state() - let chatCompose: HTMLElement | undefined = $state() - let dynamicPadding: HTMLElement | undefined = $state() let newMessagesSeen = false let showFixedNewMessages = $state(false) let showScrollButton = $state(false) @@ -275,24 +273,9 @@ const onEditPrevious = () => ifLet($events.toReversed().find(canEditEvent), onEditEvent) onMount(() => { - const controller = new AbortController() - - const observer = new ResizeObserver(() => { - if (dynamicPadding && chatCompose) { - dynamicPadding!.style.minHeight = `${chatCompose!.offsetHeight}px` - } - }) - - observer.observe(chatCompose!) - observer.observe(dynamicPadding!) start() - return () => { - cleanup() - controller.abort() - observer.unobserve(chatCompose!) - observer.unobserve(dynamicPadding!) - } + return cleanup }) @@ -306,8 +289,7 @@ {/snippet} - -
+ {#if loadingForward}

Looking for messages... @@ -351,9 +333,10 @@ End of message history {/if}

+
-
+
{#if parent}