Skip to content

Commit

Permalink
fix(FEC-10055): tooltip default position prop should be of the wrappe…
Browse files Browse the repository at this point in the history
…r control instead of the tooltip to enable overriding (#558)
  • Loading branch information
RoyBregman committed Nov 23, 2020
1 parent df64d0b commit f4c1a1e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/components/share/share.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class Share extends Component {
)
) : (
<div className={style.controlButtonContainer}>
<Tooltip label={this.props.shareTxt} type={ToolTipType.BottomLeft}>
<Tooltip label={this.props.shareTxt} type={this.props.toolTipType ? this.props.toolTipType : ToolTipType.BottomLeft}>
<Button aria-haspopup="true" className={style.controlButton} onClick={() => this.toggleOverlay()} aria-label={this.props.shareTxt}>
<Icon type={IconType.Share} />
</Button>
Expand Down
4 changes: 3 additions & 1 deletion src/components/volume/volume.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,9 @@ class Volume extends Component {
className={controlButtonClass.join(' ')}
onMouseOver={() => this.onMouseOver()}
onMouseOut={() => this.onMouseOut()}>
<Tooltip label={muted ? this.props.unmuteAriaLabel : this.props.muteAriaLabel} type={ToolTipType.Left}>
<Tooltip
label={muted ? this.props.unmuteAriaLabel : this.props.muteAriaLabel}
type={this.props.toolTipType ? this.props.toolTipType : ToolTipType.Left}>
<Button
tabIndex="0"
aria-label={muted ? this.props.unmuteAriaLabel : this.props.muteAriaLabel}
Expand Down

0 comments on commit f4c1a1e

Please sign in to comment.