A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
editor: load images threadsafely
Abdullah Attad653223df01a
diff --git a/packages/editor/package-lock.json b/packages/editor/package-lock.jsonindex 0a5399396..c731ec996 100644--- a/packages/editor/package-lock.json+++ b/packages/editor/package-lock.json@@ -39,6 +39,7 @@"@tiptap/extension-underline": "2.1.12","@tiptap/pm": "2.1.12","@tiptap/starter-kit": "2.1.12",+ "async-mutex": "^0.4.0","clipboard-polyfill": "4.0.0","detect-indent": "^7.0.0","entities": "^4.5.0",@@ -1739,6 +1740,14 @@"node": "*"}},+ "node_modules/async-mutex": {+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.0.tgz",+ "integrity": "sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA==",+ "dependencies": {+ "tslib": "^2.4.0"+ }+ },"node_modules/babel-plugin-macros": {"version": "3.1.0","resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",@@ -3113,7 +3122,6 @@"version": "17.0.2","resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz","integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",- "dev": true,"dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -3134,7 +3142,6 @@"version": "17.0.2","resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz","integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",- "dev": true,"dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -3267,7 +3274,6 @@"version": "0.20.2","resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz","integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",- "dev": true,"dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -3533,8 +3539,7 @@"node_modules/tslib": {"version": "2.5.0","resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",- "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",- "dev": true+ "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="},"node_modules/type-detect": {"version": "4.0.8",@@ -4085,7 +4090,8 @@"@emotion/use-insertion-effect-with-fallbacks": {"version": "1.0.1","resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",- "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw=="+ "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",+ "requires": {}},"@emotion/utils": {"version": "1.2.1",@@ -4559,87 +4565,104 @@"@tiptap/core": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.1.12.tgz",- "integrity": "sha512-ZGc3xrBJA9KY8kln5AYTj8y+GDrKxi7u95xIl2eccrqTY5CQeRu6HRNM1yT4mAjuSaG9jmazyjGRlQuhyxCKxQ=="+ "integrity": "sha512-ZGc3xrBJA9KY8kln5AYTj8y+GDrKxi7u95xIl2eccrqTY5CQeRu6HRNM1yT4mAjuSaG9jmazyjGRlQuhyxCKxQ==",+ "requires": {}},"@tiptap/extension-blockquote": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-2.1.12.tgz",- "integrity": "sha512-Qb3YRlCfugx9pw7VgLTb+jY37OY4aBJeZnqHzx4QThSm13edNYjasokbX0nTwL1Up4NPTcY19JUeHt6fVaVVGg=="+ "integrity": "sha512-Qb3YRlCfugx9pw7VgLTb+jY37OY4aBJeZnqHzx4QThSm13edNYjasokbX0nTwL1Up4NPTcY19JUeHt6fVaVVGg==",+ "requires": {}},"@tiptap/extension-bold": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-2.1.12.tgz",- "integrity": "sha512-AZGxIxcGU1/y6V2YEbKsq6BAibL8yQrbRm6EdcBnby41vj1WziewEKswhLGmZx5IKM2r2ldxld03KlfSIlKQZg=="+ "integrity": "sha512-AZGxIxcGU1/y6V2YEbKsq6BAibL8yQrbRm6EdcBnby41vj1WziewEKswhLGmZx5IKM2r2ldxld03KlfSIlKQZg==",+ "requires": {}},"@tiptap/extension-bullet-list": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-2.1.12.tgz",- "integrity": "sha512-vtD8vWtNlmAZX8LYqt2yU9w3mU9rPCiHmbp4hDXJs2kBnI0Ju/qAyXFx6iJ3C3XyuMnMbJdDI9ee0spAvFz7cQ=="+ "integrity": "sha512-vtD8vWtNlmAZX8LYqt2yU9w3mU9rPCiHmbp4hDXJs2kBnI0Ju/qAyXFx6iJ3C3XyuMnMbJdDI9ee0spAvFz7cQ==",+ "requires": {}},"@tiptap/extension-character-count": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-character-count/-/extension-character-count-2.1.12.tgz",- "integrity": "sha512-+GFbBG13nvF8mFIeisSERG/Q3CuRsTNwVZIRbJTLgGdbHXFqPhJh4Xfm7cv7OaOYevUlVyO+z5pGD7wIl1bLqQ=="+ "integrity": "sha512-+GFbBG13nvF8mFIeisSERG/Q3CuRsTNwVZIRbJTLgGdbHXFqPhJh4Xfm7cv7OaOYevUlVyO+z5pGD7wIl1bLqQ==",+ "requires": {}},"@tiptap/extension-code": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-2.1.12.tgz",- "integrity": "sha512-CRiRq5OTC1lFgSx6IMrECqmtb93a0ZZKujEnaRhzWliPBjLIi66va05f/P1vnV6/tHaC3yfXys6dxB5A4J8jxw=="+ "integrity": "sha512-CRiRq5OTC1lFgSx6IMrECqmtb93a0ZZKujEnaRhzWliPBjLIi66va05f/P1vnV6/tHaC3yfXys6dxB5A4J8jxw==",+ "requires": {}},"@tiptap/extension-code-block": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-2.1.12.tgz",- "integrity": "sha512-RXtSYCVsnk8D+K80uNZShClfZjvv1EgO42JlXLVGWQdIgaNyuOv/6I/Jdf+ZzhnpsBnHufW+6TJjwP5vJPSPHA=="+ "integrity": "sha512-RXtSYCVsnk8D+K80uNZShClfZjvv1EgO42JlXLVGWQdIgaNyuOv/6I/Jdf+ZzhnpsBnHufW+6TJjwP5vJPSPHA==",+ "requires": {}},"@tiptap/extension-color": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-2.1.12.tgz",- "integrity": "sha512-Myd6iSbPJvvclr+NRBEdE0k52QlQrXZnJljk4JKn0b25cl60ERA40FH9QLBjkpTed7SDbI3oX7LWIzTUoCj39w=="+ "integrity": "sha512-Myd6iSbPJvvclr+NRBEdE0k52QlQrXZnJljk4JKn0b25cl60ERA40FH9QLBjkpTed7SDbI3oX7LWIzTUoCj39w==",+ "requires": {}},"@tiptap/extension-document": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-2.1.12.tgz",- "integrity": "sha512-0QNfAkCcFlB9O8cUNSwTSIQMV9TmoEhfEaLz/GvbjwEq4skXK3bU+OQX7Ih07waCDVXIGAZ7YAZogbvrn/WbOw=="+ "integrity": "sha512-0QNfAkCcFlB9O8cUNSwTSIQMV9TmoEhfEaLz/GvbjwEq4skXK3bU+OQX7Ih07waCDVXIGAZ7YAZogbvrn/WbOw==",+ "requires": {}},"@tiptap/extension-dropcursor": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-2.1.12.tgz",- "integrity": "sha512-0tT/q8nL4NBCYPxr9T0Brck+RQbWuczm9nV0bnxgt0IiQXoRHutfPWdS7GA65PTuVRBS/3LOco30fbjFhkfz/A=="+ "integrity": "sha512-0tT/q8nL4NBCYPxr9T0Brck+RQbWuczm9nV0bnxgt0IiQXoRHutfPWdS7GA65PTuVRBS/3LOco30fbjFhkfz/A==",+ "requires": {}},"@tiptap/extension-font-family": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-font-family/-/extension-font-family-2.1.12.tgz",- "integrity": "sha512-1PAvmtilBD1OWfr1I+oKND1MLNGWMEx/Qa7xC2YDzonxhiBd56Xog6fDE/+2Bbud0vPEIrMHrg8QOjCDH413vw=="+ "integrity": "sha512-1PAvmtilBD1OWfr1I+oKND1MLNGWMEx/Qa7xC2YDzonxhiBd56Xog6fDE/+2Bbud0vPEIrMHrg8QOjCDH413vw==",+ "requires": {}},"@tiptap/extension-gapcursor": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-2.1.12.tgz",- "integrity": "sha512-zFYdZCqPgpwoB7whyuwpc8EYLYjUE5QYKb8vICvc+FraBUDM51ujYhFSgJC3rhs8EjI+8GcK8ShLbSMIn49YOQ=="+ "integrity": "sha512-zFYdZCqPgpwoB7whyuwpc8EYLYjUE5QYKb8vICvc+FraBUDM51ujYhFSgJC3rhs8EjI+8GcK8ShLbSMIn49YOQ==",+ "requires": {}},"@tiptap/extension-hard-break": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-2.1.12.tgz",- "integrity": "sha512-nqKcAYGEOafg9D+2cy1E4gHNGuL12LerVa0eS2SQOb+PT8vSel9OTKU1RyZldsWSQJ5rq/w4uIjmLnrSR2w6Yw=="+ "integrity": "sha512-nqKcAYGEOafg9D+2cy1E4gHNGuL12LerVa0eS2SQOb+PT8vSel9OTKU1RyZldsWSQJ5rq/w4uIjmLnrSR2w6Yw==",+ "requires": {}},"@tiptap/extension-heading": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-2.1.12.tgz",- "integrity": "sha512-MoANP3POAP68Ko9YXarfDKLM/kXtscgp6m+xRagPAghRNujVY88nK1qBMZ3JdvTVN6b/ATJhp8UdrZX96TLV2w=="+ "integrity": "sha512-MoANP3POAP68Ko9YXarfDKLM/kXtscgp6m+xRagPAghRNujVY88nK1qBMZ3JdvTVN6b/ATJhp8UdrZX96TLV2w==",+ "requires": {}},"@tiptap/extension-history": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-history/-/extension-history-2.1.12.tgz",- "integrity": "sha512-6b7UFVkvPjq3LVoCTrYZAczt5sQrQUaoDWAieVClVZoFLfjga2Fwjcfgcie8IjdPt8YO2hG/sar/c07i9vM0Sg=="+ "integrity": "sha512-6b7UFVkvPjq3LVoCTrYZAczt5sQrQUaoDWAieVClVZoFLfjga2Fwjcfgcie8IjdPt8YO2hG/sar/c07i9vM0Sg==",+ "requires": {}},"@tiptap/extension-horizontal-rule": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.1.12.tgz",- "integrity": "sha512-RRuoK4KxrXRrZNAjJW5rpaxjiP0FJIaqpi7nFbAua2oHXgsCsG8qbW2Y0WkbIoS8AJsvLZ3fNGsQ8gpdliuq3A=="+ "integrity": "sha512-RRuoK4KxrXRrZNAjJW5rpaxjiP0FJIaqpi7nFbAua2oHXgsCsG8qbW2Y0WkbIoS8AJsvLZ3fNGsQ8gpdliuq3A==",+ "requires": {}},"@tiptap/extension-italic": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-2.1.12.tgz",- "integrity": "sha512-/XYrW4ZEWyqDvnXVKbgTXItpJOp2ycswk+fJ3vuexyolO6NSs0UuYC6X4f+FbHYL5VuWqVBv7EavGa+tB6sl3A=="+ "integrity": "sha512-/XYrW4ZEWyqDvnXVKbgTXItpJOp2ycswk+fJ3vuexyolO6NSs0UuYC6X4f+FbHYL5VuWqVBv7EavGa+tB6sl3A==",+ "requires": {}},"@tiptap/extension-link": {"version": "2.1.12",@@ -4652,92 +4675,110 @@"@tiptap/extension-list-item": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-2.1.12.tgz",- "integrity": "sha512-Gk7hBFofAPmNQ8+uw8w5QSsZOMEGf7KQXJnx5B022YAUJTYYxO3jYVuzp34Drk9p+zNNIcXD4kc7ff5+nFOTrg=="+ "integrity": "sha512-Gk7hBFofAPmNQ8+uw8w5QSsZOMEGf7KQXJnx5B022YAUJTYYxO3jYVuzp34Drk9p+zNNIcXD4kc7ff5+nFOTrg==",+ "requires": {}},"@tiptap/extension-list-keymap": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-2.1.12.tgz",- "integrity": "sha512-f19nGaqhIZhssM2k8nYR+zcoMc7UCLcW6YCNhTXSrybUsb6SMFVob9OL7+sy1x2n5Was5IqsvyAGakLjdTEwAw=="+ "integrity": "sha512-f19nGaqhIZhssM2k8nYR+zcoMc7UCLcW6YCNhTXSrybUsb6SMFVob9OL7+sy1x2n5Was5IqsvyAGakLjdTEwAw==",+ "requires": {}},"@tiptap/extension-ordered-list": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-2.1.12.tgz",- "integrity": "sha512-tF6VGl+D2avCgn9U/2YLJ8qVmV6sPE/iEzVAFZuOSe6L0Pj7SQw4K6AO640QBob/d8VrqqJFHCb6l10amJOnXA=="+ "integrity": "sha512-tF6VGl+D2avCgn9U/2YLJ8qVmV6sPE/iEzVAFZuOSe6L0Pj7SQw4K6AO640QBob/d8VrqqJFHCb6l10amJOnXA==",+ "requires": {}},"@tiptap/extension-paragraph": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-2.1.12.tgz",- "integrity": "sha512-hoH/uWPX+KKnNAZagudlsrr4Xu57nusGekkJWBcrb5MCDE91BS+DN2xifuhwXiTHxnwOMVFjluc0bPzQbkArsw=="+ "integrity": "sha512-hoH/uWPX+KKnNAZagudlsrr4Xu57nusGekkJWBcrb5MCDE91BS+DN2xifuhwXiTHxnwOMVFjluc0bPzQbkArsw==",+ "requires": {}},"@tiptap/extension-placeholder": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-2.1.12.tgz",- "integrity": "sha512-K52o7B1zkP4vaVy3z4ZwHn+tQy6KlXtedj1skLg+796ImwH2GYS5z6MFOTfKzBO2hLncUzLco/s0C5PLCD6SDw=="+ "integrity": "sha512-K52o7B1zkP4vaVy3z4ZwHn+tQy6KlXtedj1skLg+796ImwH2GYS5z6MFOTfKzBO2hLncUzLco/s0C5PLCD6SDw==",+ "requires": {}},"@tiptap/extension-strike": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-2.1.12.tgz",- "integrity": "sha512-HlhrzIjYUT8oCH9nYzEL2QTTn8d1ECnVhKvzAe6x41xk31PjLMHTUy8aYjeQEkWZOWZ34tiTmslV1ce6R3Dt8g=="+ "integrity": "sha512-HlhrzIjYUT8oCH9nYzEL2QTTn8d1ECnVhKvzAe6x41xk31PjLMHTUy8aYjeQEkWZOWZ34tiTmslV1ce6R3Dt8g==",+ "requires": {}},"@tiptap/extension-subscript": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-2.1.12.tgz",- "integrity": "sha512-tb1jysEvf4SIiXwEOgDTXiyrG39RVNHvn/zsGMg5wy5t9qUp9m1k7kKYTH084ktuKDAPQonCcpn3hwc+ngTFzg=="+ "integrity": "sha512-tb1jysEvf4SIiXwEOgDTXiyrG39RVNHvn/zsGMg5wy5t9qUp9m1k7kKYTH084ktuKDAPQonCcpn3hwc+ngTFzg==",+ "requires": {}},"@tiptap/extension-superscript": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-2.1.12.tgz",- "integrity": "sha512-ek6L+DNsrjiJieArlgTvQt1VfJ56d8V19WAPW/ciRhq88YRlTEY9nSO3QuUCSUO1nGmE5OWQpgrsiW/XZbONVw=="+ "integrity": "sha512-ek6L+DNsrjiJieArlgTvQt1VfJ56d8V19WAPW/ciRhq88YRlTEY9nSO3QuUCSUO1nGmE5OWQpgrsiW/XZbONVw==",+ "requires": {}},"@tiptap/extension-table": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-2.1.12.tgz",- "integrity": "sha512-q/DuKZ4j1ycRfuFdb9rBJ3MglGNxlM2BQ1csScX/BrVIsAQI5B8sdzy1BrIlepQ6DRu4DCzHcKMI8u4/edUSWA=="+ "integrity": "sha512-q/DuKZ4j1ycRfuFdb9rBJ3MglGNxlM2BQ1csScX/BrVIsAQI5B8sdzy1BrIlepQ6DRu4DCzHcKMI8u4/edUSWA==",+ "requires": {}},"@tiptap/extension-table-cell": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-table-cell/-/extension-table-cell-2.1.12.tgz",- "integrity": "sha512-hextcfVTdwX8G7s8Q/V6LW2aUhGvPgu1dfV+kVVO42AFHxG+6PIkDOUuHphGajG3Nrs129bjMDWb8jphj38dUg=="+ "integrity": "sha512-hextcfVTdwX8G7s8Q/V6LW2aUhGvPgu1dfV+kVVO42AFHxG+6PIkDOUuHphGajG3Nrs129bjMDWb8jphj38dUg==",+ "requires": {}},"@tiptap/extension-table-header": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-table-header/-/extension-table-header-2.1.12.tgz",- "integrity": "sha512-a4WZ5Z7gqQ/QlK8cK2d1ONYdma/J5+yH/0SNtQhkfELoS45GsLJh89OyKO0W0FnY6Mg0RoH1FsoBD+cqm0yazA=="+ "integrity": "sha512-a4WZ5Z7gqQ/QlK8cK2d1ONYdma/J5+yH/0SNtQhkfELoS45GsLJh89OyKO0W0FnY6Mg0RoH1FsoBD+cqm0yazA==",+ "requires": {}},"@tiptap/extension-table-row": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-table-row/-/extension-table-row-2.1.12.tgz",- "integrity": "sha512-0kPr+zngQC1YQRcU6+Fl3CpIW/SdJhVJ5qOLpQleXrLPdjmZQd3Z1DXvOSDphYjXCowGPCxeUa++6bo7IoEMJw=="+ "integrity": "sha512-0kPr+zngQC1YQRcU6+Fl3CpIW/SdJhVJ5qOLpQleXrLPdjmZQd3Z1DXvOSDphYjXCowGPCxeUa++6bo7IoEMJw==",+ "requires": {}},"@tiptap/extension-task-item": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-task-item/-/extension-task-item-2.1.12.tgz",- "integrity": "sha512-uqrDTO4JwukZUt40GQdvB6S+oDhdp4cKNPMi0sbteWziQugkSMLlkYvxU0Hfb/YeziaWWwFI7ssPu/hahyk6dQ=="+ "integrity": "sha512-uqrDTO4JwukZUt40GQdvB6S+oDhdp4cKNPMi0sbteWziQugkSMLlkYvxU0Hfb/YeziaWWwFI7ssPu/hahyk6dQ==",+ "requires": {}},"@tiptap/extension-task-list": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-task-list/-/extension-task-list-2.1.12.tgz",- "integrity": "sha512-BUpYlEWK+Q3kw9KIiOqvhd0tUPhMcOf1+fJmCkluJok+okAxMbP1umAtCEQ3QkoCwLr+vpHJov7h3yi9+dwgeQ=="+ "integrity": "sha512-BUpYlEWK+Q3kw9KIiOqvhd0tUPhMcOf1+fJmCkluJok+okAxMbP1umAtCEQ3QkoCwLr+vpHJov7h3yi9+dwgeQ==",+ "requires": {}},"@tiptap/extension-text": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-2.1.12.tgz",- "integrity": "sha512-rCNUd505p/PXwU9Jgxo4ZJv4A3cIBAyAqlx/dtcY6cjztCQuXJhuQILPhjGhBTOLEEL4kW2wQtqzCmb7O8i2jg=="+ "integrity": "sha512-rCNUd505p/PXwU9Jgxo4ZJv4A3cIBAyAqlx/dtcY6cjztCQuXJhuQILPhjGhBTOLEEL4kW2wQtqzCmb7O8i2jg==",+ "requires": {}},"@tiptap/extension-text-align": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-2.1.12.tgz",- "integrity": "sha512-siMlwrkgVrAxxgmZn8GOc75J7UZi2CVrP9vDHkUPPyKm/fjssYekXwGCEk4Vswii1BbOh2gt+MDsRkeYRGyDlQ=="+ "integrity": "sha512-siMlwrkgVrAxxgmZn8GOc75J7UZi2CVrP9vDHkUPPyKm/fjssYekXwGCEk4Vswii1BbOh2gt+MDsRkeYRGyDlQ==",+ "requires": {}},"@tiptap/extension-text-style": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-2.1.12.tgz",- "integrity": "sha512-nfjWXX0JSRHLcscfiMESh+RN+Z7bG8nio/C9+8yQASM90VxU9f8oKgF8HnnSYsSrD4lLf44Q6XjmB7aMVUuikg=="+ "integrity": "sha512-nfjWXX0JSRHLcscfiMESh+RN+Z7bG8nio/C9+8yQASM90VxU9f8oKgF8HnnSYsSrD4lLf44Q6XjmB7aMVUuikg==",+ "requires": {}},"@tiptap/extension-underline": {"version": "2.1.12","resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-2.1.12.tgz",- "integrity": "sha512-NwwdhFT8gDD0VUNLQx85yFBhP9a8qg8GPuxlGzAP/lPTV8Ubh3vSeQ5N9k2ZF/vHlEvnugzeVCbmYn7wf8vn1g=="+ "integrity": "sha512-NwwdhFT8gDD0VUNLQx85yFBhP9a8qg8GPuxlGzAP/lPTV8Ubh3vSeQ5N9k2ZF/vHlEvnugzeVCbmYn7wf8vn1g==",+ "requires": {}},"@tiptap/pm": {"version": "2.1.12",@@ -4968,6 +5009,14 @@"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==","dev": true},+ "async-mutex": {+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.0.tgz",+ "integrity": "sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA==",+ "requires": {+ "tslib": "^2.4.0"+ }+ },"babel-plugin-macros": {"version": "3.1.0","resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",@@ -5790,7 +5839,8 @@}},"prosemirror-codemark": {- "version": "0.4.2"+ "version": "0.4.2",+ "requires": {}},"prosemirror-collab": {"version": "1.3.0",@@ -5938,26 +5988,26 @@}},"re-resizable": {- "version": "6.9.9"+ "version": "6.9.9",+ "requires": {}},"react": {"version": "17.0.2","resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz","integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"}},"react-colorful": {- "version": "5.6.1"+ "version": "5.6.1",+ "requires": {}},"react-dom": {"version": "17.0.2","resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz","integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -6044,7 +6094,6 @@"version": "0.20.2","resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz","integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -6237,8 +6286,7 @@"tslib": {"version": "2.5.0","resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",- "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",- "dev": true+ "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="},"type-detect": {"version": "4.0.8",@@ -6272,7 +6320,8 @@}},"use-sync-external-store": {- "version": "1.2.0"+ "version": "1.2.0",+ "requires": {}},"util-deprecate": {"version": "1.0.2",diff --git a/packages/editor/package.json b/packages/editor/package.jsonindex 5d6997b3a..09329f5be 100644--- a/packages/editor/package.json+++ b/packages/editor/package.json@@ -34,6 +34,7 @@"@tiptap/extension-underline": "2.1.12","@tiptap/pm": "2.1.12","@tiptap/starter-kit": "2.1.12",+ "async-mutex": "^0.4.0","clipboard-polyfill": "4.0.0","detect-indent": "^7.0.0","entities": "^4.5.0",diff --git a/packages/editor/src/extensions/image/component.tsx b/packages/editor/src/extensions/image/component.tsxindex 6e938348a..034896f5e 100644--- a/packages/editor/src/extensions/image/component.tsx+++ b/packages/editor/src/extensions/image/component.tsx@@ -43,7 +43,7 @@ export const AnimatedImage = motion(Image);export function ImageComponent(props: SelectionBasedReactNodeViewProps<- ImageAttributes & ImageAlignmentOptions+ Partial<ImageAttributes & ImageAlignmentOptions>>) {const { editor, node, selected } = props;@@ -68,7 +68,7 @@ export function ImageComponent(const imageRef = useRef<HTMLImageElement>(null);const downloadOptions = useToolbarStore((store) => store.downloadOptions);const isReadonly = !editor.current?.isEditable;- const isSVG = mime.includes("/svg");+ const isSVG = !!mime && mime.includes("/svg");const relativeHeight = aspectRatio? editor.view.dom.clientWidth / aspectRatio: undefined;@@ -244,37 +244,47 @@ export function ImageComponent(: "2px solid transparent !important",borderRadius: "default"}}- onDoubleClick={() =>- editor.current?.commands.previewAttachment(node.attrs)- }- onLoad={async () => {+ onDoubleClick={() => {+ const { hash, filename, mime, size } = node.attrs;+ if (!!hash && !!filename && !!mime && !!size)+ editor.current?.commands.previewAttachment({+ hash,+ filename,+ mime,+ size+ });+ }}+ onLoad={async function onLoad() {if (!imageRef.current) return;const { clientHeight, clientWidth } = imageRef.current;-- if (!isDataUrl(src) && canParse(src)) {- const { url, size, blob, mimeType } = await downloadImage(- src,- downloadOptions- );- editor.current?.commands.updateImage(- { src, hash },- {- src: await toDataURL(blob),- bloburl: url,- size: size,- mime: mimeType,- aspectRatio:- !height && !width && !aspectRatio- ? clientWidth / clientHeight- : undefined- }+ if (src && !isDataUrl(src) && canParse(src)) {+ const image = await downloadImage(src, downloadOptions);+ if (!image) return;+ const { url, size, blob, mimeType } = image;+ const dataurl = await toDataURL(blob);+ await editor.threadsafe((editor) =>+ editor.commands.updateImage(+ { src, hash },+ {+ src: dataurl,+ bloburl: url,+ size: size,+ mime: mimeType,+ aspectRatio:+ !height && !width && !aspectRatio+ ? clientWidth / clientHeight+ : undefined+ }+ ));} else if (!height && !width && !aspectRatio) {- editor.current?.commands.updateImage(- { src, hash },- {- aspectRatio: clientWidth / clientHeight- }+ await editor.threadsafe((editor) =>+ editor.commands.updateImage(+ { src, hash },+ {+ aspectRatio: clientWidth / clientHeight+ }+ ));}}}diff --git a/packages/editor/src/toolbar/popups/image-upload.tsx b/packages/editor/src/toolbar/popups/image-upload.tsxindex 18b9c51fa..55cbb99db 100644--- a/packages/editor/src/toolbar/popups/image-upload.tsx+++ b/packages/editor/src/toolbar/popups/image-upload.tsx@@ -49,10 +49,9 @@ export function ImageUploadPopup(props: ImageUploadPopupProps) {setError(undefined);try {- const { blob, size, mimeType } = await downloadImage(- url,- downloadOptions- );+ const image = await downloadImage(url, downloadOptions);+ if (!image) return;+ const { blob, size, mimeType } = image;onInsert({ src: await toDataURL(blob), size, mime: mimeType });} catch (e) {if (e instanceof Error) setError(e.message);diff --git a/packages/editor/src/types.ts b/packages/editor/src/types.tsindex cfa87dd8e..240cebb8a 100644--- a/packages/editor/src/types.ts+++ b/packages/editor/src/types.ts@@ -18,10 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import { UnionCommands, Editor as TiptapEditor } from "@tiptap/core";+import { Mutex } from "async-mutex";export type PermissionRequestEvent = CustomEvent<{ id: keyof UnionCommands }>;export class Editor extends TiptapEditor {+ private mutex: Mutex = new Mutex();/*** Use this to get the latest instance of the editor.* This is required to reduce unnecessary rerenders of@@ -45,4 +47,15 @@ export class Editor extends TiptapEditor {return this.current;}++ /**+ * Performs editor state changes in a thread-safe manner using a mutex+ * ensuring that all changes are applied sequentially. Use this when+ * you are getting `RangeError: Applying a mismatched transaction` errors.+ */+ threadsafe(callback: (editor: TiptapEditor) => void) {+ return this.mutex.runExclusive(() =>+ this.current ? callback(this.current) : void 0+ );+ }}diff --git a/packages/editor/src/utils/downloader.ts b/packages/editor/src/utils/downloader.tsindex f88d4d231..473e9b9e4 100644--- a/packages/editor/src/utils/downloader.ts+++ b/packages/editor/src/utils/downloader.ts@@ -60,14 +60,17 @@ const UTITypes: Record<string, string> = {"public.heifs": "image/heif-sequence"};-export function corsify(url: string, host?: string) {+export function corsify(url?: string, host?: string) {if (host && url && !url.startsWith("blob:") && !isDataUrl(url))return `${host}/${url}`;return url;}export async function downloadImage(url: string, options?: DownloadOptions) {- const response = await fetch(corsify(url, options?.corsHost), {+ const corsifiedURL = corsify(url, options?.corsHost);+ if (!corsifiedURL) return;++ const response = await fetch(corsifiedURL, {mode: "cors",credentials: "omit",cache: "force-cache"