From 172a855f0cd9670c46bb71dd399af0ebae8c012d Mon Sep 17 00:00:00 2001 From: NikolayAlipiev Date: Thu, 6 Dec 2018 14:15:59 +0200 Subject: [PATCH] refactor(igx-combo): revert prev move of property #3243 --- .../src/lib/combo/combo-dropdown.component.ts | 6 ------ .../igniteui-angular/src/lib/combo/combo-item.component.ts | 5 ++--- .../igniteui-angular/src/lib/drop-down/drop-down.base.ts | 6 ++++++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts b/projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts index 1ad4f51ad3e..eb9e410a264 100644 --- a/projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts +++ b/projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts @@ -52,12 +52,6 @@ export class IgxComboDropDownComponent extends IgxDropDownBase implements AfterV this.items.length - 1; } - /** - * @hidden - * @internal - */ - public disableTransitions = false; - /** * Event emitter overrides * diff --git a/projects/igniteui-angular/src/lib/combo/combo-item.component.ts b/projects/igniteui-angular/src/lib/combo/combo-item.component.ts index bd8daaaa574..f1f29759527 100644 --- a/projects/igniteui-angular/src/lib/combo/combo-item.component.ts +++ b/projects/igniteui-angular/src/lib/combo/combo-item.component.ts @@ -8,9 +8,8 @@ import { Input } from '@angular/core'; import { IgxSelectionAPIService } from '../core/selection'; -import { IgxDropDownItemBase } from '../drop-down/drop-down.base'; +import { IgxDropDownBase, IgxDropDownItemBase } from '../drop-down/drop-down.base'; import { IGX_COMBO_COMPONENT, IgxComboBase } from './combo.common'; -import { IgxComboDropDownComponent } from './combo-dropdown.component'; /** @hidden */ @Component({ @@ -36,7 +35,7 @@ export class IgxComboItemComponent extends IgxDropDownItemBase { constructor( @Inject(IGX_COMBO_COMPONENT) private combo: IgxComboBase, - public dropDown: IgxComboDropDownComponent, + public dropDown: IgxDropDownBase, protected elementRef: ElementRef, protected selection: IgxSelectionAPIService ) { diff --git a/projects/igniteui-angular/src/lib/drop-down/drop-down.base.ts b/projects/igniteui-angular/src/lib/drop-down/drop-down.base.ts index cefdd64da0a..4eae00d0b80 100644 --- a/projects/igniteui-angular/src/lib/drop-down/drop-down.base.ts +++ b/projects/igniteui-angular/src/lib/drop-down/drop-down.base.ts @@ -271,6 +271,12 @@ export abstract class IgxDropDownBase implements OnInit, IToggleView { return this.elementRef.nativeElement; } + /** + * @hidden + * @internal + */ + public disableTransitions = false; + /** * Get dropdown's html element of it scroll container */