Skip to content

1.0.3 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 2, 2020
Merged

1.0.3 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9cb806a
use weekday fn from days.js to respect locale weekday reordering (eg.…
flo-l Mar 2, 2020
a5972be
fix missing semicolon
flo-l Mar 2, 2020
8024bee
bump dayjs dependency to get weekday functionality
flo-l Mar 2, 2020
9c09ff0
Merge pull request #52 from y0c/master
y0c Mar 2, 2020
3ff9dc6
bump dayjs dependency to get weekday functionality
flo-l Mar 2, 2020
8b47b00
Merge branch 'respect-locale-weekdays' of github.com:flo-l/react-date…
flo-l Mar 2, 2020
fd12760
update type definitions to include the new ILocale from dayjs
flo-l Mar 2, 2020
231102e
Merge remote-tracking branch 'upstream/dev' into respect-locale-weekdays
flo-l Mar 2, 2020
ea96238
update yarn.lock
flo-l Mar 2, 2020
90f6eb5
use any for Locale type
flo-l Mar 2, 2020
9457c85
Merge pull request #46 from flo-l/respect-locale-weekdays
y0c Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"husky": "^1.3.1",
"jest": "^24.7.0",
"lint-staged": "^8.1.0",
"node-sass": "4.11.0",
"node-sass": "4.12.0",
"prettier": "^1.15.3",
"prop-types": "^15.6.2",
"react-docgen-typescript-loader": "^3.0.1",
Expand Down
4 changes: 3 additions & 1 deletion src/utils/LocaleUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import { IDatePicker } from '../common/@types';
import { range } from '../utils/ArrayUtil';
import * as localeData from 'dayjs/plugin/localeData';
import * as localizedFormat from 'dayjs/plugin/localizedFormat';
import * as weekday from 'dayjs/plugin/weekday';

dayjs.extend(localeData);
dayjs.extend(localizedFormat);
dayjs.extend(weekday);

export const getMonthShort = (locale: IDatePicker.Locale) => {
dayjs.locale(locale);
Expand All @@ -21,7 +23,7 @@ export const getWeekDays = (locale: IDatePicker.Locale) => {
return range(7).map(v =>
dayjs()
.localeData()
.weekdaysShort(dayjs().day(v))
.weekdaysShort(dayjs().weekday(v))
);
};

Expand Down
30 changes: 13 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7345,14 +7345,6 @@ lodash-es@^4.17.11:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"

lodash.assign@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"

lodash.clonedeep@^4.3.2:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"

lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
Expand All @@ -7377,7 +7369,7 @@ lodash.isplainobject@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"

lodash.mergewith@^4.6.0, lodash.mergewith@^4.6.1:
lodash.mergewith@^4.6.1:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"

Expand Down Expand Up @@ -7860,7 +7852,12 @@ mute-stream@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"

nan@^2.10.0, nan@^2.9.2:
nan@^2.13.2:
version "2.14.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==

nan@^2.9.2:
version "2.11.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"

Expand Down Expand Up @@ -8052,9 +8049,10 @@ node-releases@^1.1.3:
dependencies:
semver "^5.3.0"

node-sass@4.11.0:
version "4.11.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
node-sass@4.12.0:
version "4.12.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
Expand All @@ -8063,12 +8061,10 @@ node-sass@4.11.0:
get-stdin "^4.0.1"
glob "^7.0.3"
in-publish "^2.0.0"
lodash.assign "^4.2.0"
lodash.clonedeep "^4.3.2"
lodash.mergewith "^4.6.0"
lodash "^4.17.11"
meow "^3.7.0"
mkdirp "^0.5.1"
nan "^2.10.0"
nan "^2.13.2"
node-gyp "^3.8.0"
npmlog "^4.0.0"
request "^2.88.0"
Expand Down