Skip to content

TagSpaces is an offline, open source, document manager with tagging support

update md editor and description md (#2320)

Stanimircf461bf08181
diff --git a/package-lock.json b/package-lock.json
index 2f3272837..78aff2470 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,9 +15,9 @@
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@gorillastack/jmespath": "^1.3.0",
- "@milkdown/crepe": "^7.11.0",
- "@milkdown/kit": "^7.11.0",
- "@milkdown/react": "^7.11.0",
+ "@milkdown/crepe": "^7.12.1",
+ "@milkdown/kit": "^7.12.1",
+ "@milkdown/react": "^7.12.1",
"@mui/icons-material": "^6.4.8",
"@mui/lab": "6.0.0-beta.31",
"@mui/material": "^6.4.8",
@@ -15558,21 +15558,21 @@
"license": "CC0-1.0"
},
"node_modules/@milkdown/components": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/components/-/components-7.11.0.tgz",
- "integrity": "sha512-9fzFMQcX2QvGrnWu8kh1Q+bk64YCJ2NEkKcKGe1QjmPCn4DRiknPSxLzsXgXVV3nbSm8HGilr1zAaRYMaBBnrg==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/components/-/components-7.12.1.tgz",
+ "integrity": "sha512-IVRwKhCjwcrngfzsbE8CEkL4na5A2F+ZtklLJd1UvcX5ZQ9Nn+19gkAvGNqoiMNc7Ni4t54kf07KcciBw+nsVw==",
"license": "MIT",
"dependencies": {
"@floating-ui/dom": "^1.5.1",
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/plugin-tooltip": "7.11.0",
- "@milkdown/preset-commonmark": "7.11.0",
- "@milkdown/preset-gfm": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/transformer": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/plugin-tooltip": "7.12.1",
+ "@milkdown/preset-commonmark": "7.12.1",
+ "@milkdown/preset-gfm": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/transformer": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"@types/lodash.debounce": "^4.0.7",
"@types/lodash.throttle": "^4.1.9",
"clsx": "^2.0.0",
@@ -15591,15 +15591,15 @@
}
},
"node_modules/@milkdown/core": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/core/-/core-7.11.0.tgz",
- "integrity": "sha512-W1jSajqtyKtAt0ic2OIJ4N7mlv0LgkeGo7GkuHzHChleShFR01SWBF/KBuxnzLcwN0xdLOT3Bs8MpWNJefx+nw==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/core/-/core-7.12.1.tgz",
+ "integrity": "sha512-1nKh96SsiUzpXCkLw2GgOcfXc5H9V2R150bFDQxdX3aJyB/aW/MM1JlfToT8gw2K+YMTTxOn7PYSAp0lw91BKA==",
"license": "MIT",
"dependencies": {
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/transformer": "7.11.0",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/transformer": "7.12.1",
"remark-parse": "^11.0.0",
"remark-stringify": "^11.0.0",
"tslib": "^2.8.1",
@@ -15607,9 +15607,9 @@
}
},
"node_modules/@milkdown/crepe": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/crepe/-/crepe-7.11.0.tgz",
- "integrity": "sha512-HcH8H5IuZl/Veoz6ZG2SuDgXnmYCudT5THUjQcCLGEVy1s9Q/dP2zzc7YyHIgoH7EANQkx+SGPWjC+s/sRjF1g==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/crepe/-/crepe-7.12.1.tgz",
+ "integrity": "sha512-40A6HmPJNrzyU+YYAaml6ih1UB4vrIuucUF+RA3qJD/sHtAqeydGNy7gBj5tHq/wICiC9BHemeyLmtqqrLHrVA==",
"license": "MIT",
"dependencies": {
"@codemirror/commands": "^6.2.4",
@@ -15618,10 +15618,12 @@
"@codemirror/state": "^6.4.1",
"@codemirror/theme-one-dark": "^6.1.2",
"@codemirror/view": "^6.16.0",
- "@milkdown/kit": "7.11.0",
+ "@milkdown/kit": "7.12.1",
+ "@types/lodash-es": "^4.17.12",
"clsx": "^2.0.0",
"codemirror": "^6.0.1",
"katex": "^0.16.0",
+ "lodash-es": "^4.17.21",
"nanoid": "^5.0.9",
"prosemirror-virtual-cursor": "^0.4.2",
"remark-math": "^6.0.0",
@@ -15631,208 +15633,208 @@
}
},
"node_modules/@milkdown/ctx": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/ctx/-/ctx-7.11.0.tgz",
- "integrity": "sha512-EE7Yc346UGiux6FvpQIPZFohmf9R+e2YOmG5CQgy0ZuliS7JwYHf8yItizrda2/jwVKmABGVWi5fgI93j5gB6w==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/ctx/-/ctx-7.12.1.tgz",
+ "integrity": "sha512-h2sRUZ8oRXyyljQ/nvZ4L02LKc1QudNCzJUxL4ydXL2adYzS2NAXJK34U9O/lCZ028n/em8/wvHSFohvNHvCdA==",
"license": "MIT",
"dependencies": {
- "@milkdown/exception": "7.11.0",
+ "@milkdown/exception": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/exception": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.11.0.tgz",
- "integrity": "sha512-XMAsa9MAhasZl7pj29SuKfTVPt78wp1XMFUKOIEPOcqJJb/ojcpC430R1HdVdq0Ue8zKLSZU99VAgODaMbgYWA==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.12.1.tgz",
+ "integrity": "sha512-dl70uaZ+MMnPRuQIvuZsRkesuKVm0wOgfMJQ0mOnFDYTdIdk38D6nJ7B/0Vb3kKAc1/9FG6KhBux6N27Kk0JQw==",
"license": "MIT",
"dependencies": {
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/kit": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/kit/-/kit-7.11.0.tgz",
- "integrity": "sha512-68jUqyTg1i286+j2y92sb/a2vlh2EZ2zSzgItaVaXLPpgrL4Al8t0eHNDSV3TBm+46jf+YHIeLKmlu4oomCxRQ==",
- "license": "MIT",
- "dependencies": {
- "@milkdown/components": "7.11.0",
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/plugin-block": "7.11.0",
- "@milkdown/plugin-clipboard": "7.11.0",
- "@milkdown/plugin-cursor": "7.11.0",
- "@milkdown/plugin-history": "7.11.0",
- "@milkdown/plugin-indent": "7.11.0",
- "@milkdown/plugin-listener": "7.11.0",
- "@milkdown/plugin-slash": "7.11.0",
- "@milkdown/plugin-tooltip": "7.11.0",
- "@milkdown/plugin-trailing": "7.11.0",
- "@milkdown/plugin-upload": "7.11.0",
- "@milkdown/preset-commonmark": "7.11.0",
- "@milkdown/preset-gfm": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/transformer": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/kit/-/kit-7.12.1.tgz",
+ "integrity": "sha512-3W0GYPkjy8VT8kgaPzmYbxmUbBlY0krb53+CUyyTBfQ8tkfizosGOnCXTwQo/B2kwcxjYRkdV1IqV/KSq0EWWw==",
+ "license": "MIT",
+ "dependencies": {
+ "@milkdown/components": "7.12.1",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/plugin-block": "7.12.1",
+ "@milkdown/plugin-clipboard": "7.12.1",
+ "@milkdown/plugin-cursor": "7.12.1",
+ "@milkdown/plugin-history": "7.12.1",
+ "@milkdown/plugin-indent": "7.12.1",
+ "@milkdown/plugin-listener": "7.12.1",
+ "@milkdown/plugin-slash": "7.12.1",
+ "@milkdown/plugin-tooltip": "7.12.1",
+ "@milkdown/plugin-trailing": "7.12.1",
+ "@milkdown/plugin-upload": "7.12.1",
+ "@milkdown/preset-commonmark": "7.12.1",
+ "@milkdown/preset-gfm": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/transformer": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-block": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-block/-/plugin-block-7.11.0.tgz",
- "integrity": "sha512-aIt8okRyAQHDcjfrS96NXE/7S87EX/mynrk+CsprdQWppcQwKlK/zq14AubPJXtuaVwbDrpbYGR33Mrd6W6xcQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-block/-/plugin-block-7.12.1.tgz",
+ "integrity": "sha512-SVkKAohztnc3ddCtZmAVIFLYbSD13VxWsVon60vruLg9xpIKnYk3jfbjGjYG8p5DVIwKpg9ivuNyrwqfw1KliA==",
"license": "MIT",
"dependencies": {
"@floating-ui/dom": "^1.5.1",
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"@types/lodash.throttle": "^4.1.9",
"lodash.throttle": "^4.1.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-clipboard": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-clipboard/-/plugin-clipboard-7.11.0.tgz",
- "integrity": "sha512-Yl8DswHzgbYKxudbXre75izZ65lU151VaPoJyA1KE5hWBvjsPrfcFYHMU/IeZ82KAx8hgCHOKLrGBDAuJcJNlQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-clipboard/-/plugin-clipboard-7.12.1.tgz",
+ "integrity": "sha512-UDfswgJ9GW41bouUN+FRMbVcPt83LHwtZ7CgydGwZrId0EDvrq634beRiREec+ZY42YghM2r30QpqFS0DBCWZg==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-cursor": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-cursor/-/plugin-cursor-7.11.0.tgz",
- "integrity": "sha512-bA+/tdk97n4UbGWGG4w9HxjpdVMO/Mt2u4p/9h4HDGLFMmnxGVJC+dAqbjYTZYABM2Srf6QzPJe25CLdxMK7rQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-cursor/-/plugin-cursor-7.12.1.tgz",
+ "integrity": "sha512-TLJDWnYqcpEk1+T2mzo1P4L6vX5TBArip6Yc8nBJQG9Pkg9KTErAG0el+9KlWK8j/YV69249ceOalcDJ451Isw==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-history": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-history/-/plugin-history-7.11.0.tgz",
- "integrity": "sha512-09/Jqbp1o9GyZ0tE6Gpl+YNOBAtuReeNdBGIc8DXDowg/+wMb55qfOc1Lm9ZwEKxMeMKAYdDn1Vwwk7UW2QemQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-history/-/plugin-history-7.12.1.tgz",
+ "integrity": "sha512-Sgv3Us1C5p3oxLWrMYma6Kp+Ks6KKsI1z1lNWYMcfVOjaSBGI4VHubLTNMXQVjvIadL9jUPy+Spdck4VqfeBvA==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-indent": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-indent/-/plugin-indent-7.11.0.tgz",
- "integrity": "sha512-q0iPOy8v2CMOIjFjHduulYtlTeHtpx+TY+0uSRr+1j43PHy58eYxg1M/+YC6zqLO6A9OXvbzSxWtRZQpNkZWWQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-indent/-/plugin-indent-7.12.1.tgz",
+ "integrity": "sha512-5z/jOjAQe8hYhDx7TsxSDpPsLzIBv0AZIwbu89sah16U0pPeRnHAIH7t21o7v2LONJMiDDQH5dE0n6V9PfZfiQ==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-listener": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-listener/-/plugin-listener-7.11.0.tgz",
- "integrity": "sha512-ZbftNGSzUZawpIDWpYCE3fCbNpdkVsl3njmAXQNjfbZ2wMYcQ38HFEIHzFb5zCbNbW6wRIzKnldEZBa14ONRMg==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-listener/-/plugin-listener-7.12.1.tgz",
+ "integrity": "sha512-aJaW5iLWxoAKkwx24fUSxguZH2AdNiSk2+8qjxxg7eMSMcwiThAsp0yrdDXoAsYdZ3jJHmlzobnjBXVSMob+0w==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"@types/lodash.debounce": "^4.0.7",
"lodash.debounce": "^4.0.8",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-slash": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-slash/-/plugin-slash-7.11.0.tgz",
- "integrity": "sha512-AJeGmWzwyhFBoemRb+b/udlWQSucF72KHObTxDUzSpgzumf+P5nEpuNN1hV1BflSw4En3cxh1ayJnK7BRYXslQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-slash/-/plugin-slash-7.12.1.tgz",
+ "integrity": "sha512-hrgNy43gxilinQzBlaJTD8LHNrmDR5FxPKkx7KjTVJsQHHwrd2aeKd0+PW52EqX6m6y8q70VhwBTGj0NPF5c7w==",
"license": "MIT",
"dependencies": {
"@floating-ui/dom": "^1.5.1",
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"@types/lodash.debounce": "^4.0.7",
"lodash.debounce": "^4.0.8",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-tooltip": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-tooltip/-/plugin-tooltip-7.11.0.tgz",
- "integrity": "sha512-FxWy67RP3An+20r5sHRRpW+QxCzdbvfMCUJFdXHKN6fqxcyupcUFbYsy3CxWTeiiaiRmpVEkwUMRNwKUQewACg==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-tooltip/-/plugin-tooltip-7.12.1.tgz",
+ "integrity": "sha512-8//FWl0X4zZ+iaOswi2nEpjJtcG6RulEW5qKR8AvOQtxHHrMCY/Hgtq9q//SDvYj4UDmgqXsB6qukBSUa7LFNg==",
"license": "MIT",
"dependencies": {
"@floating-ui/dom": "^1.5.1",
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"@types/lodash.throttle": "^4.1.9",
"lodash.throttle": "^4.1.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-trailing": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-trailing/-/plugin-trailing-7.11.0.tgz",
- "integrity": "sha512-15E8/0RwmNNQ82oyjP96RjI+8qZ+Bi0Ta/2kjva/ivC9B7+Rr/QfG5JCyfOwRiEe7uYrT2I1OYq79PcN85huHQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-trailing/-/plugin-trailing-7.12.1.tgz",
+ "integrity": "sha512-bnbjZJt7a7D+MXBxXUnkb3Lurzo6ufMZifRxbOGIHMADEdNUOOPyCq/UprELq2S93ugC0PGmYaqRAcCRV4ZzqQ==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/plugin-upload": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/plugin-upload/-/plugin-upload-7.11.0.tgz",
- "integrity": "sha512-R/KEa2Yee+dJEhaKFY4aevpHjNiWbVWtXY56mIWxt1XvuA2R5Ka0nrzn8TNGe0DRw8BGRUZNsrmaA4FOQLWCzQ==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/plugin-upload/-/plugin-upload-7.12.1.tgz",
+ "integrity": "sha512-bvXBiDvjD9WNxFspuNy62ivZZn0TAnorEjQ4AJWKPrS1dkXnuC8/f9Hci0gSwwFGugxF0SDyfqo5nmFTgX166Q==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/preset-commonmark": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/preset-commonmark/-/preset-commonmark-7.11.0.tgz",
- "integrity": "sha512-MMxc9IsUKtZeCShcv+KBoby1P6Xj1XRa+4jqnjvr2ymhu/qOdJafgRlO1lMO8jXJ4rMVDPdB50cUOHXZPTbo5w==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/preset-commonmark/-/preset-commonmark-7.12.1.tgz",
+ "integrity": "sha512-/XdEeFmWuhvWcICkzypVfIjxvIA7+zMn1cYGZap4hHYwli7gLf5rZmENH8cud8+lDzbTkf2Z/PF1HPIstJ6IAg==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/transformer": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/transformer": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"remark-inline-links": "^7.0.0",
"tslib": "^2.8.1",
"unist-util-visit": "^5.0.0",
@@ -15840,30 +15842,30 @@
}
},
"node_modules/@milkdown/preset-gfm": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/preset-gfm/-/preset-gfm-7.11.0.tgz",
- "integrity": "sha512-L6X9SVfN9k+WK1joJx0GWgW6ehChGj4ricrinSo2R+okF+RbB54eLn2BKoFBSf4auOJ0dM8psR6LOhdeVyJsHQ==",
- "license": "MIT",
- "dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/preset-commonmark": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/transformer": "7.11.0",
- "@milkdown/utils": "7.11.0",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/preset-gfm/-/preset-gfm-7.12.1.tgz",
+ "integrity": "sha512-f97fVTA2/hXWpJFxkcBD21K3Lod8tkhb+gsOHFZsjbBBK39wcXPGF14BGujoYNWwcArwyjm7VaXgZfHX+DrngA==",
+ "license": "MIT",
+ "dependencies": {
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/preset-commonmark": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/transformer": "7.12.1",
+ "@milkdown/utils": "7.12.1",
"prosemirror-safari-ime-span": "^1.0.1",
"remark-gfm": "^4.0.1",
"tslib": "^2.8.1"
}
},
"node_modules/@milkdown/prose": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/prose/-/prose-7.11.0.tgz",
- "integrity": "sha512-2W1XMsYxnf43vOEx459LkATu2NOFrYWw2z4rRcf1NoSVxcc/wDC1ZQegJpW7lO4/xKgkZb4V+xlCi2YZhr0+rA==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/prose/-/prose-7.12.1.tgz",
+ "integrity": "sha512-0N6ZZ3lfEwxdryIbK9m3dsPSHcAfEX9In+g6zK4SJe71gJhDtehmYc6y5NtPLlqRiTuOukWuY0keH2133WC7hA==",
"license": "MIT",
"dependencies": {
- "@milkdown/exception": "7.11.0",
+ "@milkdown/exception": "7.12.1",
"prosemirror-changeset": "^2.2.1",
"prosemirror-commands": "^1.6.2",
"prosemirror-dropcursor": "^1.8.1",
@@ -15881,13 +15883,13 @@
}
},
"node_modules/@milkdown/react": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/react/-/react-7.11.0.tgz",
- "integrity": "sha512-k2z9+BK37XIurCWVROmsnNpWPBF5aheP1rr8LFa2lTL9oz4G4Ol5Tat3Lvz3FzyzfEqucA0YhQlqYXTby7HDKw==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/react/-/react-7.12.1.tgz",
+ "integrity": "sha512-f6DaPq6iyav9sZZJcS6b3a0nuD7h9epenZ4bK3dsqynTuh4cQhlPVEJyYHu3ThjKnQJ1NkhGnbcKv8KrUk6EZQ==",
"license": "MIT",
"dependencies": {
- "@milkdown/crepe": "7.11.0",
- "@milkdown/kit": "7.11.0",
+ "@milkdown/crepe": "7.12.1",
+ "@milkdown/kit": "7.12.1",
"tslib": "^2.8.1"
},
"peerDependencies": {
@@ -15896,13 +15898,13 @@
}
},
"node_modules/@milkdown/transformer": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/transformer/-/transformer-7.11.0.tgz",
- "integrity": "sha512-+zT8HIOL/qmQwOCH+9mEpqDi8250kaCiHt6YQXIIrXfGIbScdh613ChUFjNyzAU2Za5kkmY8E3F8yPL2woTulA==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/transformer/-/transformer-7.12.1.tgz",
+ "integrity": "sha512-8MnTO0VqDD+BAZfGIsLrT31HvS3V638UTRHg1e8q58mrEf+d5jjf4VeapBRPu1B3+Obn/YdfSfK9NtXsnUkfRg==",
"license": "MIT",
"dependencies": {
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
"remark": "^15.0.1",
"remark-parse": "^11.0.0",
"remark-stringify": "^11.0.0",
@@ -15911,16 +15913,16 @@
}
},
"node_modules/@milkdown/utils": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@milkdown/utils/-/utils-7.11.0.tgz",
- "integrity": "sha512-pG8PIO9dVRsmvNaFXMoC2KvMNqkLnfBwsG/G98h7j/uctxj1m0v0eRfGyulrDjp9Gx5/XYq6tfL6eFF0KxnFqw==",
+ "version": "7.12.1",
+ "resolved": "https://registry.npmjs.org/@milkdown/utils/-/utils-7.12.1.tgz",
+ "integrity": "sha512-/nI3J7pG8Mrb8y7nx2LRxv0V7s2/HwiYkARXjacMj5io0xdWWkEHTQo6VPIl4HogRgBtOaduTiXl95uJM7DiDA==",
"license": "MIT",
"dependencies": {
- "@milkdown/core": "7.11.0",
- "@milkdown/ctx": "7.11.0",
- "@milkdown/exception": "7.11.0",
- "@milkdown/prose": "7.11.0",
- "@milkdown/transformer": "7.11.0",
+ "@milkdown/core": "7.12.1",
+ "@milkdown/ctx": "7.12.1",
+ "@milkdown/exception": "7.12.1",
+ "@milkdown/prose": "7.12.1",
+ "@milkdown/transformer": "7.12.1",
"nanoid": "^5.0.9",
"tslib": "^2.8.1"
}
@@ -20248,6 +20250,15 @@
"integrity": "sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==",
"license": "MIT"
},
+ "node_modules/@types/lodash-es": {
+ "version": "4.17.12",
+ "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+ "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@types/lodash": "*"
+ }
+ },
"node_modules/@types/lodash.debounce": {
"version": "4.0.9",
"resolved": "https://registry.npmjs.org/@types/lodash.debounce/-/lodash.debounce-4.0.9.tgz",
@@ -35402,6 +35413,12 @@
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"license": "MIT"
},
+ "node_modules/lodash-es": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+ "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+ "license": "MIT"
+ },
"node_modules/lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -43122,9 +43139,9 @@
}
},
"node_modules/prosemirror-changeset": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.0.tgz",
- "integrity": "sha512-8wRKhlEwEJ4I13Ju54q2NZR1pVKGTgJ/8XsQ8L5A5uUsQ/YQScQJuEAuh8Bn8i6IwAMjjLRABd9lVli+DlIiVw==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.1.tgz",
+ "integrity": "sha512-j0kORIBm8ayJNl3zQvD1TTPHJX3g042et6y/KQhZhnPrruO8exkTgG8X+NRpj7kIyMMEx74Xb3DyMIBtO0IKkQ==",
"license": "MIT",
"dependencies": {
"prosemirror-transform": "^1.0.0"
diff --git a/package.json b/package.json
index 4d3b7db4b..042b690f6 100644
--- a/package.json
+++ b/package.json
@@ -166,9 +166,9 @@
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@gorillastack/jmespath": "^1.3.0",
- "@milkdown/crepe": "^7.11.0",
- "@milkdown/kit": "^7.11.0",
- "@milkdown/react": "^7.11.0",
+ "@milkdown/crepe": "^7.12.1",
+ "@milkdown/kit": "^7.12.1",
+ "@milkdown/react": "^7.12.1",
"@mui/icons-material": "^6.4.8",
"@mui/lab": "6.0.0-beta.31",
"@mui/material": "^6.4.8",
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 2c399a6f1..f68d31d44 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -11,7 +11,7 @@
"license": "AGPL-3.0",
"dependencies": {
"@elife/pm2": "3.6.1",
- "@tagspaces/extensions": "1.0.190",
+ "@tagspaces/extensions": "1.0.191",
"@tagspaces/tagspaces-common-node": "4.5.71",
"@tagspaces/tagspaces-ws": "4.5.71",
"sharp": "0.32.6",
@@ -146,9 +146,9 @@
}
},
"node_modules/@tagspaces/extensions": {
- "version": "1.0.190",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.190.tgz",
- "integrity": "sha512-P8eFDx5hlj4p/poApnobw59UCBltKdZLiorgQ37qCTJ9bLk5ASiNsd7MsavV4jZ6GCifanWOUwLTcA1s2ijVvg==",
+ "version": "1.0.191",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.191.tgz",
+ "integrity": "sha512-uIGKhG6MmTXrkU2dkkLRMP2ippnLZz3bLUB/JFUDgSOxVh9lwYHw74yCbHUr981sTmQZuDw+AoJjM4eKSVqv8g==",
"dependencies": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
@@ -1777,9 +1777,9 @@
}
},
"@tagspaces/extensions": {
- "version": "1.0.190",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.190.tgz",
- "integrity": "sha512-P8eFDx5hlj4p/poApnobw59UCBltKdZLiorgQ37qCTJ9bLk5ASiNsd7MsavV4jZ6GCifanWOUwLTcA1s2ijVvg==",
+ "version": "1.0.191",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.191.tgz",
+ "integrity": "sha512-uIGKhG6MmTXrkU2dkkLRMP2ippnLZz3bLUB/JFUDgSOxVh9lwYHw74yCbHUr981sTmQZuDw+AoJjM4eKSVqv8g==",
"requires": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
diff --git a/release/app/package.json b/release/app/package.json
index a70ab1d77..1e4bdd36e 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -18,7 +18,7 @@
},
"dependencies": {
"@elife/pm2": "3.6.1",
- "@tagspaces/extensions": "1.0.190",
+ "@tagspaces/extensions": "1.0.191",
"@tagspaces/tagspaces-common-node": "4.5.71",
"@tagspaces/tagspaces-ws": "4.5.71",
"sharp": "0.32.6",
diff --git a/src/renderer/components/EditDescription.tsx b/src/renderer/components/EditDescription.tsx
index a90a1925b..723d83433 100644
--- a/src/renderer/components/EditDescription.tsx
+++ b/src/renderer/components/EditDescription.tsx
@@ -39,6 +39,15 @@ function EditDescription() {
}, []);
//const noDescription = !description || description.length < 1;
+ const resetMdContent = (mdContent: string) => {
+ if (!fileDescriptionRef.current) return;
+ fileDescriptionRef.current.update(mdContent);
+ };
+
+ const setEditMode = (editMode: boolean) => {
+ if (!fileDescriptionRef.current) return;
+ fileDescriptionRef.current.setEditMode(editMode);
+ };
return (
<div
@@ -48,6 +57,8 @@ function EditDescription() {
>
<EditDescriptionButtons
getHtml={() => milkdownDivRef.current?.innerHTML}
+ resetMdContent={resetMdContent}
+ setEditMode={setEditMode}
/>
<div
ref={milkdownDivRef}
@@ -56,6 +67,7 @@ function EditDescription() {
onDoubleClick={() => {
if (Pro) {
setEditDescriptionMode(true);
+ setEditMode(true);
}
}}
style={{
diff --git a/src/renderer/components/EditDescriptionButtons.tsx b/src/renderer/components/EditDescriptionButtons.tsx
index 974b000c3..6b7926025 100644
--- a/src/renderer/components/EditDescriptionButtons.tsx
+++ b/src/renderer/components/EditDescriptionButtons.tsx
@@ -19,9 +19,15 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
interface ButtonsProps {
getHtml: () => string;
+ resetMdContent: (md: string) => void;
+ setEditMode: (editMode: boolean) => void;
}
-const EditDescriptionButtons: React.FC<ButtonsProps> = ({ getHtml }) => {
+const EditDescriptionButtons: React.FC<ButtonsProps> = ({
+ getHtml,
+ resetMdContent,
+ setEditMode,
+}) => {
const { t } = useTranslation();
const {
saveDescription,
@@ -140,8 +146,10 @@ const EditDescriptionButtons: React.FC<ButtonsProps> = ({ getHtml }) => {
<TsButton
style={{ borderTopRightRadius: 0, borderBottomRightRadius: 0 }}
onClick={() => {
+ resetMdContent(openedEntry.meta?.description);
+ setEditMode(false);
setEditDescriptionMode(false);
- return reloadOpenedFile();
+ //return reloadOpenedFile();
}}
>
{t('core:cancel')}
@@ -171,9 +179,13 @@ const EditDescriptionButtons: React.FC<ButtonsProps> = ({ getHtml }) => {
onClick={() => {
if (isEditDescriptionMode) {
saveDescription().then(() => {
+ if (!isDescriptionChanged) {
+ setEditMode(false);
+ }
setEditDescriptionMode(false);
});
} else {
+ setEditMode(true);
setEditDescriptionMode(true);
}
}}
diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsx
index a60119562..3a8efa5d6 100644
--- a/src/renderer/components/EntryContainer.tsx
+++ b/src/renderer/components/EntryContainer.tsx
@@ -27,6 +27,7 @@ import Tooltip from '-/components/Tooltip';
import TsButton from '-/components/TsButton';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import { useResolveConflictContext } from '-/components/dialogs/hooks/useResolveConflictContext';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';
import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
@@ -36,6 +37,7 @@ import { useNotificationContext } from '-/hooks/useNotificationContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { usePerspectiveActionsContext } from '-/hooks/usePerspectiveActionsContext';
import { Pro } from '-/pro';
+import { AppDispatch } from '-/reducers/app';
import {
actions as SettingsActions,
getEntryContainerTab,
@@ -61,8 +63,6 @@ import React, {
import { GlobalHotKeys } from 'react-hotkeys';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
-import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
-import { AppDispatch } from '-/reducers/app';
function EntryContainer() {
const { t } = useTranslation();
@@ -99,7 +99,7 @@ function EntryContainer() {
flexDirection: 'column',
};
const [isPanelOpened, setPanelOpened] = useState<boolean>(
- tabIndex !== undefined && tabIndex !== TabNames.closedTabs,
+ tabIndex !== TabNames.closedTabs,
);
const smallScreen = useMediaQuery(theme.breakpoints.down('md'));
@@ -746,7 +746,9 @@ function EntryContainer() {
key="FileViewID"
fileViewer={fileViewer}
fileViewerContainer={fileViewerContainer}
- height={tabIndex !== undefined ? '100%' : 'calc(100% - 100px)'}
+ height={
+ tabIndex !== TabNames.closedTabs ? '100%' : 'calc(100% - 100px)'
+ }
setSavingInProgress={(isSaving: boolean) => {
isSavingInProgress.current = isSaving;
forceUpdate();
diff --git a/src/renderer/components/md/DescriptionMdEditor.tsx b/src/renderer/components/md/DescriptionMdEditor.tsx
index 519041ff3..a07569c99 100644
--- a/src/renderer/components/md/DescriptionMdEditor.tsx
+++ b/src/renderer/components/md/DescriptionMdEditor.tsx
@@ -19,17 +19,18 @@ import React, { useRef, forwardRef, useEffect } from 'react';
import { Milkdown, useEditor } from '@milkdown/react';
import { EditorStatus, commandsCtx } from '@milkdown/kit/core';
import { getMarkdown, $useKeymap, $command } from '@milkdown/kit/utils';
+import { replaceAll } from '@milkdown/utils';
+import { Crepe } from '@milkdown/crepe';
+
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
+import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
+import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
+import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import { createCrepeEditor } from '-/components/md/utils';
import { CrepeRef, useCrepeHandler } from '-/components/md/useCrepeHandler';
-import { Crepe } from '@milkdown/crepe';
-import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
+import useFirstRender from '-/utils/useFirstRender';
import { useTranslation } from 'react-i18next';
import { Pro } from '-/pro';
-import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
-import { replaceAll } from '@milkdown/utils';
-import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
-import useFirstRender from '-/utils/useFirstRender';
interface CrepeMdEditorProps {
//onChange?: (markdown: string, prevMarkdown: string) => void;
@@ -50,17 +51,14 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(
setDescription,
} = useFilePropertiesContext();
const { openedEntry, openLink } = useOpenedEntryContext();
- const crepeInstanceRef = useRef<Crepe>(undefined);
+
+ // We’ll keep a ref to the “Crepe” wrapper (returned by createCrepeEditor):
+ const crepeRef = useRef<Crepe>(null);
const firstRender = useFirstRender();
const { get, loading } = useEditor(
(root) => {
- /*if (crepeInstanceRef.current) {
- return crepeInstanceRef.current;
- }*/
- const milkdownListener = (markdown: string) => {
- setDescription(markdown);
- };
+ // Build a Milkdown‐based “Crepe” editor:
const placeholder = isEditDescriptionMode
? undefined
: t(
@@ -76,22 +74,21 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(
placeholder,
currentDirectoryPath,
openLink,
- milkdownListener,
+ (newMd: string) => {
+ setDescription(newMd);
+ },
onFocus,
);
+ // Listen for status changes:
crepe.editor.onStatusChange((status: EditorStatus) => {
if (status === EditorStatus.Created) {
- //console.log(status);
- /* if (crepeInstanceRef.current) {
- console.log('Destroyed...');
- crepeInstanceRef.current.destroy();
- crepeInstanceRef.current = null;
- }*/
- crepeInstanceRef.current = crepe;
+ // Now “editorView” has been injected. We can safely do replaceAll here
+ crepeRef.current = crepe;
}
});
+ // Register custom save‐shortcut:
const saveCommand = $command('saveCommand', () => () => {
return () => {
saveDescription();
@@ -114,42 +111,52 @@ const DescriptionMdEditor = forwardRef<CrepeRef, CrepeMdEditorProps>(
return crepe;
},
- [currentDirectoryPath, isEditDescriptionMode],
+ [currentDirectoryPath], //, isEditDescriptionMode],
);
+ // Whenever openedEntry changes and the user hasn’t manually edited,
+ // we “push” the new description into the editor.
useEffect(() => {
if (!isDescriptionChanged) {
- changeDescription(openedEntry.meta?.description);
+ pushNewDescription(openedEntry.meta?.description ?? '');
}
}, [openedEntry]); //, isDescriptionChanged]);
+ // If some external “metaActions” say “hey, description was updated,”
+ // we re‐push it:
useEffect(() => {
if (!firstRender && metaActions && metaActions.length > 0) {
for (const action of metaActions) {
- if (action.entry && openedEntry.path === action.entry.path) {
- if (action.action === 'descriptionChange') {
- changeDescription(action.entry.meta?.description);
- }
+ if (
+ action.entry &&
+ openedEntry.path === action.entry.path &&
+ action.action === 'descriptionChange'
+ ) {
+ pushNewDescription(action.entry.meta?.description ?? '');
}
}
}
}, [metaActions]);
- function changeDescription(description: string) {
- const editor = get();
- if (!loading && editor && editor.status === EditorStatus.Created) {
+ function pushNewDescription(newMd: string) {
+ // Grab the Crepe wrapper from ref (only after status === Ready!)
+ const crepe = crepeRef.current;
+ if (!loading && crepe && crepe.editor.status === EditorStatus.Created) {
+ // Double‐check that the current editor content differs:
try {
- const markdown = editor.action(getMarkdown());
- if (markdown !== description) {
- editor.action(replaceAll(description, true));
+ const currentMd = crepe.editor.action(getMarkdown());
+ if (currentMd !== newMd) {
+ // Now we are guaranteed “editorView” is injected, so replaceAll won’t complain:
+ crepe.editor.action(replaceAll(newMd, true));
}
} catch (e) {
- console.log(e);
+ console.error('Failed to replaceAll:', e);
}
}
}
- useCrepeHandler(ref, () => crepeInstanceRef.current, get, loading);
+ // Hook up the external ref to our Crepe instance so parent callers can access it
+ useCrepeHandler(ref, () => crepeRef.current, get, loading);
return <Milkdown />;
},
diff --git a/src/renderer/components/md/useCrepeHandler.ts b/src/renderer/components/md/useCrepeHandler.ts
index f8dcbd437..03b13b10a 100644
--- a/src/renderer/components/md/useCrepeHandler.ts
+++ b/src/renderer/components/md/useCrepeHandler.ts
@@ -1,16 +1,14 @@
import React, { useImperativeHandle } from 'react';
-import { replaceAll } from '@milkdown/utils';
-import { EditorStatus } from '@milkdown/core';
+import { replaceAll, insert, getMarkdown } from '@milkdown/kit/utils';
+import { EditorStatus } from '@milkdown/kit/core';
import type { Editor } from '@milkdown/kit/core';
-import { getMarkdown, insert } from '@milkdown/kit/utils';
import { Crepe } from '@milkdown/crepe';
export interface CrepeRef {
update: (markdown: string) => void;
insert: (markdown: string) => void;
setEditMode: (isEditMode: boolean) => void;
- openSearchDialog: () => void;
- getMarkdown: () => string;
+ getMarkdown: () => string | undefined;
destroy: () => void;
}
@@ -24,7 +22,7 @@ export function useCrepeHandler(
update: (markdown: string) => {
const editor = get();
if (loading || !editor || editor.status !== EditorStatus.Created) return;
- editor.action(replaceAll(markdown));
+ editor.action(replaceAll(markdown)); //, true));
},
insert: (markdown: string) => {
const editor = get();
@@ -33,21 +31,27 @@ export function useCrepeHandler(
},
setEditMode: (isEditable: boolean) => {
const crepe = getCrepe();
- if (crepe) {
- crepe.setReadonly(!isEditable);
- }
- /*const editor = get();
- if (loading || !editor || editor.status !== EditorStatus.Created) return;
- editor.config((ctx: Ctx) => {
+ const editor = get();
+
+ if (!crepe || !editor) return;
+
+ // If we haven’t reached “Ready” yet, stash the flag and/or delay:
+ /*if (editor.status !== EditorStatus.Ready) {
+ pendingEditableRef.current = isEditable;
+ return;
+ }*/
+
+ // At this point, status === Ready, you can safely flip readOnly:
+ crepe.setReadonly(!isEditable);
+
+ // If you want to be extra sure, also update the editorViewOptionsCtx:
+ /*editor.config((ctx) => {
ctx.update(editorViewOptionsCtx, (prev) => ({
...prev,
editable: () => isEditable,
}));
});*/
},
- openSearchDialog: () => {
- // openSearchDialog();
- },
getMarkdown: () => {
const editor = get();
if (loading || !editor || editor.status !== EditorStatus.Created) return;
diff --git a/src/renderer/components/md/utils.ts b/src/renderer/components/md/utils.ts
index a5d1968a8..c7818094a 100644
--- a/src/renderer/components/md/utils.ts
+++ b/src/renderer/components/md/utils.ts
@@ -1,8 +1,9 @@
import AppConfig from '-/AppConfig';
import { Crepe } from '@milkdown/crepe';
import { Ctx } from '@milkdown/ctx';
-import { editorViewOptionsCtx } from '@milkdown/kit/core';
+import { editorViewOptionsCtx, editorViewCtx } from '@milkdown/kit/core';
import { remarkPreserveEmptyLinePlugin } from '@milkdown/preset-commonmark';
+import { trailing } from '@milkdown/kit/plugin/trailing';
export function createCrepeEditor(
root: HTMLElement,
@@ -56,6 +57,7 @@ export function createCrepeEditor(
},
});
crepe.editor.remove(remarkPreserveEmptyLinePlugin);
+ crepe.editor.remove(trailing);
crepe.editor.config((ctx: Ctx) => {
ctx.update(editorViewOptionsCtx, (prev) => ({
...prev,
@@ -84,13 +86,13 @@ export function createCrepeEditor(
if (onChange || onFocus) {
crepe.on((listener) => {
listener.markdownUpdated((_, markdown: string, prevMarkdown: string) => {
- //const view = crepe.editor.ctx.get(editorViewCtx);
- //if (view && view.hasFocus()) {
- // console.log('Change listener:' + markdown);
- if (onChange) {
- onChange(markdown, prevMarkdown);
+ const view = crepe.editor.ctx.get(editorViewCtx);
+ if (view && view.hasFocus()) {
+ // console.log('Change listener:' + markdown);
+ if (onChange) {
+ onChange(markdown, prevMarkdown);
+ }
}
- //}
});
listener.focus(() => {
if (onFocus) {
diff --git a/src/renderer/hooks/FilePropertiesContextProvider.tsx b/src/renderer/hooks/FilePropertiesContextProvider.tsx
index ce20e47ec..9499e3de4 100644
--- a/src/renderer/hooks/FilePropertiesContextProvider.tsx
+++ b/src/renderer/hooks/FilePropertiesContextProvider.tsx
@@ -175,6 +175,9 @@ export const FilePropertiesContextProvider = ({
});
}
function setEditDescriptionMode(editMode: boolean) {
+ if (!editMode) {
+ isDescriptionChanged.current = false;
+ }
setIsEditDescriptionMode((prev) => {
if (prev !== editMode && !isEditMode) {
if (AppConfig.isElectron) {