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: simplified checking scrollability of the element (closes #6601) #6937

Merged
merged 3 commits into from Mar 30, 2022
Merged

fix: simplified checking scrollability of the element (closes #6601) #6937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a7b8a4
refactor: simplified checking scrollability of the element
Aleksey28 Mar 22, 2022
92a2efb
fix: added the hidden in the SCROLLABLE_OVERFLOW_STYLE_RE
Aleksey28 Mar 29, 2022
6af1cfe
feat: added scrolling to a hidden element into the test scroll into view
Aleksey28 Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/client/core/utils/shared/scroll.ts
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ import adapter from './adapter/index';
import AxisValues from '../../../../shared/utils/values/axis-values';


const SCROLLABLE_OVERFLOW_STYLE_RE = /auto|scroll/i;
const SCROLLABLE_OVERFLOW_STYLE_RE = /auto|scroll|hidden/i;
const DEFAULT_IE_SCROLLABLE_OVERFLOW_STYLE_VALUE = 'visible';

function getScrollable (el: Element): AxisValues<boolean> {
Expand Down Expand Up @@ -40,7 +40,7 @@ function hasBodyScroll (el: HTMLBodyElement): boolean {
}

return (scrollableHorizontally || scrollableVertically) &&
bodyScrollHeight > documentElement.scrollHeight;
bodyScrollHeight > documentElement.scrollHeight;
}

function hasHTMLElementScroll (el: HTMLHtmlElement): boolean {
Expand Down
21 changes: 21 additions & 0 deletions test/functional/fixtures/api/es-next/scroll/pages/scroll-automations.html
View file
Open in desktop
Expand Up @@ -20,6 +20,13 @@
border: 1px solid black;
}

#hidden {
height: 500px;
width: 500px;
overflow: hidden;
border: 1px solid black;
}

#scrollable-deferred {
height: 500px;
width: 500px;
Expand All @@ -41,6 +48,15 @@
left: 700px;
position: absolute;
}

#hidden-target {
width: 1000px;
height: 1000px;
background-color: black;
top: 700px;
left: 700px;
position: absolute;
}
</style>
</head>
<body>
Expand All @@ -50,6 +66,11 @@
<div id="target"></div>
</div>
</div>
<div id="hidden">
<div style="height: 5000px; width: 5000px; position: relative;">
<div id="hidden-target"></div>
</div>
</div>
</div>
<script>
setTimeout(function () {
Expand Down
7 changes: 6 additions & 1 deletion test/functional/fixtures/api/es-next/scroll/testcafe-fixtures/scroll-automations.js
View file
Open in desktop
Expand Up @@ -23,9 +23,11 @@ fixture `Scroll/ScrollBy/ScrollIntoView`

const selectorHTML = Selector(() => document.scrollingElement || document.documentElement);
const selectorScrollable = Selector('#scrollable');
const selectorHidden = Selector('#hidden');
const selectorScrollableDeferred = Selector('#scrollable-deferred');

const target = Selector('#target');
const target = Selector('#target');
const hiddenTarget = Selector('#hidden-target');

async function assert (t, selector, expected) {
const actual = await getScrollPosition(selector)();
Expand Down Expand Up @@ -179,6 +181,9 @@ test('scroll into view', async t => {

await t.scrollIntoView(target, { offsetX: 1, offsetY: -1 });
await t.expect(getScrollPosition(selectorScrollable)()).eql({ left: 652, top: 1248 });

await t.scrollIntoView(hiddenTarget);
await t.expect(getScrollPosition(selectorHidden)()).eql({ left: 749, top: 749 });
});

test('scroll/scrollby options', async t => {
Expand Down