Skip to content

Commit 85a4999

Browse files
authored
Merge pull request #843 from dxc-technology/dayjs-aida
Revert "Changed import dayjs"
2 parents 467b72a + f86d054 commit 85a4999

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

projects/dxc-ngx-cdk/src/lib/dxc-date-input/dxc-date-input.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { DxcDateInputHelper } from "./dxc-date-input.helper";
1919
import { MatCalendar } from "@angular/material/datepicker";
2020
import { MdePopoverTrigger } from "@material-extended/mde";
2121
import { CssUtils } from "../utils";
22-
import dayjs from "dayjs";
22+
import { default as dayjs, Dayjs } from "dayjs";
2323
import {
2424
DateInputProperties,
2525
EmittedValue,
@@ -311,7 +311,7 @@ export class DxcDateInputComponent implements OnInit {
311311
}
312312
}
313313

314-
onSelectedChangeHandler(value: dayjs.Dayjs) {
314+
onSelectedChangeHandler(value: Dayjs) {
315315
let _stringValue = this.getDateStringValue(value, this.format);
316316
let _dateReturn = {
317317
value: _stringValue,
@@ -376,7 +376,7 @@ export class DxcDateInputComponent implements OnInit {
376376
return dayjs(value, format.toUpperCase());
377377
}
378378

379-
private getDateStringValue(value: dayjs.Dayjs, format: string) {
379+
private getDateStringValue(value: Dayjs, format: string) {
380380
return dayjs(value).format(format.toUpperCase());
381381
}
382382
}

projects/dxc-ngx-cdk/src/lib/utils/date-functions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import dayjs from "dayjs";
1+
import { default as dayjs, Dayjs } from "dayjs";
22
import localeData from "dayjs/plugin/localeData";
33
import localizedFormat from "dayjs/plugin/localizedFormat";
44
import customParseFormat from "dayjs/plugin/customParseFormat";

0 commit comments

Comments
 (0)