From 01ab8b4a545fdb4a7e1d0ce0176c36617e7ce914 Mon Sep 17 00:00:00 2001 From: Nick the Sick Date: Mon, 27 Jan 2025 14:44:23 +0100 Subject: [PATCH] test: update all demos to use the new list extension --- demos/src/Commands/Cut/React/index.jsx | 16 +--------------- .../src/Commands/InsertContent/React/index.jsx | 16 +--------------- demos/src/Commands/SetContent/React/index.jsx | 17 ++--------------- .../CollaborationSplitPane/React/Editor.jsx | 3 +-- .../CollaborativeEditing/React/index.jsx | 3 +-- .../Examples/CollaborativeEditing/Vue/index.vue | 3 +-- demos/src/Examples/Default/Svelte/index.svelte | 2 +- demos/src/Examples/Default/Vue/index.vue | 2 +- .../Examples/StaticRendering/React/index.tsx | 11 +---------- demos/src/Examples/Tasks/React/index.jsx | 3 +-- demos/src/Examples/Tasks/Vue/index.vue | 3 +-- demos/src/Experiments/All/Vue/index.vue | 6 +----- .../Experiments/IsolatingClear/React/index.jsx | 2 +- .../Experiments/MultipleEditors/Vue/index.vue | 3 +-- demos/src/Extensions/Focus/React/index.jsx | 3 +-- demos/src/Extensions/Focus/Vue/index.vue | 3 +-- demos/src/Extensions/ListKeymap/React/index.jsx | 4 +--- demos/src/Nodes/BulletList/React/index.jsx | 3 +-- demos/src/Nodes/BulletList/Vue/index.vue | 3 +-- demos/src/Nodes/ListItem/React/index.jsx | 4 +--- demos/src/Nodes/ListItem/Vue/index.vue | 4 +--- demos/src/Nodes/OrderedList/React/index.jsx | 3 +-- demos/src/Nodes/OrderedList/Vue/index.vue | 3 +-- demos/src/Nodes/TaskItem/React/index.jsx | 3 +-- demos/src/Nodes/TaskItem/Vue/index.vue | 3 +-- demos/src/Nodes/TaskList/React/index.jsx | 3 +-- demos/src/Nodes/TaskList/Vue/index.vue | 3 +-- demos/vite.config.ts | 1 + 28 files changed, 29 insertions(+), 104 deletions(-) diff --git a/demos/src/Commands/Cut/React/index.jsx b/demos/src/Commands/Cut/React/index.jsx index 67a5980a1..96c984988 100644 --- a/demos/src/Commands/Cut/React/index.jsx +++ b/demos/src/Commands/Cut/React/index.jsx @@ -1,6 +1,5 @@ import './styles.scss' -import ListItem from '@tiptap/extension-list-item' import { Color, TextStyle } from '@tiptap/extension-text-style' import { EditorContent, useEditor } from '@tiptap/react' import StarterKit from '@tiptap/starter-kit' @@ -37,20 +36,7 @@ const MenuBar = ({ editor }) => { export default () => { const editor = useEditor({ - extensions: [ - Color.configure({ types: [TextStyle.name, ListItem.name] }), - TextStyle.configure({ types: [ListItem.name] }), - StarterKit.configure({ - bulletList: { - keepMarks: true, - keepAttributes: false, // TODO : Making this as `false` becase marks are not preserved when I try to preserve attrs, awaiting a bit of help - }, - orderedList: { - keepMarks: true, - keepAttributes: false, // TODO : Making this as `false` becase marks are not preserved when I try to preserve attrs, awaiting a bit of help - }, - }), - ], + extensions: [Color, TextStyle, StarterKit], content: `

Hi there, diff --git a/demos/src/Commands/InsertContent/React/index.jsx b/demos/src/Commands/InsertContent/React/index.jsx index 2032f0fb2..905e586d4 100644 --- a/demos/src/Commands/InsertContent/React/index.jsx +++ b/demos/src/Commands/InsertContent/React/index.jsx @@ -2,7 +2,6 @@ import './styles.scss' import { Image } from '@tiptap/extension-image' import Link from '@tiptap/extension-link' -import ListItem from '@tiptap/extension-list-item' import { Color, TextStyle } from '@tiptap/extension-text-style' import { EditorProvider, useCurrentEditor } from '@tiptap/react' import StarterKit from '@tiptap/starter-kit' @@ -58,20 +57,7 @@ const MenuBar = () => { ) } -const extensions = [ - Image, - Color.configure({ types: [TextStyle.name, ListItem.name] }), - TextStyle.configure({ types: [ListItem.name] }), - Link, - StarterKit.configure({ - bulletList: { - keepMarks: true, - }, - orderedList: { - keepMarks: true, - }, - }), -] +const extensions = [Image, Color, TextStyle, Link, StarterKit] const content = '' diff --git a/demos/src/Commands/SetContent/React/index.jsx b/demos/src/Commands/SetContent/React/index.jsx index 2ce131d06..7cda59229 100644 --- a/demos/src/Commands/SetContent/React/index.jsx +++ b/demos/src/Commands/SetContent/React/index.jsx @@ -1,25 +1,12 @@ import './styles.scss' -import ListItem from '@tiptap/extension-list-item' import Mentions from '@tiptap/extension-mention' -import { Color , TextStyle } from '@tiptap/extension-text-style' +import { Color, TextStyle } from '@tiptap/extension-text-style' import { EditorProvider } from '@tiptap/react' import StarterKit from '@tiptap/starter-kit' import React from 'react' -const extensions = [ - Color.configure({ types: [TextStyle.name, ListItem.name] }), - TextStyle.configure({ types: [ListItem.name] }), - StarterKit.configure({ - bulletList: { - keepMarks: true, - }, - orderedList: { - keepMarks: true, - }, - }), - Mentions, -] +const extensions = [Color, TextStyle, StarterKit, Mentions] const content = '' diff --git a/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx b/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx index 5a8993fb2..ce1a906e9 100644 --- a/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx +++ b/demos/src/Demos/CollaborationSplitPane/React/Editor.jsx @@ -2,8 +2,7 @@ import CharacterCount from '@tiptap/extension-character-count' import Collaboration from '@tiptap/extension-collaboration' import CollaborationCursor from '@tiptap/extension-collaboration-cursor' import Highlight from '@tiptap/extension-highlight' -import TaskItem from '@tiptap/extension-task-item' -import TaskList from '@tiptap/extension-task-list' +import { TaskItem, TaskList } from '@tiptap/extension-list' import { EditorContent, useEditor } from '@tiptap/react' import StarterKit from '@tiptap/starter-kit' import React, { useCallback, useEffect, useState } from 'react' diff --git a/demos/src/Examples/CollaborativeEditing/React/index.jsx b/demos/src/Examples/CollaborativeEditing/React/index.jsx index a13966fe7..9198ecc70 100644 --- a/demos/src/Examples/CollaborativeEditing/React/index.jsx +++ b/demos/src/Examples/CollaborativeEditing/React/index.jsx @@ -5,8 +5,7 @@ import CharacterCount from '@tiptap/extension-character-count' import Collaboration from '@tiptap/extension-collaboration' import CollaborationCursor from '@tiptap/extension-collaboration-cursor' import Highlight from '@tiptap/extension-highlight' -import TaskItem from '@tiptap/extension-task-item' -import TaskList from '@tiptap/extension-task-list' +import { TaskItem, TaskList } from '@tiptap/extension-list' import { EditorContent, useEditor } from '@tiptap/react' import StarterKit from '@tiptap/starter-kit' import React, { useCallback, useEffect, useState } from 'react' diff --git a/demos/src/Examples/CollaborativeEditing/Vue/index.vue b/demos/src/Examples/CollaborativeEditing/Vue/index.vue index 9d9687c0e..ffd8e387a 100644 --- a/demos/src/Examples/CollaborativeEditing/Vue/index.vue +++ b/demos/src/Examples/CollaborativeEditing/Vue/index.vue @@ -27,8 +27,7 @@ import CharacterCount from '@tiptap/extension-character-count' import Collaboration from '@tiptap/extension-collaboration' import CollaborationCursor from '@tiptap/extension-collaboration-cursor' import Highlight from '@tiptap/extension-highlight' -import TaskItem from '@tiptap/extension-task-item' -import TaskList from '@tiptap/extension-task-list' +import { TaskItem, TaskList } from '@tiptap/extension-list' import StarterKit from '@tiptap/starter-kit' import { Editor, EditorContent } from '@tiptap/vue-3' import * as Y from 'yjs' diff --git a/demos/src/Examples/Default/Svelte/index.svelte b/demos/src/Examples/Default/Svelte/index.svelte index a0cdc590f..99b6c1eb5 100644 --- a/demos/src/Examples/Default/Svelte/index.svelte +++ b/demos/src/Examples/Default/Svelte/index.svelte @@ -2,7 +2,7 @@ import "./styles.scss"; import { Color } from '@tiptap/extension-text-style' - import ListItem from '@tiptap/extension-list-item' + import { ListItem } from '@tiptap/extension-list' import { TextStyle } from '@tiptap/extension-text-style' import StarterKit from "@tiptap/starter-kit"; import { Editor } from "@tiptap/core"; diff --git a/demos/src/Examples/Default/Vue/index.vue b/demos/src/Examples/Default/Vue/index.vue index 766c67310..bd40a6371 100644 --- a/demos/src/Examples/Default/Vue/index.vue +++ b/demos/src/Examples/Default/Vue/index.vue @@ -119,7 +119,7 @@