@doist/typist 2.0.0 → 2.0.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [2.0.1](https://github.com/Doist/typist/compare/v2.0.0...v2.0.1) (2023-09-14)
+
+### Bug Fixes
+
+-   **commands:** Buggy `insertMarkdownContentAt` implementation ([#442](https://github.com/Doist/typist/issues/442)) ([b9667f9](https://github.com/Doist/typist/commit/b9667f94d726285438244db1c58662b7c04ed8be))
+
 ## [2.0.0](https://github.com/Doist/typist/compare/v1.5.0...v2.0.0) (2023-09-13)
 
 ### ⚠ BREAKING CHANGES

package/dist/extensions/core/extra-editor-commands/commands/insert-markdown-content-at.d.ts

@@ -1,6 +1,6 @@
 import { RawCommands } from '@tiptap/core';
 import type { Range } from '@tiptap/core';
-import type { ParseOptions } from 'prosemirror-model';
+import type { ParseOptions } from '@tiptap/pm/model';
 /**
  * Augment the official `@tiptap/core` module with extra commands so that the compiler knows about
  * them. For this to work externally, a wildcard export needs to be added to the root `index.ts`.

package/dist/extensions/core/extra-editor-commands/commands/insert-markdown-content-at.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert-markdown-content-at.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/core/extra-editor-commands/commands/insert-markdown-content-at.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,cAAc,CAAA;AAMnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD;;;GAGG;AACH,OAAO,QAAQ,cAAc,CAAC;IAC1B,UAAU,QAAQ,CAAC,UAAU;QACzB,uBAAuB,EAAE;YACrB;;;;;;;;eAQG;YACH,uBAAuB,EAAE,CACrB,QAAQ,EAAE,MAAM,GAAG,KAAK,EACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;gBACN,YAAY,CAAC,EAAE,YAAY,CAAA;gBAC3B,eAAe,CAAC,EAAE,OAAO,CAAA;aAC5B,KACA,UAAU,CAAA;SAClB,CAAA;KACJ;CACJ;AAED;;;;;GAKG;AACH,iBAAS,uBAAuB,CAC5B,QAAQ,EAAE,MAAM,GAAG,KAAK,EACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IACN,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAA;CAC5B,GACF,UAAU,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC,CAgDpD;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
+{"version":3,"file":"insert-markdown-content-at.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/core/extra-editor-commands/commands/insert-markdown-content-at.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,cAAc,CAAA;AAMnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAEpD;;;GAGG;AACH,OAAO,QAAQ,cAAc,CAAC;IAC1B,UAAU,QAAQ,CAAC,UAAU;QACzB,uBAAuB,EAAE;YACrB;;;;;;;;eAQG;YACH,uBAAuB,EAAE,CACrB,QAAQ,EAAE,MAAM,GAAG,KAAK,EACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;gBACN,YAAY,CAAC,EAAE,YAAY,CAAA;gBAC3B,eAAe,CAAC,EAAE,OAAO,CAAA;aAC5B,KACA,UAAU,CAAA;SAClB,CAAA;KACJ;CACJ;AAED;;;;;GAKG;AACH,iBAAS,uBAAuB,CAC5B,QAAQ,EAAE,MAAM,GAAG,KAAK,EACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IACN,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAA;CAC5B,GACF,UAAU,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC,CAqCpD;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAA"}

package/dist/extensions/core/extra-editor-commands/commands/insert-markdown-content-at.js

@@ -1,5 +1,5 @@
 import { selectionToInsertionEnd } from '@tiptap/core';
-import { DOMParser } from 'prosemirror-model';
+import { DOMParser } from '@tiptap/pm/model';
 import { parseHtmlToElement } from '../../../../helpers/dom';
 import { getHTMLSerializerInstance } from '../../../../serializers/html/html';
 /**
@@ -21,23 +21,14 @@ function insertMarkdownContentAt(position, markdown, options) {
                 ...options,
             };
             // Get the start and end positions from the provided position
-            let { from, to } = typeof position === 'number'
+            const { from, to } = typeof position === 'number'
                 ? { from: position, to: position }
                 : { from: position.from, to: position.to };
-            // If the selection is empty, and we're in an empty textblock, expand the start and end
-            // positions to include the whole textblock (not leaving empty paragraphs behind)
-            if (from === to) {
-                const { parent } = tr.doc.resolve(from);
-                if (parent.isTextblock && parent.childCount === 0) {
-                    from -= 1;
-                    to += 1;
-                }
-            }
             // Parse the Markdown to HTML and then then into ProseMirror nodes
             const htmlContent = getHTMLSerializerInstance(editor.schema).serialize(markdown);
-            const content = DOMParser.fromSchema(editor.schema).parse(parseHtmlToElement(htmlContent), options.parseOptions);
+            const content = DOMParser.fromSchema(editor.schema).parseSlice(parseHtmlToElement(htmlContent), options.parseOptions);
             // Inserts the content into the editor while preserving the current selection
-            tr.replaceWith(from, to, content);
+            tr.replaceRange(from, to, content);
             // Set the text cursor to the end of the inserted content
             if (options.updateSelection) {
                 selectionToInsertionEnd(tr, tr.steps.length - 1, -1);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@doist/typist",
     "description": "The mighty Tiptap-based rich-text editor React component that powers Doist products.",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "license": "MIT",
     "homepage": "https://typist.doist.dev/",
     "repository": "https://github.com/Doist/typist",
@@ -106,7 +106,7 @@
         "classnames": "2.3.2",
         "conventional-changelog-conventionalcommits": "6.1.0",
         "emoji-regex": "10.2.1",
-        "eslint": "8.48.0",
+        "eslint": "8.49.0",
         "eslint-formatter-codeframe": "7.32.1",
         "eslint-import-resolver-typescript": "3.6.0",
         "eslint-plugin-simple-import-sort": "10.0.0",
@@ -134,7 +134,7 @@
         "type-fest": "4.3.1",
         "typescript": "5.2.2",
         "typescript-plugin-css-modules": "5.0.1",
-        "vitest": "0.34.3"
+        "vitest": "0.34.4"
     },
     "peerDependencies": {
         "@react-hookz/web": "^14.2.3 || >=15.x",