@doist/typist 1.3.2 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.4.0](https://github.com/Doist/typist/compare/v1.3.2...v1.4.0) (2023-06-20)
+
+### Features
+
+-   Allow all marks to coexist with the Code mark ([#309](https://github.com/Doist/typist/issues/309)) ([ac06735](https://github.com/Doist/typist/commit/ac067352d97f6c7987ae94a47855654cfbf1dda6))
+
 ## [1.3.2](https://github.com/Doist/typist/compare/v1.3.1...v1.3.2) (2023-06-19)
 
 ### Bug Fixes

package/dist/constants/extension-priorities.d.ts

@@ -28,5 +28,11 @@ declare const VIEW_EVENT_HANDLERS_PRIORITY = 105;
  * precedence over the `Bold` extension keyboard shortcut.
  */
 declare const BLOCKQUOTE_EXTENSION_PRIORITY = 101;
-export { BLOCKQUOTE_EXTENSION_PRIORITY, PASTE_EXTENSION_PRIORITY, SMART_MARKDOWN_TYPING_PRIORITY, SUGGESTION_EXTENSION_PRIORITY, VIEW_EVENT_HANDLERS_PRIORITY, };
+/**
+ * Priority for the `RichTextCode` extension. This needs to be lower than the default for most
+ * built-in and official extensions (i.e. `100`), so that other marks wrap the `Code` mark, and not
+ * the other way around (i.e. prevents `<code><em>code</em></code>` from happening).
+ */
+declare const CODE_EXTENSION_PRIORITY = 99;
+export { BLOCKQUOTE_EXTENSION_PRIORITY, CODE_EXTENSION_PRIORITY, PASTE_EXTENSION_PRIORITY, SMART_MARKDOWN_TYPING_PRIORITY, SUGGESTION_EXTENSION_PRIORITY, VIEW_EVENT_HANDLERS_PRIORITY, };
 //# sourceMappingURL=extension-priorities.d.ts.map

package/dist/constants/extension-priorities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension-priorities.d.ts","sourceRoot":"","sources":["../../src/constants/extension-priorities.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,QAAA,MAAM,6BAA6B,OAAO,CAAA;AAE1C;;;;GAIG;AACH,QAAA,MAAM,8BAA8B,MAAM,CAAA;AAE1C;;;;GAIG;AACH,QAAA,MAAM,wBAAwB,MAAM,CAAA;AAEpC;;;;GAIG;AACH,QAAA,MAAM,4BAA4B,MAAM,CAAA;AAExC;;;;GAIG;AACH,QAAA,MAAM,6BAA6B,MAAM,CAAA;AAEzC,OAAO,EACH,6BAA6B,EAC7B,wBAAwB,EACxB,8BAA8B,EAC9B,6BAA6B,EAC7B,4BAA4B,GAC/B,CAAA"}
+{"version":3,"file":"extension-priorities.d.ts","sourceRoot":"","sources":["../../src/constants/extension-priorities.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,QAAA,MAAM,6BAA6B,OAAO,CAAA;AAE1C;;;;GAIG;AACH,QAAA,MAAM,8BAA8B,MAAM,CAAA;AAE1C;;;;GAIG;AACH,QAAA,MAAM,wBAAwB,MAAM,CAAA;AAEpC;;;;GAIG;AACH,QAAA,MAAM,4BAA4B,MAAM,CAAA;AAExC;;;;GAIG;AACH,QAAA,MAAM,6BAA6B,MAAM,CAAA;AAEzC;;;;GAIG;AACH,QAAA,MAAM,uBAAuB,KAAK,CAAA;AAElC,OAAO,EACH,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,8BAA8B,EAC9B,6BAA6B,EAC7B,4BAA4B,GAC/B,CAAA"}

package/dist/constants/extension-priorities.js

@@ -28,4 +28,10 @@ const VIEW_EVENT_HANDLERS_PRIORITY = 105;
  * precedence over the `Bold` extension keyboard shortcut.
  */
 const BLOCKQUOTE_EXTENSION_PRIORITY = 101;
-export { BLOCKQUOTE_EXTENSION_PRIORITY, PASTE_EXTENSION_PRIORITY, SMART_MARKDOWN_TYPING_PRIORITY, SUGGESTION_EXTENSION_PRIORITY, VIEW_EVENT_HANDLERS_PRIORITY, };
+/**
+ * Priority for the `RichTextCode` extension. This needs to be lower than the default for most
+ * built-in and official extensions (i.e. `100`), so that other marks wrap the `Code` mark, and not
+ * the other way around (i.e. prevents `<code><em>code</em></code>` from happening).
+ */
+const CODE_EXTENSION_PRIORITY = 99;
+export { BLOCKQUOTE_EXTENSION_PRIORITY, CODE_EXTENSION_PRIORITY, PASTE_EXTENSION_PRIORITY, SMART_MARKDOWN_TYPING_PRIORITY, SUGGESTION_EXTENSION_PRIORITY, VIEW_EVENT_HANDLERS_PRIORITY, };

package/dist/extensions/rich-text/rich-text-code.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Custom extension that extends the built-in `Code` extension to allow all marks (e.g., Bold,
+ * Italic, and Strikethrough) to coexist with the `Code` mark (as opposed to disallowing all any
+ * other mark by default).
+ *
+ * @see https://tiptap.dev/api/schema#excludes
+ * @see https://prosemirror.net/docs/ref/#model.MarkSpec.excludes
+ */
+declare const RichTextCode: import("@tiptap/core").Mark<import("@tiptap/extension-code").CodeOptions, any>;
+export { RichTextCode };
+//# sourceMappingURL=rich-text-code.d.ts.map

package/dist/extensions/rich-text/rich-text-code.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rich-text-code.d.ts","sourceRoot":"","sources":["../../../src/extensions/rich-text/rich-text-code.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,QAAA,MAAM,YAAY,gFAGhB,CAAA;AAEF,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/dist/extensions/rich-text/rich-text-code.js

@@ -0,0 +1,15 @@
+import { Code } from '@tiptap/extension-code';
+import { CODE_EXTENSION_PRIORITY } from '../../constants/extension-priorities';
+/**
+ * Custom extension that extends the built-in `Code` extension to allow all marks (e.g., Bold,
+ * Italic, and Strikethrough) to coexist with the `Code` mark (as opposed to disallowing all any
+ * other mark by default).
+ *
+ * @see https://tiptap.dev/api/schema#excludes
+ * @see https://prosemirror.net/docs/ref/#model.MarkSpec.excludes
+ */
+const RichTextCode = Code.extend({
+    priority: CODE_EXTENSION_PRIORITY,
+    excludes: Code.name,
+});
+export { RichTextCode };

package/dist/extensions/rich-text/rich-text-kit.js

@@ -2,7 +2,6 @@ import { Extension } from '@tiptap/core';
 import { Blockquote } from '@tiptap/extension-blockquote';
 import { Bold } from '@tiptap/extension-bold';
 import { BulletList } from '@tiptap/extension-bullet-list';
-import { Code } from '@tiptap/extension-code';
 import { CodeBlock } from '@tiptap/extension-code-block';
 import { Dropcursor } from '@tiptap/extension-dropcursor';
 import { Gapcursor } from '@tiptap/extension-gapcursor';
@@ -24,6 +23,7 @@ import { BoldAndItalics } from './bold-and-italics';
 import { CurvenoteCodemark } from './curvenote-codemark';
 import { PasteEmojis } from './paste-emojis';
 import { PasteMarkdown } from './paste-markdown';
+import { RichTextCode } from './rich-text-code';
 import { RichTextDocument } from './rich-text-document';
 import { RichTextHorizontalRule } from './rich-text-horizontal-rule';
 import { RichTextImage } from './rich-text-image';
@@ -49,7 +49,7 @@ const RichTextKit = Extension.create({
             extensions.push(BulletList.configure(this.options?.bulletList));
         }
         if (this.options.code !== false) {
-            extensions.push(Code.configure(this.options?.code), 
+            extensions.push(RichTextCode.configure(this.options?.code), 
             // Enhances the Code extension capabilities with additional features
             CurvenoteCodemark);
         }

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.3.2",
+    "version": "1.4.0",
     "license": "MIT",
     "homepage": "https://typist.doist.dev/",
     "repository": "https://github.com/Doist/typist",
@@ -92,7 +92,7 @@
         "@storybook/mdx2-csf": "1.1.0",
         "@storybook/react": "7.0.20",
         "@storybook/react-vite": "7.0.20",
-        "@testing-library/dom": "9.3.0",
+        "@testing-library/dom": "9.3.1",
         "@testing-library/jest-dom": "5.16.5",
         "@testing-library/react": "14.0.0",
         "@types/hast": "2.3.4",
@@ -130,7 +130,7 @@
         "semantic-release": "21.0.5",
         "storybook": "7.0.20",
         "storybook-css-modules": "1.0.8",
-        "type-fest": "3.11.1",
+        "type-fest": "3.12.0",
         "typescript": "5.1.3",
         "typescript-plugin-css-modules": "5.0.1",
         "vitest": "0.32.0"