Skip to content

Commit

Permalink
fix(animation-css): Calendar always opens from left top corner even t…
Browse files Browse the repository at this point in the history
…hough [opens] is set to center or right

Fix #41
  • Loading branch information
fetrarij committed Nov 23, 2018
1 parent 6b9f8d3 commit 9faa528
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/daterangepicker/daterangepicker.component.html
Expand Up @@ -7,7 +7,7 @@
'inline': inline,
'double': !singleDatePicker && showCalInRanges,
'show-ranges': rangesArray.length
}">
}" [class]="'drops-' + drops + '-' + opens">
<div class="ranges">
<ul>
<li *ngFor="let range of rangesArray">
Expand Down
37 changes: 37 additions & 0 deletions src/daterangepicker/daterangepicker.component.scss
Expand Up @@ -129,6 +129,24 @@ $input-height: 3rem !default;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
&.drops-up-left {
transform-origin: 100% 100%;
}
&.drops-up-right {
transform-origin: 0 100%;
}
&.drops-down-left {
transform-origin: 100% 0;
}
&.drops-down-right {
transform-origin: 0 0;
}
&.drops-down-center {
transform-origin: 50%% 0;
}
&.drops-up-center {
transform-origin: 50%% 100%;
}
.calendar {
display: block;
}
Expand All @@ -143,6 +161,25 @@ $input-height: 3rem !default;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
&.drops-up-left {
transform-origin: 100% 100%;
}
&.drops-up-right {
transform-origin: 0 100%;
}
&.drops-down-left {
transform-origin: 100% 0;
}
&.drops-down-right {
transform-origin: 0 0;
}
&.drops-down-center {
transform-origin: 50%% 0;
}
&.drops-up-center {
transform-origin: 50%% 100%;
}

.calendar {
display: none;
}
Expand Down
2 changes: 2 additions & 0 deletions src/daterangepicker/daterangepicker.component.ts
Expand Up @@ -103,6 +103,8 @@ export class DaterangepickerComponent implements OnInit {
showCalInRanges: Boolean = false;

options: any = {} ; // should get some opt from user
@Input() drops: string;
@Input() opens: string;
@Output('choosedDate') choosedDate: EventEmitter<Object>;
@Output('rangeClicked') rangeClicked: EventEmitter<Object>;
@Output('datesUpdated') datesUpdated: EventEmitter<Object>;
Expand Down
4 changes: 4 additions & 0 deletions src/daterangepicker/daterangepicker.directive.ts
Expand Up @@ -141,6 +141,8 @@ export class DaterangepickerDirective implements OnInit, OnChanges, DoCheck {
private _renderer: Renderer2,
private differs: KeyValueDiffers
) {
this.drops = 'down';
this.opens = 'left';
const componentFactory = this._componentFactoryResolver.resolveComponentFactory(DaterangepickerComponent);
viewContainerRef.clear();
const componentRef = viewContainerRef.createComponent(componentFactory);
Expand Down Expand Up @@ -171,6 +173,8 @@ export class DaterangepickerDirective implements OnInit, OnChanges, DoCheck {
this.picker.emptyWeekRowClass = this.emptyWeekRowClass;
this.picker.firstDayOfNextMonthClass = this.firstDayOfNextMonthClass;
this.picker.lastDayOfPreviousMonthClass = this.lastDayOfPreviousMonthClass;
this.picker.drops = this.drops;
this.picker.opens = this.opens;
this.localeDiffer = this.differs.find(this.locale).create();
}

Expand Down

0 comments on commit 9faa528

Please sign in to comment.