moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'useaccount-memo' into 'develop' 

useAccount: memoize the account

See merge request soapbox-pub/soapbox!2617
This commit is contained in:
Alex Gleason 2023-07-20 21:45:37 +00:00
parent 2f0d756562 fb848f1484
commit 4c3f3a6bdd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/soapbox/api/hooks/accounts/useAccount.ts
View File

@ -1,4 +1,4 @@
import { useEffect } from 'react'; import { useEffect, useMemo } from 'react';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { Entities } from 'soapbox/entity-store/entities'; import { Entities } from 'soapbox/entity-store/entities';
@ -20,7 +20,7 @@ function useAccount(accountId?: string, opts: UseAccountOpts = {}) {
const { me } = useLoggedIn(); const { me } = useLoggedIn();
const { withRelationship } = opts; const { withRelationship } = opts;
const { entity: account, isUnauthorized, ...result } = useEntity<Account>( const { entity, isUnauthorized, ...result } = useEntity<Account>(
[Entities.ACCOUNTS, accountId!], [Entities.ACCOUNTS, accountId!],
() => api.get(`/api/v1/accounts/${accountId}`), () => api.get(`/api/v1/accounts/${accountId}`),
{ schema: accountSchema, enabled: !!accountId }, { schema: accountSchema, enabled: !!accountId },
@ -31,8 +31,13 @@ function useAccount(accountId?: string, opts: UseAccountOpts = {}) {
isLoading: isRelationshipLoading, isLoading: isRelationshipLoading,
} = useRelationship(accountId, { enabled: withRelationship }); } = useRelationship(accountId, { enabled: withRelationship });
const isBlocked = account?.relationship?.blocked_by === true; const isBlocked = entity?.relationship?.blocked_by === true;
const isUnavailable = (me === account?.id) ? false : (isBlocked && !features.blockersVisible); const isUnavailable = (me === entity?.id) ? false : (isBlocked && !features.blockersVisible);
const account = useMemo(
() => entity ? { ...entity, relationship } : undefined,
[entity, relationship],
);
useEffect(() => { useEffect(() => {
if (isUnauthorized) { if (isUnauthorized) {
@ -46,7 +51,7 @@ function useAccount(accountId?: string, opts: UseAccountOpts = {}) {
isRelationshipLoading, isRelationshipLoading,
isUnauthorized, isUnauthorized,
isUnavailable, isUnavailable,
account: account ? { ...account, relationship } : undefined, account,
}; };
} }