@@ -11,11 +11,7 @@ import {
1111 SingleTabStopNavigationReset ,
1212 useSingleTabStopNavigation ,
1313} from '../' ;
14- import {
15- setTestSingleTabStopNavigationTarget ,
16- renderWithSingleTabStopNavigation ,
17- TestSingleTabStopNavigationProvider ,
18- } from '../test-helpers' ;
14+ import { setTestSingleTabStopNavigationTarget , TestSingleTabStopNavigationProvider } from '../test-helpers' ;
1915
2016// Simple STSN subscriber component
2117function Button ( props : React . HTMLAttributes < HTMLButtonElement > ) {
@@ -69,22 +65,25 @@ test('does not override tab index when keyboard navigation is not active', () =>
6965} ) ;
7066
7167test ( '(legacy coverage) does not override tab index when keyboard navigation is not active' , ( ) => {
72- renderWithSingleTabStopNavigation ( < Button id = "button" /> , { navigationActive : false } ) ;
68+ render (
69+ < TestSingleTabStopNavigationProvider navigationActive = { false } >
70+ < Button id = "button" />
71+ </ TestSingleTabStopNavigationProvider >
72+ ) ;
7373 expect ( document . querySelector ( '#button' ) ) . not . toHaveAttribute ( 'tabIndex' ) ;
7474} ) ;
7575
7676test ( 'does not override tab index for suppressed elements' , ( ) => {
77- const { setCurrentTarget } = renderWithSingleTabStopNavigation (
78- < div >
77+ render (
78+ < TestSingleTabStopNavigationProvider navigationActive = { true } >
7979 < Button id = "button1" />
8080 < Button id = "button2" />
8181 < Button id = "button3" tabIndex = { - 1 } />
8282 < Button id = "button4" />
8383 < Button id = "button5" tabIndex = { - 1 } />
84- </ div > ,
85- { navigationActive : true }
84+ </ TestSingleTabStopNavigationProvider >
8685 ) ;
87- setCurrentTarget ( document . querySelector ( '#button1' ) , [
86+ setTestSingleTabStopNavigationTarget ( document . querySelector ( '#button1' ) , [
8887 document . querySelector ( '#button1' ) ,
8988 document . querySelector ( '#button2' ) ,
9089 document . querySelector ( '#button3' ) ,
@@ -109,25 +108,25 @@ test('overrides tab index when keyboard navigation is active', () => {
109108} ) ;
110109
111110test ( '(legacy coverage) overrides tab index when keyboard navigation is active' , ( ) => {
112- const { setCurrentTarget } = renderWithSingleTabStopNavigation (
113- < div >
111+ render (
112+ < TestSingleTabStopNavigationProvider navigationActive = { true } >
114113 < Button id = "button1" />
115114 < Button id = "button2" />
116- </ div >
115+ </ TestSingleTabStopNavigationProvider >
117116 ) ;
118- setCurrentTarget ( document . querySelector ( '#button1' ) ) ;
117+ setTestSingleTabStopNavigationTarget ( document . querySelector ( '#button1' ) ) ;
119118 expect ( document . querySelector ( '#button1' ) ) . toHaveAttribute ( 'tabIndex' , '0' ) ;
120119 expect ( document . querySelector ( '#button2' ) ) . toHaveAttribute ( 'tabIndex' , '-1' ) ;
121120} ) ;
122121
123122test ( 'does not override explicit tab index with 0' , ( ) => {
124- const { setCurrentTarget } = renderWithSingleTabStopNavigation (
125- < div >
123+ render (
124+ < TestSingleTabStopNavigationProvider navigationActive = { true } >
126125 < Button id = "button1" tabIndex = { - 2 } />
127126 < Button id = "button2" tabIndex = { - 2 } />
128- </ div >
127+ </ TestSingleTabStopNavigationProvider >
129128 ) ;
130- setCurrentTarget ( document . querySelector ( '#button1' ) ) ;
129+ setTestSingleTabStopNavigationTarget ( document . querySelector ( '#button1' ) ) ;
131130 expect ( document . querySelector ( '#button1' ) ) . toHaveAttribute ( 'tabIndex' , '-2' ) ;
132131 expect ( document . querySelector ( '#button2' ) ) . toHaveAttribute ( 'tabIndex' , '-2' ) ;
133132} ) ;
0 commit comments