A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
editor: add support for copy/pasting code blocks with highlighting
Abdullah Attaf2a5ed66429c
diff --git a/packages/editor/src/extensions/code-block/code-block.ts b/packages/editor/src/extensions/code-block/code-block.tsindex 01404bc7c..3141defd6 100644--- a/packages/editor/src/extensions/code-block/code-block.ts+++ b/packages/editor/src/extensions/code-block/code-block.ts@@ -449,7 +449,9 @@ export const CodeBlock = Node.create<CodeBlockOptions>({if (!event.clipboardData) {return false;}- const { isCode, language } = detectCodeBlock(event.clipboardData);+ const { isCode, language, isBlock } = detectCodeBlock(+ event.clipboardData+ );const isInsideCodeBlock = this.editor.isActive(this.type.name);if (!isInsideCodeBlock && !isCode) {@@ -470,6 +472,7 @@ export const CodeBlock = Node.create<CodeBlockOptions>({const { tr } = view.state;const isInlineCode =+ !isBlock &&indent.code.length < 80 &&indent.code.split(/[\r\n]/).length === 1;if (isInlineCode && !isInsideCodeBlock) {@@ -517,10 +520,19 @@ export const CodeBlock = Node.create<CodeBlockOptions>({addNodeView() {return createNodeView(CodeblockComponent, {- contentDOMFactory: () => {+ contentDOMFactory: (node) => {+ const languageDefinition = Languages.find(+ (l) =>+ l.filename === node.attrs.language ||+ l.alias?.some((a) => a === node.attrs.language)+ );const content = document.createElement("pre");content.classList.add("node-content-wrapper");- content.classList.add("language-xyz");+ content.classList.add(+ `language-${+ languageDefinition?.alias ?? languageDefinition?.title ?? "xyz"+ }`+ );content.style.whiteSpace = "pre";// caret is not visible if content element width is 0pxcontent.style.minWidth = "20px";@@ -741,6 +753,7 @@ function detectCodeBlock(dataTransfer: DataTransfer) {const document = new DOMParser().parseFromString(html, "text/html");+ const isBlock = !!document.querySelector(".node-content-wrapper");const isGitHub = !!document.querySelector(".react-code-text.react-code-line-contents");@@ -756,7 +769,11 @@ function detectCodeBlock(dataTransfer: DataTransfer) {? inferLanguage(document.body.firstElementChild): undefined);- return { isCode: isVSCode || isGitHub || !!language, language };+ return {+ isCode: isVSCode || isGitHub || !!language,+ language,+ isBlock+ };}const LANGUAGE_CLASS_REGEX = /(?:language|lang|brush)[-:](\s+\w+|\w+)/;diff --git a/packages/editor/src/extensions/react/react-node-view.tsx b/packages/editor/src/extensions/react/react-node-view.tsxindex f5e026021..4c23e41be 100644--- a/packages/editor/src/extensions/react/react-node-view.tsx+++ b/packages/editor/src/extensions/react/react-node-view.tsx@@ -162,7 +162,7 @@ export class ReactNodeView<P extends ReactNodeViewProps> implements NodeView {content.style.minWidth = "20px";return { dom: content };}- return this.options.contentDOMFactory?.();+ return this.options.contentDOMFactory?.(this.node);}#updatePos() {diff --git a/packages/editor/src/extensions/react/types.ts b/packages/editor/src/extensions/react/types.tsindex c34279405..758906e35 100644--- a/packages/editor/src/extensions/react/types.ts+++ b/packages/editor/src/extensions/react/types.ts@@ -58,7 +58,7 @@ export type ReactNodeViewOptions<P> = {component?: React.ComponentType<P>;componentKey?: (node: PMNode) => string;shouldUpdate?: ShouldUpdate;- contentDOMFactory?: (() => ContentDOM) | boolean;+ contentDOMFactory?: ((node: PMNode) => ContentDOM) | boolean;wrapperFactory?: () => HTMLElement;forceEnableSelection?: boolean;};