Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare stable release 2.2.0 #4830

Merged
merged 9 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions demos/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"remixicon": "^2.5.0",
"shiki": "^0.10.0",
"simplify-js": "^1.2.4",
"y-prosemirror": "1.0.20",
"y-webrtc": "^10.2.5",
"yjs": "^13.5.39"
"y-prosemirror": "^1.2.2",
"y-webrtc": "^10.3.0",
"yjs": "^13.6.11"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Plugin, PluginKey } from '@tiptap/pm/state'
import { DecorationSet } from 'prosemirror-view'
import { DecorationSet } from '@tiptap/pm/view'
import * as Y from 'yjs'

import { AnnotationItem } from './AnnotationItem.js'
Expand Down
2 changes: 2 additions & 0 deletions demos/src/Experiments/IsolatingClear/React/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Color } from '@tiptap/extension-color'
import ListItem from '@tiptap/extension-list-item'
import TextStyle from '@tiptap/extension-text-style'
import { EditorContent, Node, useEditor } from '@tiptap/react'
import StarterKit from '@tiptap/starter-kit'
import React from 'react'

import { content } from '../content.ts'
Expand Down Expand Up @@ -200,6 +201,7 @@ const MenuBar = ({ editor }) => {
export default () => {
const editor = useEditor({
extensions: [
StarterKit,
WrapperBlock,
Color.configure({ types: [TextStyle.name, ListItem.name] }),
TextStyle.configure({ types: [ListItem.name] }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<script>
import StarterKit from '@tiptap/starter-kit'
import { Editor, EditorContent } from '@tiptap/vue-2'
import { Editor, EditorContent } from '@tiptap/vue-3'

export default {
components: {
Expand Down
1 change: 0 additions & 1 deletion demos/src/Experiments/OnUpdateRerender/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ export default {
},
},
}

</script>
2 changes: 1 addition & 1 deletion demos/src/Nodes/Youtube/React/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default () => {
content: `
<p>Tiptap now supports YouTube embeds! Awesome!</p>
<div data-youtube-video>
<iframe src="https://www.youtube.com/watch?v=cqHqLQgVCgY"></iframe>
<iframe src="https://www.youtube.com/watch?v=3lTUAWOgoHs"></iframe>
</div>
<p>Try adding your own video to this editor!</p>
`,
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Nodes/Youtube/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default {
content: `
<p>Tiptap now supports YouTube embeds! Awesome!</p>
<div data-youtube-video>
<iframe src="https://www.youtube.com/watch?v=cqHqLQgVCgY"></iframe>
<iframe src="https://www.youtube.com/watch?v=3lTUAWOgoHs"></iframe>
</div>
<p>Try adding your own video to this editor!</p>
`,
Expand Down
115 changes: 27 additions & 88 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions packages/core/src/utilities/elementFromString.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@ export function elementFromString(value: string): HTMLElement {

const html = new window.DOMParser().parseFromString(wrappedValue, 'text/html').body

removeWhitespaces(html)
bdbch marked this conversation as resolved.
Show resolved Hide resolved

return removeWhitespaces(html)
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Extension } from '@tiptap/core'
import { DecorationAttrs } from 'prosemirror-view'
import { DecorationAttrs } from '@tiptap/pm/view'
import { defaultSelectionBuilder, yCursorPlugin } from 'y-prosemirror'

type CollaborationCursorStorage = {
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-table/src/table.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
callOrReturn, getExtensionField, mergeAttributes, Node, ParentConfig,
} from '@tiptap/core'
import { DOMOutputSpec } from '@tiptap/pm/model'
import { TextSelection } from '@tiptap/pm/state'
import {
addColumnAfter,
Expand All @@ -22,7 +23,6 @@ import {
toggleHeaderCell,
} from '@tiptap/pm/tables'
import { NodeView } from '@tiptap/pm/view'
import { DOMOutputSpec } from 'prosemirror-model'

import { TableView } from './TableView.js'
import { createColGroup } from './utilities/createColGroup.js'
Expand Down
3 changes: 1 addition & 2 deletions packages/extension-table/src/utilities/createColGroup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Node as ProseMirrorNode } from '@tiptap/pm/model'
import { DOMOutputSpec } from 'prosemirror-model'
import { DOMOutputSpec, Node as ProseMirrorNode } from '@tiptap/pm/model'

/**
* Creates a colgroup element for a table node in ProseMirror.
Expand Down
Loading