@@ -7,6 +7,9 @@ import createWrapper, { AppLayoutWrapper } from '../../../lib/components/test-ut
77import { viewports } from './constants' ;
88import { getUrlParams , Theme } from './utils' ;
99
10+ import vrDrawerStyles from '../../../lib/components/app-layout/visual-refresh/styles.selectors.js' ;
11+ import vrToolbarDrawerStyles from '../../../lib/components/app-layout/visual-refresh-toolbar/drawer/styles.selectors.js' ;
12+
1013const wrapper = createWrapper ( ) . findAppLayout ( ) ;
1114const findDrawerById = ( wrapper : AppLayoutWrapper , id : string ) => {
1215 return wrapper . find ( `[data-testid="awsui-app-layout-drawer-${ id } "]` ) ;
@@ -117,7 +120,14 @@ describe.each(['classic', 'refresh', 'refresh-toolbar'] as Theme[])('%s', theme
117120 const getScrollPosition = ( ) => page . getBoundingBox ( '[data-testid="drawer-sticky-header"]' ) ;
118121 const scrollBefore = await getScrollPosition ( ) ;
119122
120- await page . elementScrollTo ( wrapper . findActiveDrawer ( ) . toSelector ( ) , { top : 100 } ) ;
123+ const scrollableContainer =
124+ theme === 'classic'
125+ ? wrapper . findActiveDrawer ( ) . toSelector ( )
126+ : theme === 'refresh'
127+ ? `.${ vrDrawerStyles [ 'drawer-content-container' ] } `
128+ : `.${ vrToolbarDrawerStyles [ 'drawer-content-container' ] } ` ;
129+
130+ await page . elementScrollTo ( scrollableContainer , { top : 100 } ) ;
121131 await expect ( getScrollPosition ( ) ) . resolves . toEqual ( scrollBefore ) ;
122132 await expect ( page . isDisplayed ( '[data-testid="drawer-sticky-header"]' ) ) . resolves . toBe ( true ) ;
123133 } )
@@ -316,7 +326,8 @@ describe('Visual refresh toolbar only', () => {
316326 const getScrollPosition = ( ) => page . getBoundingBox ( '[data-testid="drawer-sticky-header"]' ) ;
317327 const scrollBefore = await getScrollPosition ( ) ;
318328
319- await page . elementScrollTo ( wrapper . findActiveDrawer ( ) . toSelector ( ) , { top : 100 } ) ;
329+ const scrollableContainer = `.${ vrToolbarDrawerStyles [ 'drawer-content-container' ] } ` ;
330+ await page . elementScrollTo ( scrollableContainer , { top : 100 } ) ;
320331 await expect ( getScrollPosition ( ) ) . resolves . toEqual ( scrollBefore ) ;
321332 await expect ( page . isDisplayed ( '[data-testid="drawer-sticky-header"]' ) ) . resolves . toBe ( true ) ;
322333 } )
0 commit comments