Skip to content
Merged
Changes from all commits
Commits
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
22 changes: 16 additions & 6 deletions src/DateTimeInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,23 @@ export default class DateTimeInput extends PureComponent {
const day = 11;

const date = new Date(year, monthIndex, day);
const formattedDate = formatDate(locale, date);

return (
formatDate(locale, date)
.replace(this.formatNumber(locale, year), 'y')
.replace(this.formatNumber(locale, monthIndex + 1), 'M')
.replace(this.formatNumber(locale, day), 'd')
);
const datePieces = ['year', 'month', 'day'];
const datePieceReplacements = ['y', 'M', 'd'];

function formatDatePiece(name, dateToFormat) {
return getFormatter({ useGrouping: false, [name]: 'numeric' })(locale, dateToFormat).match(/\d{1,}/);
}

let placeholder = formattedDate;
datePieces.forEach((datePiece, index) => {
const formattedDatePiece = formatDatePiece(datePiece, date);
const datePieceReplacement = datePieceReplacements[index];
placeholder = placeholder.replace(formattedDatePiece, datePieceReplacement);
});

return placeholder;
}

get timePlaceholder() {
Expand Down