Skip to content
Open
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
13 changes: 13 additions & 0 deletions packages/main/src/DatePicker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,15 @@ class DatePicker extends DateComponentBase implements IFormInputElement {
@property()
accessibleDescriptionRef?: string;

/**
* Defines whether the clear icon of the input will be shown.
* @default false
* @public
* @since 1.16.0
*/
@property({ type: Boolean })
showClearIcon = false;

@property({ type: Object })
_respPopoverConfig?: object;

Expand Down Expand Up @@ -878,6 +887,10 @@ class DatePicker extends DateComponentBase implements IFormInputElement {
return this.getDisplayFormat().format(this.getValueFormat().parse(this.value, true), true);
}

// get hasValue(): boolean {
// return !!this.value;
// }

get accInfo(): InputAccInfo {
return {
"ariaRoledescription": this.roleDescription,
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/DatePickerInputTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export default function DatePickerInputTemplate(this: DatePicker) {
onInput={this._onInputInput}
onSubmit={this._onInputSubmit}
onKeyDown={this._onkeydown}
showClearIcon={this.showClearIcon}
>

{!this.open && this.valueStateMessage.length > 0 &&
Expand Down
5 changes: 5 additions & 0 deletions packages/main/src/themes/DatePicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
background-color: var(--_ui5-datepicker-hover-background);
}

:host([show-clear-icon]) .ui5-date-picker-input:not([value]),
:host([show-clear-icon]) .ui5-date-picker-input[value=""] {
width: calc(100% + 36px);
}

.ui5-date-picker-popover::part(header) {
padding: 0;
}
6 changes: 6 additions & 0 deletions packages/main/src/themes/DateRangePicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,10 @@
min-width:inherit;
color: inherit;
background-color: inherit;
}

:host([show-clear-icon]) .ui5-date-picker-input:not([value]),
:host([show-clear-icon]) .ui5-date-picker-input[value=""] {
width: 100%;
min-width:inherit;
}
6 changes: 6 additions & 0 deletions packages/main/src/themes/DateTimePicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,10 @@
min-width: inherit;
color: inherit;
background-color: inherit;
}

:host([show-clear-icon]) .ui5-date-picker-input:not([value]),
:host([show-clear-icon]) .ui5-date-picker-input[value=""] {
width: 100%;
min-width:inherit;
}
2 changes: 1 addition & 1 deletion packages/main/test/pages/DatePicker.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3>format-pattern - 'short'</h3>
<ui5-date-picker id='dp6' format-pattern='short'></ui5-date-picker>

<h3>format-pattern - 'long'</h3>
<ui5-date-picker id='dp7' format-pattern='long'></ui5-date-picker>
<ui5-date-picker id='dp7' show-clear-icon format-pattern='long'></ui5-date-picker>

<h3>format-pattern - 'QQQ yyyy, MMM dd'</h3>
<ui5-date-picker id='dp8' format-pattern='QQQ yyyy, MMM dd'></ui5-date-picker>
Expand Down
2 changes: 1 addition & 1 deletion packages/main/test/pages/DateRangePicker.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<label id='labelChange'>0</label>
<label id='labelDate'></label>
</div>
<ui5-daterange-picker id="daterange-picker1"></ui5-daterange-picker>
<ui5-daterange-picker show-clear-icon id="daterange-picker1"></ui5-daterange-picker>
<h3>daterange-picker with delimiter @</h3>
<ui5-daterange-picker id="daterange-picker2" delimiter="@"></ui5-daterange-picker>
<h3>display-fomat='medium' value-fomat='yyyy-MM-dd'</h3>
Expand Down
2 changes: 1 addition & 1 deletion packages/main/test/pages/DateTimePicker.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<body class="datetimepicker1auto">

<ui5-label for="dtpLabel">Deadline</ui5-label>
<ui5-datetime-picker id="dtpLabel"></ui5-datetime-picker>
<ui5-datetime-picker id="dtpLabel" show-clear-icon></ui5-datetime-picker>

<section>
<ui5-title>DateTimePicker</ui5-title><br>
Expand Down
Loading