PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

s/tooltip/tooltipContent/

Browse source
This commit is contained in:
David Baker 2019-08-13 11:01:04 +01:00
parent c36c3a9b33
commit 860a9dbc82
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/elements/Field.js
View file

@ -48,7 +48,7 @@ export default class Field extends React.PureComponent {
onValidate: PropTypes.func, onValidate: PropTypes.func,
// If specified, contents will appear as a tooltip on the element and // If specified, contents will appear as a tooltip on the element and
// validation feedback tooltips will be suppressed. // validation feedback tooltips will be suppressed.
tooltip: PropTypes.node, tooltipContent: PropTypes.node,
// All other props pass through to the <input>. // All other props pass through to the <input>.
}; };
@ -137,8 +137,7 @@ export default class Field extends React.PureComponent {
}, VALIDATION_THROTTLE_MS); }, VALIDATION_THROTTLE_MS);
render() { render() {
const { element, prefix, onValidate, children, ...inputProps } = this.props; const { element, prefix, onValidate, children, tooltipContent, ...inputProps } = this.props;
delete inputProps.tooltip; // needs to be removed from props but we don't need it here
const inputElement = element || "input"; const inputElement = element || "input";
@ -170,11 +169,11 @@ export default class Field extends React.PureComponent {
// Handle displaying feedback on validity // Handle displaying feedback on validity
const Tooltip = sdk.getComponent("elements.Tooltip"); const Tooltip = sdk.getComponent("elements.Tooltip");
let fieldTooltip; let fieldTooltip;
if (this.props.tooltip || this.state.feedback) { if (tooltipContent || this.state.feedback) {
fieldTooltip = <Tooltip fieldTooltip = <Tooltip
tooltipClassName="mx_Field_tooltip" tooltipClassName="mx_Field_tooltip"
visible={this.state.feedbackVisible} visible={this.state.feedbackVisible}
label={this.props.tooltip || this.state.feedback} label={tooltipContent || this.state.feedback}
/>; />;
} }

2
src/components/views/settings/SetIdServer.js
View file

@ -182,7 +182,7 @@ export default class SetIdServer extends React.Component {
id="mx_SetIdServer_idServer" id="mx_SetIdServer_idServer"
type="text" value={this.state.idServer} autoComplete="off" type="text" value={this.state.idServer} autoComplete="off"
onChange={this._onIdentityServerChanged} onChange={this._onIdentityServerChanged}
tooltip={this._getTooltip()} tooltipContent={this._getTooltip()}
/> />
<input className="mx_Dialog_primary" <input className="mx_Dialog_primary"
type="submit" value={_t("Change")} type="submit" value={_t("Change")}