From 2a2644ef66c41279e114a39537ba101d9aa48672 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Tue, 29 Mar 2022 15:33:21 +0800 Subject: [PATCH 1/3] fix: fix enter at title end --- packages/client/src/tiptap/extensions/title.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/client/src/tiptap/extensions/title.tsx b/packages/client/src/tiptap/extensions/title.tsx index b4e74a9f..ef7ff843 100644 --- a/packages/client/src/tiptap/extensions/title.tsx +++ b/packages/client/src/tiptap/extensions/title.tsx @@ -19,8 +19,6 @@ declare module '@tiptap/core' { export const Title = Node.create({ name: 'title', content: 'inline*', - group: 'block', - defining: true, addOptions() { return { @@ -61,11 +59,10 @@ export const Title = Node.create({ const $head = state.selection.$head; const titleNode = $head.node($head.depth); - const insertPos = titleNode.firstChild.nodeSize + 1; - dispatch(state.tr.insert(insertPos, paragraph.create())); + const endPos = titleNode.firstChild.nodeSize + 1; const newState = view.state; - const next = new TextSelection(newState.doc.resolve(insertPos + 1)); + const next = new TextSelection(newState.doc.resolve(endPos + 2)); dispatch(newState.tr.setSelection(next)); return true; } From 080bb1eb552d98a737314616317d287ac048a135 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Tue, 29 Mar 2022 15:36:23 +0800 Subject: [PATCH 2/3] fix: fix enter in title --- packages/client/src/tiptap/extensions/title.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/tiptap/extensions/title.tsx b/packages/client/src/tiptap/extensions/title.tsx index ef7ff843..5f4265a3 100644 --- a/packages/client/src/tiptap/extensions/title.tsx +++ b/packages/client/src/tiptap/extensions/title.tsx @@ -61,6 +61,8 @@ export const Title = Node.create({ const titleNode = $head.node($head.depth); const endPos = titleNode.firstChild.nodeSize + 1; + dispatch(state.tr.insert(endPos, paragraph.create())); + const newState = view.state; const next = new TextSelection(newState.doc.resolve(endPos + 2)); dispatch(newState.tr.setSelection(next)); From f2be70396c2126af35ca8687a4c10cec7be131d9 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Tue, 29 Mar 2022 15:40:11 +0800 Subject: [PATCH 3/3] fix: fix style --- packages/client/src/tiptap/styles/code.scss | 12 +++++++++--- .../src/tiptap/wrappers/code-block/index.module.scss | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/client/src/tiptap/styles/code.scss b/packages/client/src/tiptap/styles/code.scss index 9bd9d110..5e2a78d1 100644 --- a/packages/client/src/tiptap/styles/code.scss +++ b/packages/client/src/tiptap/styles/code.scss @@ -2,7 +2,7 @@ code { padding: 4px; font-family: Consolas, Menlo, Courier, monospace; - font-size: .875rem; + font-size: 0.875rem; line-height: 1.3; cursor: text; background-color: var(--semi-color-fill-1); @@ -25,7 +25,7 @@ padding: 0; margin: 8px; overflow: auto; - font-size: .875rem; + font-size: 0.875rem; line-height: 1.5rem; color: inherit; white-space: pre; @@ -33,6 +33,12 @@ overscroll-behavior: contain; } } + + .node-codeBlock { + &::before { + opacity: 0; + } + } } /*! @@ -276,6 +282,6 @@ body[theme-mode='dark'] { } img { - opacity: .75; + opacity: 0.75; } } diff --git a/packages/client/src/tiptap/wrappers/code-block/index.module.scss b/packages/client/src/tiptap/wrappers/code-block/index.module.scss index 4aff45d9..c46713c7 100644 --- a/packages/client/src/tiptap/wrappers/code-block/index.module.scss +++ b/packages/client/src/tiptap/wrappers/code-block/index.module.scss @@ -1,5 +1,6 @@ .wrap { position: relative; + margin-top: 0.75em; .handleWrap { display: flex;