fix(lists): bullet-list and ordered-list no longer depend on list-ite…

…m or text-style extensions #5707
ueberdosis · Oct 23, 2024 · a306504 · a306504
1 parent cbbb8a5
commit a306504
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 32 deletions.
diff --git a/.changeset/light-pens-end.md b/.changeset/light-pens-end.md
@@ -0,0 +1,6 @@
+---
+"@tiptap/extension-ordered-list": patch
+"@tiptap/extension-bullet-list": patch
+---
+
+This resolves an issue where the bullet-list and ordered-list extensions were depending on the list-item and text-style extensions unneccesarily. They are no longer imported and constants are used instead.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/extension-bullet-list/package.json b/packages/extension-bullet-list/package.json
@@ -29,14 +29,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/core": "^2.9.0",
-    "@tiptap/extension-list-item": "^2.9.0",
-    "@tiptap/extension-text-style": "^2.9.0"
+    "@tiptap/core": "^2.9.0"
   },
   "peerDependencies": {
-    "@tiptap/core": "^2.7.0",
-    "@tiptap/extension-list-item": "^2.7.0",
-    "@tiptap/extension-text-style": "^2.7.0"
+    "@tiptap/core": "^2.7.0"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-bullet-list/src/bullet-list.ts b/packages/extension-bullet-list/src/bullet-list.ts
@@ -1,6 +1,7 @@
 import { mergeAttributes, Node, wrappingInputRule } from '@tiptap/core'
-import { ListItem } from '@tiptap/extension-list-item'
-import { TextStyle } from '@tiptap/extension-text-style'
+
+const ListItemName = 'listItem'
+const TextStyleName = 'textStyle'
 
 export interface BulletListOptions {
   /**
@@ -86,7 +87,7 @@ export const BulletList = Node.create<BulletListOptions>({
     return {
       toggleBulletList: () => ({ commands, chain }) => {
         if (this.options.keepAttributes) {
-          return chain().toggleList(this.name, this.options.itemTypeName, this.options.keepMarks).updateAttributes(ListItem.name, this.editor.getAttributes(TextStyle.name)).run()
+          return chain().toggleList(this.name, this.options.itemTypeName, this.options.keepMarks).updateAttributes(ListItemName, this.editor.getAttributes(TextStyleName)).run()
         }
         return commands.toggleList(this.name, this.options.itemTypeName, this.options.keepMarks)
       },
@@ -111,7 +112,7 @@ export const BulletList = Node.create<BulletListOptions>({
         type: this.type,
         keepMarks: this.options.keepMarks,
         keepAttributes: this.options.keepAttributes,
-        getAttributes: () => { return this.editor.getAttributes(TextStyle.name) },
+        getAttributes: () => { return this.editor.getAttributes(TextStyleName) },
         editor: this.editor,
       })
     }

diff --git a/packages/extension-ordered-list/package.json b/packages/extension-ordered-list/package.json
@@ -29,14 +29,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/core": "^2.9.0",
-    "@tiptap/extension-list-item": "^2.9.0",
-    "@tiptap/extension-text-style": "^2.9.0"
+    "@tiptap/core": "^2.9.0"
   },
   "peerDependencies": {
-    "@tiptap/core": "^2.7.0",
-    "@tiptap/extension-list-item": "^2.7.0",
-    "@tiptap/extension-text-style": "^2.7.0"
+    "@tiptap/core": "^2.7.0"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-ordered-list/src/ordered-list.ts b/packages/extension-ordered-list/src/ordered-list.ts
@@ -1,6 +1,7 @@
 import { mergeAttributes, Node, wrappingInputRule } from '@tiptap/core'
-import { ListItem } from '@tiptap/extension-list-item'
-import { TextStyle } from '@tiptap/extension-text-style'
+
+const ListItemName = 'listItem'
+const TextStyleName = 'textStyle'
 
 export interface OrderedListOptions {
   /**
@@ -110,7 +111,7 @@ export const OrderedList = Node.create<OrderedListOptions>({
     return {
       toggleOrderedList: () => ({ commands, chain }) => {
         if (this.options.keepAttributes) {
-          return chain().toggleList(this.name, this.options.itemTypeName, this.options.keepMarks).updateAttributes(ListItem.name, this.editor.getAttributes(TextStyle.name)).run()
+          return chain().toggleList(this.name, this.options.itemTypeName, this.options.keepMarks).updateAttributes(ListItemName, this.editor.getAttributes(TextStyleName)).run()
         }
         return commands.toggleList(this.name, this.options.itemTypeName, this.options.keepMarks)
       },
@@ -137,7 +138,7 @@ export const OrderedList = Node.create<OrderedListOptions>({
         type: this.type,
         keepMarks: this.options.keepMarks,
         keepAttributes: this.options.keepAttributes,
-        getAttributes: match => ({ start: +match[1], ...this.editor.getAttributes(TextStyle.name) }),
+        getAttributes: match => ({ start: +match[1], ...this.editor.getAttributes(TextStyleName) }),
         joinPredicate: (match, node) => node.childCount + node.attrs.start === +match[1],
         editor: this.editor,
       })