mirror of
https://github.com/toeverything/AFFiNE.git
synced 2024-12-24 19:22:49 +03:00
feat: modify current workspace label to a dot (#3399)
This commit is contained in:
parent
bc27412425
commit
bc263e7afb
@ -1,3 +1,4 @@
|
|||||||
|
import { Tooltip } from '@affine/component';
|
||||||
import {
|
import {
|
||||||
WorkspaceListItemSkeleton,
|
WorkspaceListItemSkeleton,
|
||||||
WorkspaceListSkeleton,
|
WorkspaceListSkeleton,
|
||||||
@ -19,6 +20,7 @@ import type {
|
|||||||
GeneralSettingList,
|
GeneralSettingList,
|
||||||
} from '../general-setting';
|
} from '../general-setting';
|
||||||
import {
|
import {
|
||||||
|
currentWorkspaceLabel,
|
||||||
settingSlideBar,
|
settingSlideBar,
|
||||||
sidebarItemsWrapper,
|
sidebarItemsWrapper,
|
||||||
sidebarSelectItem,
|
sidebarSelectItem,
|
||||||
@ -133,9 +135,18 @@ const WorkspaceListItem = ({
|
|||||||
<WorkspaceAvatar size={14} workspace={workspace} className="icon" />
|
<WorkspaceAvatar size={14} workspace={workspace} className="icon" />
|
||||||
<span className="setting-name">{workspaceName}</span>
|
<span className="setting-name">{workspaceName}</span>
|
||||||
{isCurrent ? (
|
{isCurrent ? (
|
||||||
<div className="current-label" data-testid="current-workspace-label">
|
<Tooltip
|
||||||
Current
|
content="Current"
|
||||||
</div>
|
title="Current"
|
||||||
|
offset={[0, -5]}
|
||||||
|
placement="top"
|
||||||
|
disablePortal={false}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
className={currentWorkspaceLabel}
|
||||||
|
data-testid="current-workspace-label"
|
||||||
|
></div>
|
||||||
|
</Tooltip>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -75,20 +75,21 @@ globalStyle(`${settingSlideBar} .setting-name`, {
|
|||||||
whiteSpace: 'nowrap',
|
whiteSpace: 'nowrap',
|
||||||
flexGrow: 1,
|
flexGrow: 1,
|
||||||
});
|
});
|
||||||
globalStyle(`${settingSlideBar} .current-label`, {
|
export const currentWorkspaceLabel = style({
|
||||||
|
width: '20px',
|
||||||
height: '20px',
|
height: '20px',
|
||||||
borderRadius: '8px',
|
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
padding: '0 5px',
|
selectors: {
|
||||||
// TODO: use color variable
|
'&::after': {
|
||||||
background: '#1E96EB',
|
content: '""',
|
||||||
fontSize: 'var(--affine-font-xs)',
|
width: '8px',
|
||||||
fontWeight: '600',
|
height: '8px',
|
||||||
color: 'var(--affine-white)',
|
borderRadius: '50%',
|
||||||
marginLeft: '10px',
|
background: 'var(--affine-blue)',
|
||||||
flexShrink: 0,
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const accountButton = style({
|
export const accountButton = style({
|
||||||
|
@ -21,7 +21,7 @@ test('should create a page with a local first avatar', async ({
|
|||||||
await page.getByTestId('workspace-name').click();
|
await page.getByTestId('workspace-name').click();
|
||||||
await page.getByTestId('workspace-card').nth(1).click();
|
await page.getByTestId('workspace-card').nth(1).click();
|
||||||
await page.getByTestId('settings-modal-trigger').click();
|
await page.getByTestId('settings-modal-trigger').click();
|
||||||
await page.getByText('current').click();
|
await page.getByTestId('current-workspace-label').click();
|
||||||
await page
|
await page
|
||||||
.getByTestId('upload-avatar')
|
.getByTestId('upload-avatar')
|
||||||
.setInputFiles(resolve(rootDir, 'tests', 'fixtures', 'smile.png'));
|
.setInputFiles(resolve(rootDir, 'tests', 'fixtures', 'smile.png'));
|
||||||
|
Loading…
Reference in New Issue
Block a user