@@ -283,8 +283,8 @@ export class MgtTeamsChannelPicker extends MgtTemplatedTaskComponent {
283283 @click=${ this . handleInputClick }
284284 @keydown=${ this . handleInputKeydown }
285285 >
286- <div tabindex="0" slot="start" style="width: max-content;" @keydown=${ this . handleStartSlotKeydown } >${ this . renderSelected ( ) } </div>
287- <div tabindex="0" slot="end" @keydown=${ this . handleChevronKeydown } >${ this . renderChevrons ( ) } ${ this . renderCloseButton ( ) } </div>
286+ <div slot="start" style="width: max-content;" @keydown=${ this . handleStartSlotKeydown } >${ this . renderSelected ( ) } </div>
287+ <div slot="end" @keydown=${ this . handleChevronKeydown } >${ this . renderChevrons ( ) } ${ this . renderCloseButton ( ) } </div>
288288 </fluent-text-field>
289289 <fluent-card
290290 class=${ classMap ( dropdownClasses ) }
@@ -380,9 +380,13 @@ export class MgtTeamsChannelPicker extends MgtTemplatedTaskComponent {
380380 */
381381 protected renderSearchIcon ( ) {
382382 return html `
383- <div class="search-icon" @keydown=${ this . handleStartSlotKeydown } >
384- ${ getSvg ( SvgIcon . Search , '#252424' ) }
385- </div>
383+ <fluent-button
384+ appearance="outline"
385+ class="search-icon"
386+ aria-label=${ this . strings . searchButtonAriaLabel }
387+ @click=${ this . handleStartSlotKeydown } >
388+ ${ getSvg ( SvgIcon . Search ) }
389+ </fluent-button>
386390 ` ;
387391 }
388392
@@ -940,6 +944,16 @@ export class MgtTeamsChannelPicker extends MgtTemplatedTaskComponent {
940944 handleChevronKeydown = ( e : KeyboardEvent ) => {
941945 if ( e . key === 'Tab' ) {
942946 this . blurPicker ( ) ;
947+ } else if ( e . key === 'Enter' ) {
948+ e . preventDefault ( ) ;
949+
950+ // Determine which chevron was pressed and handle accordingly
951+ const target = e . target as HTMLElement ;
952+ if ( target . classList . contains ( 'down-chevron' ) ) {
953+ this . gainedFocus ( ) ;
954+ } else if ( target . classList . contains ( 'up-chevron' ) ) {
955+ this . lostFocus ( ) ;
956+ }
943957 }
944958 } ;
945959
0 commit comments