Skip to content
This repository has been archived by the owner on Sep 28, 2020. It is now read-only.

Commit

Permalink
Profile popover new component: DM, calendar, whober, @mentions
Browse files Browse the repository at this point in the history
* UCHAT-181 Add button to DM a user from their profile preview popover tile, UCHAT-318 Add new style with icons to Profile Popover for email and DM, UCHAT-76 Add link to user's whober profile from their profile preview popover tile, UCHAT-342 Redesign profile hovercard to match whober style spec

* UCHAT-562 Show @username button on profile popover (#26)

* UCHAT-562 add tooltip to popover mention button

* UCHAT-1034 Profile Popover appears misplaced on the top part of the window (#34)

* UCHAT-76 Add Tooltip to link to whober profile in profile popover (#32)

* UCHAT-361 Add calendar link to profile hovercard

* UCHAT-1307 3.7 Regression - @mentions on hovercards no longer work (#57)

Also, Fix not being switched to a new channel. Fixes to profile popover from rebase.

UCHAT-1854 Display position in user hovecard under name
  • Loading branch information
David Meza committed Jan 12, 2018
1 parent d23a203 commit 78c4a29
Show file tree
Hide file tree
Showing 10 changed files with 408 additions and 34 deletions.
3 changes: 2 additions & 1 deletion components/at_mention/at_mention.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {Client4} from 'mattermost-redux/client';

import Pluggable from 'plugins/pluggable';

import ProfilePopover from 'components/profile_popover.jsx';
import ProfilePopover from 'components/profile_popover_new.jsx';

export default class AtMention extends React.PureComponent {
static propTypes = {
Expand Down Expand Up @@ -95,6 +95,7 @@ export default class AtMention extends React.PureComponent {
hide={this.hideProfilePopover}
isRHS={this.props.isRHS}
hasMention={this.props.hasMention}
parent={this}
/>
</Pluggable>
}
Expand Down
11 changes: 7 additions & 4 deletions components/profile_picture.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ import Pluggable from 'plugins/pluggable';

import * as PostUtils from 'utils/post_utils.jsx';

import ProfilePopover from './profile_popover.jsx';
import ProfilePopover from './profile_popover_new.jsx';
import StatusIcon from './status_icon.jsx';

export default class ProfilePicture extends React.PureComponent {
static defaultProps = {
width: '36',
height: '36',
isRHS: false,
hasMention: false
hasMention: false,
disablePopover: false
};

static propTypes = {
Expand All @@ -30,7 +31,8 @@ export default class ProfilePicture extends React.PureComponent {
isBusy: PropTypes.bool,
isRHS: PropTypes.bool,
hasMention: PropTypes.bool,
post: PropTypes.object
post: PropTypes.object,
disablePopover: PropTypes.bool
};

hideProfilePopover = () => {
Expand All @@ -44,7 +46,7 @@ export default class ProfilePicture extends React.PureComponent {
if (this.props.post) {
isSystemMessage = PostUtils.isSystemMessage(this.props.post);
}
if (this.props.user) {
if (this.props.user && !this.props.disablePopover) {
return (
<OverlayTrigger
ref='overlay'
Expand All @@ -61,6 +63,7 @@ export default class ProfilePicture extends React.PureComponent {
hide={this.hideProfilePopover}
isRHS={this.props.isRHS}
hasMention={this.props.hasMention}
parent={this}
/>
</Pluggable>
}
Expand Down
Loading

0 comments on commit 78c4a29

Please sign in to comment.