mirror of
https://github.com/versia-pub/frontend.git
synced 2025-12-06 16:38:20 +01:00
feat: ✨ Add new virtual scrollbar system, resolve note context
This commit is contained in:
parent
dd62647928
commit
6f0da44844
6
app.vue
6
app.vue
|
|
@ -58,7 +58,13 @@ watch(
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
@import url("overlayscrollbars/overlayscrollbars.css");
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-family: Inter, sans-serif;
|
font-family: Inter, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.os-scrollbar .os-scrollbar-handle {
|
||||||
|
background: #9999;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
@ -10,9 +10,9 @@
|
||||||
<Icon name="tabler:quote" class="h-4 w-4 text-gray-400" aria-hidden="true" />
|
<Icon name="tabler:quote" class="h-4 w-4 text-gray-400" aria-hidden="true" />
|
||||||
Quoting
|
Quoting
|
||||||
</span>
|
</span>
|
||||||
<div class="mt-2 max-h-72 overflow-y-auto">
|
<OverlayScrollbarsComponent :defer="true" class="mt-2 max-h-72 overflow-y-auto">
|
||||||
<SocialElementsNotesNote :note="respondingTo" :small="true" :disabled="true" />
|
<SocialElementsNotesNote :note="respondingTo" :small="true" :disabled="true" />
|
||||||
</div>
|
</OverlayScrollbarsComponent>
|
||||||
</div>
|
</div>
|
||||||
<textarea :disabled="submitting" ref="textarea" v-model="content" placeholder="You can use Markdown here!"
|
<textarea :disabled="submitting" ref="textarea" v-model="content" placeholder="You can use Markdown here!"
|
||||||
class="resize-none min-h-48 prose prose-invert max-h-[70dvh] w-full p-0 focus:!ring-0 !ring-none !border-none !outline-none placeholder:text-zinc-500 bg-transparent appearance-none focus:!border-none focus:!outline-none disabled:cursor-not-allowed"></textarea>
|
class="resize-none min-h-48 prose prose-invert max-h-[70dvh] w-full p-0 focus:!ring-0 !ring-none !border-none !outline-none placeholder:text-zinc-500 bg-transparent appearance-none focus:!border-none focus:!outline-none disabled:cursor-not-allowed"></textarea>
|
||||||
|
|
@ -32,6 +32,7 @@
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import type { Instance } from "~/types/mastodon/instance";
|
import type { Instance } from "~/types/mastodon/instance";
|
||||||
import type { Status } from "~/types/mastodon/status";
|
import type { Status } from "~/types/mastodon/status";
|
||||||
|
import { OverlayScrollbarsComponent } from "#imports";
|
||||||
|
|
||||||
const textarea = ref<HTMLTextAreaElement | undefined>(undefined);
|
const textarea = ref<HTMLTextAreaElement | undefined>(undefined);
|
||||||
const { input: content } = useTextareaAutosize({
|
const { input: content } = useTextareaAutosize({
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,10 @@
|
||||||
<aside v-bind="$props" class="overflow-hidden">
|
<aside v-bind="$props" class="overflow-hidden">
|
||||||
<div
|
<div
|
||||||
:class="['flex max-h-dvh overflow-hidden w-full duration-200', open ? enterClass : leaveClass, direction === 'left' ? 'flex-row' : 'flex-row-reverse']">
|
:class="['flex max-h-dvh overflow-hidden w-full duration-200', open ? enterClass : leaveClass, direction === 'left' ? 'flex-row' : 'flex-row-reverse']">
|
||||||
<div class="bg-dark-900 ring-1 ring-white/10 h-full overflow-y-auto w-full">
|
<OverlayScrollbarsComponent :defer="true"
|
||||||
|
class="bg-dark-900 ring-1 ring-white/10 h-full overflow-y-auto w-full">
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</OverlayScrollbarsComponent>
|
||||||
<button @click="open = !open"
|
<button @click="open = !open"
|
||||||
class="h-full bg-dark-700/50 hover:bg-dark-400/50 hover:cursor-pointer duration-200 py-4 px-0.5 flex items-center justify-center w-4 shrink-0">
|
class="h-full bg-dark-700/50 hover:bg-dark-400/50 hover:cursor-pointer duration-200 py-4 px-0.5 flex items-center justify-center w-4 shrink-0">
|
||||||
<Icon name="tabler:chevron-right"
|
<Icon name="tabler:chevron-right"
|
||||||
|
|
@ -18,6 +19,7 @@
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
// slides in and out from the left or right
|
// slides in and out from the left or right
|
||||||
import type { HTMLAttributes } from "vue";
|
import type { HTMLAttributes } from "vue";
|
||||||
|
import { OverlayScrollbarsComponent } from "#imports";
|
||||||
|
|
||||||
interface Props extends /* @vue-ignore */ HTMLAttributes {
|
interface Props extends /* @vue-ignore */ HTMLAttributes {
|
||||||
direction?: "left" | "right";
|
direction?: "left" | "right";
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
</div>
|
</div>
|
||||||
<HeadlessTransitionRoot appear :show="lightbox" as="template">
|
<HeadlessTransitionRoot appear :show="lightbox" as="template">
|
||||||
<HeadlessDialog @close="lightbox = false">
|
<HeadlessDialog @close="lightbox = false">
|
||||||
<div class="fixed inset-0 overflow-y-auto bg-black/70">
|
<div class="fixed inset-0 overflow-y-auto z-50 bg-black/70">
|
||||||
<div class="flex min-h-full items-center justify-center text-center">
|
<div class="flex min-h-full items-center justify-center text-center">
|
||||||
<HeadlessTransitionChild as="template" enter="duration-100 ease-out" enter-from="opacity-0 scale-95"
|
<HeadlessTransitionChild as="template" enter="duration-100 ease-out" enter-from="opacity-0 scale-95"
|
||||||
enter-to="opacity-100 scale-100">
|
enter-to="opacity-100 scale-100">
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ export const useNote = (client: MaybeRef<Mastodon | null>, noteId: string) => {
|
||||||
ref(client)
|
ref(client)
|
||||||
.value?.getStatus(noteId)
|
.value?.getStatus(noteId)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
output.value = res.data;
|
output.value = res.data as Status;
|
||||||
});
|
});
|
||||||
|
|
||||||
return output;
|
return output;
|
||||||
|
|
|
||||||
24
composables/NoteContext.ts
Normal file
24
composables/NoteContext.ts
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
import type { Mastodon } from "megalodon";
|
||||||
|
import type { Context } from "~/types/mastodon/context";
|
||||||
|
|
||||||
|
export const useNoteContext = (
|
||||||
|
client: MaybeRef<Mastodon | null>,
|
||||||
|
noteId: MaybeRef<string | null>,
|
||||||
|
) => {
|
||||||
|
if (!ref(client).value) {
|
||||||
|
return ref(null as Context | null);
|
||||||
|
}
|
||||||
|
|
||||||
|
const output = ref(null as Context | null);
|
||||||
|
|
||||||
|
watchEffect(() => {
|
||||||
|
if (toValue(noteId))
|
||||||
|
ref(client)
|
||||||
|
.value?.getStatusContext(toValue(noteId) ?? "")
|
||||||
|
.then((res) => {
|
||||||
|
output.value = res.data as Context;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return output;
|
||||||
|
};
|
||||||
|
|
@ -99,6 +99,14 @@ export default defineNuxtConfig({
|
||||||
apiHost: "https://social.lysand.org",
|
apiHost: "https://social.lysand.org",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
imports: {
|
||||||
|
presets: [
|
||||||
|
{
|
||||||
|
from: "overlayscrollbars-vue",
|
||||||
|
imports: ["OverlayScrollbarsComponent"],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
site: {
|
site: {
|
||||||
url: "https://social.lysand.org",
|
url: "https://social.lysand.org",
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,8 @@
|
||||||
"nuxt-icon": "^0.6.10",
|
"nuxt-icon": "^0.6.10",
|
||||||
"nuxt-security": "^2.0.0-beta.0",
|
"nuxt-security": "^2.0.0-beta.0",
|
||||||
"nuxt-shiki": "^0.3.0",
|
"nuxt-shiki": "^0.3.0",
|
||||||
|
"overlayscrollbars": "^2.8.0",
|
||||||
|
"overlayscrollbars-vue": "^0.5.9",
|
||||||
"shiki": "^1.3.0",
|
"shiki": "^1.3.0",
|
||||||
"vue": "^3.4.21",
|
"vue": "^3.4.21",
|
||||||
"vue-router": "^4.3.0",
|
"vue-router": "^4.3.0",
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,51 @@
|
||||||
<template>
|
<template>
|
||||||
<ClientOnly>
|
<ClientOnly>
|
||||||
<div class="max-h-dvh min-h-dvh overflow-y-auto">
|
<OverlayScrollbarsComponent v-if="loaded" :defer="true" class="max-h-dvh min-h-dvh overflow-y-auto pb-72">
|
||||||
<SocialElementsNotesNote v-if="note" :note="note" />
|
<SocialElementsNotesNote v-for="note of context?.ancestors" :note="note" />
|
||||||
</div>
|
<div ref="element" class="first:rounded-t last:rounded-b overflow-hidden">
|
||||||
|
<SocialElementsNotesNote class="!rounded-none border-2 border-pink-500" v-if="note" :note="note" />
|
||||||
|
</div>
|
||||||
|
<SocialElementsNotesNote v-for="note of context?.descendants" :note="note" />
|
||||||
|
</OverlayScrollbarsComponent>
|
||||||
|
<OverlayScrollbarsComponent :defer="true" v-else class="max-h-dvh min-h-dvh overflow-y-auto">
|
||||||
|
<SocialElementsNotesNote v-for="_ of 5" :skeleton="true" />
|
||||||
|
</OverlayScrollbarsComponent>
|
||||||
</ClientOnly>
|
</ClientOnly>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { OverlayScrollbarsComponent } from "#imports";
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
layout: "app",
|
layout: "app",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const element = ref<HTMLElement | null>(null);
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const client = useMegalodon();
|
const client = useMegalodon();
|
||||||
const uuid = route.params.uuid as string;
|
const uuid = route.params.uuid as string;
|
||||||
|
|
||||||
const note = useNote(client, uuid);
|
const note = useNote(client, uuid);
|
||||||
|
const noteId = computed(() => note.value?.id ?? null);
|
||||||
|
const context = useNoteContext(client, noteId);
|
||||||
|
const loaded = computed(() => note.value !== null && context.value !== null);
|
||||||
|
|
||||||
|
// If ancestors changes, scroll down so that the initial note stays at the same place
|
||||||
|
watch(
|
||||||
|
[() => context.value?.ancestors, loaded],
|
||||||
|
async () => {
|
||||||
|
if (context.value?.ancestors.length === 0) return;
|
||||||
|
if (!loaded.value) return;
|
||||||
|
await nextTick();
|
||||||
|
// Wait for 200ms
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 200));
|
||||||
|
element.value?.scrollIntoView({
|
||||||
|
behavior: "smooth",
|
||||||
|
});
|
||||||
|
},
|
||||||
|
{
|
||||||
|
immediate: true,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
useServerSeoMeta({
|
useServerSeoMeta({
|
||||||
title: note.value?.account.display_name,
|
title: note.value?.account.display_name,
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="max-h-dvh overflow-y-auto">
|
<OverlayScrollbarsComponent :defer="true" class="max-h-dvh overflow-y-auto">
|
||||||
<TimelinesTimelineScroller>
|
<TimelinesTimelineScroller>
|
||||||
<TimelinesHome />
|
<TimelinesHome />
|
||||||
</TimelinesTimelineScroller>
|
</TimelinesTimelineScroller>
|
||||||
</div>
|
</OverlayScrollbarsComponent>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { OverlayScrollbarsComponent } from "#imports";
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
layout: "app",
|
layout: "app",
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="max-h-dvh overflow-y-auto">
|
<OverlayScrollbarsComponent :defer="true" class="max-h-dvh overflow-y-auto">
|
||||||
<TimelinesTimelineScroller>
|
<TimelinesTimelineScroller>
|
||||||
<TimelinesLocal />
|
<TimelinesLocal />
|
||||||
</TimelinesTimelineScroller>
|
</TimelinesTimelineScroller>
|
||||||
</div>
|
</OverlayScrollbarsComponent>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
import { OverlayScrollbarsComponent } from "#imports";
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
layout: "app",
|
layout: "app",
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<ClientOnly>
|
<ClientOnly>
|
||||||
<div class="max-h-dvh overflow-y-auto">
|
<OverlayScrollbarsComponent :defer="true" class="max-h-dvh overflow-y-auto">
|
||||||
<div class="shrink-0 p-10 h-dvh" v-if="!tokenData">
|
<div class="shrink-0 p-10 h-dvh" v-if="!tokenData">
|
||||||
<button type="button"
|
<button type="button"
|
||||||
class="relative block h-full w-full rounded-lg border-2 border-dashed border-dark-300 p-12 text-center">
|
class="relative block h-full w-full rounded-lg border-2 border-dashed border-dark-300 p-12 text-center">
|
||||||
|
|
@ -15,11 +15,12 @@
|
||||||
<TimelinesTimelineScroller v-else>
|
<TimelinesTimelineScroller v-else>
|
||||||
<TimelinesNotifications />
|
<TimelinesNotifications />
|
||||||
</TimelinesTimelineScroller>
|
</TimelinesTimelineScroller>
|
||||||
</div>
|
</OverlayScrollbarsComponent>
|
||||||
</ClientOnly>
|
</ClientOnly>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
import { OverlayScrollbarsComponent } from "#imports";
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
layout: "app",
|
layout: "app",
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="max-h-dvh overflow-y-auto">
|
<OverlayScrollbarsComponent :defer="true" class="max-h-dvh overflow-y-auto">
|
||||||
<TimelinesTimelineScroller>
|
<TimelinesTimelineScroller>
|
||||||
<TimelinesPublic />
|
<TimelinesPublic />
|
||||||
</TimelinesTimelineScroller>
|
</TimelinesTimelineScroller>
|
||||||
</div>
|
</OverlayScrollbarsComponent>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { OverlayScrollbarsComponent } from "#imports";
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
layout: "app",
|
layout: "app",
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue