Skip to content

fix(PageList): Scroll favored page in page list into viewport #1697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 1 commit into from
Apr 14, 2025
Merged

fix(PageList): Scroll favored page in page list into viewport #1697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 23 additions & 8 deletions src/components/PageList/Item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->

<template>
<div :id="`page-${pageId}`"
<div :id="pageElementId"
:data-page-id="pageId"
class="app-content-list-item"
:class="{
Expand Down Expand Up @@ -65,7 +65,7 @@
:title="pageTitleIfTruncated"
class="app-content-list-item-line-one"
:class="{ 'template': isTemplate }"
@click="expand(pageId)">
@click="expandAndScroll">
{{ pageTitleString }}
</div>
</router-link>
Expand Down Expand Up @@ -221,6 +221,12 @@ export default {
'pageParents',
]),

pageElementId() {
return this.inFavoriteList
? `page-favorite-${this.pageId}`
: `page-${this.pageId}`
},

isActive() {
return this.currentPage
&& this.currentPage.id === this.pageId
Expand Down Expand Up @@ -286,7 +292,7 @@ export default {

mounted() {
// Scroll to item at initial mount if it's currentPage
if (this.isActive) {
if (this.isActive && !this.inFavoriteList) {
scrollToPage(this.pageId)
}

Expand All @@ -303,15 +309,24 @@ export default {

toggleCollapsedOrRoute(ev) {
if (this.isCollapsible) {
event.stopPropagation()
ev.stopPropagation()
this.toggleCollapsed(this.pageId)
} else {
this.expandAndScroll()
if (this.currentPage.id !== this.pageId) {
this.$router.push(this.to)
}
}
},

expandAndScroll() {
this.expand(this.pageId)
// Scroll favored page in page list into viewport
if (this.inFavoriteList) {
scrollToPage(this.pageId)
}
},

onDragstart(ev) {
// Set as dragged page if not root page (allows to move the page)
if (!this.isRootPage) {
Expand All @@ -328,25 +343,25 @@ export default {
ev.dataTransfer.setData('text/html', html)
},

onDragend(ev) {
onDragend() {
this.isHighlightedTarget = false
this.setDragoverTargetPage(false)
this.setDraggedPageId(null)
},

onDragover(ev) {
onDragover() {
if (this.isPotentialDropTarget) {
this.isHighlightedTarget = true
this.setDragoverTargetPage(true)
}
},

onDragleave(ev) {
onDragleave() {
this.isHighlightedTarget = false
this.setDragoverTargetPage(false)
},

onDrop(ev) {
onDrop() {
if (this.isDropTarget
// Ingore if self is direct parent of dragged element
&& this.pageParent(this.draggedPageId) !== this.pageId) {
Expand Down