mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-25 18:26:05 +08:00
chore(editor): adjust size of synced doc (#12163)
Close [BS-3418](https://linear.app/affine-design/issue/BS-3418/折叠的embed-doc调整宽度时,会出现一个最小高度,不需要这个) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Improved resizing and folding interactions for embedded synced documents in edgeless mode, including dynamic height calculation and enhanced drag-handle styling. - **Bug Fixes** - Adjusted minimum height for synced document embeds to allow more compact display. - Ensured consistent width settings across embed cards. - **Tests** - Added end-to-end tests covering folding, unfolding, and resizing behaviors for edgeless synced document embeds. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
@@ -0,0 +1,85 @@
|
||||
import {
|
||||
EmbedSyncedDocBlockSchema,
|
||||
SYNCED_MIN_HEIGHT,
|
||||
SYNCED_MIN_WIDTH,
|
||||
} from '@blocksuite/affine-model';
|
||||
import { clamp } from '@blocksuite/global/gfx';
|
||||
import { GfxViewInteractionExtension } from '@blocksuite/std/gfx';
|
||||
|
||||
import type { EmbedEdgelessSyncedDocBlockComponent } from '../embed-edgeless-synced-doc-block';
|
||||
import { calcSyncedDocFullHeight } from '../utils';
|
||||
|
||||
export const EmbedSyncedDocInteraction =
|
||||
GfxViewInteractionExtension<EmbedEdgelessSyncedDocBlockComponent>(
|
||||
EmbedSyncedDocBlockSchema.model.flavour,
|
||||
{
|
||||
resizeConstraint: {
|
||||
minWidth: SYNCED_MIN_WIDTH,
|
||||
minHeight: SYNCED_MIN_HEIGHT,
|
||||
},
|
||||
|
||||
handleRotate: () => {
|
||||
return {
|
||||
beforeRotate(context) {
|
||||
context.set({
|
||||
rotatable: false,
|
||||
});
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
handleResize: ({ view, model }) => {
|
||||
const initialScale = model.props.scale ?? 1;
|
||||
const initHeight = model.elementBound.h;
|
||||
const maxHeight = calcSyncedDocFullHeight(view);
|
||||
|
||||
return {
|
||||
beforeResize: context => {
|
||||
context.set({ maxHeight });
|
||||
},
|
||||
onResizeStart: context => {
|
||||
context.default(context);
|
||||
model.stash('scale');
|
||||
model.stash('preFoldHeight');
|
||||
},
|
||||
onResizeMove: context => {
|
||||
const { lockRatio, originalBound, constraint, newBound } = context;
|
||||
|
||||
let scale = initialScale;
|
||||
const realWidth = originalBound.w / initialScale;
|
||||
|
||||
if (lockRatio) {
|
||||
scale = newBound.w / realWidth;
|
||||
}
|
||||
|
||||
const newWidth = newBound.w / scale;
|
||||
|
||||
newBound.w =
|
||||
clamp(newWidth, constraint.minWidth, constraint.maxWidth) * scale;
|
||||
newBound.h =
|
||||
clamp(newBound.h, constraint.minHeight, constraint.maxHeight) *
|
||||
scale;
|
||||
|
||||
const newHeight = newBound.h / scale;
|
||||
|
||||
// only adjust height check the fold state
|
||||
if (originalBound.w === newBound.w) {
|
||||
let preFoldHeight = 0;
|
||||
if (newHeight === constraint.minHeight) {
|
||||
preFoldHeight = initHeight;
|
||||
}
|
||||
model.props.preFoldHeight = preFoldHeight;
|
||||
}
|
||||
|
||||
model.props.scale = scale;
|
||||
model.xywh = newBound.serialize();
|
||||
},
|
||||
onResizeEnd: context => {
|
||||
context.default(context);
|
||||
model.pop('scale');
|
||||
model.pop('preFoldHeight');
|
||||
},
|
||||
};
|
||||
},
|
||||
}
|
||||
);
|
||||
@@ -3,12 +3,7 @@ import {
|
||||
EdgelessCRUDIdentifier,
|
||||
reassociateConnectorsCommand,
|
||||
} from '@blocksuite/affine-block-surface';
|
||||
import {
|
||||
type AliasInfo,
|
||||
EmbedSyncedDocBlockSchema,
|
||||
SYNCED_MIN_HEIGHT,
|
||||
SYNCED_MIN_WIDTH,
|
||||
} from '@blocksuite/affine-model';
|
||||
import { type AliasInfo } from '@blocksuite/affine-model';
|
||||
import {
|
||||
EMBED_CARD_HEIGHT,
|
||||
EMBED_CARD_WIDTH,
|
||||
@@ -17,11 +12,10 @@ import {
|
||||
ThemeExtensionIdentifier,
|
||||
ThemeProvider,
|
||||
} from '@blocksuite/affine-shared/services';
|
||||
import { Bound, clamp } from '@blocksuite/global/gfx';
|
||||
import { Bound } from '@blocksuite/global/gfx';
|
||||
import { type BlockComponent, BlockStdScope } from '@blocksuite/std';
|
||||
import { GfxViewInteractionExtension } from '@blocksuite/std/gfx';
|
||||
import { html, nothing } from 'lit';
|
||||
import { query, queryAsync } from 'lit/decorators.js';
|
||||
import { query } from 'lit/decorators.js';
|
||||
import { choose } from 'lit/directives/choose.js';
|
||||
import { classMap } from 'lit/directives/class-map.js';
|
||||
import { guard } from 'lit/directives/guard.js';
|
||||
@@ -37,8 +31,8 @@ export class EmbedEdgelessSyncedDocBlockComponent extends toEdgelessEmbedBlock(
|
||||
@query('.affine-embed-synced-doc-edgeless-header-wrapper')
|
||||
accessor headerWrapper: HTMLDivElement | null = null;
|
||||
|
||||
@queryAsync('affine-preview-root')
|
||||
accessor contentElement!: Promise<BlockComponent | null>;
|
||||
@query('affine-preview-root')
|
||||
accessor contentElement: BlockComponent | null = null;
|
||||
|
||||
protected override _renderSyncedView = () => {
|
||||
const { syncedDoc, editorMode } = this;
|
||||
@@ -205,60 +199,3 @@ export class EmbedEdgelessSyncedDocBlockComponent extends toEdgelessEmbedBlock(
|
||||
|
||||
override accessor useCaptionEditor = true;
|
||||
}
|
||||
|
||||
export const EmbedSyncedDocInteraction =
|
||||
GfxViewInteractionExtension<EmbedEdgelessSyncedDocBlockComponent>(
|
||||
EmbedSyncedDocBlockSchema.model.flavour,
|
||||
{
|
||||
resizeConstraint: {
|
||||
minWidth: SYNCED_MIN_WIDTH,
|
||||
minHeight: SYNCED_MIN_HEIGHT,
|
||||
},
|
||||
|
||||
handleRotate: () => {
|
||||
return {
|
||||
beforeRotate(context) {
|
||||
context.set({
|
||||
rotatable: false,
|
||||
});
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
handleResize: ({ model }) => {
|
||||
const initialScale = model.props.scale ?? 1;
|
||||
|
||||
return {
|
||||
onResizeStart: context => {
|
||||
context.default(context);
|
||||
model.stash('scale');
|
||||
},
|
||||
onResizeMove: context => {
|
||||
const { lockRatio, originalBound, constraint, newBound } = context;
|
||||
|
||||
let scale = initialScale;
|
||||
const realWidth = originalBound.w / initialScale;
|
||||
|
||||
if (lockRatio) {
|
||||
scale = newBound.w / realWidth;
|
||||
}
|
||||
|
||||
const newWidth = newBound.w / scale;
|
||||
|
||||
newBound.w =
|
||||
clamp(newWidth, constraint.minWidth, constraint.maxWidth) * scale;
|
||||
newBound.h =
|
||||
clamp(newBound.h, constraint.minHeight, constraint.maxHeight) *
|
||||
scale;
|
||||
|
||||
model.props.scale = scale;
|
||||
model.xywh = newBound.serialize();
|
||||
},
|
||||
onResizeEnd: context => {
|
||||
context.default(context);
|
||||
model.pop('scale');
|
||||
},
|
||||
};
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
@@ -5,7 +5,6 @@ import { literal } from 'lit/static-html.js';
|
||||
|
||||
import { EmbedSyncedDocBlockAdapterExtensions } from './adapters/extension';
|
||||
import { createBuiltinToolbarConfigExtension } from './configs/toolbar';
|
||||
import { EmbedSyncedDocInteraction } from './embed-edgeless-synced-doc-block';
|
||||
import { HeightInitializationExtension } from './init-height-extension';
|
||||
|
||||
const flavour = EmbedSyncedDocBlockSchema.model.flavour;
|
||||
@@ -30,5 +29,4 @@ export const EmbedSyncedDocViewExtensions: ExtensionType[] = [
|
||||
}),
|
||||
createBuiltinToolbarConfigExtension(flavour),
|
||||
HeightInitializationExtension,
|
||||
EmbedSyncedDocInteraction,
|
||||
].flat();
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
import {
|
||||
EmbedSyncedDocBlockSchema,
|
||||
SYNCED_DEFAULT_MAX_HEIGHT,
|
||||
SYNCED_MIN_HEIGHT,
|
||||
} from '@blocksuite/affine-model';
|
||||
import { EmbedSyncedDocBlockSchema } from '@blocksuite/affine-model';
|
||||
import { DisposableGroup } from '@blocksuite/global/disposable';
|
||||
import { clamp } from '@blocksuite/global/gfx';
|
||||
import { LifeCycleWatcher } from '@blocksuite/std';
|
||||
|
||||
import { EmbedEdgelessSyncedDocBlockComponent } from './embed-edgeless-synced-doc-block';
|
||||
import { calcSyncedDocFullHeight } from './utils';
|
||||
|
||||
export class HeightInitializationExtension extends LifeCycleWatcher {
|
||||
static override key = 'embed-synced-doc-block-height-initialization';
|
||||
@@ -41,26 +37,17 @@ export class HeightInitializationExtension extends LifeCycleWatcher {
|
||||
}
|
||||
const block = payload.view;
|
||||
|
||||
block.contentElement
|
||||
.then(contentEl => {
|
||||
if (!contentEl) return;
|
||||
|
||||
block.updateComplete
|
||||
.then(() => {
|
||||
if (!block.contentElement) return;
|
||||
const resizeObserver = new ResizeObserver(() => {
|
||||
const headerHeight =
|
||||
block.headerWrapper?.getBoundingClientRect().height ?? 0;
|
||||
const contentHeight = contentEl.getBoundingClientRect().height;
|
||||
|
||||
const { x, y, w } = block.model.elementBound;
|
||||
const h = clamp(
|
||||
(headerHeight + contentHeight) / block.gfx.viewport.zoom,
|
||||
SYNCED_MIN_HEIGHT,
|
||||
SYNCED_DEFAULT_MAX_HEIGHT
|
||||
);
|
||||
const h = calcSyncedDocFullHeight(block);
|
||||
block.model.xywh$.value = `[${x},${y},${w},${h}]`;
|
||||
|
||||
resizeObserver.unobserve(contentEl);
|
||||
resizeObserver.disconnect();
|
||||
});
|
||||
resizeObserver.observe(contentEl);
|
||||
resizeObserver.observe(block.contentElement);
|
||||
})
|
||||
.catch(console.error);
|
||||
}
|
||||
|
||||
@@ -5,8 +5,10 @@ import {
|
||||
ReloadIcon,
|
||||
} from '@blocksuite/affine-components/icons';
|
||||
import { ColorScheme } from '@blocksuite/affine-model';
|
||||
import type { BlockComponent } from '@blocksuite/std';
|
||||
import type { TemplateResult } from 'lit';
|
||||
|
||||
import { EmbedEdgelessSyncedDocBlockComponent } from './embed-edgeless-synced-doc-block.js';
|
||||
import {
|
||||
DarkSyncedDocDeletedBanner,
|
||||
DarkSyncedDocEmptyBanner,
|
||||
@@ -58,3 +60,22 @@ export function getSyncedDocIcons(
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This function will return the height of the synced doc block
|
||||
*/
|
||||
export function calcSyncedDocFullHeight(block: BlockComponent) {
|
||||
if (!(block instanceof EmbedEdgelessSyncedDocBlockComponent)) {
|
||||
return 0;
|
||||
}
|
||||
const headerHeight = block.headerWrapper?.getBoundingClientRect().height ?? 0;
|
||||
// When the content is not found, we use a default height to display empty information
|
||||
const contentHeight =
|
||||
block.contentElement?.getBoundingClientRect().height ?? 200;
|
||||
|
||||
const bottomPadding = 8;
|
||||
|
||||
return (
|
||||
(headerHeight + contentHeight + bottomPadding) / block.gfx.viewport.zoom
|
||||
);
|
||||
}
|
||||
|
||||
@@ -11,9 +11,9 @@ import {
|
||||
} from './embed-linked-doc-block';
|
||||
import {
|
||||
EdgelessClipboardEmbedSyncedDocConfig,
|
||||
EmbedSyncedDocInteraction,
|
||||
EmbedSyncedDocViewExtensions,
|
||||
} from './embed-synced-doc-block';
|
||||
import { EmbedSyncedDocInteraction } from './embed-synced-doc-block/configs/edgeless-interaction';
|
||||
|
||||
export class EmbedDocViewExtension extends ViewExtensionProvider {
|
||||
override name = 'affine-embed-doc-block';
|
||||
|
||||
@@ -8,7 +8,8 @@ import {
|
||||
} from './synced-doc-model.js';
|
||||
|
||||
export const SYNCED_MIN_WIDTH = 370;
|
||||
export const SYNCED_MIN_HEIGHT = 64;
|
||||
export const SYNCED_MIN_HEIGHT = 48;
|
||||
export const SYNCED_DEFAULT_WIDTH = 800;
|
||||
// the default max height of embed doc, user can adjust height by selected rect over this value
|
||||
export const SYNCED_DEFAULT_MAX_HEIGHT = 800;
|
||||
|
||||
@@ -22,7 +23,7 @@ export const defaultEmbedSyncedDocBlockProps: EmbedSyncedDocBlockProps = {
|
||||
title: undefined,
|
||||
description: undefined,
|
||||
index: 'a0',
|
||||
xywh: `[0,0,${SYNCED_MIN_WIDTH},100]`,
|
||||
xywh: `[0,0,${SYNCED_DEFAULT_WIDTH},100]`,
|
||||
lockedBySelf: undefined,
|
||||
};
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
EmbedLoomModel,
|
||||
EmbedSyncedDocModel,
|
||||
EmbedYoutubeModel,
|
||||
SYNCED_DEFAULT_WIDTH,
|
||||
} from '@blocksuite/affine-model';
|
||||
|
||||
export const BLOCK_CHILDREN_CONTAINER_PADDING_LEFT = 24;
|
||||
@@ -29,7 +30,7 @@ export const EMBED_CARD_WIDTH: Record<EmbedCardStyle, number> = {
|
||||
video: 752,
|
||||
figma: 752,
|
||||
html: 752,
|
||||
syncedDoc: 800,
|
||||
syncedDoc: SYNCED_DEFAULT_WIDTH,
|
||||
pdf: 537 + 24 + 2,
|
||||
citation: 752,
|
||||
};
|
||||
|
||||
@@ -47,6 +47,7 @@ export class DNDAPIExtension extends Extension {
|
||||
...options.props,
|
||||
...(blockId ? { blockId } : {}),
|
||||
pageId: docId,
|
||||
style: flavour === 'affine:embed-synced-doc' ? 'syncedDoc' : 'vertical',
|
||||
};
|
||||
return {
|
||||
...snapshot,
|
||||
|
||||
@@ -1089,7 +1089,7 @@ export class DragEventWatcher {
|
||||
block.flavour === 'affine:bookmark' ||
|
||||
block.flavour.startsWith('affine:embed-')
|
||||
) {
|
||||
const style = 'vertical' as EmbedCardStyle;
|
||||
const style = (block.props.style ?? 'vertical') as EmbedCardStyle;
|
||||
block.props.style = style;
|
||||
|
||||
blockBound.w = EMBED_CARD_WIDTH[style];
|
||||
|
||||
Reference in New Issue
Block a user