fix(core): use divider component to replace height dividers (#9986)
This commit is contained in:
@@ -22,20 +22,6 @@ export const container = style({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const dividerContainer = style({
|
|
||||||
height: '16px',
|
|
||||||
width: '100%',
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'center',
|
|
||||||
});
|
|
||||||
|
|
||||||
export const divider = style({
|
|
||||||
background: cssVar('--affine-border-color'),
|
|
||||||
height: '0.5px',
|
|
||||||
width: '100%',
|
|
||||||
});
|
|
||||||
|
|
||||||
export const titleLine = style({
|
export const titleLine = style({
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
justifyContent: 'space-between',
|
justifyContent: 'space-between',
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
createReactComponentFromLit,
|
createReactComponentFromLit,
|
||||||
|
Divider,
|
||||||
useLitPortalFactory,
|
useLitPortalFactory,
|
||||||
} from '@affine/component';
|
} from '@affine/component';
|
||||||
import { TextRenderer } from '@affine/core/blocksuite/presets';
|
import { TextRenderer } from '@affine/core/blocksuite/presets';
|
||||||
@@ -339,11 +340,7 @@ export const BiDirectionalLinkPanel = () => {
|
|||||||
}, [show, setShow]);
|
}, [show, setShow]);
|
||||||
return (
|
return (
|
||||||
<div className={styles.container}>
|
<div className={styles.container}>
|
||||||
{!show && (
|
{!show && <Divider size="thinner" />}
|
||||||
<div className={styles.dividerContainer}>
|
|
||||||
<div className={styles.divider}></div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className={styles.titleLine}>
|
<div className={styles.titleLine}>
|
||||||
<div className={styles.title}>Bi-Directional Links</div>
|
<div className={styles.title}>Bi-Directional Links</div>
|
||||||
@@ -356,9 +353,8 @@ export const BiDirectionalLinkPanel = () => {
|
|||||||
|
|
||||||
{show && (
|
{show && (
|
||||||
<>
|
<>
|
||||||
<div className={styles.dividerContainer}>
|
<Divider size="thinner" />
|
||||||
<div className={styles.divider}></div>
|
|
||||||
</div>
|
|
||||||
<div className={styles.linksContainer}>
|
<div className={styles.linksContainer}>
|
||||||
<div className={styles.linksTitles}>
|
<div className={styles.linksTitles}>
|
||||||
{t['com.affine.page-properties.backlinks']()} · {backlinkCount}
|
{t['com.affine.page-properties.backlinks']()} · {backlinkCount}
|
||||||
|
|||||||
@@ -102,14 +102,7 @@ export const cursorStyle = style({
|
|||||||
padding: '1px 2px',
|
padding: '1px 2px',
|
||||||
fontSize: '14px',
|
fontSize: '14px',
|
||||||
});
|
});
|
||||||
export const dividerStyle = style({
|
|
||||||
width: '0.5px',
|
|
||||||
height: '100%',
|
|
||||||
background: cssVar('borderColor'),
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
justifyContent: 'center',
|
|
||||||
});
|
|
||||||
export const scaleIndicatorButtonStyle = style({
|
export const scaleIndicatorButtonStyle = style({
|
||||||
height: '24px',
|
height: '24px',
|
||||||
padding: '1px 2px',
|
padding: '1px 2px',
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { toast } from '@affine/component';
|
import { Divider, toast } from '@affine/component';
|
||||||
import { Button, IconButton } from '@affine/component/ui/button';
|
import { Button, IconButton } from '@affine/component/ui/button';
|
||||||
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
|
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
|
||||||
import type { ImageBlockModel } from '@blocksuite/affine/blocks';
|
import type { ImageBlockModel } from '@blocksuite/affine/blocks';
|
||||||
@@ -326,7 +326,7 @@ const ImagePreviewModalImpl = ({
|
|||||||
disabled={cursor + 1 === blocks.length}
|
disabled={cursor + 1 === blocks.length}
|
||||||
onClick={() => goto(cursor + 1)}
|
onClick={() => goto(cursor + 1)}
|
||||||
/>
|
/>
|
||||||
<div className={styles.dividerStyle}></div>
|
<Divider size="thinner" orientation="vertical" />
|
||||||
<IconButton
|
<IconButton
|
||||||
data-testid="fit-to-screen-button"
|
data-testid="fit-to-screen-button"
|
||||||
tooltip="Fit to screen"
|
tooltip="Fit to screen"
|
||||||
@@ -347,14 +347,13 @@ const ImagePreviewModalImpl = ({
|
|||||||
>
|
>
|
||||||
{`${(currentScale * 100).toFixed(0)}%`}
|
{`${(currentScale * 100).toFixed(0)}%`}
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<IconButton
|
<IconButton
|
||||||
data-testid="zoom-in-button"
|
data-testid="zoom-in-button"
|
||||||
tooltip="Zoom in"
|
tooltip="Zoom in"
|
||||||
icon={<PlusIcon />}
|
icon={<PlusIcon />}
|
||||||
onClick={zoomIn}
|
onClick={zoomIn}
|
||||||
/>
|
/>
|
||||||
<div className={styles.dividerStyle}></div>
|
<Divider size="thinner" orientation="vertical" />
|
||||||
<IconButton
|
<IconButton
|
||||||
data-testid="download-button"
|
data-testid="download-button"
|
||||||
tooltip="Download"
|
tooltip="Download"
|
||||||
@@ -369,7 +368,7 @@ const ImagePreviewModalImpl = ({
|
|||||||
/>
|
/>
|
||||||
{blockModel && !blockModel.doc.readonly && (
|
{blockModel && !blockModel.doc.readonly && (
|
||||||
<>
|
<>
|
||||||
<div className={styles.dividerStyle}></div>
|
<Divider size="thinner" orientation="vertical" />
|
||||||
<IconButton
|
<IconButton
|
||||||
data-testid="delete-button"
|
data-testid="delete-button"
|
||||||
tooltip="Delete"
|
tooltip="Delete"
|
||||||
|
|||||||
@@ -35,10 +35,8 @@ test('page delete -> refresh page -> it should be disappear', async ({
|
|||||||
await getPageItem(page, newPageId).getByTestId('delete-page-button').click();
|
await getPageItem(page, newPageId).getByTestId('delete-page-button').click();
|
||||||
await page.getByText('Delete permanently?').dblclick();
|
await page.getByText('Delete permanently?').dblclick();
|
||||||
await page.getByRole('button', { name: 'Delete' }).click();
|
await page.getByRole('button', { name: 'Delete' }).click();
|
||||||
await page.reload();
|
|
||||||
expect(page.getByText("There's no page here yet")).not.toBeUndefined();
|
expect(page.getByText("There's no page here yet")).not.toBeUndefined();
|
||||||
await page.getByTestId('all-pages').click();
|
await page.getByTestId('all-pages').click();
|
||||||
await page.reload();
|
|
||||||
|
|
||||||
const currentWorkspace = await workspace.current();
|
const currentWorkspace = await workspace.current();
|
||||||
|
|
||||||
@@ -73,7 +71,6 @@ test('page delete -> create new page -> refresh page -> new page should be appea
|
|||||||
.click();
|
.click();
|
||||||
await page.getByText('Delete permanently?').dblclick();
|
await page.getByText('Delete permanently?').dblclick();
|
||||||
await page.getByRole('button', { name: 'Delete' }).click();
|
await page.getByRole('button', { name: 'Delete' }).click();
|
||||||
await page.reload();
|
|
||||||
expect(page.getByText("There's no page here yet")).not.toBeUndefined();
|
expect(page.getByText("There's no page here yet")).not.toBeUndefined();
|
||||||
await page.getByTestId('all-pages').click();
|
await page.getByTestId('all-pages').click();
|
||||||
|
|
||||||
@@ -89,7 +86,6 @@ test('page delete -> create new page -> refresh page -> new page should be appea
|
|||||||
await page.waitForTimeout(1000);
|
await page.waitForTimeout(1000);
|
||||||
const newPageId2 = getCurrentDocIdFromUrl(page);
|
const newPageId2 = getCurrentDocIdFromUrl(page);
|
||||||
await page.getByTestId('all-pages').click();
|
await page.getByTestId('all-pages').click();
|
||||||
await page.reload();
|
|
||||||
await getPageItem(page, newPageId1).click();
|
await getPageItem(page, newPageId1).click();
|
||||||
await page.getByTestId('all-pages').click();
|
await page.getByTestId('all-pages').click();
|
||||||
await getPageItem(page, newPageId2).click();
|
await getPageItem(page, newPageId2).click();
|
||||||
@@ -153,8 +149,6 @@ test('delete multiple pages -> create multiple pages -> refresh', async ({
|
|||||||
await page.getByRole('button', { name: 'Delete' }).click();
|
await page.getByRole('button', { name: 'Delete' }).click();
|
||||||
await page.getByTestId('all-pages').click();
|
await page.getByTestId('all-pages').click();
|
||||||
|
|
||||||
await page.reload();
|
|
||||||
|
|
||||||
const currentWorkspace = await workspace.current();
|
const currentWorkspace = await workspace.current();
|
||||||
|
|
||||||
expect(currentWorkspace.meta.flavour).toContain('local');
|
expect(currentWorkspace.meta.flavour).toContain('local');
|
||||||
|
|||||||
Reference in New Issue
Block a user