@@ -131,9 +131,13 @@ export class ListboxPattern<V> {
131
131
. on ( Modifier . Shift , 'Enter' , ( ) => this . _updateSelection ( { selectFromAnchor : true } ) )
132
132
. on ( Modifier . Shift , this . prevKey , ( ) => this . prev ( { toggle : true } ) )
133
133
. on ( Modifier . Shift , this . nextKey , ( ) => this . next ( { toggle : true } ) )
134
- . on ( Modifier . Ctrl | Modifier . Shift , 'Home' , ( ) => this . first ( { selectFromActive : true } ) )
135
- . on ( Modifier . Ctrl | Modifier . Shift , 'End' , ( ) => this . last ( { selectFromActive : true } ) )
136
- . on ( Modifier . Ctrl , 'A' , ( ) => this . _updateSelection ( { selectAll : true } ) ) ;
134
+ . on ( [ Modifier . Ctrl , Modifier . Meta ] , 'A' , ( ) => this . _updateSelection ( { selectAll : true } ) )
135
+ . on ( [ Modifier . Ctrl | Modifier . Shift , Modifier . Meta | Modifier . Shift ] , 'Home' , ( ) =>
136
+ this . first ( { selectFromActive : true } ) ,
137
+ )
138
+ . on ( [ Modifier . Ctrl | Modifier . Shift , Modifier . Meta | Modifier . Shift ] , 'End' , ( ) =>
139
+ this . last ( { selectFromActive : true } ) ,
140
+ ) ;
137
141
}
138
142
139
143
if ( ! this . followFocus ( ) && this . inputs . multi ( ) ) {
@@ -148,12 +152,12 @@ export class ListboxPattern<V> {
148
152
149
153
if ( this . inputs . multi ( ) && this . followFocus ( ) ) {
150
154
manager
151
- . on ( Modifier . Ctrl , this . prevKey , ( ) => this . prev ( ) )
152
- . on ( Modifier . Ctrl , this . nextKey , ( ) => this . next ( ) )
153
- . on ( Modifier . Ctrl , ' ' , ( ) => this . _updateSelection ( { toggle : true } ) )
154
- . on ( Modifier . Ctrl , 'Enter' , ( ) => this . _updateSelection ( { toggle : true } ) )
155
- . on ( Modifier . Ctrl , 'Home' , ( ) => this . first ( ) ) // TODO: Not in spec but prob should be.
156
- . on ( Modifier . Ctrl , 'End' , ( ) => this . last ( ) ) ; // TODO: Not in spec but prob should be.
155
+ . on ( [ Modifier . Ctrl , Modifier . Meta ] , this . prevKey , ( ) => this . prev ( ) )
156
+ . on ( [ Modifier . Ctrl , Modifier . Meta ] , this . nextKey , ( ) => this . next ( ) )
157
+ . on ( [ Modifier . Ctrl , Modifier . Meta ] , ' ' , ( ) => this . _updateSelection ( { toggle : true } ) )
158
+ . on ( [ Modifier . Ctrl , Modifier . Meta ] , 'Enter' , ( ) => this . _updateSelection ( { toggle : true } ) )
159
+ . on ( [ Modifier . Ctrl , Modifier . Meta ] , 'Home' , ( ) => this . first ( ) ) // TODO: Not in spec but prob should be.
160
+ . on ( [ Modifier . Ctrl , Modifier . Meta ] , 'End' , ( ) => this . last ( ) ) ; // TODO: Not in spec but prob should be.
157
161
}
158
162
159
163
return manager ;
0 commit comments