Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion app/pages/package/[[org]]/[name].vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ const router = useRouter()

const header = useTemplateRef('header')
const isHeaderPinned = shallowRef(false)
const navExtraOffset = shallowRef(0)
const isMobile = useMediaQuery('(max-width: 639.9px)')

function checkHeaderPosition() {
const el = header.value
Expand All @@ -43,10 +45,51 @@ function checkHeaderPosition() {
useEventListener('scroll', checkHeaderPosition, { passive: true })
useEventListener('resize', checkHeaderPosition)

const footerTarget = ref<HTMLElement | null>(null)
const footerThresholds = Array.from({ length: 11 }, (_, i) => i / 10)

const { pause: pauseFooterObserver, resume: resumeFooterObserver } = useIntersectionObserver(
footerTarget,
([entry]) => {
if (!entry) return

navExtraOffset.value = entry.isIntersecting ? entry.intersectionRect.height : 0
},
{
threshold: footerThresholds,
immediate: false,
},
)

function initFooterObserver() {
footerTarget.value = document.querySelector('footer')
if (!footerTarget.value) return

pauseFooterObserver()

watch(
isMobile,
value => {
if (value) {
resumeFooterObserver()
} else {
pauseFooterObserver()
navExtraOffset.value = 0
}
},
{ immediate: true },
)
}

onMounted(() => {
checkHeaderPosition()
initFooterObserver()
})

const navExtraOffsetStyle = computed(() => ({
'--package-nav-extra': `${navExtraOffset.value}px`,
}))

const { packageName, requestedVersion, orgName } = usePackageRoute()
const selectedPM = useSelectedPackageManager()
const activePmId = computed(() => selectedPM.value ?? 'npm')
Expand Down Expand Up @@ -647,6 +690,7 @@ onKeyStroke(
as="nav"
:aria-label="$t('package.navigation')"
class="hidden sm:flex max-sm:flex max-sm:fixed max-sm:z-40 max-sm:inset-is-1/2 max-sm:-translate-x-1/2 max-sm:rtl:translate-x-1/2 max-sm:bg-[--bg]/90 max-sm:backdrop-blur-md max-sm:border max-sm:border-border max-sm:rounded-md max-sm:shadow-md"
:style="navExtraOffsetStyle"
:class="$style.packageNav"
>
<LinkBase
Expand Down Expand Up @@ -1460,7 +1504,7 @@ onKeyStroke(
/* Mobile floating nav: safe-area positioning + kbd hiding */
@media (max-width: 639.9px) {
.packageNav {
bottom: calc(1.25rem + env(safe-area-inset-bottom, 0px));
bottom: calc(1.25rem + var(--package-nav-extra, 0px) + env(safe-area-inset-bottom, 0px));
}

.packageNav > :global(a kbd) {
Expand Down
Loading