fix(select): prevent navigation to disabled option from keyboard (#1427)

akveo · May 27, 2019 · 657d8ae · 657d8ae
1 parent ee07fbc
commit 657d8ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/framework/theme/components/select/option.component.ts b/src/framework/theme/components/select/option.component.ts
@@ -32,7 +32,7 @@ import { NbSelectComponent } from './select.component';
   template: `
     <nb-checkbox *ngIf="withCheckbox"
                  [value]="selected"
-                 [disabled]="disabledAttribute"
+                 [disabled]="disabled"
                  aria-hidden="true">
     </nb-checkbox>
     <ng-content></ng-content>
@@ -49,7 +49,7 @@ export class NbOptionComponent<T> implements OnDestroy, NbFocusableOption {
 
   @Input()
   get disabled(): boolean {
-    return this._disabled;
+    return this._disabled || this.disabledByGroup;
   }
   set disabled(value: boolean) {
     this._disabled = convertToBoolProperty(value);
@@ -103,8 +103,7 @@ export class NbOptionComponent<T> implements OnDestroy, NbFocusableOption {
 
   @HostBinding('attr.disabled')
   get disabledAttribute(): '' | null {
-    const disabled = this.disabledByGroup || this.disabled;
-    return disabled ? '' : null;
+    return this.disabled ? '' : null;
   }
 
   @HostBinding('tabIndex')

diff --git a/src/framework/theme/components/select/select.spec.ts b/src/framework/theme/components/select/select.spec.ts
@@ -803,13 +803,4 @@ describe('NbOptionComponent disabled', () => {
     const option = fixture.debugElement.query(By.directive(NbOptionComponent));
     expect(option.attributes.disabled).toEqual('');
   }));
-
-  it('should not change disabled property if group disabled changes', fakeAsync(() => {
-    testComponent.optionGroupDisabled = true;
-    fixture.detectChanges();
-    flush();
-    fixture.detectChanges();
-
-    expect(optionComponent.disabled).toEqual(false);
-  }));
 });