mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-04-06 10:46:57 +00:00
Code Issues Releases Wiki Activity

feat: replace prosemirror-schema-list to prosemirror-flat-list

Browse Source
This commit is contained in:
lin onetwo 2025-03-24 02:34:54 +08:00
parent e2414094f6
commit eecab2c0b8
8 changed files with 2039 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/tiddlywiki/prosemirror/ast/from-prosemirror.js
View File

@ -39,30 +39,22 @@ function heading(context, node) {
};
}
function bullet_list(context, node) {
function list(context, node) {
const listType = node.attrs && node.attrs.kind === "ordered" ? "ol" : "ul";
const listItems = node.content.map(item => {
return {
type: "element",
tag: "li",
children: convertANode(context, item)
};
});
return {
type: "element",
tag: "ul",
tag: listType,
rule: "list",
children: convertNodes(context, node.content)
};
}
function ordered_list(context, node) {
return {
type: "element",
tag: "ol",
rule: "list",
children: convertNodes(context, node.content)
};
}
function list_item(context, node) {
return {
type: "element",
tag: "li",
rule: "list",
children: convertNodes(context, node.content)
children: listItems
};
}
@ -74,9 +66,7 @@ const builders = {
paragraph,
text,
heading,
bullet_list,
ordered_list,
list_item,
list,
};
function wikiAstFromProseMirrorAst(input) {

28
plugins/tiddlywiki/prosemirror/ast/to-prosemirror.js
View File

@ -61,26 +61,34 @@ const elementBuilders = {
},
ul: function(context, node) {
return {
type: "bullet_list",
type: "list",
attrs: {
kind: "bullet",
order: null,
checked: false,
collapsed: false
},
content: convertNodes(context, node.children)
};
},
ol: function(context, node) {
return {
type: "ordered_list",
type: "list",
attrs: {
kind: "ordered",
order: null,
checked: false,
collapsed: false
},
content: convertNodes(context, node.children)
};
},
li: function(context, node) {
// In ProseMirror, list items must contain block content (not bare text)
// TODO: find solution to https://discuss.prosemirror.net/t/removing-the-default-paragraph-p-inside-a-list-item-li/2745/17
// In ProseMirror, list items are converted to paragraphs or other block content
// directly under the list node, no special list_item type needed
const processedContent = convertNodes(context, node.children);
const wrappedContent = wrapTextNodesInParagraphs(context, processedContent);
return {
type: "list_item",
content: wrappedContent
};
// Ensure content starts with a block element (typically paragraph)
return wrapTextNodesInParagraphs(context, processedContent);
}
};

10
plugins/tiddlywiki/prosemirror/development.tid
View File

@ -7,7 +7,9 @@ Downloaded from JsDelivr CDN (like `https://cdn.jsdelivr.net/npm/prosemirror-sta
** [ext[prosemirror.css|https://cdn.jsdelivr.net/npm/prosemirror-view@latest/style/prosemirror.css]]
* [ext[prosemirror-model|https://cdn.jsdelivr.net/npm/prosemirror-model@latest/dist/index.cjs]]: v1.25.0
* [ext[prosemirror-schema-basic|https://cdn.jsdelivr.net/npm/prosemirror-schema-basic@latest/dist/index.cjs]]: v1.2.4
* [ext[prosemirror-schema-list|https://cdn.jsdelivr.net/npm/prosemirror-schema-list@latest/dist/index.cjs]]: v1.5.1
* [ext[prosemirror-flat-list|https://cdn.jsdelivr.net/npm/prosemirror-flat-list@latest/dist/prosemirror-flat-list.cjs]]: v0.5.4
** [ext[prosemirror-flat-list.css|https://cdn.jsdelivr.net/npm/prosemirror-flat-list@latest/dist/style.css]]
** (Instead of [ext[prosemirror-schema-list|https://cdn.jsdelivr.net/npm/prosemirror-schema-list@latest/dist/index.cjs]])
* [ext[prosemirror-example-setup|https://cdn.jsdelivr.net/npm/prosemirror-example-setup@latest/dist/index.cjs]]: v1.2.3
* [ext[orderedmap|https://cdn.jsdelivr.net/npm/orderedmap@latest/dist/index.cjs]]: v2.1.1
* [ext[prosemirror-transform|https://cdn.jsdelivr.net/npm/prosemirror-transform@latest/dist/index.cjs]]: v1.10.3
@ -22,3 +24,9 @@ Downloaded from JsDelivr CDN (like `https://cdn.jsdelivr.net/npm/prosemirror-sta
* [ext[w3c-keyname|https://cdn.jsdelivr.net/npm/w3c-keyname@latest/dist/index.cjs]]: v2.2.8
* [ext[crelt|https://cdn.jsdelivr.net/npm/crelt@latest/dist/index.cjs]]: v1.0.6
* [ext[rope-sequence|https://cdn.jsdelivr.net/npm/rope-sequence@latest/dist/index.cjs]]: v1.3.4
* [ext[prosemirror-safari-ime-span|https://cdn.jsdelivr.net/npm/prosemirror-safari-ime-span@latest/dist/index.cjs]]: v1.0.2
!! TODO
* remove prosemirror-example-setup, move all configs here. And remove `prosemirror-schema-list` that it depends on.
* prosemirror-flat-list only add dot style to list container, not each list item. Make it looks weird. And when creating new list, it will make each item to be a full new list, which is also weird.

1779
plugins/tiddlywiki/prosemirror/files/prosemirror-flat-list.cjs Normal file
View File

File diff suppressed because it is too large Load Diff

87
plugins/tiddlywiki/prosemirror/files/prosemirror-flat-list.css Normal file
View File

@ -0,0 +1,87 @@
/* src/style.css */
.prosemirror-flat-list {
padding: 0;
margin-top: 0;
margin-bottom: 0;
margin-left: 32px;
margin-bottom: 0;
position: relative;
display: list-item;
list-style: none;
}
.prosemirror-flat-list.ProseMirror-selectednode {
outline: none;
}
.prosemirror-flat-list.ProseMirror-selectednode:after {
content: "";
position: absolute;
left: -32px;
right: -2px;
top: -2px;
bottom: -2px;
border: 2px solid #8cf;
pointer-events: none;
}
.prosemirror-flat-list[data-list-kind=bullet] {
list-style: disc;
}
.prosemirror-flat-list[data-list-kind=ordered] {
counter-increment: prosemirror-flat-list-counter;
}
.prosemirror-flat-list[data-list-kind=ordered] > * {
contain: style;
}
.prosemirror-flat-list[data-list-kind=ordered]::before {
position: absolute;
right: 100%;
font-variant-numeric: tabular-nums;
content: counter(prosemirror-flat-list-counter, decimal) ". ";
}
.prosemirror-flat-list[data-list-kind=ordered]:first-child,
:not(.prosemirror-flat-list[data-list-kind=ordered]) + .prosemirror-flat-list[data-list-kind=ordered] {
counter-reset: prosemirror-flat-list-counter;
}
@supports (counter-set: prosemirror-flat-list-counter 1) {
[data-list-order]:is(.prosemirror-flat-list[data-list-kind=ordered]:first-child, :not(.prosemirror-flat-list[data-list-kind=ordered]) + .prosemirror-flat-list[data-list-kind=ordered]) {
counter-set: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
}
}
@supports not (counter-set: prosemirror-flat-list-counter 1) {
[data-list-order]:is(.prosemirror-flat-list[data-list-kind=ordered]:first-child, :not(.prosemirror-flat-list[data-list-kind=ordered]) + .prosemirror-flat-list[data-list-kind=ordered]) {
counter-increment: prosemirror-flat-list-counter var(--prosemirror-flat-list-order);
}
}
.prosemirror-flat-list[data-list-kind=task] > .list-marker {
position: absolute;
right: 100%;
text-align: center;
width: 1.5em;
width: 1lh;
}
.prosemirror-flat-list[data-list-kind=task] > .list-marker,
.prosemirror-flat-list[data-list-kind=task] > .list-marker * {
cursor: pointer;
}
.prosemirror-flat-list[data-list-kind=toggle] > .list-marker {
position: absolute;
right: 100%;
text-align: center;
width: 1.5em;
width: 1lh;
}
.prosemirror-flat-list[data-list-kind=toggle] > .list-marker::before {
content: "\23f7";
}
.prosemirror-flat-list[data-list-kind=toggle][data-list-collapsable][data-list-collapsed] > .list-marker::before {
content: "\23f5";
}
.prosemirror-flat-list[data-list-kind=toggle][data-list-collapsable] > .list-marker {
cursor: pointer;
}
.prosemirror-flat-list[data-list-kind=toggle]:not([data-list-collapsable]) > .list-marker {
opacity: 40%;
pointer-events: none;
}
.prosemirror-flat-list[data-list-kind=toggle][data-list-collapsable][data-list-collapsed] > .list-content > *:nth-child(n+2) {
display: none;
}

74
plugins/tiddlywiki/prosemirror/files/prosemirror-safari-ime-span.cjs Normal file
View File

@ -0,0 +1,74 @@
"use strict";
var __defProp = Object.defineProperty;
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
var __getOwnPropNames = Object.getOwnPropertyNames;
var __hasOwnProp = Object.prototype.hasOwnProperty;
var __export = (target, all) => {
for (var name in all)
__defProp(target, name, { get: all[name], enumerable: true });
};
var __copyProps = (to, from, except, desc) => {
if (from && typeof from === "object" || typeof from === "function") {
for (let key2 of __getOwnPropNames(from))
if (!__hasOwnProp.call(to, key2) && key2 !== except)
__defProp(to, key2, { get: () => from[key2], enumerable: !(desc = __getOwnPropDesc(from, key2)) || desc.enumerable });
}
return to;
};
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
// src/index.ts
var src_exports = {};
__export(src_exports, {
imeSpan: () => imeSpan
});
module.exports = __toCommonJS(src_exports);
var import_prosemirror_state = require("prosemirror-state");
var import_prosemirror_view = require("prosemirror-view");
// src/browser.ts
var nav = typeof navigator != "undefined" ? navigator : null;
var agent = nav && nav.userAgent || "";
var ie_edge = /Edge\/(\d+)/.exec(agent);
var ie_upto10 = /MSIE \d/.exec(agent);
var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(agent);
var ie = !!(ie_upto10 || ie_11up || ie_edge);
var safari = !ie && !!nav && /Apple Computer/.test(nav.vendor);
// src/index.ts
var key = new import_prosemirror_state.PluginKey("safari-ime-span");
var isComposing = false;
var spec = {
key,
props: {
decorations: createDecorations,
handleDOMEvents: {
compositionstart: () => {
isComposing = true;
},
compositionend: () => {
isComposing = false;
}
}
}
};
function createDecorations(state) {
const { $from, $to, to } = state.selection;
if (isComposing && $from.sameParent($to)) {
const deco = import_prosemirror_view.Decoration.widget(to, createSpan, {
ignoreSelection: true,
key: "safari-ime-span"
});
return import_prosemirror_view.DecorationSet.create(state.doc, [deco]);
}
}
function createSpan(view) {
const span = view.dom.ownerDocument.createElement("span");
span.className = "ProseMirror-safari-ime-span";
return span;
}
var imeSpan = new import_prosemirror_state.Plugin(safari ? spec : { key });
// Annotate the CommonJS export names for ESM import in node:
0 && (module.exports = {
imeSpan
});

60
plugins/tiddlywiki/prosemirror/files/tiddlywiki.files
View File

@ -28,6 +28,13 @@
"title": "$:/plugins/tiddlywiki/prosemirror/lib/prosemirror.css",
"tags": "[[$:/tags/Stylesheet]]"
}
},{
"file": "prosemirror-flat-list.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-flat-list",
"module-type": "library"
}
},{
"file": "prosemirror-schema-list.cjs",
"fields": {
@ -35,6 +42,13 @@
"title": "prosemirror-schema-list",
"module-type": "library"
}
},{
"file": "prosemirror-flat-list.css",
"fields": {
"type": "text/css",
"title": "$:/plugins/tiddlywiki/prosemirror/lib/prosemirror-flat-list.css",
"tags": "[[$:/tags/Stylesheet]]"
}
},{
"file": "prosemirror-example-setup.cjs",
"fields": {
@ -49,110 +63,104 @@
"title": "prosemirror-schema-basic",
"module-type": "library"
}
},
{
},{
"file": "orderedmap.cjs",
"fields": {
"type": "application/javascript",
"title": "orderedmap",
"module-type": "library"
}
},
{
},{
"file": "prosemirror-transform.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-transform",
"module-type": "library"
}
},
{
},{
"file": "prosemirror-keymap.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-keymap",
"module-type": "library"
}
},
{
},{
"file": "prosemirror-history.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-history",
"module-type": "library"
}
},
{
},{
"file": "prosemirror-commands.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-commands",
"module-type": "library"
}
},
{
},{
"file": "prosemirror-dropcursor.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-dropcursor",
"module-type": "library"
}
},
{
},{
"file": "prosemirror-gapcursor.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-gapcursor",
"module-type": "library"
}
},
{
},{
"file": "prosemirror-menu.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-menu",
"module-type": "library"
}
},
{
},{
"file": "menu.css",
"fields": {
"type": "text/css",
"title": "$:/plugins/tiddlywiki/prosemirror/lib/menu.css",
"tags": "[[$:/tags/Stylesheet]]"
}
},
{
},{
"file": "prosemirror-inputrules.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-inputrules",
"module-type": "library"
}
},
{
},{
"file": "w3c-keyname.cjs",
"fields": {
"type": "application/javascript",
"title": "w3c-keyname",
"module-type": "library"
}
},
{
},{
"file": "crelt.cjs",
"fields": {
"type": "application/javascript",
"title": "crelt",
"module-type": "library"
}
},
{
},{
"file": "rope-sequence.cjs",
"fields": {
"type": "application/javascript",
"title": "rope-sequence",
"module-type": "library"
}
},{
"file": "prosemirror-safari-ime-span.cjs",
"fields": {
"type": "application/javascript",
"title": "prosemirror-safari-ime-span",
"module-type": "library"
}
}
]
}

35
plugins/tiddlywiki/prosemirror/widget.js
View File

@ -15,9 +15,16 @@ var wikiAstToProseMirrorAst = require("$:/plugins/tiddlywiki/prosemirror/ast/to-
var { EditorState } = require("prosemirror-state");
var { EditorView } = require("prosemirror-view");
var { Schema, DOMParser } = require("prosemirror-model");
var { schema } = require("prosemirror-schema-basic");
var { addListNodes } = require("prosemirror-schema-list");
var { schema: basicSchema } = require("prosemirror-schema-basic");
var {
createListPlugins,
createListSpec,
listInputRules,
listKeymap
} = require("prosemirror-flat-list");
var { exampleSetup } = require("prosemirror-example-setup");
var { keymap } = require("prosemirror-keymap");
var { inputRules } = require("prosemirror-inputrules");
var ProsemirrorWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
@ -39,13 +46,14 @@ ProsemirrorWidget.prototype.render = function(parent,nextSibling) {
class: 'tc-prosemirror-container',
});
// Mix the nodes from prosemirror-schema-list into the basic schema to
// create a schema with list support.
var mySchema = new Schema({
// nodes: addListNodes(schema.spec.nodes, "paragraph block*", "block"),
nodes: addListNodes(schema.spec.nodes, "block*", "block"),
marks: schema.spec.marks
var schema = new Schema({
nodes: basicSchema.spec.nodes.append({ list: createListSpec() }),
marks: basicSchema.spec.marks,
})
var listKeymapPlugin = keymap(listKeymap)
var listInputRulePlugin = inputRules({ rules: listInputRules })
var listPlugins = createListPlugins({ schema })
var self = this;
var wikiAst = $tw.wiki.parseText(null, `* This is an unordered list
@ -59,9 +67,14 @@ ProsemirrorWidget.prototype.render = function(parent,nextSibling) {
console.log(`initial doc`, doc);
this.view = new EditorView(container, {
state: EditorState.create({
// doc: mySchema.node("doc", null, [mySchema.node("paragraph")]),
doc: mySchema.nodeFromJSON(doc),
plugins: exampleSetup({schema: mySchema})
// doc: schema.node("doc", null, [schema.node("paragraph")]),
doc: schema.nodeFromJSON(doc),
plugins: [
listKeymapPlugin,
listInputRulePlugin,
...listPlugins,
...exampleSetup({ schema }),
],
}),
dispatchTransaction: function(transaction) {
var newState = self.view.state.apply(transaction);