yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Aggressive embed conversion on server Markdown -> Ydoc

Browse Source
This commit is contained in:
Tom Moor
2023-09-24 23:12:38 -04:00
parent 136ee0ad1d
commit 43bdb97639
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/models/helpers/ProsemirrorHelper.tsx
View File

@@ -1,6 +1,6 @@
import { prosemirrorToYDoc } from "@getoutline/y-prosemirror"; import { prosemirrorToYDoc } from "@getoutline/y-prosemirror";
import { JSDOM } from "jsdom"; import { JSDOM } from "jsdom";
import { Node, DOMSerializer, Fragment } from "prosemirror-model"; import { Node, DOMSerializer, Fragment, Mark } from "prosemirror-model";
import * as React from "react"; import * as React from "react";
import { renderToString } from "react-dom/server"; import { renderToString } from "react-dom/server";
import styled, { ServerStyleSheet, ThemeProvider } from "styled-components"; import styled, { ServerStyleSheet, ThemeProvider } from "styled-components";
@@ -50,7 +50,14 @@ export default class ProsemirrorHelper {
// @ts-expect-error content // @ts-expect-error content
for (const textNode of node.content.content) { for (const textNode of node.content.content) {
for (const embed of embeds) { for (const embed of embeds) {
if (textNode.text && embed.matcher(textNode.text)) { if (
textNode.text &&
textNode.marks.some(
(m: Mark) =>
m.type.name === "link" && m.attrs.href === textNode.text
) &&
embed.matcher(textNode.text)
) {
return schema.nodes.embed.createAndFill({ return schema.nodes.embed.createAndFill({
href: textNode.text, href: textNode.text,
}); });