@doist/typist 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.1.1](https://github.com/Doist/typist/compare/v1.1.0...v1.1.1) (2023-03-03)
+
+### Bug Fixes
+
+-   Invalid `hasCodeMarkBefore` check in `canInsertSuggestion` utility function ([#156](https://github.com/Doist/typist/issues/156)) ([21826c5](https://github.com/Doist/typist/commit/21826c58f763d020d3810fe373ab2524e0f0448e))
+
 ## [1.1.0](https://github.com/Doist/typist/compare/v1.0.19...v1.1.0) (2023-03-02)
 
 ### Features

package/dist/utilities/can-insert-node-at.d.ts

@@ -1,4 +1,4 @@
-import { Editor, Range } from '@tiptap/core';
+import type { Editor, Range } from '@tiptap/core';
 /**
  * Check if a node of a specific type can be inserted at a specific position in the editor.
  *

package/dist/utilities/can-insert-node-at.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"can-insert-node-at.d.ts","sourceRoot":"","sources":["../../src/utilities/can-insert-node-at.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAE5C;;;;GAIG;AACH,iBAAS,eAAe,CAAC,EACrB,MAAM,EACN,QAAQ,EACR,KAAK,GACR,EAAE;IACC,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACf,WAIA;AAED,OAAO,EAAE,eAAe,EAAE,CAAA"}
+{"version":3,"file":"can-insert-node-at.d.ts","sourceRoot":"","sources":["../../src/utilities/can-insert-node-at.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEjD;;;;GAIG;AACH,iBAAS,eAAe,CAAC,EACrB,MAAM,EACN,QAAQ,EACR,KAAK,GACR,EAAE;IACC,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACf,WAIA;AAED,OAAO,EAAE,eAAe,EAAE,CAAA"}

package/dist/utilities/can-insert-suggestion.d.ts

@@ -1,5 +1,5 @@
-import { Editor } from '@tiptap/core';
-import { EditorState } from '@tiptap/pm/state';
+import type { Editor } from '@tiptap/core';
+import type { EditorState } from '@tiptap/pm/state';
 /**
  * Check if a suggestion can be inserted within the current editor selection.
  *

package/dist/utilities/can-insert-suggestion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"can-insert-suggestion.d.ts","sourceRoot":"","sources":["../../src/utilities/can-insert-suggestion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C;;;;GAIG;AACH,iBAAS,mBAAmB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,WAkBrF;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"can-insert-suggestion.d.ts","sourceRoot":"","sources":["../../src/utilities/can-insert-suggestion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEnD;;;;GAIG;AACH,iBAAS,mBAAmB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,WAoBrF;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/dist/utilities/can-insert-suggestion.js

@@ -7,12 +7,9 @@ function canInsertSuggestion({ editor, state }) {
     const { selection } = state;
     const isInsideCodeMark = editor.isActive('code');
     const isInsideCodeBlockNode = selection.$from.parent.type.name === 'codeBlock';
-    const hasCodeMarkBefore = state.doc
-        .nodeAt(selection.$from.parentOffset - 1)
-        ?.marks.some((mark) => mark.type.name === 'code');
-    const isComposingInlineCode = selection.$from.nodeBefore?.text
-        ?.split(' ')
-        .some((word) => word.startsWith('`'));
+    const wordsBeforeSelection = (selection.$from.nodeBefore?.text ?? '').split(' ');
+    const hasCodeMarkBefore = (selection.$from.parent.cut(selection.$from.parentOffset - wordsBeforeSelection.slice(-1)[0].length - 1, selection.$from.parentOffset - 1).content.firstChild?.marks.length ?? 0) > 0;
+    const isComposingInlineCode = wordsBeforeSelection.some((word) => word.startsWith('`'));
     return (!isInsideCodeMark && !isInsideCodeBlockNode && !hasCodeMarkBefore && !isComposingInlineCode);
 }
 export { canInsertSuggestion };

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": "1.1.0",
+    "version": "1.1.1",
     "license": "MIT",
     "homepage": "https://typist.doist.dev/",
     "repository": "https://github.com/Doist/typist",