diff --git a/apps/core/src/components/blocksuite/workspace-header/header.tsx b/apps/core/src/components/blocksuite/workspace-header/header.tsx index 716272f246..e7f197dcfc 100644 --- a/apps/core/src/components/blocksuite/workspace-header/header.tsx +++ b/apps/core/src/components/blocksuite/workspace-header/header.tsx @@ -200,7 +200,7 @@ export const Header = forwardRef< data-testid="editor-header-items" data-is-edgeless={mode === 'edgeless'} > -
+
{!open && } {props.leftSlot}
diff --git a/apps/core/src/components/blocksuite/workspace-header/styles.css.ts b/apps/core/src/components/blocksuite/workspace-header/styles.css.ts index 38c026e9d2..15d9fbe48c 100644 --- a/apps/core/src/components/blocksuite/workspace-header/styles.css.ts +++ b/apps/core/src/components/blocksuite/workspace-header/styles.css.ts @@ -83,13 +83,23 @@ export const titleWrapper = style({ justifyContent: 'center', alignItems: 'center', }); - +export const headerLeftSide = style({ + display: 'flex', + alignItems: 'center', + width: '150px', + '@media': { + '(max-width: 900px)': { + width: 'auto', + }, + }, +}); export const headerRightSide = style({ height: '100%', display: 'flex', alignItems: 'center', gap: '12px', zIndex: 1, + justifyContent: 'flex-end', }); export const browserWarning = style({ @@ -153,7 +163,6 @@ export const allPageListTitleWrapper = style({ fontSize: 'var(--affine-font-base)', color: 'var(--affine-text-primary-color)', display: 'flex', - justifyContent: 'center', alignItems: 'center', '::after': { content: '""', diff --git a/packages/component/src/components/page-list/view/collection-bar.tsx b/packages/component/src/components/page-list/view/collection-bar.tsx index 8e9a1e0d3b..322816c0c1 100644 --- a/packages/component/src/components/page-list/view/collection-bar.tsx +++ b/packages/component/src/components/page-list/view/collection-bar.tsx @@ -1,3 +1,4 @@ +import { Tooltip } from '@affine/component'; import { EditCollectionModel } from '@affine/component/page-list'; import type { PropertiesMeta } from '@affine/env/filter'; import type { GetPageInfoById } from '@affine/env/page-info'; @@ -102,9 +103,21 @@ export const CollectionBar = ({ width: 20, }} /> -
- {setting.currentCollection.name} -
+ +
+ {setting.currentCollection.name} +
+
{actions.map(action => { return (
span`, { + overflow: 'hidden', + textOverflow: 'ellipsis', + whiteSpace: 'nowrap', }); export const viewMenu = style({}); export const viewOption = style({ diff --git a/packages/component/src/components/page-list/view/collection-list.tsx b/packages/component/src/components/page-list/view/collection-list.tsx index 1ef90ab22a..2802d1b321 100644 --- a/packages/component/src/components/page-list/view/collection-list.tsx +++ b/packages/component/src/components/page-list/view/collection-list.tsx @@ -16,7 +16,7 @@ import { useAtom } from 'jotai'; import type { MouseEvent, ReactNode } from 'react'; import { useCallback, useMemo, useState } from 'react'; -import { Button, MenuItem } from '../../..'; +import { Button, MenuItem, Tooltip } from '../../..'; import Menu from '../../../ui/menu/menu'; import { appSidebarOpenAtom } from '../../app-sidebar'; import { CreateFilterMenu } from '../filter/vars'; @@ -80,39 +80,53 @@ const CollectionOption = ({ key={collection.id} className={styles.viewMenu} > -
-
{collection.name}
- {actions.map((v, i) => { - const onClick = (e: MouseEvent) => { - e.stopPropagation(); - v.click(); - }; - return ( -
- {v.icon} -
- ); - })} +
+ {collection.name} +
+
+ {actions.map((v, i) => { + const onClick = (e: MouseEvent) => { + e.stopPropagation(); + v.click(); + }; + return ( +
+ {v.icon} +
+ ); + })} +
-
+ ); }; @@ -155,7 +169,6 @@ export const CollectionList = ({ [styles.filterButtonCollapse]: !open, })} style={{ - marginLeft: 4, display: 'flex', alignItems: 'center', }} @@ -199,7 +212,12 @@ export const CollectionList = ({ hoverColor="var(--affine-icon-color)" data-testid="collection-select" > - {setting.currentCollection.name} + + <>{setting.currentCollection.name} + )} diff --git a/packages/component/src/ui/popper/popper.tsx b/packages/component/src/ui/popper/popper.tsx index fb4f69158e..e62d5bf6d1 100644 --- a/packages/component/src/ui/popper/popper.tsx +++ b/packages/component/src/ui/popper/popper.tsx @@ -22,7 +22,7 @@ export const Popper = ({ defaultVisible = false, visible: propsVisible, trigger = 'hover', - pointerEnterDelay = 100, + pointerEnterDelay = 500, pointerLeaveDelay = 100, onVisibleChange, popoverStyle, diff --git a/packages/component/src/ui/tooltip/tooltip.tsx b/packages/component/src/ui/tooltip/tooltip.tsx index d8e5175f5f..3b5e43b32a 100644 --- a/packages/component/src/ui/tooltip/tooltip.tsx +++ b/packages/component/src/ui/tooltip/tooltip.tsx @@ -15,6 +15,7 @@ const StyledTooltip = styled(StyledPopperContainer)(() => { fontSize: 'var(--affine-font-sm)', borderRadius: '8px', marginBottom: '12px', + overflowWrap: 'break-word', }; });