mirrors/TiddlyWiki5
1
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5.git synced 2025-12-06 02:30:46 -08:00
Code Issues Projects Releases Packages Wiki Activity

accomodate also for scroll-margin-left

Browse source
This commit is contained in:
BurningTreeC 2025-08-10 16:49:53 +02:00
parent 49cccd7b2a
commit 9aec77b814
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/modules/utils/dom/scroller.js
View file

@ -98,14 +98,18 @@ PageScroller.prototype.scrollIntoView = function(element,callback,options) {
if(toolbar) {
offset = toolbar.offsetHeight;
}
// Get the scroll-margin-top value from the element
var scrollMarginTop = 0;
// Get the scroll-margin-top and scroll-margin-left values from the element
var scrollMarginTop = 0, scrollMarginLeft = 0;
if(element) {
var computedStyle = srcWindow.getComputedStyle(element);
var marginTop = computedStyle.getPropertyValue("scroll-margin-top");
if(marginTop) {
scrollMarginTop = parseFloat(marginTop) || 0;
}
var marginLeft = computedStyle.getPropertyValue("scroll-margin-left");
if(marginLeft) {
scrollMarginLeft = parseFloat(marginLeft) || 0;
}
}
// Get the client bounds of the element and adjust by the scroll position
var getBounds = function() {
@ -115,7 +119,7 @@ PageScroller.prototype.scrollIntoView = function(element,callback,options) {
if(isWindowScroll) {
scrollPosition = $tw.utils.getScrollPosition(srcWindow);
return {
left: clientBounds.left + scrollPosition.x,
left: clientBounds.left + scrollPosition.x - scrollMarginLeft,
top: clientBounds.top + scrollPosition.y - offset - scrollMarginTop,
width: clientBounds.width,
height: clientBounds.height
@ -128,7 +132,7 @@ PageScroller.prototype.scrollIntoView = function(element,callback,options) {
y: scrollContainer.scrollTop
};
return {
left: clientBounds.left - containerBounds.left + scrollPosition.x,
left: clientBounds.left - containerBounds.left + scrollPosition.x - scrollMarginLeft,
top: clientBounds.top - containerBounds.top + scrollPosition.y - offset - scrollMarginTop,
width: clientBounds.width,
height: clientBounds.height