Skip to content

Commit bf4be07

Browse files
authored
Merge branch 'master' into copilot/add-pdf-export-feature
2 parents 61a3fd9 + 144b2d4 commit bf4be07

File tree

6 files changed

+70
-7
lines changed

6 files changed

+70
-7
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
/// @param {Map} $theme - The theme used to style the component.
77
@mixin date-range-picker($theme) {
88
@include css-vars($theme);
9+
$variant: map.get($theme, '_meta', 'theme');
910

1011
%igx-date-range-picker {
12+
@include sizable();
13+
--input-group-size: #{map.get($theme, 'size')};
14+
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
1115
display: flex;
1216

1317
> igx-icon {
@@ -32,6 +36,8 @@
3236
igx-date-range-end,
3337
%igx-date-range-picker__start,
3438
%igx-date-range-picker__end {
39+
--size: var(--input-group-size) !important;
40+
3541
flex: 1 0 0%;
3642
}
3743

@@ -40,6 +46,17 @@
4046
align-items: center;
4147
color: var-get($theme, 'label-color');
4248
margin: 0 rem(8px);
49+
height: var(--input-group-size);
50+
51+
@if $variant != 'material' {
52+
align-self: flex-end;
53+
54+
&.input-has-hint {
55+
align-self: center;
56+
}
57+
} @else {
58+
align-self: flex-start;
59+
}
4360
}
4461

4562
%igx-date-range-picker-buttons {

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

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,24 @@ import { IgxCalendarContainerComponent } from '../date-picker/calendar-container
4343
import { PickerBaseDirective } from '../date-picker/picker-base.directive';
4444
import { IgxOverlayOutletDirective } from 'igniteui-angular/directives';
4545
import {
46-
IgxInputDirective, IgxInputGroupComponent, IgxInputGroupType, IgxInputState,
47-
IgxLabelDirective, IGX_INPUT_GROUP_TYPE, IgxSuffixDirective,
46+
IgxInputDirective,
47+
IgxInputGroupComponent,
48+
IgxInputGroupType,
49+
IgxInputState,
50+
IgxLabelDirective,
51+
IGX_INPUT_GROUP_TYPE,
52+
IgxSuffixDirective,
4853
IgxPrefixDirective,
49-
IgxReadOnlyInputDirective
54+
IgxReadOnlyInputDirective,
55+
IgxHintDirective
5056
} from 'igniteui-angular/input-group';
51-
import { IgxDateRangeEndComponent, IgxDateRangeInputsBaseComponent, IgxDateRangeSeparatorDirective, IgxDateRangeStartComponent, DateRangePickerFormatPipe } from './date-range-picker-inputs.common';
57+
import {
58+
IgxDateRangeEndComponent,
59+
IgxDateRangeInputsBaseComponent,
60+
IgxDateRangeSeparatorDirective,
61+
IgxDateRangeStartComponent,
62+
DateRangePickerFormatPipe,
63+
} from './date-range-picker-inputs.common';
5264
import { IgxIconComponent } from 'igniteui-angular/icon';
5365
import { fadeIn, fadeOut } from 'igniteui-angular/animations';
5466

@@ -420,6 +432,9 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
420432
@ContentChild(IgxLabelDirective)
421433
public label: IgxLabelDirective;
422434

435+
@ContentChild(IgxHintDirective)
436+
public hint: IgxHintDirective;
437+
423438
@ContentChild(IgxPickerActionsDirective)
424439
public pickerActions: IgxPickerActionsDirective;
425440

@@ -550,7 +565,9 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
550565

551566
/** @hidden @internal */
552567
public get separatorClass(): string {
553-
return 'igx-date-range-picker__label';
568+
const classes = ['igx-date-range-picker__label'];
569+
if (this.hint) classes.push('input-has-hint');
570+
return classes.join(' ');
554571
}
555572

556573
protected override get toggleContainer(): HTMLElement | undefined {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ <h6>Angular Date Range Picker, two inputs, template-driven form</h6>
4646
type="text"
4747
[placeholder]="properties.placeholder"
4848
/>
49-
<igx-hint>Helper text</igx-hint>
49+
@if (properties.hint) {
50+
<span igxHint>{{ properties.hint }}</span>
51+
}
5052
</igx-date-range-start>
5153
<igx-date-range-end>
5254
<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
@@ -148,6 +148,12 @@ export class DateRangeSampleComponent {
148148
defaultValue: 'MM/dd/yyyy'
149149
}
150150
},
151+
hint: {
152+
label: 'Hint Text',
153+
control: {
154+
type: 'text'
155+
}
156+
},
151157
displayFormat: {
152158
label: 'Display Format',
153159
control: {

src/app/tooltip/tooltip.sample.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,20 @@ <h4 class="sample-title">Simple tooltip settings</h4>
5353
</div>
5454
</article>
5555

56+
<article class="column">
57+
<h4 class="sample-title">WebComponents tooltip</h4>
58+
<div style="margin: 10dvh 5dvw">
59+
<igc-button id="basic-tooltip"> Hover over me </igc-button>
60+
</div>
61+
62+
<igc-tooltip
63+
anchor="basic-tooltip"
64+
>
65+
Hello from the tooltip!
66+
<button class="my-close-btn">Close Me</button>
67+
</igc-tooltip>
68+
</article>
69+
5670
<article class="column">
5771
<h4 class="sample-title">Rich tooltip</h4>
5872
<article class="card-wrapper">

src/app/tooltip/tooltip.sample.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, ViewChild } from '@angular/core';
1+
import { Component, CUSTOM_ELEMENTS_SCHEMA, OnInit, ViewChild } from '@angular/core';
22
import { FormsModule } from '@angular/forms';
33
import {
44
IgxAvatarComponent,
@@ -18,11 +18,18 @@ import {
1818
IgxTooltipTargetDirective,
1919
OverlaySettings,
2020
} from 'igniteui-angular';
21+
import {
22+
defineComponents,
23+
IgcButtonComponent,
24+
IgcTooltipComponent,
25+
} from 'igniteui-webcomponents';
2126

27+
defineComponents(IgcTooltipComponent, IgcButtonComponent);
2228
@Component({
2329
selector: 'app-tooltip-sample',
2430
styleUrls: ['tooltip.sample.css'],
2531
templateUrl: 'tooltip.sample.html',
32+
schemas: [CUSTOM_ELEMENTS_SCHEMA],
2633
imports: [IgxAvatarComponent, IgxTooltipTargetDirective, IgxTooltipDirective, IgxIconComponent, IgxIconButtonDirective, IgxSwitchComponent, FormsModule, IgxSliderComponent, IgxButtonDirective, IgxCardComponent, IgxCardContentDirective, IgxCardActionsComponent, IgxRippleDirective, IgxGridComponent, IgxColumnComponent, IgxCellTemplateDirective]
2734
})
2835
export class TooltipSampleComponent implements OnInit {

0 commit comments

Comments
 (0)