diff --git a/package.json b/package.json index 3348bdc..3db128c 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@types/node": "^12.11.1", "codelyzer": "^5.1.2", "cpy-cli": "^3.0.0", - "dayjs": "^1.8.17", + "dayjs": "^1.10.7", "jasmine-core": "~3.4.0", "jasmine-spec-reporter": "~4.2.1", "karma": "~4.1.0", diff --git a/projects/example-material-dayjs-adapter/src/app/app.module.ts b/projects/example-material-dayjs-adapter/src/app/app.module.ts index 68b4b69..05fe9e4 100644 --- a/projects/example-material-dayjs-adapter/src/app/app.module.ts +++ b/projects/example-material-dayjs-adapter/src/app/app.module.ts @@ -1,3 +1,4 @@ +import { MAT_DATE_FORMATS, MatDateFormats } from '@angular/material/core'; import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -10,6 +11,18 @@ import { AppComponent } from './app.component'; // import { MatMomentDateModule, MAT_MOMENT_DATE_ADAPTER_OPTIONS } from '@angular/material-moment-adapter' import { MatDayjsDateModule, MAT_DAYJS_DATE_ADAPTER_OPTIONS } from 'material-dayjs-adapter'; +const DATE_FORMAT: MatDateFormats = { + parse: { + dateInput: 'DD/MM/YYYY', + }, + display: { + dateInput: 'DD/MM/YYYY', + monthYearLabel: 'MMM YYYY', + dateA11yLabel: 'LL', + monthYearA11yLabel: 'MMMM YYYY', + } +}; + @NgModule({ declarations: [ AppComponent @@ -26,7 +39,8 @@ import { MatDayjsDateModule, MAT_DAYJS_DATE_ADAPTER_OPTIONS } from 'material-day ], providers: [ // { provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true, strict: true } } - { provide: MAT_DAYJS_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } } + { provide: MAT_DAYJS_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }, + { provide: MAT_DATE_FORMATS, useValue: DATE_FORMAT} ], bootstrap: [AppComponent] }) diff --git a/projects/material-dayjs-adapter/src/lib/adapter/dayjs-date-adapter.ts b/projects/material-dayjs-adapter/src/lib/adapter/dayjs-date-adapter.ts index f449731..a955e9f 100644 --- a/projects/material-dayjs-adapter/src/lib/adapter/dayjs-date-adapter.ts +++ b/projects/material-dayjs-adapter/src/lib/adapter/dayjs-date-adapter.ts @@ -137,7 +137,7 @@ export class DayjsDateAdapter extends DateAdapter { parse(value: any, parseFormat: string): Dayjs | null { if (value && typeof value === 'string') { - return this.dayJs(value, dayjs().localeData().longDateFormat(parseFormat), this.locale); + return this.dayJs(value, parseFormat, this.locale); } return value ? this.dayJs(value).locale(this.locale) : null; } diff --git a/yarn.lock b/yarn.lock index 3162e83..7664769 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3571,10 +3571,10 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -dayjs@^1.8.17: - version "1.8.22" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.22.tgz#5e835d776b373e216678be8d12c336da71a25a9c" - integrity sha512-N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ== +dayjs@^1.10.7: + version "1.10.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" + integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9"