OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3333 from matrix-org/travis/fix-tooltip 

Remove tooltipClassName from the Field's input
pull/21833/head
Travis Ralston 2019-08-22 08:40:23 -06:00 committed by GitHub
parent fbb2af00da 6f7bbf958e
commit efe8254985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/elements/Field.js
View File

@ -144,7 +144,7 @@ export default class Field extends React.PureComponent {
render() { render() {
const { const {
element, prefix, onValidate, children, tooltipContent, flagInvalid, element, prefix, onValidate, children, tooltipContent, flagInvalid,
...inputProps} = this.props; tooltipClassName, ...inputProps} = this.props;
const inputElement = element || "input"; const inputElement = element || "input";
@ -180,7 +180,7 @@ export default class Field extends React.PureComponent {
const Tooltip = sdk.getComponent("elements.Tooltip"); const Tooltip = sdk.getComponent("elements.Tooltip");
let fieldTooltip; let fieldTooltip;
if (tooltipContent || this.state.feedback) { if (tooltipContent || this.state.feedback) {
const addlClassName = this.props.tooltipClassName ? this.props.tooltipClassName : ''; const addlClassName = tooltipClassName ? tooltipClassName : '';
fieldTooltip = <Tooltip fieldTooltip = <Tooltip
tooltipClassName={`mx_Field_tooltip ${addlClassName}`} tooltipClassName={`mx_Field_tooltip ${addlClassName}`}
visible={this.state.feedbackVisible} visible={this.state.feedbackVisible}