Skip to content

feat(ui5-button): implement title property #2492

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 25, 2020
Merged

feat(ui5-button): implement title property #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c953f4
feat(ui5-button): implement tooltip property
fifoosid Nov 18, 2020
a06eb76
fix comments
fifoosid Nov 23, 2020
5c65ae9
fix comments
fifoosid Nov 24, 2020
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
2 changes: 1 addition & 1 deletion packages/main/src/Button.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
style="{{styles.icon}}"
class="ui5-button-icon"
name="{{icon}}"
show-tooltip={{iconOnly}}
show-tooltip={{showIconTooltip}}
></ui5-icon>
{{/if}}

Expand Down
20 changes: 19 additions & 1 deletion packages/main/src/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,19 @@ const metadata = {
type: Boolean,
},

/**
* Defines the tooltip of the button.
* <br>
* <b>Important:</b> Tooltips should only be set to icon only buttons.
* @type {string}
* @defaultvalue: ""
* @private
* @since 1.0.0-rc.11
*/
title: {
type: String,
},

/**
* Used to switch the active state (pressed or not) of the <code>ui5-button</code>.
* @private
Expand Down Expand Up @@ -187,6 +200,7 @@ const metadata = {
_iconSettings: {
type: Object,
},

_buttonAccInfo: {
type: Object,
},
Expand Down Expand Up @@ -370,7 +384,7 @@ class Button extends UI5Element {
"ariaExpanded": this.ariaExpanded || (this._buttonAccInfo && this._buttonAccInfo.ariaExpanded),
"ariaControls": this._buttonAccInfo && this._buttonAccInfo.ariaControls,
"ariaHaspopup": this._buttonAccInfo && this._buttonAccInfo.ariaHaspopup,
"title": this._buttonAccInfo && this._buttonAccInfo.title,
"title": this.title || (this._buttonAccInfo && this._buttonAccInfo.title),
};
}

Expand Down Expand Up @@ -400,6 +414,10 @@ class Button extends UI5Element {
return this.nonFocusable ? "-1" : this._tabIndex;
}

get showIconTooltip() {
return this.iconOnly && !this.title;
}

get styles() {
return {
icon: {
Expand Down
9 changes: 9 additions & 0 deletions packages/main/test/pages/Button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,15 @@
<ui5-button class="long-button" icon="download">Download</ui5-button>
<ui5-button class="long-button long-button-end" icon="download">Download</ui5-button>

<br/>
<br/>
<ui5-title>Buttons with tooltip</ui5-title>
<br/>
<ui5-button icon="home" title="Go home"></ui5-button>
<ui5-button icon="accept" title="Accept terms & conditions"></ui5-button>
<ui5-button icon="action-settings" title="Go to settings"></ui5-button>
<ui5-button icon="alert" title="Fire an alert"></ui5-button>
<ui5-button icon="arrow-down" title="Go down"></ui5-button>

<script>
var clickCounter = document.querySelector("#click-counter");
Expand Down