+
Skip to content

Fix note-editor related issues #475

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Fix note-editor related issues #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42049e8
fix #472 #473
ticruz38 Nov 15, 2024
5e0d2e7
fix Code fencing doesn't allow line breaks #469
ticruz38 Nov 15, 2024
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
5 changes: 2 additions & 3 deletions src/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ body,
}

.tiptap pre code {
@apply block max-w-full overflow-auto whitespace-nowrap rounded bg-neutral-200 px-1 no-underline text-neutral-800;
@apply block max-w-full overflow-auto rounded bg-neutral-200 px-1 text-neutral-800 no-underline;
}

.tiptap p code {
Expand All @@ -266,10 +266,9 @@ body,

.link-content,
.tiptap [tag] {
@apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded bg-neutral-200 px-1 no-underline text-neutral-800;
@apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded bg-neutral-200 px-1 text-neutral-800 no-underline;
}

.link-content.link-content-selected {
@apply bg-neutral-300;
}

10 changes: 2 additions & 8 deletions src/app/editor/LinkExtension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import type {Node as ProsemirrorNode} from "@tiptap/pm/model"
import type {MarkdownSerializerState} from "prosemirror-markdown"
import {createPasteRuleMatch} from "./util"

export const LINK_REGEX =
/([a-z\+:]{2,30}:\/\/)?[^<>\(\)\s]+\.[a-z]{2,6}[^\s]*[^<>"'\.!?,:\s\)\(]*/gi
export const LINK_REGEX = /([a-z\+:]{2,30}:\/\/)?[^<>\(\)\s]+\.[a-z]{2,6}[^\s<>"'\.!?,:\)\(]*/gi

export interface LinkAttributes {
url: string
Expand Down Expand Up @@ -67,7 +66,6 @@ export const LinkExtension = Node.create({
new InputRule({
find: text => {
const match = last(Array.from(text.matchAll(LINK_REGEX)))

if (match && text.length === match.index + match[0].length + 1) {
return {
index: match.index!,
Expand All @@ -82,15 +80,11 @@ export const LinkExtension = Node.create({
},
handler: ({state, range, match}) => {
const {tr} = state

if (match[0]) {
try {
tr.insert(range.from - 1, this.type.create(match.data))
.delete(tr.mapping.map(range.from - 1), tr.mapping.map(range.to))
.insert(
tr.mapping.map(range.to),
this.editor.schema.text(last(Array.from(match.input!))),
)
.insertText(last(Array.from(match.input!)))
} catch (e) {
// If the node was already linkified, the above code breaks for whatever reason
}
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载