Skip to content

Commit

Permalink
Merge pull request #3128 from owncloud/wrapper-element-fix
Browse files Browse the repository at this point in the history
[Tests-Only] Used only virtualScrollWrapper inside findItemInFilesList
  • Loading branch information
individual-it authored Mar 3, 2020
2 parents 387015a + c248b75 commit e8421f0
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions tests/acceptance/pageObjects/FilesPageElement/filesList.js
Original file line number Diff line number Diff line change
Expand Up @@ -599,24 +599,22 @@ module.exports = {
function (
{
itemName,
listContainerSelector,
scrollWrapperSelector,
listHeaderSelector
},
done
) {
const filesListContainer = document.querySelector(listContainerSelector)
const virtualScrollWrapper = document.querySelector(scrollWrapperSelector)
const tableHeaderPosition = document.querySelector(listHeaderSelector).getBoundingClientRect().top
let scrollDistance = filesListContainer.scrollTop
let scrollDistance = virtualScrollWrapper.scrollTop

function scrollUntilElementVisible () {
const item = document.querySelector(`[filename="${itemName}"]`)

if (item) {
const position = item.getBoundingClientRect()
// Add position from top to list container height to properly decide if the item is visible
const visiblePosition = filesListContainer.clientHeight + tableHeaderPosition
const visiblePosition = virtualScrollWrapper.clientHeight + tableHeaderPosition

// Check if the item is inside the view after it's renredered
if (position.top > -1 && position.top <= visiblePosition) {
Expand All @@ -630,7 +628,7 @@ module.exports = {
return
}

scrollDistance += filesListContainer.clientHeight
scrollDistance += virtualScrollWrapper.clientHeight
virtualScrollWrapper.scrollTop = scrollDistance
setTimeout(function () {
scrollUntilElementVisible()
Expand All @@ -640,7 +638,6 @@ module.exports = {
scrollUntilElementVisible()
}, [{
itemName: itemName,
listContainerSelector: this.elements.filesTableContainer.selector,
scrollWrapperSelector: this.elements.virtualScrollWrapper.selector,
listHeaderSelector: this.elements.filesTableHeader.selector
}])
Expand Down

0 comments on commit e8421f0

Please sign in to comment.