File tree 3 files changed +45
-31
lines changed
3 files changed +45
-31
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"dist/downshift.cjs.js" : {
3
- "bundled" : 82078 ,
4
- "minified" : 38025 ,
5
- "gzipped" : 9601
3
+ "bundled" : 82171 ,
4
+ "minified" : 38051 ,
5
+ "gzipped" : 9612
6
6
},
7
7
"preact/dist/downshift.cjs.js" : {
8
- "bundled" : 80787 ,
9
- "minified" : 36977 ,
10
- "gzipped" : 9500
8
+ "bundled" : 80880 ,
9
+ "minified" : 37003 ,
10
+ "gzipped" : 9510
11
11
},
12
12
"preact/dist/downshift.umd.min.js" : {
13
- "bundled" : 93847 ,
14
- "minified" : 32054 ,
15
- "gzipped" : 9859
13
+ "bundled" : 93946 ,
14
+ "minified" : 32080 ,
15
+ "gzipped" : 9869
16
16
},
17
17
"preact/dist/downshift.umd.js" : {
18
- "bundled" : 107911 ,
19
- "minified" : 38110 ,
20
- "gzipped" : 11396
18
+ "bundled" : 108010 ,
19
+ "minified" : 38136 ,
20
+ "gzipped" : 11406
21
21
},
22
22
"dist/downshift.umd.min.js" : {
23
- "bundled" : 98486 ,
24
- "minified" : 33372 ,
25
- "gzipped" : 10422
23
+ "bundled" : 98585 ,
24
+ "minified" : 33398 ,
25
+ "gzipped" : 10431
26
26
},
27
27
"dist/downshift.umd.js" : {
28
- "bundled" : 137071 ,
29
- "minified" : 47008 ,
30
- "gzipped" : 14011
28
+ "bundled" : 137170 ,
29
+ "minified" : 47034 ,
30
+ "gzipped" : 14022
31
31
},
32
32
"dist/downshift.esm.js" : {
33
- "bundled" : 81697 ,
34
- "minified" : 37716 ,
35
- "gzipped" : 9541 ,
33
+ "bundled" : 81790 ,
34
+ "minified" : 37742 ,
35
+ "gzipped" : 9551 ,
36
36
"treeshaked" : {
37
37
"rollup" : {
38
38
"code" : 629 ,
39
39
"import_statements" : 303
40
40
},
41
41
"webpack" : {
42
- "code" : 27590
42
+ "code" : 27616
43
43
}
44
44
}
45
45
},
46
46
"preact/dist/downshift.esm.js" : {
47
- "bundled" : 80387 ,
48
- "minified" : 36649 ,
49
- "gzipped" : 9439 ,
47
+ "bundled" : 80480 ,
48
+ "minified" : 36675 ,
49
+ "gzipped" : 9449 ,
50
50
"treeshaked" : {
51
51
"rollup" : {
52
52
"code" : 630 ,
53
53
"import_statements" : 304
54
54
},
55
55
"webpack" : {
56
- "code" : 27633
56
+ "code" : 27659
57
57
}
58
58
}
59
59
}
Original file line number Diff line number Diff line change @@ -50,6 +50,17 @@ describe('getItemProps', () => {
50
50
51
51
expect ( itemProps [ 'aria-selected' ] ) . toBeUndefined ( )
52
52
} )
53
+
54
+ test ( 'omit event handlers when disabled' , ( ) => {
55
+ const { result} = setupHook ( )
56
+ const itemProps = result . current . getItemProps ( {
57
+ index : 0 ,
58
+ disabled : true ,
59
+ } )
60
+
61
+ expect ( itemProps . onMouseMove ) . toBeUndefined ( )
62
+ expect ( itemProps . onClick ) . toBeUndefined ( )
63
+ } )
53
64
} )
54
65
55
66
describe ( 'user props' , ( ) => {
Original file line number Diff line number Diff line change @@ -398,7 +398,7 @@ function useSelect(userProps = {}) {
398
398
if ( itemIndex < 0 ) {
399
399
throw new Error ( 'Pass either item or item index in getItemProps!' )
400
400
}
401
- return {
401
+ const itemProps = {
402
402
[ refKey ] : handleRefs ( ref , itemNode => {
403
403
if ( itemNode ) {
404
404
itemRefs . current . push ( itemNode )
@@ -407,12 +407,15 @@ function useSelect(userProps = {}) {
407
407
role : 'option' ,
408
408
...( itemIndex === highlightedIndex && { 'aria-selected' : true } ) ,
409
409
id : getItemId ( itemIndex ) ,
410
- onMouseMove : callAllEventHandlers ( onMouseMove , ( ) =>
411
- itemHandleMouseMove ( itemIndex ) ,
412
- ) ,
413
- onClick : callAllEventHandlers ( onClick , ( ) => itemHandleClick ( itemIndex ) ) ,
414
410
...rest ,
411
+ } ;
412
+
413
+ if ( ! rest . disabled ) {
414
+ itemProps . onMouseMove = callAllEventHandlers ( onMouseMove , ( ) => itemHandleMouseMove ( itemIndex ) )
415
+ itemProps . onClick = callAllEventHandlers ( onClick , ( ) => itemHandleClick ( itemIndex ) )
415
416
}
417
+
418
+ return itemProps ;
416
419
}
417
420
418
421
return {
You can’t perform that action at this time.
0 commit comments