Merge branch 'next-mobile' into 'next'
Next: mobile fixes See merge request soapbox-pub/soapbox-fe!1213
This commit is contained in:
commit
a0a02a2700
|
@ -44,13 +44,19 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
|
||||||
if (!status) return null;
|
if (!status) return null;
|
||||||
|
|
||||||
const handleMouseEnter = () => {
|
const handleMouseEnter = () => {
|
||||||
|
if (!isUserTouching()) {
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleMouseLeave = () => {
|
const handleMouseLeave = () => {
|
||||||
setVisible(false);
|
setVisible(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleUnfocus = () => {
|
||||||
|
setVisible(false);
|
||||||
|
};
|
||||||
|
|
||||||
const handleReact = (emoji: string): void => {
|
const handleReact = (emoji: string): void => {
|
||||||
if (ownAccount) {
|
if (ownAccount) {
|
||||||
dispatch(simpleEmojiReact(status, emoji));
|
dispatch(simpleEmojiReact(status, emoji));
|
||||||
|
@ -77,6 +83,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
|
||||||
handleReact(meEmojiReact);
|
handleReact(meEmojiReact);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -106,6 +113,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
|
||||||
<div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
|
<div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
|
||||||
{React.cloneElement(children, {
|
{React.cloneElement(children, {
|
||||||
onClick: handleClick,
|
onClick: handleClick,
|
||||||
|
onBlur: handleUnfocus,
|
||||||
ref,
|
ref,
|
||||||
})}
|
})}
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ class TimelineQueueButtonHeader extends React.PureComponent {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={classes}>
|
<div className={classes}>
|
||||||
<a className='flex items-center bg-primary-600 hover:bg-primary-700 hover:scale-105 active:scale-100 transition-transform text-white rounded-full px-4 py-2 space-x-1.5 cursor-pointer' onClick={this.handleClick}>
|
<a className='flex items-center bg-primary-600 hover:bg-primary-700 hover:scale-105 active:scale-100 transition-transform text-white rounded-full px-4 py-2 space-x-1.5 cursor-pointer whitespace-nowrap' onClick={this.handleClick}>
|
||||||
<Icon src={require('@tabler/icons/icons/arrow-bar-to-up.svg')} />
|
<Icon src={require('@tabler/icons/icons/arrow-bar-to-up.svg')} />
|
||||||
|
|
||||||
{(count > 0) && (
|
{(count > 0) && (
|
||||||
|
|
|
@ -364,7 +364,7 @@ class ComposeForm extends ImmutablePureComponent {
|
||||||
<QuotedStatusContainer />
|
<QuotedStatusContainer />
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className={classNames('flex items-center justify-between', {
|
className={classNames('flex flex-wrap items-center justify-between', {
|
||||||
'hidden': condensed,
|
'hidden': condensed,
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
|
@ -378,7 +378,7 @@ class ComposeForm extends ImmutablePureComponent {
|
||||||
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
|
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className='flex items-center space-x-4 ml-4'>
|
<div className='flex items-center space-x-4 ml-auto'>
|
||||||
{maxTootChars && (
|
{maxTootChars && (
|
||||||
<div className='flex items-center space-x-1'>
|
<div className='flex items-center space-x-1'>
|
||||||
<TextCharacterCounter max={maxTootChars} text={text} />
|
<TextCharacterCounter max={maxTootChars} text={text} />
|
||||||
|
|
Loading…
Reference in New Issue