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.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
fix(editor): should preserve indentation when pasting code with spaces into code block (#11587)
donteatfriedrice0302bd43cbd8
diff --git a/blocksuite/affine/blocks/paragraph/src/adapters/markdown.ts b/blocksuite/affine/blocks/paragraph/src/adapters/markdown.tsindex d01622d941..c7faae1a5c 100644--- a/blocksuite/affine/blocks/paragraph/src/adapters/markdown.ts+++ b/blocksuite/affine/blocks/paragraph/src/adapters/markdown.ts@@ -71,6 +71,7 @@ export const paragraphBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher ='children').closeNode();+ walkerContext.skipAllChildren();break;}case 'heading': {diff --git a/blocksuite/affine/blocks/root/src/clipboard/readonly-clipboard.ts b/blocksuite/affine/blocks/root/src/clipboard/readonly-clipboard.tsindex 3e8e24ef10..0f75d379fe 100644--- a/blocksuite/affine/blocks/root/src/clipboard/readonly-clipboard.ts+++ b/blocksuite/affine/blocks/root/src/clipboard/readonly-clipboard.ts@@ -34,12 +34,6 @@ const NotionClipboardConfig = ClipboardAdapterConfigExtension({priority: 95,});-const HtmlClipboardConfig = ClipboardAdapterConfigExtension({- mimeType: 'text/html',- adapter: HtmlAdapter,- priority: 90,-});-const imageClipboardConfigs = ['image/apng','image/avif',@@ -52,14 +46,20 @@ const imageClipboardConfigs = [return ClipboardAdapterConfigExtension({mimeType,adapter: ImageAdapter,- priority: 80,+ priority: 85,});});const PlainTextClipboardConfig = ClipboardAdapterConfigExtension({mimeType: 'text/plain',adapter: MixTextAdapter,- priority: 70,+ priority: 80,+});++const HtmlClipboardConfig = ClipboardAdapterConfigExtension({+ mimeType: 'text/html',+ adapter: HtmlAdapter,+ priority: 75,});const AttachmentClipboardConfig = ClipboardAdapterConfigExtension({diff --git a/blocksuite/affine/inlines/preset/src/adapters/markdown/markdown-inline.ts b/blocksuite/affine/inlines/preset/src/adapters/markdown/markdown-inline.tsindex 923aa5c417..6385f1a0c6 100644--- a/blocksuite/affine/inlines/preset/src/adapters/markdown/markdown-inline.ts+++ b/blocksuite/affine/inlines/preset/src/adapters/markdown/markdown-inline.ts@@ -79,6 +79,17 @@ export const markdownListToDeltaMatcher = MarkdownASTToDeltaExtension({toDelta: () => [],});+export const markdownHtmlToDeltaMatcher = MarkdownASTToDeltaExtension({+ name: 'html',+ match: ast => ast.type === 'html',+ toDelta: ast => {+ if (!('value' in ast)) {+ return [];+ }+ return [{ insert: ast.value }];+ },+});+export const MarkdownInlineToDeltaAdapterExtensions = [markdownTextToDeltaMatcher,markdownInlineCodeToDeltaMatcher,@@ -89,4 +100,5 @@ export const MarkdownInlineToDeltaAdapterExtensions = [markdownInlineMathToDeltaMatcher,markdownListToDeltaMatcher,markdownFootnoteReferenceToDeltaMatcher,+ markdownHtmlToDeltaMatcher,];diff --git a/tests/affine-local/e2e/blocksuite/clipboard/clipboard.spec.ts b/tests/affine-local/e2e/blocksuite/clipboard/clipboard.spec.tsindex 8df38a58fb..416575b0a5 100644--- a/tests/affine-local/e2e/blocksuite/clipboard/clipboard.spec.ts+++ b/tests/affine-local/e2e/blocksuite/clipboard/clipboard.spec.ts@@ -323,4 +323,54 @@ test.describe('paste to code block', () => {await verifyCodeBlockContent(page, 0, 'hello test\ntest\ntest hello');});++ test('should preserve indentation when pasting code with spaces into code block', async ({+ page,+ }) => {+ await pressEnter(page);+ await addCodeBlock(page);++ // Sample code with proper indentation for text/plain+ const plainTextCode = [+ 'const fibonacci = (n: number): number => {',+ ' if (n <= 1) return n;',+ ' return fibonacci(n - 1) + fibonacci(n - 2);',+ '}',+ 'function generateSequence(length: number) {',+ ' const sequence = [];',+ ' for (let i = 0; i < length; i++) {',+ ' sequence.push(fibonacci(i));',+ ' }',+ ' return sequence;',+ '}',+ ].join('\n');++ const htmlCode =+ '<div><span>const</span><span> </span><span>fibonacci</span><span> </span><span>=</span><span> (n</span><span>:</span><span> </span><span>number</span><span>)</span><span>:</span><span> </span><span>number</span><span> </span><span>=></span><span> {</span></div><div><span> </span><span>if</span><span> (n </span><span><=</span><span> </span><span>1</span><span>) </span><span>return</span><span> n;</span></div><div><span> </span><span>return</span><span> </span><span>fibonacci</span><span>(n </span><span>-</span><span> </span><span>1</span><span>) </span><span>+</span><span> </span><span>fibonacci</span><span>(n </span><span>-</span><span> </span><span>2</span><span>);</span></div><div><span>}</span></div><div><span>function</span><span> </span><span>generateSequence</span><span>(length</span><span>:</span><span> </span><span>number</span><span>) {</span></div><div><span> </span><span>const</span><span> </span><span>sequence</span><span> </span><span>=</span><span> [];</span></div><div><span> </span><span>for</span><span> (</span><span>let</span><span> i </span><span>=</span><span> </span><span>0</span><span>; i </span><span><</span><span> length; i</span><span>++</span><span>) {</span></div><div><span> sequence.</span><span>push</span><span>(</span><span>fibonacci</span><span>(i));</span></div><div><span> }</span></div><div><span> </span><span>return</span><span> sequence;</span></div><div><span>}</span></div></div>';++ await pasteContent(page, {+ 'text/plain': plainTextCode,+ 'text/html': htmlCode,+ });+ await page.waitForTimeout(100);++ // Verify the pasted code maintains indentation+ await verifyCodeBlockContent(page, 0, plainTextCode);+ });++ test('html tag should be treated as plain text when pasting', async ({+ page,+ }) => {+ await pressEnter(page);+ await addCodeBlock(page);++ const textWithHtmlTags =+ '<div><span>const</span><span> </span><span>fibonacci</span><span> </span><span>=</span><span> (n</span><span>:</span><span> </span><span>number</span><span>)</span><span>:</span><span> </span><span>number</span><span> </span><span>=></span><span> {</span></div><div><span> </span><span>if</span><span> (n </span><span><=</span><span> </span><span>1</span><span>) </span><span>return</span><span> n;</span></div><div><span> </span><span>return</span><span> </span><span>fibonacci</span><span>(n </span><span>-</span><span> </span><span>1</span><span>) </span><span>+</span><span> </span><span>fibonacci</span><span>(n </span><span>-</span><span> </span><span>2</span><span>);</span></div><div><span>}</span></div><div><span>function</span><span> </span><span>generateSequence</span><span>(length</span><span>:</span><span> </span><span>number</span><span>) {</span></div><div><span> </span><span>const</span><span> </span><span>sequence</span><span> </span><span>=</span><span> [];</span></div><div><span> </span><span>for</span><span> (</span><span>let</span><span> i </span><span>=</span><span> </span><span>0</span><span>; i </span><span><</span><span> length; i</span><span>++</span><span>) {</span></div><div><span> sequence.</span><span>push</span><span>(</span><span>fibonacci</span><span>(i));</span></div><div><span> }</span></div><div><span> </span><span>return</span><span> sequence;</span></div><div><span>}</span></div></div>';++ await pasteContent(page, { 'text/plain': textWithHtmlTags });+ await page.waitForTimeout(100);++ // Verify the pasted code maintains indentation+ await verifyCodeBlockContent(page, 0, textWithHtmlTags);+ });});