Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

fix(editor): extra line breaks and spaces when parsing table from html (#10190)

zzj3720b6f8027e1b7e
diff --git a/blocksuite/affine/block-table/src/adapters/html.ts b/blocksuite/affine/block-table/src/adapters/html.ts
index 7d207cb942..4a70f98ecf 100644
--- a/blocksuite/affine/block-table/src/adapters/html.ts
+++ b/blocksuite/affine/block-table/src/adapters/html.ts
@@ -41,7 +41,7 @@ export const tableBlockHtmlAdapterMatcher: BlockHtmlAdapterMatcher = {
},
'children'
);
- walkerContext.skipChildren();
+ walkerContext.skipAllChildren();
}
},
leave: (o, context) => {
diff --git a/blocksuite/affine/block-table/src/adapters/markdown.ts b/blocksuite/affine/block-table/src/adapters/markdown.ts
index d5c981be43..c26136cfc9 100644
--- a/blocksuite/affine/block-table/src/adapters/markdown.ts
+++ b/blocksuite/affine/block-table/src/adapters/markdown.ts
@@ -35,7 +35,7 @@ export const tableBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher = {
},
'children'
);
- walkerContext.skipChildren();
+ walkerContext.skipAllChildren();
}
},
leave: (o, context) => {
diff --git a/blocksuite/affine/block-table/src/adapters/utils.ts b/blocksuite/affine/block-table/src/adapters/utils.ts
index 43262a386b..43164ad226 100644
--- a/blocksuite/affine/block-table/src/adapters/utils.ts
+++ b/blocksuite/affine/block-table/src/adapters/utils.ts
@@ -91,7 +91,7 @@ export const processTable = (
};
const getTextFromElement = (element: ElementContent): string => {
if (element.type === 'text') {
- return element.value;
+ return element.value.trim();
}
if (element.type === 'element') {
return element.children.map(child => getTextFromElement(child)).join('');
diff --git a/blocksuite/affine/model/src/blocks/table/table-model.ts b/blocksuite/affine/model/src/blocks/table/table-model.ts
index a13dd79105..a8e5277147 100644
--- a/blocksuite/affine/model/src/blocks/table/table-model.ts
+++ b/blocksuite/affine/model/src/blocks/table/table-model.ts
@@ -39,7 +39,7 @@ export interface TableBlockPropsSerialized {
}
export class TableBlockModel extends BlockModel<TableBlockProps> {}
-export const TableModelFlavour = 'affine:table-test1-flavour';
+export const TableModelFlavour = 'affine:table';
export const TableBlockSchema = defineBlockSchema({
flavour: TableModelFlavour,
props: (): TableBlockProps => ({