Skip to content

Commit a348f2d

Browse files
committed
Merge branch 'ddincheva/activeNode-11.0.x' of https://github.com/IgniteUI/igniteui-angular into ddincheva/activeNode-11.0.x
2 parents 8f63ba7 + 272086d commit a348f2d

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

projects/igniteui-angular/src/lib/buttonGroup/buttonGroup.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,17 @@ import { IgxIconModule } from '../icon/public_api';
2424
import { takeUntil } from 'rxjs/operators';
2525
import { DisplayDensityBase, DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
2626
import { IBaseEventArgs } from '../core/utils';
27+
import { mkenum } from '../core/utils';
28+
29+
/**
30+
* Determines the Button Group alignment
31+
*/
32+
export const ButtonGroupAlignment = mkenum({
33+
horizontal: 'horizontal',
34+
vertical: 'vertical'
35+
});
36+
export type ButtonGroupAlignment = (typeof ButtonGroupAlignment)[keyof typeof ButtonGroupAlignment];
2737

28-
export enum ButtonGroupAlignment { horizontal, vertical }
2938
let NEXT_ID = 0;
3039

3140
/**
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
import { mkenum } from './utils';
12
/**
23
* This enumeration is used to configure whether the date/time picker has an editable input with drop down
34
* or is readonly - the date/time is selected only through a dialog.
45
*/
5-
export enum InteractionMode {
6-
DropDown = 'dropdown',
7-
Dialog = 'dialog'
8-
}
6+
export const InteractionMode = mkenum({
7+
DropDown: 'dropdown',
8+
Dialog: 'dialog'
9+
});
10+
export type InteractionMode = (typeof InteractionMode)[keyof typeof InteractionMode];

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@
107107
@include e(date, 'weekend') {
108108
@extend %cal-value !optional;
109109
@extend %cal-value--weekend !optional;
110+
111+
&:hover,
112+
&:focus {
113+
@extend %cal-value--hover !optional;
114+
}
110115
}
111116

112117
@include e(date, 'special') {

projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
562562
* ```
563563
*/
564564
@Input()
565-
public mode = InteractionMode.Dialog;
565+
public mode: InteractionMode = InteractionMode.Dialog;
566566

567567
/**
568568
* Gets/Sets whether date should spin continuously or stop when min/max is reached.

projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ export class IgxTimePickerComponent implements
365365
* @memberof IgxTimePickerComponent
366366
*/
367367
@Input()
368-
public mode = InteractionMode.Dialog;
368+
public mode: InteractionMode = InteractionMode.Dialog;
369369

370370
/**
371371
* Determines the container the popup element should be attached to.

src/app/buttonGroup/buttonGroup.sample.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h4 class="sample-title">Multiple Selection <i class="light">Horizontal Disabled
2020

2121
<article class="sample-column">
2222
<h4 class="sample-title">Exclusive Selection <i class="light">Vertical</i></h4>
23-
<igx-buttongroup [multiSelection]="false" [values]="cities" [alignment]="alignment">
23+
<igx-buttongroup [multiSelection]="false" [values]="cities" alignment="vertical">
2424
</igx-buttongroup>
2525
</article>
2626

0 commit comments

Comments
 (0)