Skip to content

Commit a9d9802

Browse files
committed
fixed issue to where the prev version was jumped to while resolving version was still happening
1 parent 314d49f commit a9d9802

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

app/components/Changelog/Releases.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const { data: releases, error } = await useFetch<ReleaseData[]>(
1212
)
1313
1414
const route = useRoute()
15-
const router = useRouter()
1615
1716
const matchingDateReleases = computed(() => {
1817
if (!requestedDate || !releases.value) {
@@ -33,6 +32,8 @@ if (import.meta.client) {
3332
watch(
3433
[() => route.hash, () => requestedDate?.toLowerCase(), releases, () => requestedVersion],
3534
([hash, date, r, rv]) => {
35+
console.log({ rv })
36+
3637
if (hash && r) {
3738
// ensures the user is scrolled to the hash
3839
navigateTo(hash, { replace: true })
@@ -54,6 +55,7 @@ if (import.meta.client) {
5455
},
5556
{
5657
immediate: true,
58+
flush: 'post',
5759
},
5860
)
5961
}

app/pages/package-changes/[[org]]/[name].vue

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ if (import.meta.server) {
3232
}
3333
3434
// status: resolvedStatus
35-
const { data: version } = await useResolvedVersion(packageName, requestedVersion)
35+
const { data: version, pending: resolvingPending } = await useResolvedVersion(
36+
packageName,
37+
requestedVersion,
38+
)
3639
3740
const { data: pkg } = usePackage(packageName, () => version.value ?? requestedVersion.value ?? null)
3841
@@ -99,10 +102,14 @@ defineOgImageComponent('Default', {
99102
:resolved-version="version"
100103
:display-version="pkg?.requestedVersion"
101104
/>
105+
{{ requestedVersion }} {{ version }}
102106
<section class="container w-full pt-3">
103107
<div
104-
class="sticky top-[--combined-header-height] pa-3 z-2 flex justify-between gap-4 h-14"
105-
:class="$style.gitTocHeader"
108+
class="pa-3 z-2 flex justify-between gap-4 h-14"
109+
:class="{
110+
[$style.gitTocHeader]: true,
111+
sticky: changelog?.type == 'md',
112+
}"
106113
>
107114
<LinkBase
108115
v-if="changelog?.link"
@@ -116,7 +123,7 @@ defineOgImageComponent('Default', {
116123
<!- prevents layout shift while loading ->
117124
</div>
118125
</div>
119-
<section v-if="pending" class="flex flex-col gap-2 py-3">
126+
<section v-if="pending || resolvingPending" class="flex flex-col gap-2 py-3">
120127
<SkeletonBlock class="h-8 w-40 rounded" />
121128
<ul class="ms-3 list-disc my-[1rem] ps-[1.5rem] marker:color-[--border-hover]">
122129
<li class="mb-1" v-for="_n in 5">
@@ -128,13 +135,13 @@ defineOgImageComponent('Default', {
128135
<SkeletonBlock class="h-5 w-3/4 max-w-2xl rounded" />
129136
</section>
130137

131-
<Suspense v-else-if="latestVersion?.version">
138+
<Suspense v-else>
132139
<template #default>
133140
<LazyChangelogReleases
134141
v-if="changelog?.type == 'release'"
135142
:info="changelog"
136143
:requestedDate="versionDate"
137-
:requested-version="version || latestVersion?.version"
144+
:requested-version="version"
138145
#error
139146
>
140147
<LazyChangelogErrorMsg
@@ -147,7 +154,7 @@ defineOgImageComponent('Default', {
147154
v-else-if="changelog?.type == 'md'"
148155
:info="changelog"
149156
:tpTarget="tptoc"
150-
:requested-version="version || latestVersion?.version"
157+
:requested-version="version"
151158
#error
152159
>
153160
<LazyChangelogErrorMsg
@@ -181,5 +188,6 @@ defineOgImageComponent('Default', {
181188
border-bottom-width: 1px;
182189
border-color: color-mix(in srgb, var(--border) var(--un-border-opacity), transparent);
183190
background-color: color-mix(in srgb, var(--bg) var(--un-bg-opacity), transparent);
191+
top: var(--combined-header-height);
184192
}
185193
</style>

0 commit comments

Comments
 (0)