@@ -53,7 +53,7 @@ describe('Listbox', () => {
5353 disabled ?: boolean ;
5454 readonly ?: boolean ;
5555 value ?: number [ ] ;
56- skipDisabled ?: boolean ;
56+ softDisabled ?: boolean ;
5757 focusMode ?: 'roving' | 'activedescendant' ;
5858 multi ?: boolean ;
5959 wrap ?: boolean ;
@@ -74,7 +74,7 @@ describe('Listbox', () => {
7474 if ( opts ?. disabled !== undefined ) testComponent . disabled = opts . disabled ;
7575 if ( opts ?. readonly !== undefined ) testComponent . readonly = opts . readonly ;
7676 if ( opts ?. value !== undefined ) testComponent . value = opts . value ;
77- if ( opts ?. skipDisabled !== undefined ) testComponent . skipDisabled = opts . skipDisabled ;
77+ if ( opts ?. softDisabled !== undefined ) testComponent . softDisabled = opts . softDisabled ;
7878 if ( opts ?. focusMode !== undefined ) testComponent . focusMode = opts . focusMode ;
7979 if ( opts ?. multi !== undefined ) testComponent . multi = opts . multi ;
8080 if ( opts ?. wrap !== undefined ) testComponent . wrap = opts . wrap ;
@@ -593,22 +593,22 @@ describe('Listbox', () => {
593593 expect ( isFocused ( 1 ) ) . toBe ( true ) ;
594594 } ) ;
595595
596- it ( 'should skip disabled options with ArrowDown (skipDisabled="true ")' , ( ) => {
596+ it ( 'should skip disabled options with ArrowDown (softDisabled="false ")' , ( ) => {
597597 setupListbox ( {
598598 focusMode,
599599 orientation : 'vertical' ,
600- skipDisabled : true ,
600+ softDisabled : false ,
601601 disabledOptions : [ 1 , 2 ] ,
602602 } ) ;
603603 down ( ) ;
604604 expect ( isFocused ( 3 ) ) . toBe ( true ) ;
605605 } ) ;
606606
607- it ( 'should not skip disabled options with ArrowDown (skipDisabled="false ")' , ( ) => {
607+ it ( 'should not skip disabled options with ArrowDown (softDisabled="true ")' , ( ) => {
608608 setupListbox ( {
609609 focusMode,
610610 orientation : 'vertical' ,
611- skipDisabled : false ,
611+ softDisabled : true ,
612612 disabledOptions : [ 1 , 2 ] ,
613613 } ) ;
614614 down ( ) ;
@@ -641,7 +641,7 @@ describe('Listbox', () => {
641641 } ) ;
642642
643643 it ( 'should move focus to the clicked disabled option' , ( ) => {
644- setupListbox ( { focusMode, disabledOptions : [ 2 ] , skipDisabled : false } ) ;
644+ setupListbox ( { focusMode, disabledOptions : [ 2 ] , softDisabled : true } ) ;
645645 click ( 2 ) ;
646646 expect ( isFocused ( 2 ) ) . toBe ( true ) ;
647647 } ) ;
@@ -696,14 +696,14 @@ describe('Listbox', () => {
696696 expect ( isFocused ( 0 ) ) . toBe ( true ) ;
697697 } ) ) ;
698698
699- it ( 'should skip disabled options with typeahead (skipDisabled=true )' , ( ) => {
700- setupListbox ( { options : getOptions ( ) , focusMode, disabledOptions : [ 2 ] , skipDisabled : true } ) ;
699+ it ( 'should skip disabled options with typeahead (softDisabled=false )' , ( ) => {
700+ setupListbox ( { options : getOptions ( ) , focusMode, disabledOptions : [ 2 ] , softDisabled : false } ) ;
701701 type ( 'B' ) ;
702702 expect ( isFocused ( 3 ) ) . toBe ( true ) ;
703703 } ) ;
704704
705- it ( 'should focus disabled options with typeahead if skipDisabled=false ' , ( ) => {
706- setupListbox ( { options : getOptions ( ) , focusMode, disabledOptions : [ 2 ] , skipDisabled : false } ) ;
705+ it ( 'should focus disabled options with typeahead if softDisabled=true ' , ( ) => {
706+ setupListbox ( { options : getOptions ( ) , focusMode, disabledOptions : [ 2 ] , softDisabled : true } ) ;
707707 type ( 'B' ) ;
708708 expect ( isFocused ( 2 ) ) . toBe ( true ) ;
709709 } ) ;
@@ -749,7 +749,7 @@ interface TestOption {
749749 [readonly]="readonly"
750750 [focusMode]="focusMode"
751751 [orientation]="orientation"
752- [skipDisabled ]="skipDisabled "
752+ [softDisabled ]="softDisabled "
753753 [multi]="multi"
754754 [wrap]="wrap"
755755 [selectionMode]="selectionMode"
@@ -773,7 +773,7 @@ class ListboxExample {
773773 value : number [ ] = [ ] ;
774774 disabled = false ;
775775 readonly = false ;
776- skipDisabled = true ;
776+ softDisabled = false ;
777777 focusMode : 'roving' | 'activedescendant' = 'roving' ;
778778 orientation : 'vertical' | 'horizontal' = 'vertical' ;
779779 multi = false ;
0 commit comments