mirror/outline
1
0
Fork 0
mirror of https://github.com/outline/outline.git synced 2026-02-05 10:09:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: Bump prosemirror-model

Browse Source
This commit is contained in:
Tom Moor
2024-07-14 15:50:13 -04:00
parent cf3ef2a839
commit 6a6c069e4e
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -180,7 +180,7 @@
"prosemirror-inputrules": "^1.4.0",
"prosemirror-keymap": "^1.2.2",
"prosemirror-markdown": "^1.13.0",
"prosemirror-model": "^1.21.1",
"prosemirror-model": "^1.22.1",
"prosemirror-schema-list": "^1.3.0",
"prosemirror-state": "^1.4.3",
"prosemirror-tables": "^1.3.7",

36
shared/editor/lib/ExtensionManager.ts
View File

@@ -2,7 +2,7 @@ import { PluginSimple } from "markdown-it";
import { observer } from "mobx-react";
import { keymap } from "prosemirror-keymap";
import { MarkdownParser } from "prosemirror-markdown";
import { Schema } from "prosemirror-model";
import { MarkSpec, NodeSpec, Schema } from "prosemirror-model";
import { EditorView } from "prosemirror-view";
import { Primitive } from "utility-types";
import type { Editor } from "~/editor";
@@ -46,8 +46,8 @@ export default class ExtensionManager {
return this.extensions
.filter((extension) => extension.widget({ rtl: false, readOnly: false }))
.reduce(
(nodes, node: Node) => ({
...nodes,
(memo, node: Node) => ({
...memo,
[node.name]: observer(node.widget as any),
}),
{}
@@ -55,21 +55,22 @@ export default class ExtensionManager {
}
get nodes() {
const nodes = this.extensions
const nodes: Record<string, NodeSpec> = this.extensions
.filter((extension) => extension.type === "node")
.reduce(
(nodes, node: Node) => ({
...nodes,
(memo, node: Node) => ({
...memo,
[node.name]: node.schema,
}),
{}
);
for (const i in nodes) {
if (nodes[i].marks) {
const { marks } = nodes[i];
if (marks) {
// We must filter marks from the marks list that are not defined
// in the schema for the current editor.
nodes[i].marks = nodes[i].marks
nodes[i].marks = marks
.split(" ")
.filter((m: string) => Object.keys(this.marks).includes(m))
.join(" ");
@@ -80,21 +81,22 @@ export default class ExtensionManager {
}
get marks() {
const marks = this.extensions
const marks: Record<string, MarkSpec> = this.extensions
.filter((extension) => extension.type === "mark")
.reduce(
(marks, mark: Mark) => ({
...marks,
(memo, mark: Mark) => ({
...memo,
[mark.name]: mark.schema,
}),
{}
);
for (const i in marks) {
if (marks[i].excludes) {
const { excludes } = marks[i];
if (excludes) {
// We must filter marks from the excludes list that are not defined
// in the schema for the current editor.
marks[i].excludes = marks[i].excludes
marks[i].excludes = excludes
.split(" ")
.filter((m: string) => Object.keys(marks).includes(m))
.join(" ");
@@ -108,8 +110,8 @@ export default class ExtensionManager {
const nodes = this.extensions
.filter((extension) => extension.type === "node")
.reduce(
(nodes, extension: Node) => ({
...nodes,
(memo, extension: Node) => ({
...memo,
[extension.name]: extension.toMarkdown,
}),
{}
@@ -118,8 +120,8 @@ export default class ExtensionManager {
const marks = this.extensions
.filter((extension) => extension.type === "mark")
.reduce(
(marks, extension: Mark) => ({
...marks,
(memo, extension: Mark) => ({
...memo,
[extension.name]: extension.toMarkdown,
}),
{}

8
yarn.lock
View File

@@ -12632,10 +12632,10 @@ prosemirror-markdown@^1.13.0:
markdown-it "^14.0.0"
prosemirror-model "^1.20.0"
prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.21.1, prosemirror-model@^1.8.1:
version "1.21.1"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.21.1.tgz#023b804cfc7942bc9b3104e65f59b18bf18514c6"
integrity sha512-IVBAuMqOfltTr7yPypwpfdGT+6rGAteVOw2FO6GEvCGGa1ZwxLseqC1Eax/EChDvG/xGquB2d/hLdgh3THpsYg==
prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.22.1, prosemirror-model@^1.8.1:
version "1.22.1"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.22.1.tgz#2ed7d7840e710172c559d5a9950e92b870d1e764"
integrity sha512-gMrxal+F3higDFxCkBK5iQXckRVYvIu/3dopERJ6b20xfwZ9cbYvQvuldqaN+v/XytNPGyURYUpUU23kBRxWCQ==
dependencies:
orderedmap "^2.0.0"