@@ -537,7 +537,6 @@ export class Slider extends FASTElement implements SliderConfiguration {
537537 this . setDisabledSideEffect ( this . disabled ) ;
538538 this . updateStepMultiplier ( ) ;
539539 this . setupTrackConstraints ( ) ;
540- this . setupListeners ( ) ;
541540 this . setupDefaultValue ( ) ;
542541 this . setSliderPosition ( ) ;
543542
@@ -554,8 +553,6 @@ export class Slider extends FASTElement implements SliderConfiguration {
554553 public disconnectedCallback ( ) : void {
555554 super . disconnectedCallback ( ) ;
556555
557- this . setupListeners ( true ) ;
558-
559556 Observable . getNotifier ( this ) . unsubscribe ( this , 'max' ) ;
560557 Observable . getNotifier ( this ) . unsubscribe ( this , 'min' ) ;
561558 Observable . getNotifier ( this ) . unsubscribe ( this , 'step' ) ;
@@ -593,9 +590,9 @@ export class Slider extends FASTElement implements SliderConfiguration {
593590 this . value = decrementedValString ;
594591 }
595592
596- public keypressHandler = ( event : KeyboardEvent ) : void => {
593+ public handleKeydown ( event : KeyboardEvent ) : boolean {
597594 if ( this . disabled ) {
598- return ;
595+ return true ;
599596 }
600597
601598 switch ( event . key ) {
@@ -628,7 +625,9 @@ export class Slider extends FASTElement implements SliderConfiguration {
628625 }
629626 break ;
630627 }
631- } ;
628+
629+ return true ;
630+ }
632631
633632 /**
634633 * Places the thumb based on the current value
@@ -666,15 +665,6 @@ export class Slider extends FASTElement implements SliderConfiguration {
666665 }
667666 } ;
668667
669- private setupListeners = ( remove : boolean = false ) : void => {
670- //TODO Bug: https://github.com/microsoft/fluentui/issues/30087
671- this . addEventListener ( 'keydown' , this . keypressHandler ) ;
672-
673- if ( remove ) {
674- this . removeEventListener ( 'keydown' , this . keypressHandler ) ;
675- }
676- } ;
677-
678668 private get midpoint ( ) : string {
679669 return `${ this . convertToConstrainedValue ( ( this . maxAsNumber + this . minAsNumber ) / 2 ) } ` ;
680670 }
@@ -698,13 +688,14 @@ export class Slider extends FASTElement implements SliderConfiguration {
698688 * Handle mouse moves during a thumb drag operation
699689 * If the event handler is null it removes the events
700690 */
701- public handleThumbPointerDown = ( event : PointerEvent | null ) : void => {
691+ public handleThumbPointerDown = ( event : PointerEvent | null ) : boolean => {
702692 const windowFn = event !== null ? window . addEventListener : window . removeEventListener ;
703693 windowFn ( 'pointerup' , this . handleWindowPointerUp ) ;
704694 windowFn ( 'pointermove' , this . handlePointerMove , { passive : true } ) ;
705695 windowFn ( 'touchmove' , this . handlePointerMove , { passive : true } ) ;
706696 windowFn ( 'touchend' , this . handleWindowPointerUp ) ;
707697 this . isDragging = event !== null ;
698+ return true ;
708699 } ;
709700
710701 /**
@@ -787,6 +778,7 @@ export class Slider extends FASTElement implements SliderConfiguration {
787778 this . value = `${ this . calculateNewValue ( controlValue ) } ` ;
788779 }
789780 }
781+ return true ;
790782 } ;
791783
792784 private convertToConstrainedValue ( value : number ) : number {
0 commit comments