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-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-76 Add Tooltip to link to whober profile in profile popover (#32)

* UCHAT-361 Add calendar link to profile hovercard

UCHAT-1854 Display position in user hovecard under name
  • Loading branch information
David Meza committed Jun 7, 2018
1 parent 00b242f commit 40c97e6
Show file tree
Hide file tree
Showing 13 changed files with 447 additions and 36 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 @@ -7,7 +7,8 @@ import {OverlayTrigger} from 'react-bootstrap';
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
6 changes: 4 additions & 2 deletions components/profile_picture.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ 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 {
Expand All @@ -19,6 +19,7 @@ export default class ProfilePicture extends React.PureComponent {
height: '36',
isRHS: false,
hasMention: false,
disablePopover: false,
};

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

hideProfilePopover = () => {
Expand All @@ -42,7 +44,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 Down
Loading

0 comments on commit 40c97e6

Please sign in to comment.