haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(toolbox): rename label / tooltip getters in ToolboxItem

This commit is contained in:
Saúl Ibarra Corretgé 2018-05-15 13:22:20 +02:00 committed by Lyubo Marinov
parent 8a160fd9ab
commit bce2438471
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
react/features/base/toolbox/components/AbstractToolboxItem.js
View File

@ -122,9 +122,9 @@ export default class AbstractToolboxItem<P : Props> extends Component<P> {
* provided then it will be translated using it. * provided then it will be translated using it.
* *
* @protected * @protected
* @returns {string} * @returns {?string}
*/ */
get _label() { get label(): ?string {
return this._maybeTranslateAttribute(this.props.label); return this._maybeTranslateAttribute(this.props.label);
} }
@ -133,9 +133,9 @@ export default class AbstractToolboxItem<P : Props> extends Component<P> {
* provided then it will be translated using it. * provided then it will be translated using it.
* *
* @protected * @protected
* @returns {string} * @returns {?string}
*/ */
get _tooltip() { get tooltip(): ?string {
return this._maybeTranslateAttribute(this.props.tooltip); return this._maybeTranslateAttribute(this.props.tooltip);
} }

7
react/features/base/toolbox/components/ToolboxItem.web.js
View File

@ -10,9 +10,6 @@ import type { Props } from './AbstractToolboxItem';
* Web implementation of {@code AbstractToolboxItem}. * Web implementation of {@code AbstractToolboxItem}.
*/ */
export default class ToolboxItem extends AbstractToolboxItem<Props> { export default class ToolboxItem extends AbstractToolboxItem<Props> {
_label: string;
_tooltip: string;
/** /**
* Handles rendering of the actual item. If the label is being shown, which * Handles rendering of the actual item. If the label is being shown, which
* is controlled with the `showLabel` prop, the item is rendered for its * is controlled with the `showLabel` prop, the item is rendered for its
@ -40,7 +37,7 @@ export default class ToolboxItem extends AbstractToolboxItem<Props> {
// $FlowFixMe // $FlowFixMe
<React.Fragment> <React.Fragment>
{ this._renderIcon() } { this._renderIcon() }
{ showLabel && this._label } { showLabel && this.label }
</React.Fragment> </React.Fragment>
); );
@ -61,7 +58,7 @@ export default class ToolboxItem extends AbstractToolboxItem<Props> {
= showLabel ? 'overflow-menu-item-icon' : 'toolbox-icon'; = showLabel ? 'overflow-menu-item-icon' : 'toolbox-icon';
const iconWrapper const iconWrapper
= React.createElement(elementType, { className }, icon); = React.createElement(elementType, { className }, icon);
const tooltip = this._tooltip; const tooltip = this.tooltip;
const useTooltip = !showLabel && tooltip && tooltip.length > 0; const useTooltip = !showLabel && tooltip && tooltip.length > 0;
if (useTooltip) { if (useTooltip) {