Skip to content

Scroll to selected chapter #18497

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
merged 10 commits into from
Oct 30, 2025
Merged

Scroll to selected chapter #18497

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c050eba
Scroll to a chapter after selecting it, if it is currently not in view.
johndoknjas Oct 27, 2025
d64afa8
Misc unimportant changes.
johndoknjas Oct 27, 2025
31cad91
Scroll to the active chapter (if needed) on page load as well.
johndoknjas Oct 27, 2025
c5dc912
Fix existing code rather than writing new stuff.
johndoknjas Oct 28, 2025
f08d656
formatting
johndoknjas Oct 28, 2025
bb93703
Merge branch 'master' into scroll-to-selected-chapter
johndoknjas Oct 28, 2025
65253ed
Undo changes to scrolling in `common.ts`, and instead just add `posit…
johndoknjas Oct 29, 2025
9645e81
Merge remote-tracking branch 'origin/scroll-to-selected-chapter' into…
johndoknjas Oct 29, 2025
ef37f19
Merge branch 'master' into scroll-to-selected-chapter
ornicar Oct 29, 2025
eaf4cdc
Apply PR feedback.
johndoknjas Oct 30, 2025
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
1 change: 1 addition & 0 deletions ui/analyse/css/study/_list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
min-height: 16em;
max-height: 16em;
}
position: relative;
display: flex;
flex-direction: column;
overflow: hidden;
Expand Down
10 changes: 6 additions & 4 deletions ui/analyse/src/study/studyChapters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,19 @@ export function view(ctrl: StudyCtrl): VNode {
const canContribute = ctrl.members.canContribute(),
current = ctrl.currentChapter();
function update(vnode: VNode) {
const isChapterObscured = (study_list: HTMLElement, chapter: HTMLElement): boolean => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

naming conventions studyList

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also it's a list of chapters

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer isChapterVisible - a positive and clearer name.

const c = chapter.getBoundingClientRect(),
l = study_list.getBoundingClientRect();
return c.top < l.top || c.bottom > l.bottom;
};
const newCount = ctrl.chapters.list.size(),
vData = vnode.data!.li!,
el = vnode.elm as HTMLElement;
if (vData.count !== newCount) {
if (current.id !== ctrl.chapters.list.first().id) scrollToInnerSelector(el, '.active');
} else if (vData.currentId !== ctrl.data.chapter.id) {
vData.currentId = ctrl.data.chapter.id;
scrollToInnerSelector(el, '.active');
if (isChapterObscured(el, el.querySelector('.active')!)) scrollToInnerSelector(el, '.active');
}
vData.count = newCount;
if (canContribute && newCount > 1 && !vData.sortable) {
Expand Down Expand Up @@ -207,11 +212,8 @@ export function view(ctrl: StudyCtrl): VNode {
update(vnode);
},
postpatch(old, vnode) {
const scrollTop = (old.elm as HTMLElement).scrollTop;
vnode.data!.li = old.data!.li;
update(vnode);
if (old.children?.length === vnode.children?.length)
(vnode.elm as HTMLElement).scrollTop = scrollTop;
},
destroy: vnode => {
const sortable: Sortable = vnode.data!.li!.sortable;
Expand Down
Loading