Skip to content

enhancement tooltip ui #268

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 2 commits into from
Jun 28, 2017
Merged

enhancement tooltip ui #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3ccfec
enhancement tooltip ui
Jun 27, 2017
38fb9ff
use single quotes
Jun 28, 2017
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
17 changes: 7 additions & 10 deletions src/components/CallingSettingsPanel/i18n/en-US.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@ export default {
ringoutHint: 'Ring me at my location first, then connect the called party',
myLocationLabel: 'My Location',
press1ToStartCallLabel: 'Prompt me to dial 1 before connecting the call',
[`${callingOptions.browser}Tooltip`]: `Use this option to make and receive calls
using your computer’s microphone and speaker.`,
[`${callingOptions.softphone}Tooltip`]: `Use this option to make and receive calls
using your {brand} for Desktop app.`,
[`${callingOptions.browser}Tooltip`]: 'Use this option to make and receive calls using your computer’s microphone and speaker.',
[`${callingOptions.softphone}Tooltip`]: 'Use this option to make and receive calls using your {brand} for Desktop app.',
[`${callingOptions.myphone}Tooltip`]: 'Use this option to make calls using your {brand} phone.',
[`${callingOptions.otherphone}Tooltip`]: `Use this option to make calls using your other phones
such as home or cell phones that you have added in your {brand} Extension.
For the call you make, this phone will ring first then the party you called.`,
[`${callingOptions.customphone}Tooltip`]: `Use this option to make calls using any phone of
your choice by entering a valid phone number in the field below.
For the call you make, this phone will ring first then the party you called.`,
[`${callingOptions.myphone}Tooltip1`]: 'For the call you make, your {brand} phone will ring first then the party you called.',
[`${callingOptions.otherphone}Tooltip`]: 'Use this option to make calls using your other phones such as home or cell phones that you have added in your {brand} Extension.',
[`${callingOptions.otherphone}Tooltip1`]: 'For the call you make, this phone will ring first then the party you called.',
[`${callingOptions.customphone}Tooltip`]: 'Use this option to make calls using any phone of your choice by entering a valid phone number in the field below.',
[`${callingOptions.customphone}Tooltip1`]: 'For the call you make, this phone will ring first then the party you called.',
};
48 changes: 38 additions & 10 deletions src/components/CallingSettingsPanel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,37 @@ export default class CallingSettingsPanel extends Component {
ringoutPrompt: checked,
});
}

getTooltipContent() {
let contentKeys;
if (this.state.callWith === callingOptions.browser
|| this.state.callWith === callingOptions.softphone
) {
contentKeys = [`${this.state.callWith}Tooltip`];
} else {
contentKeys = [`${this.state.callWith}Tooltip`, `${this.state.callWith}Tooltip1`];
}
return (
<div>
{
contentKeys.map(contentKey => (
<div key={contentKey}>
{formatMessage(
i18n.getString(contentKey, this.props.currentLocale),
{ brand: this.props.brand }
)}
</div>
))
}
</div>
);
}

renderHandler = (option) => {
const brand = this.props.brand;
return formatMessage(i18n.getString(option, this.props.currentLocale), { brand });
}

render() {
const {
currentLocale,
Expand Down Expand Up @@ -173,16 +200,7 @@ export default class CallingSettingsPanel extends Component {
</div>
) : null;

const toolTip = (
<div style={{ width: 150 }}>
{
formatMessage(
i18n.getString(`${this.state.callWith}Tooltip`, currentLocale),
{ brand: this.props.brand }
)
}
</div>
);
const toolTip = this.getTooltipContent();
return (
<div className={classnames(styles.root, className)}>
<BackHeader
Expand All @@ -201,7 +219,11 @@ export default class CallingSettingsPanel extends Component {
placement="bottom"
trigger="click"
overlay={toolTip}
align={{
offset: [0, 47],
}}
arrowContent={<div className="rc-tooltip-arrow-inner" />}
getTooltipContainer={() => this.tooltipContainner}
>
<i className={classnames(dynamicsFont.information, styles.infoIcon)} />
</Tooltip>
Expand All @@ -220,6 +242,12 @@ export default class CallingSettingsPanel extends Component {
disabled={disabled}
titleEnabled
/>
<div
className={styles.tooltipContainner}
ref={(tooltipContainner) => {
this.tooltipContainner = tooltipContainner;
}}
/>
</InputField>
{ringout}
</Panel>
Expand Down
9 changes: 9 additions & 0 deletions src/components/CallingSettingsPanel/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@
color: #848484;
}

.tooltipContainner {
width: 100%;
height: 1px;
:global .rc-tooltip {
opacity: 1;
left: 0!important;
}
}

.ringoutHint {
padding: 15px 0px;
@include primary-font;
Expand Down