Compare commits
7 commits
774e10d68c
...
f5d4e0d011
Author | SHA1 | Date | |
---|---|---|---|
f5d4e0d011 | |||
6363a6eac1 | |||
7e2deb2a0a | |||
59a6759bba | |||
4679b3658c | |||
806a932063 | |||
ff9bce6635 |
7 changed files with 82 additions and 12 deletions
10
app.vue
10
app.vue
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div>
|
||||
<Banner v-if="banner" />
|
||||
<NuxtPage />
|
||||
<NuxtPage :keepalive="true" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
@ -12,6 +12,12 @@ const banner = useState("banner", () => false);
|
|||
</script>
|
||||
|
||||
<style>
|
||||
:root {
|
||||
--background-color: rgb(30, 30, 30);
|
||||
--main-text-color: rgb(190, 190, 190);
|
||||
--outline-border: 1px solid rgb(150, 150, 150);
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
|
@ -22,7 +28,7 @@ body {
|
|||
}
|
||||
|
||||
*:focus-visible {
|
||||
outline: 1px solid rgb(150, 150, 150);
|
||||
outline: var(--outline-border);
|
||||
}
|
||||
|
||||
a {
|
||||
|
|
|
@ -95,6 +95,10 @@ onMounted(async () => {
|
|||
margin-top: 1dvh;
|
||||
}
|
||||
|
||||
.grouped-message {
|
||||
margin-top: .3em;
|
||||
}
|
||||
|
||||
#last-message {
|
||||
margin-bottom: 2dvh;
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import type { MessageResponse } from '~/types/interfaces';
|
||||
import type { MessageResponse, ScrollPosition } from '~/types/interfaces';
|
||||
import scrollToBottom from '~/utils/scrollToBottom';
|
||||
|
||||
const props = defineProps<{ channelUrl: string, amount?: number, offset?: number }>();
|
||||
|
@ -101,6 +101,11 @@ if (messagesRes) {
|
|||
}
|
||||
}
|
||||
|
||||
function pushMessage(message: MessageResponse) {
|
||||
groupMessage(message);
|
||||
messages.value.push(message);
|
||||
}
|
||||
|
||||
const messages = ref<MessageResponse[]>([]);
|
||||
|
||||
const messageInput = ref<string>();
|
||||
|
@ -137,14 +142,13 @@ if (accessToken && apiBase) {
|
|||
console.log("message uuid:", event.data.uuid);
|
||||
const parsedData = JSON.parse(event.data);
|
||||
|
||||
groupMessage(parsedData);
|
||||
console.log("parsed message type:", messagesType.value[parsedData.uuid]);
|
||||
console.log("parsed message timestamp:", messageTimestamps.value[parsedData.uuid]);
|
||||
messages.value.push(parsedData);
|
||||
pushMessage(parsedData);
|
||||
await nextTick();
|
||||
if (messagesElement.value) {
|
||||
console.log("scrolling to bottom");
|
||||
scrollToBottom(messagesElement);
|
||||
scrollToBottom(messagesElement.value);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -168,7 +172,7 @@ const route = useRoute();
|
|||
onMounted(async () => {
|
||||
if (import.meta.server) return;
|
||||
if (messagesElement.value) {
|
||||
scrollToBottom(messagesElement);
|
||||
scrollToBottom(messagesElement.value);
|
||||
let fetched = false;
|
||||
const amount = messages.value.length;
|
||||
let offset = messages.value.length;
|
||||
|
@ -203,14 +207,40 @@ onMounted(async () => {
|
|||
}
|
||||
});
|
||||
|
||||
let scrollPosition = ref<Record<string, ScrollPosition>>({});
|
||||
|
||||
onActivated(async () => {
|
||||
await nextTick();
|
||||
console.log("scroll activated");
|
||||
if (messagesElement.value) {
|
||||
if (scrollPosition.value[route.params.channelId as string]) {
|
||||
console.log("saved scroll position:", scrollPosition.value);
|
||||
setScrollPosition(messagesElement.value, scrollPosition.value[route.params.channelId as string]);
|
||||
console.log("scrolled to saved scroll position");
|
||||
} else {
|
||||
scrollToBottom(messagesElement.value);
|
||||
console.log("scrolled to bottom");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const router = useRouter();
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
console.log("scroll hi");
|
||||
if (messagesElement.value && from.params.channelId) {
|
||||
scrollPosition.value[from.params.channelId as string] = getScrollPosition(messagesElement.value)
|
||||
console.log("set saved scroll position to:", scrollPosition.value);
|
||||
}
|
||||
next()
|
||||
})
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
#message-area {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr;
|
||||
grid-template-rows: 8fr 1fr;
|
||||
justify-content: space-between;
|
||||
padding-left: 1dvw;
|
||||
padding-right: 1dvw;
|
||||
overflow: hidden;
|
||||
|
|
|
@ -70,3 +70,14 @@ export interface StatsResponse {
|
|||
email_verification_required: boolean,
|
||||
build_number: string
|
||||
}
|
||||
|
||||
export interface ScrollPosition {
|
||||
scrollHeight: number,
|
||||
scrollWidth: number,
|
||||
scrollTop: number,
|
||||
scrollLeft: number
|
||||
offsetHeight: number,
|
||||
offsetWidth: number,
|
||||
offsetTop: number,
|
||||
offsetLeft: number
|
||||
}
|
||||
|
|
14
utils/getScrollPosition.ts
Normal file
14
utils/getScrollPosition.ts
Normal file
|
@ -0,0 +1,14 @@
|
|||
import type { ScrollPosition } from "~/types/interfaces";
|
||||
|
||||
export default (element: HTMLElement): ScrollPosition => {
|
||||
return {
|
||||
scrollHeight: element.scrollHeight,
|
||||
scrollWidth: element.scrollWidth,
|
||||
scrollTop: element.scrollTop,
|
||||
scrollLeft: element.scrollLeft,
|
||||
offsetHeight: element.offsetHeight,
|
||||
offsetWidth: element.offsetWidth,
|
||||
offsetTop: element.offsetTop,
|
||||
offsetLeft: element.offsetLeft
|
||||
};
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
export default (element: Ref<HTMLElement | undefined, HTMLElement | undefined>) => {
|
||||
if (element.value) {
|
||||
element.value.scrollTo({ top: element.value.scrollHeight });
|
||||
export default (element: HTMLElement) => {
|
||||
if (element) {
|
||||
element.scrollTo({ top: element.scrollHeight });
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
5
utils/setScrollPosition.ts
Normal file
5
utils/setScrollPosition.ts
Normal file
|
@ -0,0 +1,5 @@
|
|||
import type { ScrollPosition } from "~/types/interfaces";
|
||||
|
||||
export default (element: HTMLElement, scrollPosition: ScrollPosition) => {
|
||||
return element.scrollTo({ top: scrollPosition.scrollTop, left: scrollPosition.scrollLeft });
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue