Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(date-picker): Fixed import and hide function #3034 #3961

Merged
merged 3 commits into from
Feb 20, 2019
Merged

fix(date-picker): Fixed import and hide function #3034 #3961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cbff7a
fix(date-picker): Fixed import and hide function #3034
sboykova Feb 20, 2019
894cfcc
fix(date-picker): Fixes in date picker #3034
sboykova Feb 20, 2019
63ae024
fix(date-picker): Fixed Circular dependency detected #3034
sboykova Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/igniteui-angular/src/lib/date-picker/calendar-container.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, ViewChild, Input, Output, EventEmitter, HostListener, HostBinding } from '@angular/core';
import { DatePickerInteractionMode, IgxCalendarComponent } from 'igniteui-angular';
import { DatePickerInteractionMode } from './date-picker.component';
import { IgxCalendarComponent } from '../calendar';

/**
* @hidden
Expand Down
7 changes: 5 additions & 2 deletions projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
HorizontalAlignment,
PositionSettings,
ConnectedPositioningStrategy
} from '../services';
} from '../services/index';
import { DateRangeDescriptor } from '../core/dates/dateRange';
import { EditorProvider } from '../core/edit-provider';
import { IgxButtonModule } from '../directives/button/button.directive';
Expand Down Expand Up @@ -806,7 +806,9 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
*@hidden
*/
public ngOnDestroy(): void {
this._overlayService.hideAll();
if (this._componentID) {
this._overlayService.hide(this._componentID);
}
this._destroy$.next(true);
this._destroy$.complete();
}
Expand Down Expand Up @@ -1122,6 +1124,7 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor

private _onClosed(): void {
this.collapsed = true;
this._componentID = null;
this.onClose.emit(this);

if (this.getEditElement()) {
Expand Down