Skip to content

Commit c72b380

Browse files
committed
chore(select): Address comments -1 #5911
1 parent a993d94 commit c72b380

File tree

6 files changed

+14
-11
lines changed

6 files changed

+14
-11
lines changed

projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
2929
super(elementRef, cdr, selection, _displayDensityOptions);
3030
}
3131

32-
protected get scrollContainer() {
32+
/** @hidden @internal */
33+
public get scrollContainer() {
3334
return this.virtDir.dc.location.nativeElement;
3435
}
3536

projects/igniteui-angular/src/lib/drop-down/drop-down.base.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ export class IgxDropDownBaseDirective extends DisplayDensityBase implements IDro
2727
protected _id = `igx-drop-down-${NEXT_ID++}`;
2828

2929
/**
30+
* @hidden @internal
3031
* Get dropdown's html element of its scroll container
3132
*/
32-
protected get scrollContainer() {
33+
public get scrollContainer() {
3334
return this.element;
3435
}
3536

projects/igniteui-angular/src/lib/drop-down/drop-down.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ export class IgxDropDownComponent extends IgxDropDownBaseDirective implements ID
205205
return this.toggleDirective.collapsed;
206206
}
207207

208-
protected get scrollContainer() {
208+
/** @hidden @internal */
209+
public get scrollContainer() {
209210
return this.scrollContainerRef.nativeElement;
210211
}
211212

projects/igniteui-angular/src/lib/select/select-positioning-strategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export class SelectPositioningStrategy extends BaseFitPositionStrategy implement
170170
selectFit.styles = {};
171171
selectFit.itemElement = this.getInteractionItemElement();
172172
selectFit.itemHeight = itemHeight;
173-
selectFit.dropDownList = this.select.getListItemsContainer();
173+
selectFit.dropDownList = this.select.scrollContainer;
174174
selectFit.targetRect = targetRect;
175175
selectFit.contentElementRect = contentElementRect;
176176
selectFit.inputElement = this.select.getEditElement();
@@ -209,7 +209,7 @@ export class SelectPositioningStrategy extends BaseFitPositionStrategy implement
209209
itemElement = this.select.selectedItem.element.nativeElement;
210210
// D.P. Feb 22 2019, #3921 Force item scroll before measuring in IE11, due to base scrollToItem delay
211211
if (isIE()) {
212-
this.select.getListItemsContainer().scrollTop = this.select.calculateScrollPosition(this.select.selectedItem);
212+
this.select.scrollContainer.scrollTop = this.select.calculateScrollPosition(this.select.selectedItem);
213213
}
214214
} else {
215215
itemElement = this.select.getFirstItemElement();

projects/igniteui-angular/src/lib/select/select.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
<ng-content *ngTemplateOutlet="headerTemplate"></ng-content>
3535
</div>
3636

37-
<div #scrollContainer class="igx-drop-down__list--select" style="overflow-y: auto;"
38-
[style.maxHeight]="maxHeight" [attr.id]="this.listId" role="listbox">
37+
<div #scrollContainer class="igx-drop-down__list--select" [style.maxHeight]="maxHeight" [attr.id]="this.listId" role="listbox">
3938
<ng-content select="igx-select-item, igx-select-item-group">
4039
</ng-content>
4140
</div>

projects/igniteui-angular/src/lib/services/overlay/position/base-fit-position-strategy.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrate
99
position(contentElement: HTMLElement, size: Size, document?: Document, initialCall?: boolean): void {
1010
const targetRect = Util.getTargetRect(this.settings);
1111
const contentElementRect = contentElement.getBoundingClientRect();
12-
let exposedConnectedFit = {};
12+
// let exposedConnectedFit = {};
13+
const connectedFit: ConnectedFit = {};
1314
if (initialCall) {
14-
const connectedFit: ConnectedFit = {};
1515
connectedFit.targetRect = targetRect;
1616
connectedFit.contentElementRect = contentElementRect;
1717
this._initialSettings = this._initialSettings || Object.assign({}, this.settings);
@@ -21,9 +21,10 @@ export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrate
2121
if (!connectedFit.fitHorizontal || !connectedFit.fitVertical) {
2222
this.fitInViewport(contentElement, connectedFit);
2323
}
24-
exposedConnectedFit = connectedFit;
24+
//exposedConnectedFit = connectedFit;
2525
}
26-
this.setStyle(contentElement, targetRect, contentElementRect, exposedConnectedFit);
26+
// this.setStyle(contentElement, targetRect, contentElementRect, exposedConnectedFit);
27+
this.setStyle(contentElement, targetRect, contentElementRect, connectedFit);
2728
}
2829

2930
/**

0 commit comments

Comments
 (0)