@@ -7,7 +7,8 @@ import includes from 'array-includes';
77import JSXAttributeMock from './JSXAttributeMock' ;
88import JSXElementMock from './JSXElementMock' ;
99
10- import type { TJSXElementMock } from './JSXElementMock' ;
10+ import type { JSXElementMockType } from './JSXElementMock' ;
11+ import type { JSXAttributeMockType } from './JSXAttributeMock' ;
1112
1213const domElements = [ ...dom . keys ( ) ] ;
1314const roleNames = [ ...roles . keys ( ) ] ;
@@ -147,7 +148,7 @@ const nonInteractiveRoles = roleNames
147148 // aria-activedescendant, thus in practice we treat it as a widget.
148149 . filter ( ( role ) => ! includes ( [ 'toolbar' ] , role ) ) ;
149150
150- export function genElementSymbol ( openingElement : Object ) {
151+ export function genElementSymbol ( openingElement : Object ) : string {
151152 return (
152153 openingElement . name . name + ( openingElement . attributes . length > 0
153154 ? `${ openingElement . attributes
@@ -158,8 +159,8 @@ export function genElementSymbol(openingElement: Object) {
158159 ) ;
159160}
160161
161- export function genInteractiveElements ( ) : Array < TJSXElementMock > {
162- return Object . keys ( interactiveElementsMap ) . map ( ( elementSymbol : string ) : TJSXElementMock => {
162+ export function genInteractiveElements ( ) : Array < JSXElementMockType > {
163+ return Object . keys ( interactiveElementsMap ) . map ( ( elementSymbol : string ) : JSXElementMockType => {
163164 const bracketIndex = elementSymbol . indexOf ( '[' ) ;
164165 let name = elementSymbol ;
165166 if ( bracketIndex > - 1 ) {
@@ -170,15 +171,15 @@ export function genInteractiveElements(): Array<TJSXElementMock> {
170171 } ) ;
171172}
172173
173- export function genInteractiveRoleElements ( ) : Array < TJSXElementMock > {
174- return [ ...interactiveRoles , 'button article' , 'fakerole button article' ] . map ( ( value ) : TJSXElementMock => JSXElementMock (
174+ export function genInteractiveRoleElements ( ) : Array < JSXElementMockType > {
175+ return [ ...interactiveRoles , 'button article' , 'fakerole button article' ] . map ( ( value ) : JSXElementMockType => JSXElementMock (
175176 'div' ,
176177 [ JSXAttributeMock ( 'role' , value ) ] ,
177178 ) ) ;
178179}
179180
180- export function genNonInteractiveElements ( ) : Array < TJSXElementMock > {
181- return Object . keys ( nonInteractiveElementsMap ) . map ( ( elementSymbol ) : TJSXElementMock => {
181+ export function genNonInteractiveElements ( ) : Array < JSXElementMockType > {
182+ return Object . keys ( nonInteractiveElementsMap ) . map ( ( elementSymbol ) : JSXElementMockType => {
182183 const bracketIndex = elementSymbol . indexOf ( '[' ) ;
183184 let name = elementSymbol ;
184185 if ( bracketIndex > - 1 ) {
@@ -189,25 +190,25 @@ export function genNonInteractiveElements(): Array<TJSXElementMock> {
189190 } ) ;
190191}
191192
192- export function genNonInteractiveRoleElements ( ) {
193+ export function genNonInteractiveRoleElements ( ) : Array < JSXElementMockType > {
193194 return [
194195 ...nonInteractiveRoles ,
195196 'article button' ,
196197 'fakerole article button' ,
197198 ] . map ( ( value ) => JSXElementMock ( 'div' , [ JSXAttributeMock ( 'role' , value ) ] ) ) ;
198199}
199200
200- export function genAbstractRoleElements ( ) {
201+ export function genAbstractRoleElements ( ) : Array < JSXElementMockType > {
201202 return abstractRoles . map ( ( value ) => JSXElementMock ( 'div' , [ JSXAttributeMock ( 'role' , value ) ] ) ) ;
202203}
203204
204- export function genNonAbstractRoleElements ( ) {
205+ export function genNonAbstractRoleElements(): Array < JSXElementMockType > {
205206 return nonAbstractRoles . map ( ( value ) => JSXElementMock ( 'div' , [ JSXAttributeMock ( 'role' , value ) ] ) ) ;
206207}
207208
208- export function genIndeterminantInteractiveElements ( ) : Array < TJSXElementMock > {
209+ export function genIndeterminantInteractiveElements(): Array< JSXElementMockType > {
209210 return Object . keys ( indeterminantInteractiveElementsMap ) . map ( ( name ) => {
210- const attributes = indeterminantInteractiveElementsMap [ name ] . map ( ( { prop, value } ) : TJSXElementMock => JSXAttributeMock ( prop , value ) ) ;
211+ const attributes = indeterminantInteractiveElementsMap [ name ] . map ( ( { prop, value } ) : JSXAttributeMockType => JSXAttributeMock ( prop , value ) ) ;
211212 return JSXElementMock ( name , attributes ) ;
212213 } ) ;
213214}
0 commit comments