Skip to content

Commit bdf61ff

Browse files
committed
style(date-range-picker): fix datepicker label positioning
1 parent 873b255 commit bdf61ff

4 files changed

Lines changed: 22 additions & 11 deletions

File tree

projects/igniteui-angular/src/lib/core/styles/components/date-range-picker/_date-range-picker-theme.scss

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
@include css-vars($theme);
99
$variant: map.get($theme, '_meta', 'theme');
1010

11-
$label-height: map.get((
12-
'material': 0,
13-
'fluent': rem(21px),
14-
'bootstrap': rem(28px),
15-
'indigo': rem(19px),
16-
), $variant);
17-
1811
%igx-date-range-picker {
1912
@include sizable();
2013
--input-group-size: #{map.get($theme, 'size')};
@@ -50,8 +43,14 @@
5043
margin: 0 rem(8px);
5144
height: var(--input-group-size);
5245

53-
&.labeled-input {
54-
transform: translateY($label-height);
46+
@if $variant != 'material' {
47+
align-self: flex-end;
48+
49+
&.input-has-hint {
50+
align-self: center;
51+
}
52+
} @else {
53+
align-self: flex-start;
5554
}
5655
}
5756

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { DateTimeUtil } from '../date-common/util/date-time.util';
2424
import { IgxOverlayOutletDirective } from '../directives/toggle/toggle.directive';
2525
import {
2626
IgxInputDirective, IgxInputGroupComponent, IgxInputGroupType, IgxInputState,
27-
IgxLabelDirective, IGX_INPUT_GROUP_TYPE, IgxSuffixDirective
27+
IgxLabelDirective, IgxHintDirective, IGX_INPUT_GROUP_TYPE, IgxSuffixDirective
2828
} from '../input-group/public_api';
2929
import {
3030
AutoPositionStrategy, IgxOverlayService, OverlayCancelableEventArgs, OverlayEventArgs,
@@ -407,6 +407,9 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
407407
@ContentChild(IgxLabelDirective)
408408
public label: IgxLabelDirective;
409409

410+
@ContentChild(IgxHintDirective)
411+
public hint: IgxHintDirective;
412+
410413
@ContentChild(IgxPickerActionsDirective)
411414
public pickerActions: IgxPickerActionsDirective;
412415

@@ -538,7 +541,7 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
538541
/** @hidden @internal */
539542
public get separatorClass(): string {
540543
const classes = ['igx-date-range-picker__label'];
541-
if (this.label) classes.push('labeled-input');
544+
if (this.hint) classes.push('input-has-hint');
542545
return classes.join(' ');
543546
}
544547

src/app/date-range/date-range.sample.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ <h6>Angular Date Range Picker, two inputs, template-driven form</h6>
4646
type="text"
4747
[placeholder]="properties.placeholder"
4848
/>
49+
@if (properties.hint) {
50+
<span igxHint>{{ properties.hint }}</span>
51+
}
4952
</igx-date-range-start>
5053
<igx-date-range-end>
5154
<igx-picker-toggle igxPrefix>

src/app/date-range/date-range.sample.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@ export class DateRangeSampleComponent {
150150
defaultValue: 'MM/dd/yyyy'
151151
}
152152
},
153+
hint: {
154+
label: 'Hint Text',
155+
control: {
156+
type: 'text'
157+
}
158+
},
153159
displayFormat: {
154160
label: 'Display Format',
155161
control: {

0 commit comments

Comments
 (0)