File tree 3 files changed +61
-38
lines changed
3 files changed +61
-38
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"dist/downshift.cjs.js" : {
3
- "bundled" : 82381 ,
4
- "minified" : 38042 ,
5
- "gzipped" : 9598
3
+ "bundled" : 82078 ,
4
+ "minified" : 38025 ,
5
+ "gzipped" : 9601
6
6
},
7
7
"preact/dist/downshift.cjs.js" : {
8
- "bundled" : 81090 ,
9
- "minified" : 36994 ,
10
- "gzipped" : 9498
8
+ "bundled" : 80787 ,
9
+ "minified" : 36977 ,
10
+ "gzipped" : 9500
11
11
},
12
12
"preact/dist/downshift.umd.min.js" : {
13
- "bundled" : 93792 ,
14
- "minified" : 32003 ,
15
- "gzipped" : 9813
13
+ "bundled" : 93847 ,
14
+ "minified" : 32054 ,
15
+ "gzipped" : 9859
16
16
},
17
17
"preact/dist/downshift.umd.js" : {
18
- "bundled" : 107824 ,
19
- "minified" : 38043 ,
20
- "gzipped" : 11343
18
+ "bundled" : 107911 ,
19
+ "minified" : 38110 ,
20
+ "gzipped" : 11396
21
21
},
22
22
"dist/downshift.umd.min.js" : {
23
- "bundled" : 98431 ,
24
- "minified" : 33321 ,
25
- "gzipped" : 10377
23
+ "bundled" : 98486 ,
24
+ "minified" : 33372 ,
25
+ "gzipped" : 10422
26
26
},
27
27
"dist/downshift.umd.js" : {
28
- "bundled" : 136984 ,
29
- "minified" : 46941 ,
30
- "gzipped" : 13963
28
+ "bundled" : 137071 ,
29
+ "minified" : 47008 ,
30
+ "gzipped" : 14011
31
31
},
32
32
"dist/downshift.esm.js" : {
33
- "bundled" : 81619 ,
34
- "minified" : 37532 ,
35
- "gzipped" : 9478 ,
33
+ "bundled" : 81697 ,
34
+ "minified" : 37716 ,
35
+ "gzipped" : 9541 ,
36
36
"treeshaked" : {
37
37
"rollup" : {
38
38
"code" : 629 ,
39
39
"import_statements" : 303
40
40
},
41
41
"webpack" : {
42
- "code" : 27541
42
+ "code" : 27590
43
43
}
44
44
}
45
45
},
46
46
"preact/dist/downshift.esm.js" : {
47
- "bundled" : 80309 ,
48
- "minified" : 36465 ,
49
- "gzipped" : 9374 ,
47
+ "bundled" : 80387 ,
48
+ "minified" : 36649 ,
49
+ "gzipped" : 9439 ,
50
50
"treeshaked" : {
51
51
"rollup" : {
52
52
"code" : 630 ,
53
53
"import_statements" : 304
54
54
},
55
55
"webpack" : {
56
- "code" : 27584
56
+ "code" : 27633
57
57
}
58
58
}
59
59
}
Original file line number Diff line number Diff line change @@ -76,6 +76,16 @@ describe('getToggleButtonProps', () => {
76
76
77
77
expect ( toggleButtonProps [ 'aria-expanded' ] ) . toEqual ( true )
78
78
} )
79
+
80
+ test ( 'omit event handlers when disabled' , ( ) => {
81
+ const { result} = setupHook ( )
82
+ const toggleButtonProps = result . current . getToggleButtonProps ( {
83
+ disabled : true ,
84
+ } )
85
+
86
+ expect ( toggleButtonProps . onClick ) . toBeUndefined ( )
87
+ expect ( toggleButtonProps . onKeyDown ) . toBeUndefined ( )
88
+ } )
79
89
} )
80
90
81
91
describe ( 'user props' , ( ) => {
Original file line number Diff line number Diff line change @@ -360,18 +360,31 @@ function useSelect(userProps = {}) {
360
360
refKey = 'ref' ,
361
361
ref,
362
362
...rest
363
- } = { } ) => ( {
364
- [ refKey ] : handleRefs ( ref , toggleButtonNode => {
365
- toggleButtonRef . current = toggleButtonNode
366
- } ) ,
367
- id : toggleButtonId ,
368
- 'aria-haspopup' : 'listbox' ,
369
- 'aria-expanded' : isOpen ,
370
- 'aria-labelledby' : `${ labelId } ${ toggleButtonId } ` ,
371
- onClick : callAllEventHandlers ( onClick , toggleButtonHandleClick ) ,
372
- onKeyDown : callAllEventHandlers ( onKeyDown , toggleButtonHandleKeyDown ) ,
373
- ...rest ,
374
- } )
363
+ } = { } ) => {
364
+ const toggleProps = {
365
+ [ refKey ] : handleRefs ( ref , toggleButtonNode => {
366
+ toggleButtonRef . current = toggleButtonNode
367
+ } ) ,
368
+ id : toggleButtonId ,
369
+ 'aria-haspopup' : 'listbox' ,
370
+ 'aria-expanded' : isOpen ,
371
+ 'aria-labelledby' : `${ labelId } ${ toggleButtonId } ` ,
372
+ ...rest ,
373
+ }
374
+
375
+ if ( ! rest . disabled ) {
376
+ toggleProps . onClick = callAllEventHandlers (
377
+ onClick ,
378
+ toggleButtonHandleClick ,
379
+ )
380
+ toggleProps . onKeyDown = callAllEventHandlers (
381
+ onKeyDown ,
382
+ toggleButtonHandleKeyDown ,
383
+ )
384
+ }
385
+
386
+ return toggleProps
387
+ }
375
388
const getItemProps = ( {
376
389
item,
377
390
index,
You can’t perform that action at this time.
0 commit comments