Skip to content

Commit 8a66935

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/follow-redirects-1.15.5
2 parents 5e885d8 + eb14235 commit 8a66935

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

src/datepicker-input/datepicker-input.component.ts

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ import { NG_VALUE_ACCESSOR } from "@angular/forms";
3535
'cds--date-picker-input__wrapper--invalid': invalid,
3636
'cds--date-picker-input__wrapper--warn': warn
3737
}">
38-
<input
38+
<span>
39+
<input
3940
#input
4041
*ngIf="!skeleton"
4142
autocomplete="off"
@@ -52,25 +53,26 @@ import { NG_VALUE_ACCESSOR } from "@angular/forms";
5253
[placeholder]="placeholder"
5354
[id]= "id"
5455
[disabled]="disabled"
55-
(change)="onChange($event)"/>
56-
<svg
57-
*ngIf="type !== 'simple' && !warn && !invalid"
58-
cdsIcon="calendar"
59-
size="16"
60-
class="cds--date-picker__icon">
61-
</svg>
62-
<svg
63-
*ngIf="!warn && invalid"
64-
class="cds--date-picker__icon cds--date-picker__icon--invalid"
65-
cdsIcon="warning--filled"
66-
size="16">
67-
</svg>
68-
<svg
69-
*ngIf="!invalid && warn"
70-
cdsIcon="warning--alt--filled"
71-
size="16"
72-
class="cds--date-picker__icon cds--date-picker__icon--warn">
73-
</svg>
56+
(change)="onChange($event)"/>
57+
<svg
58+
*ngIf="type !== 'simple' && !warn && !invalid"
59+
cdsIcon="calendar"
60+
size="16"
61+
class="cds--date-picker__icon">
62+
</svg>
63+
<svg
64+
*ngIf="!warn && invalid"
65+
class="cds--date-picker__icon cds--date-picker__icon--invalid"
66+
cdsIcon="warning--filled"
67+
size="16">
68+
</svg>
69+
<svg
70+
*ngIf="!invalid && warn"
71+
cdsIcon="warning--alt--filled"
72+
size="16"
73+
class="cds--date-picker__icon cds--date-picker__icon--warn">
74+
</svg>
75+
</span>
7476
</div>
7577
<div
7678
*ngIf="helperText && !invalid && !warn"

src/datepicker/datepicker.stories.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const RangeTemplate = (args) => ({
115115
[rangeLabel]="label"
116116
[size]="size"
117117
range="true"
118-
id="initial-value-datepicker"
118+
id="initial-value-range-datepicker"
119119
[placeholder]="placeholder"
120120
[language]="language"
121121
[theme]="theme"
@@ -156,7 +156,7 @@ const RangeTemplate = (args) => ({
156156
export const Range = RangeTemplate.bind({});
157157
Range.args = {
158158
dateFormat: "d/m/Y",
159-
value: [new Date("01 Feb 24"), new Date("29 Feb 24")],
159+
value: ["01/02/24", "08/02/24"],
160160
language: "en"
161161
};
162162
Range.argTypes = {

0 commit comments

Comments
 (0)