diff --git a/e2e/testcafe-devextreme/tests/common/gantt/common.ts b/e2e/testcafe-devextreme/tests/common/gantt/common.ts index 0a30228449e8..475d90d296cc 100644 --- a/e2e/testcafe-devextreme/tests/common/gantt/common.ts +++ b/e2e/testcafe-devextreme/tests/common/gantt/common.ts @@ -4,10 +4,11 @@ import { Selector } from 'testcafe'; import { testScreenshot } from '../../../helpers/themeUtils'; import url from '../../../helpers/getPageUrl'; import { createWidget } from '../../../helpers/createWidget'; -import { appendElementTo } from '../../../helpers/domUtils'; +import { appendElementTo, insertStylesheetRulesToPage } from '../../../helpers/domUtils'; import { Themes } from '../../../helpers/themes'; const TOOLBAR_ITEM_BUTTON = '.dx-button'; +const HIDDEN_SCROLLBAR_THUMB_STYLE = '.dx-gantt .dx-scrollable-scroll { visibility: hidden !important; }'; fixture`Gantt` .page(url(__dirname, '../../container-extended.html')); @@ -128,6 +129,7 @@ test.meta({ themes: [Themes.materialBlue] })('Gantt - show resources button shou .expect(compareResults.isValid()) .ok(compareResults.errorMessages()); }).before(async () => { + await insertStylesheetRulesToPage(HIDDEN_SCROLLBAR_THUMB_STYLE); const id = `${new Guid()}`; await appendElementTo('#container', 'div', id, {}); await createWidget('dxGantt', { @@ -149,6 +151,7 @@ test('Gantt - show dependencies button should not have focus state (T1264485)', .expect(compareResults.isValid()) .ok(compareResults.errorMessages()); }).before(async () => { + await insertStylesheetRulesToPage(HIDDEN_SCROLLBAR_THUMB_STYLE); const id = `${new Guid()}`; await appendElementTo('#container', 'div', id, {}); await createWidget('dxGantt', { diff --git a/e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts b/e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts index a5e6b7c5765a..5b63ace55337 100644 --- a/e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts +++ b/e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts @@ -2036,7 +2036,15 @@ test('Last group should not disappear after collapsing another subgroup with vir // act await dataGrid.scrollTo(t, { y: 200 }); await dataGrid.scrollTo(t, { y: 600 }); - await t.expect(dataGrid.isReady()).ok(); + await t + .expect(dataGrid.isReady()) + .ok() + .expect(dataGrid.isVirtualRowIntersectViewport()) + .notOk() + .expect(dataGrid.getFixedDataCell(12, 0).element.textContent) + .eql('12') + .expect(dataGrid.getFixedDataCell(19, 0).element.textContent) + .eql('19'); // assert await testScreenshot(t, takeScreenshot, `grid-${scrollingMode}-scrolling-T1152498.png`, { element: '#container' }); diff --git a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png index 974342016900..0b8dc30b378c 100644 Binary files a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png index 974342016900..fc21dd598622 100644 Binary files a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position after show, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png index 974342016900..0b8dc30b378c 100644 Binary files a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=false,useSimScrollbar=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png index 974342016900..fc21dd598622 100644 Binary files a/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/navigation/scrollable/etalons/Scroll position before hide, useNative=true,rtl=true,useSimScrollbar=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/navigation/scrollable/visibility.ts b/e2e/testcafe-devextreme/tests/navigation/scrollable/visibility.ts index afcf1abcc073..b827058719bf 100644 --- a/e2e/testcafe-devextreme/tests/navigation/scrollable/visibility.ts +++ b/e2e/testcafe-devextreme/tests/navigation/scrollable/visibility.ts @@ -4,12 +4,14 @@ import Scrollable from 'devextreme-testcafe-models/scrollView/internal/scrollabl import { testScreenshot } from '../../../helpers/themeUtils'; import url from '../../../helpers/getPageUrl'; import { createWidget } from '../../../helpers/createWidget'; -import { appendElementTo } from '../../../helpers/domUtils'; +import { appendElementTo, insertStylesheetRulesToPage } from '../../../helpers/domUtils'; fixture.disablePageReloads`Scrollable_visibility_integration` .page(url(__dirname, '../../container.html')); type ScrollableDirection = 'both' | 'horizontal' | 'vertical'; +const PINNED_SCROLLBAR_THUMB_STYLE = '#scrollable .dx-scrollable-scroll { opacity: 1 !important; transition: none !important; }'; + (['both'] as ScrollableDirection[]).forEach((direction) => { [false, true].forEach((useNative) => { [false, true].forEach((rtlEnabled) => { @@ -42,6 +44,10 @@ type ScrollableDirection = 'both' | 'horizontal' | 'vertical'; .expect(compareResults.isValid()) .ok(compareResults.errorMessages()); }).before(async () => { + if (useNative && useSimulatedScrollbar) { + await insertStylesheetRulesToPage(PINNED_SCROLLBAR_THUMB_STYLE); + } + await appendElementTo('#container', 'div', 'scrollable'); await appendElementTo('#scrollable', 'div', 'content', {