bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-effect' into 'next'

Browse source 
Remove conditional to run style logic

See merge request soapbox-pub/soapbox-fe!1142
This commit is contained in:
Justin 2022-03-24 16:34:12 +00:00
commit e0b1abdfc0
3 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/soapbox/components/account.tsx
View file

@ -94,18 +94,16 @@ const Account = ({
}; };
React.useEffect(() => { React.useEffect(() => {
if (isOnScreen) { const style: React.CSSProperties = {};
const style: React.CSSProperties = {}; const actionWidth = actionRef.current?.clientWidth;
const actionWidth = actionRef.current?.clientWidth;
if (overflowRef.current) { if (overflowRef.current) {
style.maxWidth = overflowRef.current.clientWidth - 30 - avatarSize - actionWidth; style.maxWidth = overflowRef.current.clientWidth - 30 - avatarSize - actionWidth;
} else { } else {
style.visibility = 'hidden'; style.visibility = 'hidden';
}
setStyle(style);
} }
setStyle(style);
}, [isOnScreen, overflowRef, actionRef]); }, [isOnScreen, overflowRef, actionRef]);
if (!account) { if (!account) {

12
app/soapbox/features/followers/index.js
View file

@ -105,19 +105,15 @@ class Followers extends ImmutablePureComponent {
if (accountId === -1 || (!accountIds)) { if (accountId === -1 || (!accountIds)) {
return ( return (
<Column> <Spinner />
<Spinner />
</Column>
); );
} }
if (unavailable) { if (unavailable) {
return ( return (
<Column> <div className='empty-column-indicator'>
<div className='empty-column-indicator'> <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />
<FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' /> </div>
</div>
</Column>
); );
} }

12
app/soapbox/features/following/index.js
View file

@ -105,19 +105,15 @@ class Following extends ImmutablePureComponent {
if (accountId === -1 || (!accountIds)) { if (accountId === -1 || (!accountIds)) {
return ( return (
<Column> <Spinner />
<Spinner />
</Column>
); );
} }
if (unavailable) { if (unavailable) {
return ( return (
<Column> <div className='empty-column-indicator'>
<div className='empty-column-indicator'> <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />
<FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' /> </div>
</div>
</Column>
); );
} }