Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(presets): add canvas export options for generating image #6881

Merged
merged 1 commit into from
Apr 25, 2024
Merged

fix(presets): add canvas export options for generating image #6881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 22 additions & 15 deletions packages/blocks/src/root-block/edgeless/controllers/clipboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,13 @@ const BLOCKSUITE_SURFACE = 'blocksuite/surface';
const IMAGE_PNG = 'image/png';

const { GROUP, MINDMAP } = CanvasElementType;
const IMAGE_PADDING = 10; // for rotated shapes some padding is needed
const IMAGE_PADDING = 5; // for rotated shapes some padding is needed

interface CanvasExportOptions {
dpr: number;
padding: number;
background?: string;
}

export class EdgelessClipboardController extends PageClipboard {
constructor(public override host: EdgelessRootBlockComponent) {
Expand Down Expand Up @@ -1090,7 +1096,7 @@ export class EdgelessClipboardController extends PageClipboard {
async toCanvas(
blocks: TopLevelBlockModel[],
shapes: CanvasElement[],
dpr?: number
options?: CanvasExportOptions
) {
blocks.sort(compare);
shapes.sort(compare);
Expand All @@ -1110,7 +1116,7 @@ export class EdgelessClipboardController extends PageClipboard {
bound,
blocks,
shapes,
dpr
options
);
return canvas;
}
Expand Down Expand Up @@ -1192,7 +1198,10 @@ export class EdgelessClipboardController extends PageClipboard {
bound: IBound,
nodes?: TopLevelBlockModel[],
canvasElements: CanvasElement[] = [],
dpr = window.devicePixelRatio || 1
{ dpr, padding, background }: CanvasExportOptions = {
dpr: window.devicePixelRatio || 1,
padding: IMAGE_PADDING,
}
): Promise<HTMLCanvasElement | undefined> {
const host = edgeless.host;
const rootModel = this.doc.root;
Expand All @@ -1213,10 +1222,14 @@ export class EdgelessClipboardController extends PageClipboard {
if (!container) return;

const canvas = document.createElement('canvas');
canvas.width = (bound.w + IMAGE_PADDING) * dpr;
canvas.height = (bound.h + IMAGE_PADDING) * dpr;
canvas.width = (bound.w + padding * 2) * dpr;
canvas.height = (bound.h + padding * 2) * dpr;
const ctx = canvas.getContext('2d');
if (!ctx) return;
if (background) {
ctx.fillStyle = background;
ctx.fillRect(0, 0, canvas.width, canvas.height);
}
ctx.scale(dpr, dpr);

const replaceImgSrcWithSvg = this._exportManager.replaceImgSrcWithSvg;
Expand Down Expand Up @@ -1293,8 +1306,8 @@ export class EdgelessClipboardController extends PageClipboard {
);
ctx.drawImage(
canvasData,
blockBound.x - bound.x + IMAGE_PADDING / 2,
blockBound.y - bound.y + IMAGE_PADDING / 2,
blockBound.x - bound.x + padding,
blockBound.y - bound.y + padding,
blockBound.w,
isInFrame
? (blockBound.w / canvasData.width) * canvasData.height
Expand Down Expand Up @@ -1336,13 +1349,7 @@ export class EdgelessClipboardController extends PageClipboard {
bound,
canvasElements
);
ctx.drawImage(
surfaceCanvas,
IMAGE_PADDING / 2,
IMAGE_PADDING / 2,
bound.w,
bound.h
);
ctx.drawImage(surfaceCanvas, padding, padding, bound.w, bound.h);

return canvas;
}
Expand Down
11 changes: 9 additions & 2 deletions packages/presets/src/ai/entries/edgeless/actions-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,11 @@ const generateGroup: AIItemGroupConfig = {
const canvas = await edgelessRoot.clipboardController.toCanvas(
images,
pureShapes,
1
{
dpr: 1,
padding: 0,
background: 'white',
}
);
if (!canvas) return;
const png = await canvasToBlob(canvas);
Expand Down Expand Up @@ -334,7 +338,10 @@ const generateGroup: AIItemGroupConfig = {
const canvas = await edgelessRoot.clipboardController.toCanvas(
[...notes, ...frames, ...images],
shapes,
1
{
dpr: 1,
padding: 0,
}
);
if (!canvas) return;
const png = await canvasToBlob(canvas);
Expand Down