fix: avoid avatar flickering (#1319)

This commit is contained in:
Himself65
2023-03-04 23:07:13 -06:00
committed by DarkSky
parent f63d54a9de
commit 1e11f727fd
8 changed files with 69 additions and 95 deletions

View File

@@ -1,8 +1,7 @@
import { UNTITLED_WORKSPACE_NAME } from '@affine/env';
import React from 'react';
import { useBlockSuiteWorkspaceAvatar } from '../../../hooks/use-blocksuite-workspace-avatar';
import { useWorkspaceBlobImage } from '../../../hooks/use-workspace-blob';
import { useBlockSuiteWorkspaceBlobUrl } from '../../../hooks/use-blocksuite-workspace-blob-url';
import { BlockSuiteWorkspace, RemWorkspace } from '../../../shared';
import { stringToColour } from '../../../utils';
@@ -88,14 +87,14 @@ export const BlockSuiteWorkspaceAvatar: React.FC<BlockSuiteWorkspaceAvatar> = ({
style,
...props
}) => {
const [avatar] = useBlockSuiteWorkspaceAvatar(workspace);
const avatarURL = useWorkspaceBlobImage(avatar ?? null, workspace);
const [avatar] = useBlockSuiteWorkspaceBlobUrl(workspace);
return (
<Avatar
{...props}
size={size}
name={workspace.meta.name ?? UNTITLED_WORKSPACE_NAME}
avatar_url={avatarURL ?? ''}
avatar_url={avatar ?? ''}
style={style}
/>
);