Skip to content

[stable25] Fix scrolling while dragging in file list view #36028

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 1 commit into from
Jan 6, 2023
Merged

[stable25] Fix scrolling while dragging in file list view #36028

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
36 changes: 19 additions & 17 deletions apps/files/js/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ var dragOptions={
revert: 'invalid',
revertDuration: 300,
opacity: 0.7,
appendTo: 'body',
cursorAt: { left: 24, top: 18 },
helper: createDragShadow,
cursor: 'move',
Expand Down Expand Up @@ -482,23 +481,26 @@ var dragOptions={
$('.crumbmenu').removeClass('canDropChildren');
},
drag: function(event, ui) {
var scrollingArea = FileList.$container;
var currentScrollTop = $(scrollingArea).scrollTop();
var scrollArea = Math.min(Math.floor($(window).innerHeight() / 2), 100);

var bottom = $(window).innerHeight() - scrollArea;
var top = $(window).scrollTop() + scrollArea;
if (event.pageY < top) {
$(scrollingArea).animate({
scrollTop: currentScrollTop - 10
}, 400);

} else if (event.pageY > bottom) {
$(scrollingArea).animate({
scrollTop: currentScrollTop + 10
}, 400);
}
/** @type {JQuery<HTMLDivElement>} */
const scrollingArea = FileList.$container;

// Get the top and bottom scroll trigger y positions
const containerHeight = scrollingArea.innerHeight() ?? 0
const scrollTriggerArea = Math.min(Math.floor(containerHeight / 2), 100);
const bottomTriggerY = containerHeight - scrollTriggerArea;
const topTriggerY = scrollTriggerArea;

// Get the cursor position relative to the container
const containerOffset = scrollingArea.offset() ?? {left: 0, top: 0}
const cursorPositionY = event.pageY - containerOffset.top

const currentScrollTop = scrollingArea.scrollTop() ?? 0

if (cursorPositionY < topTriggerY) {
scrollingArea.scrollTop(currentScrollTop - 10)
} else if (cursorPositionY > bottomTriggerY) {
scrollingArea.scrollTop(currentScrollTop + 10)
}
}
};
// sane browsers support using the distance option
Expand Down