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.

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: extract config for format bar widget #6430

Merged
merged 7 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/blocks/src/note-block/commands/block-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {

type UpdateBlockConfig = {
flavour: BlockSuite.Flavour;
props: Record<string, unknown>;
props?: Record<string, unknown>;
};

export const updateBlockType: Command<
Expand Down Expand Up @@ -183,7 +183,7 @@ export const updateBlockType: Command<
'affine:code',
]);
if (model.flavour === flavour) {
doc.updateBlock(model, props);
doc.updateBlock(model, props ?? {});
newModels.push(model);
return;
}
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,84 +1,53 @@
import { assertExists } from '@blocksuite/global/utils';
import type { EditorHost } from '@blocksuite/lit';
import { type BlockElement } from '@blocksuite/lit';
import { computePosition, flip, offset, shift } from '@floating-ui/dom';
import { html } from 'lit';
import { ref, type RefOrCallback } from 'lit/directives/ref.js';
import { repeat } from 'lit/directives/repeat.js';

import { whenHover } from '../../../../_common/components/hover/index.js';
import { textConversionConfigs } from '../../../../_common/configs/text-conversion.js';
import { ArrowDownIcon } from '../../../../_common/icons/index.js';
import type { ParagraphBlockModel } from '../../../../paragraph-block/index.js';
import { isRootElement } from '../../../../root-block/utils/guard.js';
import type { ParagraphActionConfigItem } from '../config.js';
import type { AffineFormatBarWidget } from '../format-bar.js';

interface ParagraphPanelProps {
host: EditorHost;
selectedBlockElements: BlockElement[];
formatBar: AffineFormatBarWidget;
ref?: RefOrCallback;
}

const updateParagraphType = (
host: EditorHost,
selectedBlockElements: BlockElement[],
flavour: BlockSuite.Flavour,
type?: string
) => {
if (selectedBlockElements.length === 0) {
throw new Error('No models to update!');
}
const { flavour: defaultFlavour, type: defaultType } =
textConversionConfigs[0];
const targetFlavour = selectedBlockElements.every(
el =>
el.flavour === flavour && (el.model as ParagraphBlockModel).type === type
)
? defaultFlavour
: flavour;
const targetType = selectedBlockElements.every(
el =>
el.flavour === flavour && (el.model as ParagraphBlockModel).type === type
)
? defaultType
: type;

host.std.command
.chain()
.with({
selectedBlocks: selectedBlockElements,
})
.updateBlockType({
flavour: targetFlavour,
props: {
type: targetType,
},
})
.run();
};

const ParagraphPanel = ({
formatBar,
host,
selectedBlockElements,
ref: containerRef,
}: ParagraphPanelProps) => {
const config = formatBar.configItems
.filter(
(item): item is ParagraphActionConfigItem =>
item.type === 'paragraph-action'
)
.filter(({ flavour }) => host.doc.schema.flavourSchemaMap.has(flavour));

const renderedConfig = repeat(
config,
item =>
html`<icon-button
width="100%"
height="32px"
style="padding-left: 12px; justify-content: flex-start; gap: 8px;"
text="${item.name}"
data-testid="${item.id}"
@click="${() => item.action(formatBar)}"
>
${typeof item.icon === 'function' ? item.icon() : item.icon}
</icon-button>`
);

return html`<div ${ref(containerRef)} class="paragraph-panel">
${textConversionConfigs
.filter(({ flavour }) => flavour !== 'affine:divider')
.filter(({ flavour }) => host.doc.schema.flavourSchemaMap.has(flavour))
.map(
({ flavour, type, name, icon }) =>
html`<icon-button
width="100%"
height="32px"
style="padding-left: 12px; justify-content: flex-start; gap: 8px;"
text="${name}"
data-testid="${flavour}/${type}"
@click="${() =>
updateParagraphType(host, selectedBlockElements, flavour, type)}"
>
${icon}
</icon-button>`
)}
${renderedConfig}
</div>`;
};

Expand Down Expand Up @@ -143,7 +112,7 @@ export const ParagraphButton = (formatBar: AffineFormatBarWidget) => {
});

const paragraphPanel = ParagraphPanel({
selectedBlockElements,
formatBar,
host: formatBar.host,
ref: setFloating,
});
Expand Down
Loading
Loading