Skip to content

Commit 39e2148

Browse files
Merge pull request #165 from data-driven-forms/fix-placeholder-date-pf3
fix(pf3): Date time picker placeholder.
2 parents 70c817a + b1a59a4 commit 39e2148

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

packages/pf3-component-mapper/demo/demo-schemas/sandbox.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ const output = {
429429
label: 'Datepicker with past days',
430430
title: 'Datepicker with past days',
431431
component: components.DATE_PICKER,
432+
variant: 'date-time',
432433
},
433434
],
434435
component: components.SUB_FORM,

packages/pf3-component-mapper/src/form-fields/date-time-picker/date-time-picker.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ import { createDisabledDays } from './helpers';
77

88
import 'react-day-picker/lib/style.css';
99

10+
const getPlaceholder = (variant, placeholder) => placeholder
11+
? placeholder
12+
: variant === 'date'
13+
? 'Click in this input to select date'
14+
: 'Click in this input to select date and time';
15+
1016
const selectValidDate = (newDate, disabledDays) => {
1117
const { after, before } = disabledDays.find(item => typeof item === 'object' && !(item instanceof Date)) || {};
1218
if (before && newDate < before) {
@@ -110,12 +116,13 @@ export class DateTimePicker extends React.Component {
110116
disabledDays,
111117
isClearable,
112118
} = this.props;
119+
const inputPlaceholder = getPlaceholder(variant, placeholder);
113120
const cleanDisabledDays = createDisabledDays(disabledDays);
114121
return (
115122
<div style={{ position: 'relative' }} ref={ this.wrapperRef } >
116123
<PickerInput
117124
handleOverlayToggle={ this.handleOverlayToggle }
118-
placeholder={ placeholder }
125+
placeholder={ inputPlaceholder }
119126
selectedDay={ selectedDay }
120127
variant={ variant }
121128
locale={ locale }
@@ -171,7 +178,6 @@ DateTimePicker.propTypes = {
171178
DateTimePicker.defaultProps = {
172179
variant: 'date',
173180
locale: 'en',
174-
placeholder: 'Click in this input to select date',
175181
showTodayButton: true,
176182
todayButtonLabel: 'Today',
177183
closeOnDaySelect: false,

0 commit comments

Comments
 (0)