diff --git a/src/PickerInput/Selector/hooks/useInputProps.ts b/src/PickerInput/Selector/hooks/useInputProps.ts index fa7a1c907..22b6627b1 100644 --- a/src/PickerInput/Selector/hooks/useInputProps.ts +++ b/src/PickerInput/Selector/hooks/useInputProps.ts @@ -4,6 +4,7 @@ import * as React from 'react'; import type { SelectorProps } from '../../../interface'; import { formatValue } from '../../../utils/dateUtil'; import type { InputProps } from '../Input'; +import { toArray } from '../../../utils/miscUtil'; export default function useInputProps( props: Pick< @@ -128,7 +129,7 @@ export default function useInputProps( // ======================== Input ========================= const getInputProps = (index?: number): InputProps => { function getProp(propValue: T | T[]): T { - return index !== undefined ? propValue[index] : propValue; + return toArray(propValue)[index || 0]; } const pickedAttrs = pickAttrs(props, { diff --git a/src/locale/am_ET.ts b/src/locale/am_ET.ts index 5418a733b..19b5fd917 100644 --- a/src/locale/am_ET.ts +++ b/src/locale/am_ET.ts @@ -17,8 +17,8 @@ const locale: Locale = { yearSelect: 'አመት ምረጥ', decadeSelect: 'አስርት አመታት ምረጥ', yearFormat: 'YYYY', - dateFormat: 'D/M/YYYY', - dayFormat: 'D', + fieldDateFormat: 'D/M/YYYY', + cellDateFormat: 'D', dateTimeFormat: 'D/M/YYYY HH:mm:ss', monthBeforeYear: true, previousMonth: 'ያለፈው ወር (PageUp)', diff --git a/src/locale/ar_EG.ts b/src/locale/ar_EG.ts index 64be47600..2647808b0 100644 --- a/src/locale/ar_EG.ts +++ b/src/locale/ar_EG.ts @@ -17,7 +17,7 @@ const locale: Locale = { monthSelect: 'اختيار الشهر', yearSelect: 'اختيار السنة', decadeSelect: 'اختيار العقد', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', previousMonth: 'الشهر السابق (PageUp)', nextMonth: 'الشهر التالى(PageDown)', diff --git a/src/locale/az_AZ.ts b/src/locale/az_AZ.ts index 0380334f1..12d2b4025 100644 --- a/src/locale/az_AZ.ts +++ b/src/locale/az_AZ.ts @@ -18,7 +18,7 @@ const locale: Locale = { monthSelect: 'Ay seç', yearSelect: 'il seç', decadeSelect: 'Onillik seçin', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', previousMonth: 'Əvvəlki ay (PageUp)', nextMonth: 'Növbəti ay (PageDown)', diff --git a/src/locale/bg_BG.ts b/src/locale/bg_BG.ts index b8e8a1f9e..ea15feb39 100644 --- a/src/locale/bg_BG.ts +++ b/src/locale/bg_BG.ts @@ -17,7 +17,7 @@ const locale: Locale = { monthSelect: 'Избор на месец', yearSelect: 'Избор на година', decadeSelect: 'Десетилетие', - dateFormat: 'D M YYYY', + fieldDateFormat: 'D M YYYY', dateTimeFormat: 'D M YYYY HH:mm:ss', previousMonth: 'Предишен месец (PageUp)', nextMonth: 'Следващ месец (PageDown)', diff --git a/src/locale/bn_BD.ts b/src/locale/bn_BD.ts index c324da5ff..573591f18 100644 --- a/src/locale/bn_BD.ts +++ b/src/locale/bn_BD.ts @@ -18,7 +18,7 @@ const locale: Locale = { monthSelect: 'মাস পছন্দ করুন', yearSelect: 'বছর পছন্দ করুন', decadeSelect: 'একটি দশক পছন্দ করুন', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', previousMonth: 'গত মাস (PageUp)', nextMonth: 'আগামী মাস (PageDown)', diff --git a/src/locale/by_BY.ts b/src/locale/by_BY.ts index 2cff11568..d8626b8fd 100644 --- a/src/locale/by_BY.ts +++ b/src/locale/by_BY.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Выбраць год', decadeSelect: 'Выбраць дзесяцігоддзе', - dateFormat: 'D-M-YYYY', + fieldDateFormat: 'D-M-YYYY', dateTimeFormat: 'D-M-YYYY HH:mm:ss', diff --git a/src/locale/ca_ES.ts b/src/locale/ca_ES.ts index 463ceecc9..1913718f9 100644 --- a/src/locale/ca_ES.ts +++ b/src/locale/ca_ES.ts @@ -17,7 +17,7 @@ const locale: Locale = { monthSelect: 'Escollir un mes', yearSelect: 'Escollir un any', decadeSelect: 'Escollir una dècada', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', previousMonth: 'Mes anterior (PageUp)', nextMonth: 'Mes següent (PageDown)', diff --git a/src/locale/common.ts b/src/locale/common.ts index a46b4be8f..aa4c02d14 100644 --- a/src/locale/common.ts +++ b/src/locale/common.ts @@ -2,7 +2,7 @@ import type { Locale } from '../interface'; export const commonLocale: Partial = { yearFormat: 'YYYY', - dayFormat: 'D', + cellDateFormat: 'D', cellMeridiemFormat: 'A', monthBeforeYear: true, }; diff --git a/src/locale/cs_CZ.ts b/src/locale/cs_CZ.ts index b9e85129f..6d879c106 100644 --- a/src/locale/cs_CZ.ts +++ b/src/locale/cs_CZ.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Vyberte rok', decadeSelect: 'Vyberte dekádu', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/da_DK.ts b/src/locale/da_DK.ts index c4ebfd6bb..e90753c87 100644 --- a/src/locale/da_DK.ts +++ b/src/locale/da_DK.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Vælg år', decadeSelect: 'Vælg årti', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/de_DE.ts b/src/locale/de_DE.ts index 666aa8371..431e4eb3d 100644 --- a/src/locale/de_DE.ts +++ b/src/locale/de_DE.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Wähle ein Jahr', decadeSelect: 'Wähle ein Jahrzehnt', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/el_GR.ts b/src/locale/el_GR.ts index 16fbec8e0..d0a7040f8 100644 --- a/src/locale/el_GR.ts +++ b/src/locale/el_GR.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Επιλογή έτους', decadeSelect: 'Επιλογή δεκαετίας', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/en_GB.ts b/src/locale/en_GB.ts index 240a46b0d..8d936d6dc 100644 --- a/src/locale/en_GB.ts +++ b/src/locale/en_GB.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Choose a year', decadeSelect: 'Choose a decade', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/en_US.ts b/src/locale/en_US.ts index f68c9ebd6..e801489d5 100644 --- a/src/locale/en_US.ts +++ b/src/locale/en_US.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Choose a year', decadeSelect: 'Choose a decade', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/es_ES.ts b/src/locale/es_ES.ts index d9e4d6d63..c2084a8ed 100644 --- a/src/locale/es_ES.ts +++ b/src/locale/es_ES.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Elegir un año', decadeSelect: 'Elegir una década', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/es_MX.ts b/src/locale/es_MX.ts index 6b84877ff..a1758a3e7 100644 --- a/src/locale/es_MX.ts +++ b/src/locale/es_MX.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Seleccionar año', decadeSelect: 'Seleccionar década', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/et_EE.ts b/src/locale/et_EE.ts index f3f79d1c5..5794e3d12 100644 --- a/src/locale/et_EE.ts +++ b/src/locale/et_EE.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Vali aasta', decadeSelect: 'Vali dekaad', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/eu_ES.ts b/src/locale/eu_ES.ts index 79f640f92..ef48a31d0 100644 --- a/src/locale/eu_ES.ts +++ b/src/locale/eu_ES.ts @@ -18,7 +18,7 @@ const locale: Locale = { monthSelect: 'Hilabetea aukeratu', yearSelect: 'Urtea aukeratu', decadeSelect: 'Hamarkada aukeratu', - dateFormat: 'YYYY/M/D', + fieldDateFormat: 'YYYY/M/D', dateTimeFormat: 'YYYY/M/D HH:mm:ss', monthBeforeYear: false, previousMonth: 'Aurreko hilabetea (RePag)', diff --git a/src/locale/fa_IR.ts b/src/locale/fa_IR.ts index 319005683..40dc6a3c2 100644 --- a/src/locale/fa_IR.ts +++ b/src/locale/fa_IR.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'یک سال را انتخاب کنید', decadeSelect: 'یک دهه را انتخاب کنید', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/fi_FI.ts b/src/locale/fi_FI.ts index 1297533d4..19d312885 100644 --- a/src/locale/fi_FI.ts +++ b/src/locale/fi_FI.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Valitse vuosi', decadeSelect: 'Valitse vuosikymmen', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/fr_BE.ts b/src/locale/fr_BE.ts index 40c42e4bb..3b372a271 100644 --- a/src/locale/fr_BE.ts +++ b/src/locale/fr_BE.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Choisissez une année', decadeSelect: 'Choisissez une décennie', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/fr_CA.ts b/src/locale/fr_CA.ts index 467a1e1ab..2ca126e37 100644 --- a/src/locale/fr_CA.ts +++ b/src/locale/fr_CA.ts @@ -18,8 +18,8 @@ const locale: Locale = { yearSelect: 'Choisissez une année', decadeSelect: 'Choisissez une décennie', - dateFormat: 'DD/MM/YYYY', - dayFormat: 'DD', + fieldDateFormat: 'DD/MM/YYYY', + cellDateFormat: 'DD', dateTimeFormat: 'DD/MM/YYYY HH:mm:ss', previousMonth: 'Mois précédent (PageUp)', diff --git a/src/locale/fr_FR.ts b/src/locale/fr_FR.ts index 12ec850cd..68a8c45ab 100644 --- a/src/locale/fr_FR.ts +++ b/src/locale/fr_FR.ts @@ -18,8 +18,8 @@ const locale: Locale = { yearSelect: 'Choisissez une année', decadeSelect: 'Choisissez une décennie', - dateFormat: 'DD/MM/YYYY', - dayFormat: 'DD', + fieldDateFormat: 'DD/MM/YYYY', + cellDateFormat: 'DD', dateTimeFormat: 'DD/MM/YYYY HH:mm:ss', previousMonth: 'Mois précédent (PageUp)', diff --git a/src/locale/ga_IE.ts b/src/locale/ga_IE.ts index f0e4150f2..596171d4f 100644 --- a/src/locale/ga_IE.ts +++ b/src/locale/ga_IE.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Roghnaigh bliain', decadeSelect: 'Roghnaigh deich mbliana', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/gl_ES.ts b/src/locale/gl_ES.ts index 1e856a14b..2e8e2ec92 100644 --- a/src/locale/gl_ES.ts +++ b/src/locale/gl_ES.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Elexir un año', decadeSelect: 'Elexir unha década', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/he_IL.ts b/src/locale/he_IL.ts index 764d8b4b1..0cbb67c4f 100644 --- a/src/locale/he_IL.ts +++ b/src/locale/he_IL.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'בחר שנה', decadeSelect: 'בחר עשור', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/hi_IN.ts b/src/locale/hi_IN.ts index 3e637c7f5..ef2c29839 100644 --- a/src/locale/hi_IN.ts +++ b/src/locale/hi_IN.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'एक वर्ष चुनें', decadeSelect: 'एक दशक चुनें', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/hr_HR.ts b/src/locale/hr_HR.ts index eb4705559..05abdfb5b 100644 --- a/src/locale/hr_HR.ts +++ b/src/locale/hr_HR.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Odaberite godinu', decadeSelect: 'Odaberite desetljeće', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/hu_HU.ts b/src/locale/hu_HU.ts index f42eb0249..486b0b459 100644 --- a/src/locale/hu_HU.ts +++ b/src/locale/hu_HU.ts @@ -18,8 +18,8 @@ const locale: Locale = { yearSelect: 'Év kiválasztása', // 'Choose a year', decadeSelect: 'Évtized kiválasztása', // 'Choose a decade', - dateFormat: 'YYYY/MM/DD', // 'M/D/YYYY', - dayFormat: 'DD', // 'D', + fieldDateFormat: 'YYYY/MM/DD', // 'M/D/YYYY', + cellDateFormat: 'DD', // 'D', dateTimeFormat: 'YYYY/MM/DD HH:mm:ss', // 'M/D/YYYY HH:mm:ss', previousMonth: 'Előző hónap (PageUp)', // 'Previous month (PageUp)', diff --git a/src/locale/id_ID.ts b/src/locale/id_ID.ts index 76efbae18..58a0642a3 100644 --- a/src/locale/id_ID.ts +++ b/src/locale/id_ID.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Pilih satu tahun', decadeSelect: 'Pilih satu dekade', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/is_IS.ts b/src/locale/is_IS.ts index 46adbb53e..8f7736308 100644 --- a/src/locale/is_IS.ts +++ b/src/locale/is_IS.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Velja ár', decadeSelect: 'Velja áratug', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/it_IT.ts b/src/locale/it_IT.ts index 99279dc4b..d899cef97 100644 --- a/src/locale/it_IT.ts +++ b/src/locale/it_IT.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: "Seleziona l'anno", decadeSelect: 'Seleziona il decennio', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/ja_JP.ts b/src/locale/ja_JP.ts index 1211ab3a7..6e849d183 100644 --- a/src/locale/ja_JP.ts +++ b/src/locale/ja_JP.ts @@ -21,7 +21,7 @@ const locale: Locale = { yearSelect: '年を選択', decadeSelect: '年代を選択', yearFormat: 'YYYY年', - dateFormat: 'YYYY年M月D日', + fieldDateFormat: 'YYYY年M月D日', dateTimeFormat: 'YYYY年M月D日 HH時mm分ss秒', previousYear: '前年 (Controlを押しながら左キー)', nextYear: '翌年 (Controlを押しながら右キー)', diff --git a/src/locale/ka_GE.ts b/src/locale/ka_GE.ts index 518c2bf92..4b2f8bc36 100644 --- a/src/locale/ka_GE.ts +++ b/src/locale/ka_GE.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'წლის არჩევა', decadeSelect: 'ათწლეულის არჩევა', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/kk_KZ.ts b/src/locale/kk_KZ.ts index d9c736f41..6b0508a1e 100644 --- a/src/locale/kk_KZ.ts +++ b/src/locale/kk_KZ.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Жылды таңдаңыз', decadeSelect: 'Онжылды таңдаңыз', - dateFormat: 'D-M-YYYY', + fieldDateFormat: 'D-M-YYYY', dateTimeFormat: 'D-M-YYYY HH:mm:ss', diff --git a/src/locale/km_KH.ts b/src/locale/km_KH.ts index b7bbed647..3a2c1295c 100644 --- a/src/locale/km_KH.ts +++ b/src/locale/km_KH.ts @@ -21,7 +21,7 @@ const locale: Locale = { yearSelect: 'ជ្រើសរើសឆ្នាំ', decadeSelect: 'ជ្រើសរើសអាយុ', - dateFormat: 'YYYY-M-D', + fieldDateFormat: 'YYYY-M-D', dateTimeFormat: 'YYYY-M-D HH:mm:ss', previousYear: 'ឆ្នាំមុន (Controlគ្រាប់ចុចបូកព្រួញខាងឆ្វេង)', nextYear: 'ឆ្នាំក្រោយ (Control គ្រាប់ចុចបូកព្រួញស្ដាំ)', diff --git a/src/locale/kmr_IQ.ts b/src/locale/kmr_IQ.ts index bcf60dc22..ff4208b7b 100644 --- a/src/locale/kmr_IQ.ts +++ b/src/locale/kmr_IQ.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Sal hilbijêre', decadeSelect: 'Dehsal hilbijêre', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/kn_IN.ts b/src/locale/kn_IN.ts index 965bee542..f25a0976e 100644 --- a/src/locale/kn_IN.ts +++ b/src/locale/kn_IN.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'ಒಂದು ವರ್ಷ ಆರಿಸಿ', decadeSelect: 'ಒಂದು ದಶಕದ ಆಯ್ಕೆಮಾಡಿ', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/ko_KR.ts b/src/locale/ko_KR.ts index 70e178221..cb0729dc9 100644 --- a/src/locale/ko_KR.ts +++ b/src/locale/ko_KR.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: '연 선택', decadeSelect: '연대 선택', yearFormat: 'YYYY년', - dateFormat: 'YYYY-MM-DD', + fieldDateFormat: 'YYYY-MM-DD', dateTimeFormat: 'YYYY-MM-DD HH:mm:ss', monthBeforeYear: false, previousMonth: '이전 달 (PageUp)', diff --git a/src/locale/lt_LT.ts b/src/locale/lt_LT.ts index 93bcf1265..05426fb5f 100644 --- a/src/locale/lt_LT.ts +++ b/src/locale/lt_LT.ts @@ -19,8 +19,8 @@ const locale: Locale = { yearSelect: 'Pasirinkti metus', decadeSelect: 'Pasirinkti dešimtmetį', - dateFormat: 'YYYY-MM-DD', - dayFormat: 'DD', + fieldDateFormat: 'YYYY-MM-DD', + cellDateFormat: 'DD', dateTimeFormat: 'YYYY-MM-DD HH:MM:SS', previousMonth: 'Buvęs mėnesis (PageUp)', diff --git a/src/locale/lv_LV.ts b/src/locale/lv_LV.ts index 6c048d677..b7a0a6c26 100644 --- a/src/locale/lv_LV.ts +++ b/src/locale/lv_LV.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Izvēlieties gadu', decadeSelect: 'Izvēlieties desmit gadus', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/mk_MK.ts b/src/locale/mk_MK.ts index c626da91a..cce866e89 100644 --- a/src/locale/mk_MK.ts +++ b/src/locale/mk_MK.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Избери година', decadeSelect: 'Избери деценија', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/ml_IN.ts b/src/locale/ml_IN.ts index 96b3b52c7..79a4b4758 100644 --- a/src/locale/ml_IN.ts +++ b/src/locale/ml_IN.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'വർഷം തിരഞ്ഞെടുക്കുക', decadeSelect: 'ദശാബ്ദം തിരഞ്ഞെടുക്കുക', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/mn_MN.ts b/src/locale/mn_MN.ts index 95141f803..cc4150f29 100644 --- a/src/locale/mn_MN.ts +++ b/src/locale/mn_MN.ts @@ -19,8 +19,8 @@ const locale: Locale = { yearSelect: 'Жил сонгох', decadeSelect: 'Арван сонгох', - dateFormat: 'YYYY/MM/DD', - dayFormat: 'DD', + fieldDateFormat: 'YYYY/MM/DD', + cellDateFormat: 'DD', dateTimeFormat: 'YYYY/MM/DD HH:mm:ss', previousMonth: 'Өмнөх сар (PageUp)', diff --git a/src/locale/ms_MY.ts b/src/locale/ms_MY.ts index f7b2428cf..5f9ce383f 100644 --- a/src/locale/ms_MY.ts +++ b/src/locale/ms_MY.ts @@ -21,7 +21,7 @@ const locale: Locale = { yearSelect: 'Pilih tahun', decadeSelect: 'Pilih dekad', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', previousYear: 'Tahun lepas (Ctrl+left)', nextYear: 'Tahun depan (Ctrl+right)', diff --git a/src/locale/my_MM.ts b/src/locale/my_MM.ts index fee50fc41..96df9f658 100644 --- a/src/locale/my_MM.ts +++ b/src/locale/my_MM.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'နှစ်ကိုရွေး', decadeSelect: 'ဆယ်စုနှစ်ကိုရွေး', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/nb_NO.ts b/src/locale/nb_NO.ts index 5029999e8..362012579 100644 --- a/src/locale/nb_NO.ts +++ b/src/locale/nb_NO.ts @@ -19,8 +19,8 @@ const locale: Locale = { yearSelect: 'Velg år', decadeSelect: 'Velg tiår', - dateFormat: 'DD.MM.YYYY', - dayFormat: 'DD', + fieldDateFormat: 'DD.MM.YYYY', + cellDateFormat: 'DD', dateTimeFormat: 'DD.MM.YYYY HH:mm:ss', previousMonth: 'Forrige måned (PageUp)', diff --git a/src/locale/ne_NP.ts b/src/locale/ne_NP.ts index 3372899e9..06489b780 100644 --- a/src/locale/ne_NP.ts +++ b/src/locale/ne_NP.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'एक वर्ष छान्नुहोस्', decadeSelect: 'एक दशक छान्नुहोस्', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/nl_BE.ts b/src/locale/nl_BE.ts index ee6e9de0f..ab11b60a0 100644 --- a/src/locale/nl_BE.ts +++ b/src/locale/nl_BE.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Kies een jaar', decadeSelect: 'Kies een decennium', - dateFormat: 'D-M-YYYY', + fieldDateFormat: 'D-M-YYYY', dateTimeFormat: 'D-M-YYYY HH:mm:ss', diff --git a/src/locale/nl_NL.ts b/src/locale/nl_NL.ts index b6e11dd38..16ffa1f81 100644 --- a/src/locale/nl_NL.ts +++ b/src/locale/nl_NL.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Kies een jaar', decadeSelect: 'Kies een decennium', - dateFormat: 'D-M-YYYY', + fieldDateFormat: 'D-M-YYYY', dateTimeFormat: 'D-M-YYYY HH:mm:ss', diff --git a/src/locale/pl_PL.ts b/src/locale/pl_PL.ts index 2ec0fe680..7758aa5c9 100644 --- a/src/locale/pl_PL.ts +++ b/src/locale/pl_PL.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Wybierz rok', decadeSelect: 'Wybierz dekadę', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/pt_BR.ts b/src/locale/pt_BR.ts index c89e6156b..a293c9a8a 100644 --- a/src/locale/pt_BR.ts +++ b/src/locale/pt_BR.ts @@ -17,7 +17,7 @@ const locale: Locale = { monthSelect: 'Escolher mês', yearSelect: 'Escolher ano', decadeSelect: 'Escolher década', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', monthBeforeYear: false, previousMonth: 'Mês anterior (PageUp)', diff --git a/src/locale/pt_PT.ts b/src/locale/pt_PT.ts index d6e680e70..91f915222 100644 --- a/src/locale/pt_PT.ts +++ b/src/locale/pt_PT.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Selecionar ano', decadeSelect: 'Selecionar década', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/ro_RO.ts b/src/locale/ro_RO.ts index de97eef9d..bb59ce520 100644 --- a/src/locale/ro_RO.ts +++ b/src/locale/ro_RO.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Alege un an', decadeSelect: 'Alege un deceniu', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/ru_RU.ts b/src/locale/ru_RU.ts index c73dd8c57..788a0d1f2 100644 --- a/src/locale/ru_RU.ts +++ b/src/locale/ru_RU.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Выбрать год', decadeSelect: 'Выбрать десятилетие', - dateFormat: 'D-M-YYYY', + fieldDateFormat: 'D-M-YYYY', dateTimeFormat: 'D-M-YYYY HH:mm:ss', diff --git a/src/locale/si_LK.ts b/src/locale/si_LK.ts index 21fc5c14f..aea12a442 100644 --- a/src/locale/si_LK.ts +++ b/src/locale/si_LK.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'අවුරුද්දක් තෝරන්න', decadeSelect: 'දශකයක් තෝරන්න', - dateFormat: 'YYYY/M/D', + fieldDateFormat: 'YYYY/M/D', dateTimeFormat: 'YYYY/M/D HH:mm:ss', monthBeforeYear: false, diff --git a/src/locale/sk_SK.ts b/src/locale/sk_SK.ts index c41163eb2..4d8764315 100644 --- a/src/locale/sk_SK.ts +++ b/src/locale/sk_SK.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Vybrať rok', decadeSelect: 'Vybrať dekádu', - dateFormat: 'D.M.YYYY', + fieldDateFormat: 'D.M.YYYY', dateTimeFormat: 'D.M.YYYY HH:mm:ss', diff --git a/src/locale/sl_SI.ts b/src/locale/sl_SI.ts index e177d8e66..93d38e822 100644 --- a/src/locale/sl_SI.ts +++ b/src/locale/sl_SI.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Izberite leto', decadeSelect: 'Izberite desetletje', - dateFormat: 'DD.MM.YYYY', + fieldDateFormat: 'DD.MM.YYYY', dateTimeFormat: 'DD.MM.YYYY HH:mm:ss', diff --git a/src/locale/sr_Cyrl_RS.ts b/src/locale/sr_Cyrl_RS.ts index 9576acd67..7cfc061c2 100644 --- a/src/locale/sr_Cyrl_RS.ts +++ b/src/locale/sr_Cyrl_RS.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Изабери годину', decadeSelect: 'Изабери деценију', - dateFormat: 'DD.MM.YYYY', + fieldDateFormat: 'DD.MM.YYYY', dateTimeFormat: 'DD.MM.YYYY HH:mm:ss', diff --git a/src/locale/sr_RS.ts b/src/locale/sr_RS.ts index 6205cce8e..c1e133e83 100644 --- a/src/locale/sr_RS.ts +++ b/src/locale/sr_RS.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Izaberi godinu', decadeSelect: 'Izaberi deceniju', - dateFormat: 'DD.MM.YYYY', + fieldDateFormat: 'DD.MM.YYYY', dateTimeFormat: 'DD.MM.YYYY HH:mm:ss', diff --git a/src/locale/sv_SE.ts b/src/locale/sv_SE.ts index d0f598e63..4cf85b024 100644 --- a/src/locale/sv_SE.ts +++ b/src/locale/sv_SE.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Välj år', decadeSelect: 'Välj årtionde', - dateFormat: 'YYYY-MM-DD', + fieldDateFormat: 'YYYY-MM-DD', dateTimeFormat: 'YYYY-MM-DD H:mm:ss', diff --git a/src/locale/ta_IN.ts b/src/locale/ta_IN.ts index 16351378e..270fd8280 100644 --- a/src/locale/ta_IN.ts +++ b/src/locale/ta_IN.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'வருடத்தைத் தேர்வுசெய்க', decadeSelect: 'தசாப்தத்தைத் தேர்வுசெய்க', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/th_TH.ts b/src/locale/th_TH.ts index 8ce4fac54..ef8e70e73 100644 --- a/src/locale/th_TH.ts +++ b/src/locale/th_TH.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'เลือกปี', decadeSelect: 'เลือกทศวรรษ', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/tk_TK.ts b/src/locale/tk_TK.ts index ae126e35b..804f8027f 100644 --- a/src/locale/tk_TK.ts +++ b/src/locale/tk_TK.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Ýyl saýla', decadeSelect: 'On ýyllygy saýla', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/tr_TR.ts b/src/locale/tr_TR.ts index 62063ab6f..4138201c7 100644 --- a/src/locale/tr_TR.ts +++ b/src/locale/tr_TR.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Yıl Seç', decadeSelect: 'On Yıl Seç', - dateFormat: 'DD/MM/YYYY', + fieldDateFormat: 'DD/MM/YYYY', dateTimeFormat: 'DD/MM/YYYY HH:mm:ss', diff --git a/src/locale/ug_CN.ts b/src/locale/ug_CN.ts index da3331d57..313196390 100644 --- a/src/locale/ug_CN.ts +++ b/src/locale/ug_CN.ts @@ -20,8 +20,8 @@ const locale: Locale = { yearSelect: 'يىل تاللاش', decadeSelect: 'يىللارنى تاللاش', yearFormat: 'YYYY-يىلى', - dayFormat: 'D-كۈنى', - dateFormat: 'YYYY-يىلىM-ئاينىڭD-كۈنى', + cellDateFormat: 'D-كۈنى', + fieldDateFormat: 'YYYY-يىلىM-ئاينىڭD-كۈنى', dateTimeFormat: 'YYYY-يىلىM—ئاينىڭD-كۈنى، HH:mm:ss', previousYear: 'ئالدىنقى يىلى (Controlبىلەن يۆنىلىش كونۇپكىسى)', nextYear: 'كېلەركى يىلى (Controlبىلەن يۆنىلىش كونۇپكىسى)', diff --git a/src/locale/uk_UA.ts b/src/locale/uk_UA.ts index 7222b6000..323e51907 100644 --- a/src/locale/uk_UA.ts +++ b/src/locale/uk_UA.ts @@ -18,7 +18,7 @@ const locale: Locale = { yearSelect: 'Обрати рік', decadeSelect: 'Обрати десятиріччя', - dateFormat: 'D-M-YYYY', + fieldDateFormat: 'D-M-YYYY', dateTimeFormat: 'D-M-YYYY HH:mm:ss', diff --git a/src/locale/ur_PK.ts b/src/locale/ur_PK.ts index ca5e82a76..5967f196d 100644 --- a/src/locale/ur_PK.ts +++ b/src/locale/ur_PK.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'ایک سال کا انتخاب کریں', decadeSelect: 'ایک دہائی کا انتخاب کریں', - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', diff --git a/src/locale/uz_UZ.ts b/src/locale/uz_UZ.ts index e5f4b429f..f871908f7 100644 --- a/src/locale/uz_UZ.ts +++ b/src/locale/uz_UZ.ts @@ -18,7 +18,7 @@ const locale: Locale = { monthSelect: 'Oyni tanlang', yearSelect: 'Yilni tanlang', decadeSelect: "O'n yilni tanlang", - dateFormat: 'M/D/YYYY', + fieldDateFormat: 'M/D/YYYY', dateTimeFormat: 'M/D/YYYY HH:mm:ss', previousMonth: 'Oldingi oy (PageUp)', nextMonth: 'Keyingi oy (PageDown)', diff --git a/src/locale/vi_VN.ts b/src/locale/vi_VN.ts index 2b4124c33..314f254d5 100644 --- a/src/locale/vi_VN.ts +++ b/src/locale/vi_VN.ts @@ -19,7 +19,7 @@ const locale: Locale = { yearSelect: 'Chọn năm', decadeSelect: 'Chọn thập kỷ', - dateFormat: 'D/M/YYYY', + fieldDateFormat: 'D/M/YYYY', dateTimeFormat: 'D/M/YYYY HH:mm:ss', diff --git a/src/locale/zh_TW.ts b/src/locale/zh_TW.ts index ea1e11113..ebbd2c4b9 100644 --- a/src/locale/zh_TW.ts +++ b/src/locale/zh_TW.ts @@ -23,7 +23,7 @@ const locale: Locale = { decadeSelect: '選擇年代', yearFormat: 'YYYY年', - dateFormat: 'YYYY年M月D日', + fieldDateFormat: 'YYYY年M月D日', dateTimeFormat: 'YYYY年M月D日 HH時mm分ss秒', previousYear: '上一年 (Control鍵加左方向鍵)', nextYear: '下一年 (Control鍵加右方向鍵)', diff --git a/tests/__snapshots__/panel.spec.tsx.snap b/tests/__snapshots__/panel.spec.tsx.snap index 34125971b..d523946ed 100644 --- a/tests/__snapshots__/panel.spec.tsx.snap +++ b/tests/__snapshots__/panel.spec.tsx.snap @@ -100,7 +100,7 @@ exports[`Picker.Panel append cell with cellRender in date 1`] = `
{ // type date fireEvent.change(inputEle, { target: { - value: '2000-03-03', + value: '3/8/2000', }, }); - expect(onCalendarChange).toHaveBeenCalledWith(expect.anything(), '2000-03-03', {}); + expect(onCalendarChange).toHaveBeenCalledWith(expect.anything(), '3/8/2000', {}); // Submit fireEvent.keyDown(inputEle, { key: 'Enter', }); - expect(onChange).toHaveBeenCalledWith(expect.anything(), '2000-03-03'); + expect(onChange).toHaveBeenCalledWith(expect.anything(), '3/8/2000'); }); it('warning for legacy preventDefault', () => { diff --git a/tests/multiple.spec.tsx b/tests/multiple.spec.tsx index f12facf80..5eb145a43 100644 --- a/tests/multiple.spec.tsx +++ b/tests/multiple.spec.tsx @@ -39,7 +39,7 @@ describe('Picker.Multiple', () => { selectCell(1); expect(onCalendarChange).toHaveBeenCalledWith( expect.anything(), - ['1990-09-01', '1990-09-03'], + ['9/1/1990', '9/3/1990'], expect.anything(), ); @@ -50,11 +50,7 @@ describe('Picker.Multiple', () => { // Confirm fireEvent.click(document.querySelector('.rc-picker-ok button')); - expect(onChange).toHaveBeenCalledWith(expect.anything(), [ - '1990-09-01', - '1990-09-03', - '1990-09-05', - ]); + expect(onChange).toHaveBeenCalledWith(expect.anything(), ['9/1/1990', '9/3/1990', '9/5/1990']); expect(onChange.mock.calls[0][0]).toHaveLength(3); }); @@ -71,7 +67,7 @@ describe('Picker.Multiple', () => { // Confirm fireEvent.click(document.querySelector('.rc-picker-ok button')); - expect(onChange).toHaveBeenCalledWith(expect.anything(), ['1990-09-01', '1990-09-05']); + expect(onChange).toHaveBeenCalledWith(expect.anything(), ['9/1/1990', '9/5/1990']); }); it('selector remove', () => { @@ -88,7 +84,7 @@ describe('Picker.Multiple', () => { const removeEle = container.querySelector('.rc-picker-selection-item-remove'); fireEvent.mouseDown(removeEle); fireEvent.click(removeEle); - expect(onChange).toHaveBeenCalledWith(expect.anything(), ['2000-01-28']); + expect(onChange).toHaveBeenCalledWith(expect.anything(), ['1/28/2000']); }); it('open to remove selector should not trigger onChange', () => { @@ -111,7 +107,7 @@ describe('Picker.Multiple', () => { // Confirm fireEvent.click(document.querySelector('.rc-picker-ok button')); - expect(onChange).toHaveBeenCalledWith(expect.anything(), ['2000-01-28']); + expect(onChange).toHaveBeenCalledWith(expect.anything(), ['1/28/2000']); }); it('hide clearIcon', () => { @@ -183,12 +179,12 @@ describe('Picker.Multiple', () => { expect(onChange).not.toHaveBeenCalled(); expect(onCalendarChange).toHaveBeenCalledWith( expect.anything(), - ['1998-10-23'], + ['10/23/1998'], expect.anything(), ); // Confirm fireEvent.click(document.querySelector('.rc-picker-ok button')); - expect(onChange).toHaveBeenCalledWith(expect.anything(), ['1998-10-23']); + expect(onChange).toHaveBeenCalledWith(expect.anything(), ['10/23/1998']); }); }); diff --git a/tests/new-range.spec.tsx b/tests/new-range.spec.tsx index ee123b25f..a93a5afaa 100644 --- a/tests/new-range.spec.tsx +++ b/tests/new-range.spec.tsx @@ -1296,7 +1296,7 @@ describe('NewPicker.Range', () => { // Out of range fireEvent.change(inputEle, { target: { - value: '2000-01-01', + value: '1/1/2000', }, }); fireEvent.keyDown(inputEle, { @@ -1307,7 +1307,7 @@ describe('NewPicker.Range', () => { // In range fireEvent.change(inputEle, { target: { - value: '2024-03-03', + value: '3/3/2024', }, }); fireEvent.keyDown(inputEle, { diff --git a/tests/panel.spec.tsx b/tests/panel.spec.tsx index 39131afab..4a452c7fb 100644 --- a/tests/panel.spec.tsx +++ b/tests/panel.spec.tsx @@ -616,12 +616,12 @@ describe('Picker.Panel', () => { it('week picker current should check year', () => { const { container } = render(); expect( - container.querySelector('.rc-picker-week-panel-row-selected td[title="1990-09-03"]'), + container.querySelector('.rc-picker-week-panel-row-selected td[title="9/3/1990"]'), ).toBeTruthy(); // Diff year fireEvent.click(container.querySelector('.rc-picker-header-super-next-btn')); - expect(container.querySelector('td[title="1991-09-03"]')).toBeTruthy(); + expect(container.querySelector('td[title="9/3/1991"]')).toBeTruthy(); expect(container.querySelector('.rc-picker-week-panel-row-selected')).toBeFalsy(); }); diff --git a/tests/picker.spec.tsx b/tests/picker.spec.tsx index be3853ae6..8fe198fe2 100644 --- a/tests/picker.spec.tsx +++ b/tests/picker.spec.tsx @@ -194,7 +194,7 @@ describe('Picker.Basic', () => { describe('value', () => { it('defaultValue', () => { const { container } = render(); - expect(container.querySelector('input').value).toEqual('1989-11-28'); + expect(container.querySelector('input').value).toEqual('11/28/1989'); }); it('uncontrolled', () => { @@ -207,8 +207,8 @@ describe('Picker.Basic', () => { expect(onChange).toHaveBeenCalled(); expect(isSame(onChange.mock.calls[0][0], '1990-09-11')).toBeTruthy(); - expect(onChange.mock.calls[0][1]).toEqual('1990-09-11'); - expect(container.querySelector('input').value).toEqual('1990-09-11'); + expect(onChange.mock.calls[0][1]).toEqual('9/11/1990'); + expect(container.querySelector('input').value).toEqual('9/11/1990'); }); it('controlled', () => { @@ -222,16 +222,16 @@ describe('Picker.Basic', () => { closePicker(container); expect(isSame(onChange.mock.calls[0][0], '2011-11-03')).toBeTruthy(); - expect(document.querySelector('input').value).toEqual('2011-11-11'); + expect(document.querySelector('input').value).toEqual('11/11/2011'); rerender(); - expect(document.querySelector('input').value).toEqual('2011-11-03'); + expect(document.querySelector('input').value).toEqual('11/3/2011'); // Raw change value rerender(); - expect(document.querySelector('input').value).toEqual('1999-09-09'); + expect(document.querySelector('input').value).toEqual('9/9/1999'); }); }); @@ -239,7 +239,8 @@ describe('Picker.Basic', () => { [ { name: 'basic', - value: '2000-11-11', + value: '11/11/2000', + picker: 'date', selected: '.rc-picker-cell-selected', matchDate: '2000-11-11', }, @@ -276,6 +277,7 @@ describe('Picker.Basic', () => { expect(document.querySelector('input').value).toEqual(value); expect(onChange).not.toHaveBeenCalled(); keyDown(KeyCode.ENTER); + expect(onChange).toHaveBeenCalled(); expect(isSame(onChange.mock.calls[0][0], matchDate, picker as any)).toBeTruthy(); expect(document.querySelector(selected)).toBeTruthy(); @@ -867,7 +869,7 @@ describe('Picker.Basic', () => { expect(document.querySelector('input').value).toEqual('aaaaa'); closePicker(container); - expect(document.querySelector('input').value).toEqual('2000-01-01'); + expect(document.querySelector('input').value).toEqual('1/1/2000'); }); it('switch picker should change format', () => { @@ -877,7 +879,7 @@ describe('Picker.Basic', () => { expect(document.querySelector('input').value).toEqual('1999-09-03 00:00:00'); [ - ['date', '1999-09-03'], + ['date', '9/3/1999'], ['month', '1999-09'], ['quarter', '1999-Q3'], ['year', '1999'], @@ -975,13 +977,13 @@ describe('Picker.Basic', () => { fireEvent.mouseEnter(cell); jest.runAllTimers(); - expect(document.querySelector('input').value).toBe('2020-07-24'); + expect(document.querySelector('input').value).toBe('7/24/2020'); expect(document.querySelector('.rc-picker-input')).toHaveClass('rc-picker-input-placeholder'); fireEvent.mouseLeave(cell); jest.runAllTimers(); - expect(document.querySelector('input').value).toBe('2020-07-22'); + expect(document.querySelector('input').value).toBe('7/22/2020'); expect(document.querySelector('.rc-picker-input')).not.toHaveClass( 'rc-picker-input-placeholder', ); @@ -995,11 +997,11 @@ describe('Picker.Basic', () => { fireEvent.mouseEnter(cell); jest.runAllTimers(); - expect(document.querySelector('input').value).toBe('2020-07-24'); + expect(document.querySelector('input').value).toBe('7/24/2020'); expect(document.querySelector('.rc-picker-input')).toHaveClass('rc-picker-input-placeholder'); selectCell(24); - expect(document.querySelector('input').value).toBe('2020-07-24'); + expect(document.querySelector('input').value).toBe('7/24/2020'); expect(document.querySelector('.rc-picker-input')).not.toHaveClass( 'rc-picker-input-placeholder', ); @@ -1012,7 +1014,7 @@ describe('Picker.Basic', () => { fireEvent.mouseEnter(cell); jest.runAllTimers(); - expect(document.querySelector('input').value).toBe('2020-07-24'); + expect(document.querySelector('input').value).toBe('7/24/2020'); expect(document.querySelector('.rc-picker-input')).toHaveClass('rc-picker-input-placeholder'); fireEvent.mouseLeave(cell); @@ -1028,7 +1030,7 @@ describe('Picker.Basic', () => { ); closePicker(container); - expect(document.querySelector('input').value).toBe('2020-07-23'); + expect(document.querySelector('input').value).toBe('7/22/2020'); expect(document.querySelector('.rc-picker-input')).not.toHaveClass( 'rc-picker-input-placeholder', ); @@ -1338,7 +1340,7 @@ describe('Picker.Basic', () => { fireEvent.change(container.querySelector('input'), { target: { - value: '1888-11-11', + value: '11/11/1888', }, }); expect(onPickerValueChange).toHaveBeenCalledWith(