Skip to content
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.

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

Helper text #41

Merged
merged 5 commits into from
Jun 4, 2020
Merged
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"vaadin-element-mixin": "vaadin/vaadin-element-mixin#^2.4.1",
"vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#^1.6.0",
"vaadin-material-styles": "vaadin/vaadin-material-styles#^1.3.2",
"vaadin-date-picker": "vaadin/vaadin-date-picker#^4.3.0-alpha1",
"vaadin-time-picker": "vaadin/vaadin-time-picker#^2.3.0-alpha2",
"vaadin-custom-field": "vaadin/vaadin-custom-field#^1.2.0-alpha1"
"vaadin-date-picker": "vaadin/vaadin-date-picker#^4.3.0-alpha2",
"vaadin-time-picker": "vaadin/vaadin-time-picker#^2.3.0-alpha3",
"vaadin-custom-field": "vaadin/vaadin-custom-field#^1.2.0-alpha2"
},
"devDependencies": {
"iron-component-page": "^3.0.0",
Expand Down
10 changes: 10 additions & 0 deletions demo/date-time-picker-basic-demos.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ <h3>Disabled and readonly</h3>
</template>
</vaadin-demo-snippet>

<h3>Helper text</h3>
<p>Use the <code>helper-text</code> attribute or add content to the <code>helper</code> slot to set helper content.</p>
<vaadin-demo-snippet id="date-time-picker-basic-demos-helper-text">
<template preserve-content>
<vaadin-date-time-picker label="Appointment time">
<span slot="helper">Please consult with customer service before choosing time</span>
</vaadin-date-time-picker>
</template>
</vaadin-demo-snippet>

<h3>Initial position of date picker</h3>
<vaadin-demo-snippet id="date-time-picker-basic-demos-initial-position">
<template preserve-content>
Expand Down
8 changes: 8 additions & 0 deletions demo/date-time-picker-theme-variants-demos.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ <h3>Small text field</h3>
</template>
</vaadin-demo-snippet>

<h3>Helper text position</h3>
<vaadin-demo-snippet>
<template preserve-content>
<vaadin-date-time-picker helper-text="helper text below date time picker"></vaadin-date-time-picker>
<vaadin-date-time-picker helper-text="helper text above date time picker" theme="helper-above-field"></vaadin-date-time-picker>
</template>
</vaadin-demo-snippet>

</template>
<script>
class DateTimePickerThemeVariantsDemos extends DemoReadyEventEmitter(DateTimePickerDemo(Polymer.Element)) {
Expand Down
10 changes: 10 additions & 0 deletions src/vaadin-date-time-picker.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
disabled$="[[disabled]]"
readonly$="[[readonly]]"
error-message="[[errorMessage]]"
helper-text="[[helperText]]"
>
<div class="slot-container">
<slot name="date-picker" id="dateSlot">
Expand All @@ -72,6 +73,7 @@
<vaadin-date-time-picker-time-picker part="time" theme$="[[theme]]"></vaadin-date-time-picker-time-picker>
</slot>
</div>
<slot name="helper" slot="helper">[[helperText]]</slot>
</vaadin-date-time-picker-custom-field>
</template>

Expand Down Expand Up @@ -275,6 +277,14 @@
type: String
},

/**
* String used for the helper text.
*/
helperText: {
type: String,
value: ''
},

/**
* Specifies the number of valid intervals in a day used for
* configuring the items displayed in the time selection box.
Expand Down
26 changes: 26 additions & 0 deletions test/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
</template>
</test-fixture>

<test-fixture id="dtp-with-slotted-helper">
<template>
<vaadin-date-time-picker>
<div slot="helper">foo</div>
</vaadin-date-time-picker>
</template>
</test-fixture>

<test-fixture id="theme-attribute">
<template>
<vaadin-date-time-picker theme="foo"></vaadin-date-time-picker>
Expand Down Expand Up @@ -293,6 +301,24 @@

});

describe('helperText', () => {
let dateTimePicker;

beforeEach(() => dateTimePicker = fixture('default'));

it('should display the helper text when provided', () => {
dateTimePicker.helperText = 'Foo';
expect(dateTimePicker.$.customField.helperText).to.equal(dateTimePicker.helperText);
});

it('should display the helper text when slotted helper available', () => {
const dateTimePicker = fixture(`dtp-with-slotted-helper`);
const evt = new CustomEvent('slotchange');
dateTimePicker.shadowRoot.querySelector('[name="helper"]').dispatchEvent(evt);
expect(dateTimePicker.$.customField.querySelector('[slot="helper"]').assignedNodes()[0].textContent).to.eql('foo');
});
});

describe('Theme attribute', () => {
let dateTimePicker;
let customField;
Expand Down
15 changes: 14 additions & 1 deletion test/visual/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,16 @@
const dir = window.location.search.replace(/.*dir=(\w+).*/, '$1') || 'ltr';
document.documentElement.setAttribute('dir', dir);
</script>
<style>
vaadin-date-time-picker {
text-align: initial;
}
</style>
</head>

<body>

<div id="default-tests" style="padding: 10px; text-align: right; width: 500px">
<div id="default-tests" style="padding: 10px; text-align: end; width: 500px">
Plain
<vaadin-date-time-picker></vaadin-date-time-picker>

Expand All @@ -27,6 +32,14 @@

<br>Read-only
<vaadin-date-time-picker readonly label="Label" value="2019-09-16T15:00"></vaadin-date-time-picker>

<br>Helper text
<vaadin-date-time-picker label="Foo" value="2019-09-16T15:00" helper-text="Bar"></vaadin-date-time-picker>

<br>Slotted helper
<vaadin-date-time-picker>
<span slot="helper">Bar</span>
</vaadin-date-time-picker>
</div>

</body>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.