fix(editor): overflow of embed github card in edgeless note (#10442)
This PR fixes the overflow of the `embed-github-card` inside edgeless notes. https://github.com/user-attachments/assets/21775d0f-e4c8-4fcc-86d8-aafb27033358
This commit is contained in:
@@ -9,6 +9,7 @@ import {
|
|||||||
EMBED_CARD_WIDTH,
|
EMBED_CARD_WIDTH,
|
||||||
} from '@blocksuite/affine-shared/consts';
|
} from '@blocksuite/affine-shared/consts';
|
||||||
import { DocModeProvider } from '@blocksuite/affine-shared/services';
|
import { DocModeProvider } from '@blocksuite/affine-shared/services';
|
||||||
|
import { findAncestorModel } from '@blocksuite/affine-shared/utils';
|
||||||
import type { BlockService } from '@blocksuite/block-std';
|
import type { BlockService } from '@blocksuite/block-std';
|
||||||
import type { GfxCompatibleProps } from '@blocksuite/block-std/gfx';
|
import type { GfxCompatibleProps } from '@blocksuite/block-std/gfx';
|
||||||
import type { BlockModel } from '@blocksuite/store';
|
import type { BlockModel } from '@blocksuite/store';
|
||||||
@@ -57,7 +58,15 @@ export class EmbedBlockComponent<
|
|||||||
) {
|
) {
|
||||||
this.style.display = 'block';
|
this.style.display = 'block';
|
||||||
|
|
||||||
if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
|
const insideNote = findAncestorModel(
|
||||||
|
this.model,
|
||||||
|
m => m.flavour === 'affine:note'
|
||||||
|
);
|
||||||
|
|
||||||
|
if (
|
||||||
|
!insideNote &&
|
||||||
|
this.std.get(DocModeProvider).getEditorMode() === 'edgeless'
|
||||||
|
) {
|
||||||
this.style.minWidth = `${EMBED_CARD_MIN_WIDTH}px`;
|
this.style.minWidth = `${EMBED_CARD_MIN_WIDTH}px`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { css, html } from 'lit';
|
|||||||
|
|
||||||
export const styles = css`
|
export const styles = css`
|
||||||
.affine-embed-github-block {
|
.affine-embed-github-block {
|
||||||
|
container: affine-embed-github-block / inline-size;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
display: flex;
|
display: flex;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -24,6 +25,7 @@ export const styles = css`
|
|||||||
padding: 12px;
|
padding: 12px;
|
||||||
border-radius: var(--1, 0px);
|
border-radius: var(--1, 0px);
|
||||||
opacity: var(--add, 1);
|
opacity: var(--add, 1);
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.affine-embed-github-content-title {
|
.affine-embed-github-content-title {
|
||||||
@@ -376,6 +378,15 @@ export const styles = css`
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@container affine-embed-github-block (width < 375px) {
|
||||||
|
.affine-embed-github-content {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.affine-embed-github-banner {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const GithubIcon = html`<svg
|
export const GithubIcon = html`<svg
|
||||||
|
|||||||
@@ -4,19 +4,20 @@ import {
|
|||||||
locateEditorContainer,
|
locateEditorContainer,
|
||||||
locateElementToolbar,
|
locateElementToolbar,
|
||||||
} from '@affine-test/kit/utils/editor';
|
} from '@affine-test/kit/utils/editor';
|
||||||
|
import { pressEnter } from '@affine-test/kit/utils/keyboard';
|
||||||
import { openHomePage } from '@affine-test/kit/utils/load-page';
|
import { openHomePage } from '@affine-test/kit/utils/load-page';
|
||||||
import {
|
import {
|
||||||
clickNewPageButton,
|
clickNewPageButton,
|
||||||
|
type,
|
||||||
waitForEditorLoad,
|
waitForEditorLoad,
|
||||||
} from '@affine-test/kit/utils/page-logic';
|
} from '@affine-test/kit/utils/page-logic';
|
||||||
|
import { isContainedInBoundingBox } from '@affine-test/kit/utils/utils';
|
||||||
import { expect } from '@playwright/test';
|
import { expect } from '@playwright/test';
|
||||||
|
|
||||||
const title = 'Edgeless Note Header Test';
|
|
||||||
|
|
||||||
test.beforeEach(async ({ page }) => {
|
test.beforeEach(async ({ page }) => {
|
||||||
await openHomePage(page);
|
await openHomePage(page);
|
||||||
await waitForEditorLoad(page);
|
await waitForEditorLoad(page);
|
||||||
await clickNewPageButton(page, title);
|
await clickNewPageButton(page);
|
||||||
await clickEdgelessModeButton(page);
|
await clickEdgelessModeButton(page);
|
||||||
const container = locateEditorContainer(page);
|
const container = locateEditorContainer(page);
|
||||||
await container.click();
|
await container.click();
|
||||||
@@ -40,3 +41,20 @@ test('should close embed editing modal when editor switching to page mode by sho
|
|||||||
await waitForEditorLoad(page);
|
await waitForEditorLoad(page);
|
||||||
expect(editingModal).toBeHidden();
|
expect(editingModal).toBeHidden();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('embed card should not overflow the edgeless note', async ({ page }) => {
|
||||||
|
const note = page.locator('affine-edgeless-note');
|
||||||
|
await note.dblclick();
|
||||||
|
await type(page, '/github');
|
||||||
|
await pressEnter(page);
|
||||||
|
await page
|
||||||
|
.locator('.embed-card-modal-input')
|
||||||
|
.fill('https://github.com/toeverything/AFFiNE/pull/10442');
|
||||||
|
await pressEnter(page);
|
||||||
|
|
||||||
|
const embedCard = page.locator('affine-embed-github-block');
|
||||||
|
await embedCard
|
||||||
|
.locator('.affine-embed-github-block:not(.loading)')
|
||||||
|
.waitFor({ state: 'visible' });
|
||||||
|
expect(await isContainedInBoundingBox(note, embedCard, true)).toBe(true);
|
||||||
|
});
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { setTimeout } from 'node:timers/promises';
|
import { setTimeout } from 'node:timers/promises';
|
||||||
|
|
||||||
import type { Page } from '@playwright/test';
|
import type { Locator, Page } from '@playwright/test';
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
|
|
||||||
export async function waitForLogMessage(
|
export async function waitForLogMessage(
|
||||||
@@ -36,3 +36,37 @@ export async function removeWithRetry(
|
|||||||
// Add a return statement here to ensure that a value is always returned
|
// Add a return statement here to ensure that a value is always returned
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function isContainedInBoundingBox(
|
||||||
|
container: Locator,
|
||||||
|
element: Locator,
|
||||||
|
includeDescendant = false
|
||||||
|
) {
|
||||||
|
const containerBox = await container.boundingBox();
|
||||||
|
if (!containerBox) {
|
||||||
|
throw new Error('Container bounding box not found');
|
||||||
|
}
|
||||||
|
const { x: cx, y: cy, width: cw, height: ch } = containerBox;
|
||||||
|
|
||||||
|
const inside = async (el: Locator): Promise<boolean> => {
|
||||||
|
const elBox = await el.boundingBox();
|
||||||
|
if (!elBox) {
|
||||||
|
throw new Error('Element bounding box not found');
|
||||||
|
}
|
||||||
|
const { x, y, width, height } = elBox;
|
||||||
|
|
||||||
|
return x >= cx && x + width <= cx + cw && y >= cy && y + height <= cy + ch;
|
||||||
|
};
|
||||||
|
|
||||||
|
let isInside = await inside(element);
|
||||||
|
if (!isInside) return false;
|
||||||
|
|
||||||
|
if (includeDescendant) {
|
||||||
|
const children = await element.locator('*:visible').all();
|
||||||
|
for (const child of children) {
|
||||||
|
isInside = await inside(child);
|
||||||
|
if (!isInside) return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user