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

feat: add pdf style to attachment #8752

Merged
merged 1 commit into from
Nov 15, 2024
+48 −25
Merged

feat: add pdf style to attachment #8752

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/affine/model/src/blocks/attachment/attachment-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ type BackwardCompatibleUndefined = undefined;
export const AttachmentBlockStyles: EmbedCardStyle[] = [
'cubeThick',
'horizontalThin',
'pdf',
] as const;

export interface AttachmentBlockEdgelessProps {
Expand Down
3 changes: 2 additions & 1 deletion packages/affine/model/src/utils/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ export type EmbedCardStyle =
| 'video'
| 'figma'
| 'html'
| 'syncedDoc';
| 'syncedDoc'
| 'pdf';

export type LinkPreviewData = {
description: string | null;
Expand Down
2 changes: 2 additions & 0 deletions packages/affine/shared/src/consts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const EMBED_CARD_WIDTH: Record<EmbedCardStyle, number> = {
figma: 752,
html: 752,
syncedDoc: 752,
pdf: 537 + 24 + 2,
};

export const EMBED_CARD_HEIGHT: Record<EmbedCardStyle, number> = {
Expand All @@ -34,6 +35,7 @@ export const EMBED_CARD_HEIGHT: Record<EmbedCardStyle, number> = {
figma: 544,
html: 544,
syncedDoc: 455,
pdf: 759 + 46 + 24 + 2,
};

export const EMBED_BLOCK_FLAVOUR_LIST = [
Expand Down
23 changes: 20 additions & 3 deletions packages/blocks/src/attachment-block/components/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import type { AttachmentBlockModel } from '@blocksuite/affine-model';

import {
CaptionIcon,
DownloadIcon,
Expand All @@ -13,6 +11,15 @@ import {
renderGroups,
renderToolbarSeparator,
} from '@blocksuite/affine-components/toolbar';
import {
type AttachmentBlockModel,
defaultAttachmentProps,
} from '@blocksuite/affine-model';
import {
EMBED_CARD_HEIGHT,
EMBED_CARD_WIDTH,
} from '@blocksuite/affine-shared/consts';
import { Bound } from '@blocksuite/global/utils';
import { flip, offset } from '@floating-ui/dom';
import { html, nothing } from 'lit';
import { join } from 'lit/directives/join.js';
Expand Down Expand Up @@ -43,7 +50,17 @@ export function attachmentViewToggleMenu({
label: 'Card view',
disabled: readonly || !embedded,
action: () => {
model.doc.updateBlock(model, { embed: false });
const style = defaultAttachmentProps.style!;
const width = EMBED_CARD_WIDTH[style];
const height = EMBED_CARD_HEIGHT[style];
const bound = Bound.deserialize(model.xywh);
bound.w = width;
bound.h = height;
model.doc.updateBlock(model, {
style,
embed: false,
xywh: bound.serialize(),
});
callback?.();
},
},
Expand Down
40 changes: 21 additions & 19 deletions packages/blocks/src/root-block/widgets/element-toolbar/change-attachment-button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,26 +90,28 @@ export class EdgelessChangeAttachmentButton extends WithDisposable(LitElement) {
override render() {
return join(
[
html`
<editor-menu-button
.contentPadding=${'8px'}
.button=${html`
<editor-icon-button
aria-label="Card style"
.tooltip=${'Card style'}
this.model.style === 'pdf'
? null
: html`
<editor-menu-button
.contentPadding=${'8px'}
.button=${html`
<editor-icon-button
aria-label="Card style"
.tooltip=${'Card style'}
>
${PaletteIcon}
</editor-icon-button>
`}
>
${PaletteIcon}
</editor-icon-button>
`}
>
<card-style-panel
.value=${this.model.style}
.options=${this._getCardStyleOptions}
.onSelect=${this._setCardStyle}
>
</card-style-panel>
</editor-menu-button>
`,
<card-style-panel
.value=${this.model.style}
.options=${this._getCardStyleOptions}
.onSelect=${this._setCardStyle}
>
</card-style-panel>
</editor-menu-button>
`,
this.viewToggleMenu,
html`
<editor-icon-button
Expand Down
4 changes: 2 additions & 2 deletions packages/blocks/src/root-block/widgets/element-toolbar/change-embed-card-button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ export class EdgelessChangeEmbedCardButton extends WithDisposable(LitElement) {
this._blockComponent?.captionEditor?.show();
}

private _viewMenuButton() {
private _viewToggleMenu() {
if (this._canConvertToEmbedView || this._isEmbedView) {
const buttons = [
{
Expand Down Expand Up @@ -600,7 +600,7 @@ export class EdgelessChangeEmbedCardButton extends WithDisposable(LitElement) {

this._openMenuButton(),

this._viewMenuButton(),
this._viewToggleMenu(),

'style' in model && this._canShowCardStylePanel
? html`
Expand Down
Loading