Skip to content
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

Jump to bottom

Fix scrolling lines into view #514

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Fix scrolling lines into view #514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7edecc
Fix scrollIntoView function
Skalakid Oct 9, 2024
d85e699
Remove unused code
Skalakid Oct 10, 2024
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
35 changes: 14 additions & 21 deletions src/web/utils/cursorUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,21 @@ function setCursorPosition(target: MarkdownTextInputElement, startIndex: number,

function scrollIntoView(target: MarkdownTextInputElement, node: TreeNode) {
const targetElement = target;
if (node.type === 'br' && node.parentNode?.parentNode?.type === 'line') {
// If the node is a line break, scroll to the parent paragraph, because Safari doesn't support scrollIntoView on br elements
node.parentNode.parentNode.element.scrollIntoView({
block: 'nearest',
});
} else {
const selection = window.getSelection();
if (selection && selection.rangeCount > 0) {
const range = selection.getRangeAt(0);
const caretRect = range.getBoundingClientRect();
const targetRect = target.getBoundingClientRect();

// In case the caret is below the visible input area, scroll to the end of the node
if (caretRect.top + caretRect.height > targetRect.top + targetRect.height) {
targetElement.scrollTop = caretRect.top + caretRect.height - targetRect.top - targetRect.height + target.scrollTop;
}
}

node.element.scrollIntoView({
block: 'nearest',
});
const orderIndex = Number(node.orderIndex.split(',')[0]);
const currentLine = target.tree.childNodes[orderIndex]?.element;
const scrollTargetElement = currentLine || node.element;

const caretRect = scrollTargetElement.getBoundingClientRect();
const targetRect = target.getBoundingClientRect();
// In case the caret is below the visible input area, scroll to the end of the node
if (caretRect.top + caretRect.height > targetRect.top + targetRect.height) {
targetElement.scrollTop = caretRect.top - targetRect.top + target.scrollTop - targetRect.height + caretRect.height + 4;
tomekzaw marked this conversation as resolved.
Show resolved Hide resolved
return;
Copy link

Choose a reason for hiding this comment

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

Do we need this return?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, we only want to change scrollTop. Executing the rest of the code below can cause scroll jumps

}

scrollTargetElement.scrollIntoView({
block: 'nearest',
});
}

function moveCursorToEnd(target: HTMLElement) {
Expand Down
Loading