update detail status page and mobile settings for porfile hover card
This commit is contained in:
parent
f6ebe5cbd7
commit
d76f4d422e
|
@ -253,11 +253,11 @@ class Status extends ImmutablePureComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
handleProfileHover = e => {
|
handleProfileHover = e => {
|
||||||
if (!isMobile()) this.setState({ profileCardVisible: true });
|
if (!isMobile(window.innerWidth)) this.setState({ profileCardVisible: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
handleProfileLeave = e => {
|
handleProfileLeave = e => {
|
||||||
if (!isMobile()) this.setState({ profileCardVisible: false });
|
if (!isMobile(window.innerWidth)) this.setState({ profileCardVisible: false });
|
||||||
}
|
}
|
||||||
|
|
||||||
_properStatus() {
|
_properStatus() {
|
||||||
|
@ -467,7 +467,7 @@ class Status extends ImmutablePureComponent {
|
||||||
</div>
|
</div>
|
||||||
</NavLink>
|
</NavLink>
|
||||||
<DisplayName account={status.get('account')} others={otherAccounts}>
|
<DisplayName account={status.get('account')} others={otherAccounts}>
|
||||||
<ProfileHoverCardContainer accountId={status.getIn(['account', 'id'])} visible={profileCardVisible} />
|
<ProfileHoverCardContainer accountId={status.getIn(['account', 'id'])} visible={!isMobile(window.innerWidth) && profileCardVisible} />
|
||||||
</DisplayName>
|
</DisplayName>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -9,6 +9,8 @@ import UserPanel from '../ui/components/user_panel';
|
||||||
import ActionButton from '../ui/components/action_button';
|
import ActionButton from '../ui/components/action_button';
|
||||||
import { isAdmin, isModerator } from 'soapbox/utils/accounts';
|
import { isAdmin, isModerator } from 'soapbox/utils/accounts';
|
||||||
import Badge from 'soapbox/components/badge';
|
import Badge from 'soapbox/components/badge';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
import { isMobile } from 'soapbox/is_mobile';
|
||||||
|
|
||||||
const getAccount = makeGetAccount();
|
const getAccount = makeGetAccount();
|
||||||
|
|
||||||
|
@ -43,8 +45,8 @@ class ProfileHoverCardContainer extends ImmutablePureComponent {
|
||||||
const accountBio = { __html: account.get('note_emojified') };
|
const accountBio = { __html: account.get('note_emojified') };
|
||||||
let followed_by = account.getIn(['relationship', 'followed_by']);
|
let followed_by = account.getIn(['relationship', 'followed_by']);
|
||||||
|
|
||||||
return visible && (
|
return (
|
||||||
<div className='profile-hover-card'>
|
<div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })}>
|
||||||
<div className='profile-hover-card__container'>
|
<div className='profile-hover-card__container'>
|
||||||
<div className='profile-hover-card__action-button'><ActionButton account={account} /></div>
|
<div className='profile-hover-card__action-button'><ActionButton account={account} /></div>
|
||||||
<UserPanel className='profile-hover-card__user' accountId={accountId} />
|
<UserPanel className='profile-hover-card__user' accountId={accountId} />
|
||||||
|
|
|
@ -16,7 +16,8 @@ import classNames from 'classnames';
|
||||||
import Icon from 'soapbox/components/icon';
|
import Icon from 'soapbox/components/icon';
|
||||||
import PollContainer from 'soapbox/containers/poll_container';
|
import PollContainer from 'soapbox/containers/poll_container';
|
||||||
import { StatusInteractionBar } from './status_interaction_bar';
|
import { StatusInteractionBar } from './status_interaction_bar';
|
||||||
import UserPanel from '../../ui/components/user_panel';
|
import ProfileHoverCardContainer from 'soapbox/features/profile_hover_card/profile_hover_card_container';
|
||||||
|
import { isMobile } from 'soapbox/is_mobile';
|
||||||
|
|
||||||
export default class DetailedStatus extends ImmutablePureComponent {
|
export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
@ -39,9 +40,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
|
|
||||||
state = {
|
state = {
|
||||||
height: null,
|
height: null,
|
||||||
profilePanelVisible: false,
|
profileCardVisible: false,
|
||||||
profilePanelX: 0,
|
|
||||||
profilePanelY: 0,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
handleOpenVideo = (media, startTime) => {
|
handleOpenVideo = (media, startTime) => {
|
||||||
|
@ -85,21 +84,19 @@ export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
window.open(href, 'soapbox-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
|
window.open(href, 'soapbox-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
|
||||||
}
|
}
|
||||||
|
|
||||||
isMobile = () => window.matchMedia('only screen and (max-width: 895px)').matches;
|
|
||||||
|
|
||||||
handleProfileHover = e => {
|
handleProfileHover = e => {
|
||||||
if (!this.isMobile()) this.setState({ profilePanelVisible: true, profilePanelX: e.nativeEvent.offsetX, profilePanelY: e.nativeEvent.offsetY });
|
if (!isMobile(window.innerWidth)) this.setState({ profileCardVisible: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
handleProfileLeave = e => {
|
handleProfileLeave = e => {
|
||||||
if (!this.isMobile()) this.setState({ profilePanelVisible: false });
|
if (!isMobile(window.innerWidth)) this.setState({ profileCardVisible: false });
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
|
const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
|
||||||
const outerStyle = { boxSizing: 'border-box' };
|
const outerStyle = { boxSizing: 'border-box' };
|
||||||
const { compact } = this.props;
|
const { compact } = this.props;
|
||||||
const { profilePanelVisible, profilePanelX, profilePanelY } = this.state;
|
const { profileCardVisible } = this.state;
|
||||||
|
|
||||||
if (!status) {
|
if (!status) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -176,9 +173,10 @@ export default class DetailedStatus extends ImmutablePureComponent {
|
||||||
<div className='detailed-status__profile' onMouseEnter={this.handleProfileHover} onMouseLeave={this.handleProfileLeave}>
|
<div className='detailed-status__profile' onMouseEnter={this.handleProfileHover} onMouseLeave={this.handleProfileLeave}>
|
||||||
<NavLink to={`/@${status.getIn(['account', 'acct'])}`} className='detailed-status__display-name'>
|
<NavLink to={`/@${status.getIn(['account', 'acct'])}`} className='detailed-status__display-name'>
|
||||||
<div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div>
|
<div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div>
|
||||||
<DisplayName account={status.get('account')} />
|
|
||||||
<UserPanel accountId={status.getIn(['account', 'id'])} visible={profilePanelVisible} style={{ top: `${profilePanelY+15}px`, left: `${profilePanelX-132}px` }} />
|
|
||||||
</NavLink>
|
</NavLink>
|
||||||
|
<DisplayName account={status.get('account')}>
|
||||||
|
<ProfileHoverCardContainer accountId={status.getIn(['account', 'id'])} visible={!isMobile(window.innerWidth) && profileCardVisible} />
|
||||||
|
</DisplayName>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{status.get('group') && (
|
{status.get('group') && (
|
||||||
|
|
|
@ -1,17 +1,25 @@
|
||||||
.display-name__account {
|
.display-name__account {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.profile-hover-card {
|
.profile-hover-card {
|
||||||
@include standard-panel;
|
@include standard-panel;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
pointer-events: none;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition-property: opacity;
|
transition-property: opacity;
|
||||||
transition-duration: 0.5s;
|
transition-duration: 0.2s;
|
||||||
|
transition-delay: 0.7s;
|
||||||
z-index: 998;
|
z-index: 998;
|
||||||
opacity: 1;
|
|
||||||
transition-delay: 1s;
|
|
||||||
left: -10px;
|
left: -10px;
|
||||||
|
top: 70px;
|
||||||
|
|
||||||
|
&--visible {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: all;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@media(min-width: 750px) {
|
@media(min-width: 750px) {
|
||||||
left: -80px;
|
left: -80px;
|
||||||
|
@ -45,6 +53,7 @@
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,3 +61,10 @@
|
||||||
margin: 0 20px 20px;
|
margin: 0 20px 20px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.detailed-status {
|
||||||
|
.profile-hover-card {
|
||||||
|
top: -20px;
|
||||||
|
left: 80px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue