Merge branch 'big-emoji' into 'develop'
Display big emojis when there's no other content See merge request soapbox-pub/soapbox-fe!589
This commit is contained in:
commit
ed793d912a
|
@ -9,8 +9,10 @@ import classnames from 'classnames';
|
||||||
import Icon from 'soapbox/components/icon';
|
import Icon from 'soapbox/components/icon';
|
||||||
import { getSoapboxConfig } from 'soapbox/actions/soapbox';
|
import { getSoapboxConfig } from 'soapbox/actions/soapbox';
|
||||||
import { addGreentext } from 'soapbox/utils/greentext';
|
import { addGreentext } from 'soapbox/utils/greentext';
|
||||||
|
import { onlyEmoji } from 'soapbox/utils/rich_content';
|
||||||
|
|
||||||
const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
|
const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
|
||||||
|
const BIG_EMOJI_LIMIT = 10;
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
greentext: getSoapboxConfig(state).get('greentext'),
|
greentext: getSoapboxConfig(state).get('greentext'),
|
||||||
|
@ -88,14 +90,24 @@ class StatusContent extends React.PureComponent {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
setOnlyEmoji = () => {
|
||||||
|
if (this.node && this.state.onlyEmoji === undefined) {
|
||||||
|
this.setState({ onlyEmoji: onlyEmoji(this.node, BIG_EMOJI_LIMIT) });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
refresh = () => {
|
||||||
this.setCollapse();
|
this.setCollapse();
|
||||||
this._updateStatusLinks();
|
this._updateStatusLinks();
|
||||||
|
this.setOnlyEmoji();
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidUpdate() {
|
componentDidUpdate() {
|
||||||
this.setCollapse();
|
this.refresh();
|
||||||
this._updateStatusLinks();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMentionClick = (mention, e) => {
|
onMentionClick = (mention, e) => {
|
||||||
|
@ -171,6 +183,7 @@ class StatusContent extends React.PureComponent {
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { status } = this.props;
|
const { status } = this.props;
|
||||||
|
const { onlyEmoji } = this.state;
|
||||||
|
|
||||||
if (status.get('content').length === 0) {
|
if (status.get('content').length === 0) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -185,6 +198,7 @@ class StatusContent extends React.PureComponent {
|
||||||
'status__content--with-action': this.props.onClick && this.context.router,
|
'status__content--with-action': this.props.onClick && this.context.router,
|
||||||
'status__content--with-spoiler': status.get('spoiler_text').length > 0,
|
'status__content--with-spoiler': status.get('spoiler_text').length > 0,
|
||||||
'status__content--collapsed': this.state.collapsed === true,
|
'status__content--collapsed': this.state.collapsed === true,
|
||||||
|
'status__content--big': onlyEmoji,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (isRtl(status.get('search_index'))) {
|
if (isRtl(status.get('search_index'))) {
|
||||||
|
@ -250,7 +264,9 @@ class StatusContent extends React.PureComponent {
|
||||||
<div
|
<div
|
||||||
tabIndex='0'
|
tabIndex='0'
|
||||||
ref={this.setRef}
|
ref={this.setRef}
|
||||||
className='status__content'
|
className={classnames('status__content', {
|
||||||
|
'status__content--big': onlyEmoji,
|
||||||
|
})}
|
||||||
style={directionStyle}
|
style={directionStyle}
|
||||||
dangerouslySetInnerHTML={content}
|
dangerouslySetInnerHTML={content}
|
||||||
lang={status.get('language')}
|
lang={status.get('language')}
|
||||||
|
|
|
@ -15,6 +15,9 @@ import Bundle from 'soapbox/features/ui/components/bundle';
|
||||||
import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container';
|
import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container';
|
||||||
import { initReportById } from 'soapbox/actions/reports';
|
import { initReportById } from 'soapbox/actions/reports';
|
||||||
import { createSelector } from 'reselect';
|
import { createSelector } from 'reselect';
|
||||||
|
import { onlyEmoji } from 'soapbox/utils/rich_content';
|
||||||
|
|
||||||
|
const BIG_EMOJI_LIMIT = 1;
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
today: { id: 'chats.dividers.today', defaultMessage: 'Today' },
|
today: { id: 'chats.dividers.today', defaultMessage: 'Today' },
|
||||||
|
@ -120,6 +123,12 @@ class ChatMessageList extends ImmutablePureComponent {
|
||||||
link.setAttribute('rel', 'ugc nofollow noopener');
|
link.setAttribute('rel', 'ugc nofollow noopener');
|
||||||
link.setAttribute('target', '_blank');
|
link.setAttribute('target', '_blank');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (onlyEmoji(c, BIG_EMOJI_LIMIT)) {
|
||||||
|
c.classList.add('chat-message__bubble--onlyEmoji');
|
||||||
|
} else {
|
||||||
|
c.classList.remove('chat-message__bubble--onlyEmoji');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
isNearBottom = () => {
|
isNearBottom = () => {
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
// Returns `true` if the node contains only emojis, up to a limit
|
||||||
|
export const onlyEmoji = (node, limit = 1) => {
|
||||||
|
if (!node) return false;
|
||||||
|
if (node.textContent.replaceAll(' ', '') !== '') return false;
|
||||||
|
const emojis = Array.from(node.querySelectorAll('img.emojione'));
|
||||||
|
if (emojis.length === 0) return false;
|
||||||
|
if (emojis.length > limit) return false;
|
||||||
|
const images = Array.from(node.querySelectorAll('img'));
|
||||||
|
if (images.length > emojis.length) return false;
|
||||||
|
return true;
|
||||||
|
};
|
|
@ -163,6 +163,15 @@
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&--onlyEmoji {
|
||||||
|
background: transparent !important;
|
||||||
|
|
||||||
|
img.emojione {
|
||||||
|
width: 36px !important;
|
||||||
|
height: 36px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&--me .chat-message__bubble {
|
&--me .chat-message__bubble {
|
||||||
|
|
|
@ -36,6 +36,13 @@
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
margin: -1px 0 0;
|
margin: -1px 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&--big {
|
||||||
|
img.emojione {
|
||||||
|
width: 56px;
|
||||||
|
height: 56px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.video-player,
|
.video-player,
|
||||||
|
|
|
@ -66,6 +66,16 @@
|
||||||
margin: 20px 0;
|
margin: 20px 0;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&--big {
|
||||||
|
font-size: 32px !important;
|
||||||
|
line-height: normal !important;
|
||||||
|
|
||||||
|
img.emojione {
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.status__content > ul,
|
.status__content > ul,
|
||||||
|
|
Loading…
Reference in New Issue