Scroll collapsed file into view (#23702)

This commit is contained in:
Jimmy Praet 2023-04-05 01:51:42 +02:00 committed by GitHub
parent 0983b237d5
commit 54197b67f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions

View file

@ -1867,6 +1867,13 @@
.diff-file-box { .diff-file-box {
border: 1px solid transparent; border: 1px solid transparent;
border-radius: var(--border-radius); border-radius: var(--border-radius);
scroll-margin-top: 47px; /* match .repository .diff-detail-box */
}
@media (max-width: 991px) {
.diff-file-box {
scroll-margin-top: 77px; /* match .repository .diff-detail-box */
}
} }
/* TODO: this can potentially be made "global" by removing the class prefix */ /* TODO: this can potentially be made "global" by removing the class prefix */

View file

@ -246,12 +246,12 @@ a.blob-excerpt:hover {
display: none; display: none;
} }
.pull.files.diff [id] { .pull.files.diff .comment {
scroll-margin-top: 99px; scroll-margin-top: 99px;
} }
@media (max-width: 991px) { @media (max-width: 991px) {
.pull.files.diff [id] { .pull.files.diff .comment {
scroll-margin-top: 130px; scroll-margin-top: 130px;
} }
} }

View file

@ -8,6 +8,9 @@ import {svg} from '../svg.js';
export function setFileFolding(fileContentBox, foldArrow, newFold) { export function setFileFolding(fileContentBox, foldArrow, newFold) {
foldArrow.innerHTML = svg(`octicon-chevron-${newFold ? 'right' : 'down'}`, 18); foldArrow.innerHTML = svg(`octicon-chevron-${newFold ? 'right' : 'down'}`, 18);
fileContentBox.setAttribute('data-folded', newFold); fileContentBox.setAttribute('data-folded', newFold);
if (newFold && fileContentBox.getBoundingClientRect().top < 0) {
fileContentBox.scrollIntoView();
}
} }
// Like `setFileFolding`, except that it automatically inverts the current file folding state. // Like `setFileFolding`, except that it automatically inverts the current file folding state.