erudit 3.0.0-dev.2 → 3.0.0-dev.21

package/app/components/preview/PreviewFooterAction.vue

@@ -1,73 +1,73 @@
-<script lang="ts" setup>
-import type { MyIconName } from '#my-icons';
-
-defineProps<{
-    icon: MyIconName;
-    link?: string;
-    brand?: boolean;
-}>();
-
-const nuxtLink = defineNuxtLink({ prefetch: false });
-</script>
-
-<template>
-    <component
-        :is="link ? nuxtLink : 'button'"
-        :to="link || null"
-        :class="[$style.uiAction, brand && $style.brand]"
-        target="_blank"
-    >
-        <MyIcon :name="icon" />
-    </component>
-</template>
-
-<style lang="scss" module>
-@use '$/partials/preview';
-
-.uiAction {
-    --size: 40px;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    width: var(--size);
-    height: var(--size);
-
-    border: none;
-    border-radius: 3px;
-    background: transparent;
-
-    color: var(--textMuted);
-    font-size: 22px;
-    text-decoration: none;
-
-    @include transition(color, background, opacity);
-
-    &:hover,
-    &:active {
-        cursor: pointer;
-        color: var(--textColor);
-        background: var(--bgAccent);
-
-        @include preview.hasTheme() {
-            background: color-mix(
-                in srgb,
-                var(--_previewThemeText),
-                var(--bgAccent) 85%
-            );
-        }
-
-        &.brand {
-            //color: color-mix(in srgb, var(--brand), black 20%);
-            background: color-mix(in srgb, var(--brand), transparent 80%);
-        }
-    }
-
-    //
-
-    &.brand {
-        color: var(--brand);
-    }
-}
-</style>
+<script lang="ts" setup>
+import type { MyIconName } from '#my-icons';
+
+defineProps<{
+    icon: MyIconName;
+    link?: string;
+    brand?: boolean;
+}>();
+
+const nuxtLink = defineNuxtLink({ prefetch: false, trailingSlash: 'append' });
+</script>
+
+<template>
+    <component
+        :is="link ? nuxtLink : 'button'"
+        :to="link || null"
+        :class="[$style.uiAction, brand && $style.brand]"
+        target="_blank"
+    >
+        <MyIcon :name="icon" />
+    </component>
+</template>
+
+<style lang="scss" module>
+@use '$/partials/preview';
+
+.uiAction {
+    --size: 40px;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    width: var(--size);
+    height: var(--size);
+
+    border: none;
+    border-radius: 3px;
+    background: transparent;
+
+    color: var(--textMuted);
+    font-size: 22px;
+    text-decoration: none;
+
+    @include transition(color, background, opacity);
+
+    &:hover,
+    &:active {
+        cursor: pointer;
+        color: var(--textColor);
+        background: var(--bgAccent);
+
+        @include preview.hasTheme() {
+            background: color-mix(
+                in srgb,
+                var(--_previewThemeText),
+                var(--bgAccent) 85%
+            );
+        }
+
+        &.brand {
+            //color: color-mix(in srgb, var(--brand), black 20%);
+            background: color-mix(in srgb, var(--brand), transparent 80%);
+        }
+    }
+
+    //
+
+    &.brand {
+        color: var(--brand);
+    }
+}
+</style>

package/app/components/preview/PreviewLoading.vue

@@ -1,14 +1,14 @@
-<template>
-    <div :class="$style.loadingContainer">
-        <Loading />
-    </div>
-</template>
-
-<style lang="scss" module>
-.loadingContainer {
-    height: 225px;
-    display: grid;
-    place-items: center;
-    font-size: 50px;
-}
-</style>
+<template>
+    <div :class="$style.loadingContainer">
+        <Loading />
+    </div>
+</template>
+
+<style lang="scss" module>
+.loadingContainer {
+    height: 225px;
+    display: grid;
+    place-items: center;
+    font-size: 50px;
+}
+</style>

package/app/components/preview/PreviewScreen.vue

@@ -1,99 +1,141 @@
-<script lang="ts" setup>
-import type { PreviewRequest } from '@app/scripts/preview/request';
-import { type PreviewData } from '@app/scripts/preview/data';
-import { buildPreviewData } from '@app/scripts/preview/build';
-import { getPreviewDisplayComponent } from '@app/scripts/preview/display';
-import { createPreviewError } from '@app/scripts/preview/data/alert';
-
-import { PreviewDisplayAlert } from '#components';
-
-const { request } = defineProps<{ request: PreviewRequest }>();
-const height = defineModel<number>('height');
-
-const loading = ref(true);
-
-const screenElem = useTemplateRef('screenElem');
-const screenSizeObserver = new ResizeObserver(updateContentHeight);
-
-const DisplayComponent = shallowRef<Component>();
-const previewData = shallowRef<PreviewData>();
-
-const setupDisplay = setTimeout(async () => {
-    //await new Promise(resolve => setTimeout(resolve, 5000));
-
-    try {
-        previewData.value = await buildPreviewData(request);
-        DisplayComponent.value = getPreviewDisplayComponent(previewData.value);
-    } catch (error) {
-        console.error(error);
-
-        previewData.value = createPreviewError({
-            // @ts-ignore
-            message: error?.message || error,
-        });
-
-        DisplayComponent.value = PreviewDisplayAlert;
-    }
-
-    await nextTick();
-    loading.value = false;
-});
-
-function updateContentHeight() {
-    if (!screenElem.value) return;
-
-    height.value = screenElem.value.offsetHeight;
-}
-
-onMounted(() => {
-    height.value = screenElem.value?.offsetHeight ?? 0;
-
-    watch(
-        screenElem,
-        () => {
-            if (screenElem.value) {
-                screenSizeObserver.disconnect();
-                screenSizeObserver.observe(screenElem.value);
-            }
-        },
-        { immediate: true },
-    );
-});
-
-onUnmounted(() => {
-    clearTimeout(setupDisplay);
-    screenSizeObserver.disconnect();
-});
-</script>
-
-<template>
-    <div :class="$style.screenContainer">
-        <TransitionFade>
-            <div
-                ref="screenElem"
-                :class="$style.screen"
-                :key="loading ? 'a' : 'b'"
-            >
-                <PreviewLoading v-if="loading" />
-                <component v-else :is="DisplayComponent" :data="previewData" />
-            </div>
-        </TransitionFade>
-    </div>
-</template>
-
-<style lang="scss" module>
-.screenContainer {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-}
-
-.screen {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-}
-</style>
+<script lang="ts" setup>
+import type { PreviewRequest } from '@app/scripts/preview/request';
+import { type PreviewData } from '@app/scripts/preview/data';
+import { buildPreviewData } from '@app/scripts/preview/build';
+import { getPreviewDisplayComponent } from '@app/scripts/preview/display';
+import { createPreviewError } from '@app/scripts/preview/data/alert';
+
+import { LazyPreviewDisplayAlert } from '#components';
+
+const { request } = defineProps<{ request: PreviewRequest }>();
+const height = defineModel<number>('height');
+
+const loading = ref(true);
+const suspensePending = ref(true);
+const effectiveLoading = computed(() => loading.value || suspensePending.value);
+
+const loadingElem = useTemplateRef('loadingElem');
+const screenElem = useTemplateRef('screenElem');
+const screenSizeObserver = new ResizeObserver(updateContentHeight);
+
+const DisplayComponent = shallowRef<Component>();
+const previewData = shallowRef<PreviewData>();
+
+const setupDisplay = setTimeout(async () => {
+    //await new Promise(resolve => setTimeout(resolve, 5000));
+
+    try {
+        previewData.value = await buildPreviewData(request);
+        DisplayComponent.value = getPreviewDisplayComponent(previewData.value);
+    } catch (error) {
+        console.error(error);
+
+        previewData.value = createPreviewError({
+            // @ts-ignore
+            message: error?.message || error,
+        });
+
+        DisplayComponent.value = LazyPreviewDisplayAlert;
+    }
+
+    await nextTick();
+    loading.value = false;
+});
+
+function updateContentHeight() {
+    // Use the proper element for height calculation based on which one is visible
+    const targetElem = effectiveLoading.value
+        ? loadingElem.value
+        : screenElem.value;
+    if (!targetElem) return;
+
+    height.value = targetElem.offsetHeight;
+}
+
+function onSuspenseResolve() {
+    suspensePending.value = false;
+}
+
+onMounted(() => {
+    // Initialize height with either element that's available
+    const initialElement = loadingElem.value || screenElem.value;
+    height.value = initialElement?.offsetHeight ?? 0;
+
+    // Observe both elements for size changes
+    watch(
+        [loadingElem, screenElem, effectiveLoading],
+        () => {
+            screenSizeObserver.disconnect();
+
+            // Observe loading element when it's visible
+            if (effectiveLoading.value && loadingElem.value) {
+                screenSizeObserver.observe(loadingElem.value);
+            }
+            // Otherwise observe content element
+            else if (screenElem.value) {
+                screenSizeObserver.observe(screenElem.value);
+            }
+
+            // Update height after elements change
+            updateContentHeight();
+        },
+        { immediate: true },
+    );
+});
+
+onUnmounted(() => {
+    clearTimeout(setupDisplay);
+    screenSizeObserver.disconnect();
+});
+</script>
+
+<template>
+    <div :class="$style.screenContainer">
+        <TransitionFade>
+            <div
+                v-if="effectiveLoading"
+                ref="loadingElem"
+                :class="$style.loadingOverlay"
+            >
+                <PreviewLoading />
+            </div>
+        </TransitionFade>
+
+        <div ref="screenElem" :class="$style.screen">
+            <Suspense @resolve="onSuspenseResolve" v-if="DisplayComponent">
+                <component :is="DisplayComponent" :data="previewData" />
+                <template #fallback>
+                    <div></div>
+                </template>
+            </Suspense>
+        </div>
+    </div>
+</template>
+
+<style lang="scss" module>
+.screenContainer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.loadingOverlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: auto;
+    z-index: 2;
+    background-color: var(--_previewThemeBg, var(--bgAside));
+}
+
+.screen {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 1;
+}
+</style>

package/app/components/preview/display/Alert.vue

@@ -1,50 +1,50 @@
-<script lang="ts" setup>
-import type { PreviewDataAlert } from '@app/scripts/preview/data/alert';
-import type { PreviewDisplayProps } from '@app/scripts/preview/display';
-import type { PreviewFooter } from '@app/scripts/preview/footer';
-import { setPreviewTheme } from '@app/scripts/preview/state';
-
-const { data } = defineProps<PreviewDisplayProps<PreviewDataAlert>>();
-
-const phrase = await usePhrases('error');
-
-setPreviewTheme(data.theme!);
-
-const footer: PreviewFooter = {
-    iconName: 'alert',
-    primary: data.title || phrase.error,
-};
-</script>
-
-<template>
-    <PreviewDisplay :footer>
-        <div :class="$style.alertContent">
-            <div v-html="data.message"></div>
-            <pre v-if="data.pre" v-html="data.pre"></pre>
-        </div>
-    </PreviewDisplay>
-</template>
-
-<style lang="scss" module>
-.alertContent {
-    display: flex;
-    flex-direction: column;
-    gap: var(--gap);
-    padding: var(--gapBig);
-
-    color: var(--_previewThemeText);
-    font-size: 0.9em;
-
-    @include transition(color);
-
-    div {
-        font-weight: 500;
-    }
-
-    pre {
-        max-height: 100px;
-        overflow: auto;
-        @include scroll;
-    }
-}
-</style>
+<script lang="ts" setup>
+import type { PreviewDataAlert } from '@app/scripts/preview/data/alert';
+import type { PreviewDisplayProps } from '@app/scripts/preview/display';
+import type { PreviewFooter } from '@app/scripts/preview/footer';
+import { setPreviewTheme } from '@app/scripts/preview/state';
+
+const { data } = defineProps<PreviewDisplayProps<PreviewDataAlert>>();
+
+const phrase = await usePhrases('error');
+
+setPreviewTheme(data.theme!);
+
+const footer: PreviewFooter = {
+    iconName: 'alert',
+    primary: data.title || phrase.error,
+};
+</script>
+
+<template>
+    <PreviewDisplay :footer>
+        <div :class="$style.alertContent">
+            <div v-html="data.message"></div>
+            <pre v-if="data.pre" v-html="data.pre"></pre>
+        </div>
+    </PreviewDisplay>
+</template>
+
+<style lang="scss" module>
+.alertContent {
+    display: flex;
+    flex-direction: column;
+    gap: var(--gap);
+    padding: var(--gapBig);
+
+    color: var(--_previewThemeText);
+    font-size: 0.9em;
+
+    @include transition(color);
+
+    div {
+        font-weight: 500;
+    }
+
+    pre {
+        max-height: 100px;
+        overflow: auto;
+        @include scroll;
+    }
+}
+</style>

package/app/components/preview/display/Custom.vue

@@ -1,18 +1,18 @@
-<script lang="ts" setup>
-import type { PreviewDataCustom } from '@app/scripts/preview/data/custom';
-import type { PreviewDisplayProps } from '@app/scripts/preview/display';
-
-const { data } = defineProps<PreviewDisplayProps<PreviewDataCustom>>();
-</script>
-
-<template>
-    <PreviewDisplay :footer="data.footer">
-        <div :class="$style.message">{{ data.message }}</div>
-    </PreviewDisplay>
-</template>
-
-<style lang="scss" module>
-.message {
-    padding: var(--gapBig);
-}
-</style>
+<script lang="ts" setup>
+import type { PreviewDataCustom } from '@app/scripts/preview/data/custom';
+import type { PreviewDisplayProps } from '@app/scripts/preview/display';
+
+const { data } = defineProps<PreviewDisplayProps<PreviewDataCustom>>();
+</script>
+
+<template>
+    <PreviewDisplay :footer="data.footer">
+        <div :class="$style.message">{{ data.message }}</div>
+    </PreviewDisplay>
+</template>
+
+<style lang="scss" module>
+.message {
+    padding: var(--gapBig);
+}
+</style>

package/app/components/preview/display/GenericLink.vue

@@ -1,48 +1,48 @@
-<script lang="ts" setup>
-import type { PreviewDataGenericLink } from '@app/scripts/preview/data/genericLink';
-import type { PreviewDisplayProps } from '@app/scripts/preview/display';
-import type { PreviewFooter } from '@app/scripts/preview/footer';
-
-const { data } = defineProps<PreviewDisplayProps<PreviewDataGenericLink>>();
-
-const phrase = await usePhrases(
-    'external_link',
-    'external_link_warn',
-    'internal_link',
-    'internal_link_warn',
-);
-
-const footer: PreviewFooter = {
-    iconName: data.external ? 'link-external' : 'link',
-    href: data.href,
-    primary: data.external ? phrase.external_link : phrase.internal_link,
-};
-
-const warnMessage = data.external
-    ? phrase.external_link_warn
-    : phrase.internal_link_warn;
-</script>
-
-<template>
-    <PreviewDisplay :footer>
-        <div :class="$style.wrapper">
-            <div :class="$style.warn">{{ warnMessage }}</div>
-            <pre>{{ data.href }}</pre>
-        </div>
-    </PreviewDisplay>
-</template>
-
-<style lang="scss" module>
-.wrapper {
-    padding: var(--gapBig);
-
-    pre {
-        font-family: monospace;
-    }
-}
-
-.warn {
-    color: var(--textMuted);
-    margin-bottom: var(--gap);
-}
-</style>
+<script lang="ts" setup>
+import type { PreviewDataGenericLink } from '@app/scripts/preview/data/genericLink';
+import type { PreviewDisplayProps } from '@app/scripts/preview/display';
+import type { PreviewFooter } from '@app/scripts/preview/footer';
+
+const { data } = defineProps<PreviewDisplayProps<PreviewDataGenericLink>>();
+
+const phrase = await usePhrases(
+    'external_link',
+    'external_link_warn',
+    'internal_link',
+    'internal_link_warn',
+);
+
+const footer: PreviewFooter = {
+    iconName: data.external ? 'link-external' : 'link',
+    href: data.href,
+    primary: data.external ? phrase.external_link : phrase.internal_link,
+};
+
+const warnMessage = data.external
+    ? phrase.external_link_warn
+    : phrase.internal_link_warn;
+</script>
+
+<template>
+    <PreviewDisplay :footer>
+        <div :class="$style.wrapper">
+            <div :class="$style.warn">{{ warnMessage }}</div>
+            <pre>{{ data.href }}</pre>
+        </div>
+    </PreviewDisplay>
+</template>
+
+<style lang="scss" module>
+.wrapper {
+    padding: var(--gapBig);
+
+    pre {
+        font-family: monospace;
+    }
+}
+
+.warn {
+    color: var(--textMuted);
+    margin-bottom: var(--gap);
+}
+</style>