Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ueberdosis/tiptap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @tiptap/extension-bold@2.5.9
Choose a base ref
...
head repository: ueberdosis/tiptap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: @tiptap/extension-bold@2.6.0
Choose a head ref

Commits on Aug 7, 2024

  1. fixes vue 3 custom node views when using class components (#5410)

    wagich authored Aug 7, 2024
    Copy the full SHA
    be63e59 View commit details
  2. fix: bump priority of text-style extension fixes #4742 (#5457)

    nperez0111 authored Aug 7, 2024
    Copy the full SHA
    c0e631f View commit details
  3. docs: update types to reflect setting plugin and pluginkey for meta

    nperez0111 committed Aug 7, 2024
    Copy the full SHA
    597c781 View commit details
  4. docs: onTransaction has an editor prop

    nperez0111 committed Aug 7, 2024
    Copy the full SHA
    7280e29 View commit details

Commits on Aug 8, 2024

  1. fix(react): update the types to reflect true options #5459 (#5460)

    nperez0111 authored Aug 8, 2024
    Copy the full SHA
    c7fd0f8 View commit details

Commits on Aug 9, 2024

  1. feat(core): add getContent to nodePasteRules (#4212)

    daibhin authored Aug 9, 2024
    Copy the full SHA
    86a8553 View commit details
  2. Copy the full SHA
    e31673d View commit details
  3. Copy the full SHA
    da7b337 View commit details
  4. Copy the full SHA
    3efb23b View commit details

Commits on Aug 10, 2024

  1. Copy the full SHA
    8ea34e4 View commit details
  2. docs: update README.md (#5331)

    inviduals -> individuals
    eltociear authored Aug 10, 2024
    Copy the full SHA
    84febb2 View commit details

Commits on Aug 11, 2024

  1. Copy the full SHA
    08b4319 View commit details
  2. Copy the full SHA
    222f2ac View commit details

Commits on Aug 12, 2024

  1. Copy the full SHA
    fa17c23 View commit details
  2. Copy the full SHA
    e11aa0d View commit details
  3. Copy the full SHA
    2c6590b View commit details
  4. chore: bump deps

    nperez0111 committed Aug 12, 2024
    Copy the full SHA
    ff19f24 View commit details
  5. Copy the full SHA
    fef96a0 View commit details
  6. Copy the full SHA
    df9f696 View commit details
  7. chore: pin esbuild

    nperez0111 committed Aug 12, 2024
    Copy the full SHA
    157d9d8 View commit details
  8. chore: dedupe esbuild

    nperez0111 committed Aug 12, 2024
    Copy the full SHA
    5270b5c View commit details
  9. chore: package-lock dedupe

    nperez0111 committed Aug 12, 2024
    Copy the full SHA
    f6fc816 View commit details
  10. chore: resolve to root dir

    nperez0111 committed Aug 12, 2024
    Copy the full SHA
    a3ceec7 View commit details
  11. build(deps): bump actions/upload-artifact from 4.3.5 to 4.3.6 (#5471)

    Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6.
    - [Release notes](https://github.com/actions/upload-artifact/releases)
    - [Commits](actions/upload-artifact@v4.3.5...v4.3.6)
    
    ---
    updated-dependencies:
    - dependency-name: actions/upload-artifact
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Aug 12, 2024
    Copy the full SHA
    ef304e3 View commit details

Commits on Aug 13, 2024

  1. chore: name as patch

    nperez0111 committed Aug 13, 2024
    Copy the full SHA
    af529f9 View commit details
  2. Copy the full SHA
    b2d5c94 View commit details
Showing with 3,826 additions and 3,495 deletions.
  1. +2 −2 .github/workflows/build.yml
  2. +1 −1 LICENSE.md
  3. +1 −1 README.md
  4. +3 −0 demos/includeDependencies.txt
  5. +7 −5 demos/package.json
  6. +18 −1 demos/src/Demos/CollaborationSplitPane/React/index.spec.js
  7. +18 −1 demos/src/Extensions/Collaboration/React/index.spec.js
  8. +18 −1 demos/src/Extensions/Collaboration/Vue/index.spec.js
  9. +19 −2 demos/src/Extensions/CollaborationCursor/React/index.spec.js
  10. +19 −2 demos/src/Extensions/CollaborationCursor/Vue/index.spec.js
  11. +4 −0 demos/vite.config.ts
  12. +2,702 −3,126 package-lock.json
  13. +18 −0 packages/core/CHANGELOG.md
  14. +3 −3 packages/core/package.json
  15. +6 −0 packages/core/src/Editor.ts
  16. +4 −3 packages/core/src/Extension.ts
  17. +4 −3 packages/core/src/Mark.ts
  18. +4 −3 packages/core/src/Node.ts
  19. +3 −1 packages/core/src/commands/setMeta.ts
  20. +27 −17 packages/core/src/commands/splitListItem.ts
  21. +14 −5 packages/core/src/pasteRules/nodePasteRule.ts
  22. +9 −0 packages/extension-blockquote/CHANGELOG.md
  23. +3 −3 packages/extension-blockquote/package.json
  24. +9 −0 packages/extension-bold/CHANGELOG.md
  25. +3 −3 packages/extension-bold/package.json
  26. +10 −0 packages/extension-bubble-menu/CHANGELOG.md
  27. +5 −5 packages/extension-bubble-menu/package.json
  28. +9 −0 packages/extension-bullet-list/CHANGELOG.md
  29. +3 −3 packages/extension-bullet-list/package.json
  30. +10 −0 packages/extension-character-count/CHANGELOG.md
  31. +5 −5 packages/extension-character-count/package.json
  32. +11 −0 packages/extension-code-block-lowlight/CHANGELOG.md
  33. +7 −7 packages/extension-code-block-lowlight/package.json
  34. +10 −0 packages/extension-code-block/CHANGELOG.md
  35. +5 −5 packages/extension-code-block/package.json
  36. +9 −0 packages/extension-code/CHANGELOG.md
  37. +3 −3 packages/extension-code/package.json
  38. +9 −0 packages/extension-collaboration-cursor/CHANGELOG.md
  39. +3 −3 packages/extension-collaboration-cursor/package.json
  40. +2 −0 packages/extension-collaboration-cursor/src/collaboration-cursor.ts
  41. +10 −0 packages/extension-collaboration/CHANGELOG.md
  42. +5 −5 packages/extension-collaboration/package.json
  43. +11 −0 packages/extension-color/CHANGELOG.md
  44. +5 −5 packages/extension-color/package.json
  45. +9 −0 packages/extension-document/CHANGELOG.md
  46. +3 −3 packages/extension-document/package.json
  47. +10 −0 packages/extension-dropcursor/CHANGELOG.md
  48. +5 −5 packages/extension-dropcursor/package.json
  49. +10 −0 packages/extension-floating-menu/CHANGELOG.md
  50. +5 −5 packages/extension-floating-menu/package.json
  51. +10 −0 packages/extension-focus/CHANGELOG.md
  52. +5 −5 packages/extension-focus/package.json
  53. +11 −0 packages/extension-font-family/CHANGELOG.md
  54. +5 −5 packages/extension-font-family/package.json
  55. +10 −0 packages/extension-gapcursor/CHANGELOG.md
  56. +5 −5 packages/extension-gapcursor/package.json
  57. +9 −0 packages/extension-hard-break/CHANGELOG.md
  58. +3 −3 packages/extension-hard-break/package.json
  59. +9 −0 packages/extension-heading/CHANGELOG.md
  60. +3 −3 packages/extension-heading/package.json
  61. +9 −0 packages/extension-highlight/CHANGELOG.md
  62. +3 −3 packages/extension-highlight/package.json
  63. +10 −0 packages/extension-history/CHANGELOG.md
  64. +5 −5 packages/extension-history/package.json
  65. +10 −0 packages/extension-horizontal-rule/CHANGELOG.md
  66. +5 −5 packages/extension-horizontal-rule/package.json
  67. +9 −0 packages/extension-image/CHANGELOG.md
  68. +3 −3 packages/extension-image/package.json
  69. +9 −0 packages/extension-italic/CHANGELOG.md
  70. +3 −3 packages/extension-italic/package.json
  71. +11 −0 packages/extension-link/CHANGELOG.md
  72. +5 −5 packages/extension-link/package.json
  73. +4 −1 packages/extension-link/src/link.ts
  74. +9 −0 packages/extension-list-item/CHANGELOG.md
  75. +3 −3 packages/extension-list-item/package.json
  76. +9 −0 packages/extension-list-keymap/CHANGELOG.md
  77. +3 −3 packages/extension-list-keymap/package.json
  78. +11 −0 packages/extension-mention/CHANGELOG.md
  79. +7 −7 packages/extension-mention/package.json
  80. +13 −0 packages/extension-ordered-list/CHANGELOG.md
  81. +3 −3 packages/extension-ordered-list/package.json
  82. +4 −0 packages/extension-ordered-list/src/ordered-list.ts
  83. +9 −0 packages/extension-paragraph/CHANGELOG.md
  84. +3 −3 packages/extension-paragraph/package.json
  85. +10 −0 packages/extension-placeholder/CHANGELOG.md
  86. +5 −5 packages/extension-placeholder/package.json
  87. +9 −0 packages/extension-strike/CHANGELOG.md
  88. +3 −3 packages/extension-strike/package.json
  89. +9 −0 packages/extension-subscript/CHANGELOG.md
  90. +3 −3 packages/extension-subscript/package.json
  91. +9 −0 packages/extension-superscript/CHANGELOG.md
  92. +3 −3 packages/extension-superscript/package.json
  93. +9 −0 packages/extension-table-cell/CHANGELOG.md
  94. +3 −3 packages/extension-table-cell/package.json
  95. +9 −0 packages/extension-table-header/CHANGELOG.md
  96. +3 −3 packages/extension-table-header/package.json
  97. +9 −0 packages/extension-table-row/CHANGELOG.md
  98. +3 −3 packages/extension-table-row/package.json
  99. +10 −0 packages/extension-table/CHANGELOG.md
  100. +5 −5 packages/extension-table/package.json
  101. +10 −0 packages/extension-task-item/CHANGELOG.md
  102. +5 −5 packages/extension-task-item/package.json
  103. +9 −0 packages/extension-task-list/CHANGELOG.md
  104. +3 −3 packages/extension-task-list/package.json
  105. +9 −0 packages/extension-text-align/CHANGELOG.md
  106. +3 −3 packages/extension-text-align/package.json
  107. +10 −0 packages/extension-text-style/CHANGELOG.md
  108. +3 −3 packages/extension-text-style/package.json
  109. +2 −0 packages/extension-text-style/src/text-style.ts
  110. +9 −0 packages/extension-text/CHANGELOG.md
  111. +3 −3 packages/extension-text/package.json
  112. +9 −0 packages/extension-typography/CHANGELOG.md
  113. +3 −3 packages/extension-typography/package.json
  114. +9 −0 packages/extension-underline/CHANGELOG.md
  115. +3 −3 packages/extension-underline/package.json
  116. +9 −0 packages/extension-youtube/CHANGELOG.md
  117. +3 −3 packages/extension-youtube/package.json
  118. +10 −0 packages/html/CHANGELOG.md
  119. +5 −5 packages/html/package.json
  120. +2 −0 packages/pm/CHANGELOG.md
  121. +1 −1 packages/pm/package.json
  122. +24 −0 packages/react/CHANGELOG.md
  123. +7 −7 packages/react/package.json
  124. +3 −2 packages/react/src/Context.tsx
  125. +4 −2 packages/react/src/Editor.ts
  126. +93 −47 packages/react/src/EditorContent.tsx
  127. +1 −0 packages/react/src/NodeViewWrapper.tsx
  128. +14 −16 packages/react/src/ReactNodeViewRenderer.tsx
  129. +11 −2 packages/react/src/ReactRenderer.tsx
  130. +15 −15 packages/react/src/useEditor.ts
  131. +1 −2 packages/react/src/useEditorState.ts
  132. +28 −0 packages/starter-kit/CHANGELOG.md
  133. +20 −20 packages/starter-kit/package.json
  134. +10 −0 packages/suggestion/CHANGELOG.md
  135. +5 −5 packages/suggestion/package.json
  136. +12 −0 packages/vue-2/CHANGELOG.md
  137. +7 −7 packages/vue-2/package.json
  138. +13 −0 packages/vue-3/CHANGELOG.md
  139. +7 −7 packages/vue-3/package.json
  140. +6 −1 packages/vue-3/src/VueNodeViewRenderer.ts
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -114,15 +114,15 @@ jobs:
quiet: true

- name: Export screenshots (on failure only)
uses: actions/upload-artifact@v4.3.5
uses: actions/upload-artifact@v4.3.6
if: failure()
with:
name: cypress-screenshots
path: tests/cypress/screenshots
retention-days: 7

- name: Export screen recordings (on failure only)
uses: actions/upload-artifact@v4.3.5
uses: actions/upload-artifact@v4.3.6
if: failure()
with:
name: cypress-videos
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023, Tiptap GmbH
Copyright (c) 2024, Tiptap GmbH

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ For help, discussion about best practices, or any other conversation that would

</table>

[iFixit](https://www.ifixit.com/), [ApostropheCMS](https://apostrophecms.com/), [Novadiscovery](http://www.novadiscovery.com/), [Omics Data Automation](https://www.omicsautomation.com), [Flow Mobile](https://www.flowmobile.app/), [DocIQ](https://www.dociq.io/) and [hundreds of awesome inviduals](https://github.com/sponsors/ueberdosis).
[iFixit](https://www.ifixit.com/), [ApostropheCMS](https://apostrophecms.com/), [Novadiscovery](http://www.novadiscovery.com/), [Omics Data Automation](https://www.omicsautomation.com), [Flow Mobile](https://www.flowmobile.app/), [DocIQ](https://www.dociq.io/) and [hundreds of awesome individuals](https://github.com/sponsors/ueberdosis).

### Contributing
Feel like adding some magic of your own to Tiptap Editor Core? We welcome contributions! Please see our [CONTRIBUTING](CONTRIBUTING.md) guidelines for how to get started.
3 changes: 3 additions & 0 deletions demos/includeDependencies.txt
Original file line number Diff line number Diff line change
@@ -20,10 +20,13 @@ prosemirror-view
react
react-dom
react-dom/client
use-sync-external-store/shim
use-sync-external-store/shim/with-selector
shiki
simplify-js
tippy.js
uuid
y-webrtc
yjs
@hocuspocus/provider
@lifeomic/attempt
12 changes: 7 additions & 5 deletions demos/package.json
Original file line number Diff line number Diff line change
@@ -10,8 +10,9 @@
"ts": "tsc --project tsconfig.base.json --noEmit && tsc --project tsconfig.react.json --noEmit && tsc --project tsconfig.vue-2.json --noEmit && tsc --project tsconfig.vue-3.json --noEmit"
},
"dependencies": {
"@hocuspocus/provider": "^2.13.5",
"@hocuspocus/provider": "2.13.5",
"@lexical/react": "^0.11.1",
"@shikijs/core": "1.10.3",
"d3": "^7.3.0",
"fast-glob": "^3.2.11",
"highlight.js": "^11.10.0",
@@ -20,24 +21,25 @@
"remixicon": "^2.5.0",
"shiki": "^1.10.3",
"simplify-js": "^1.2.4",
"y-prosemirror": "^1.2.11",
"y-prosemirror": "1.2.11",
"y-webrtc": "^10.3.0",
"yjs": "^13.6.18"
"yjs": "13.6.18"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@types/uuid": "^8.3.4",
"@vitejs/plugin-react": "^1.3.2",
"@vitejs/plugin-vue": "^5.0.0",
"autoprefixer": "^10.4.2",
"esbuild": "0.21.5",
"iframe-resizer": "^4.3.2",
"postcss": "^8.4.31",
"postcss-import": "^15.1.0",
"prosemirror-dev-tools": "^4.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"sass": "^1.49.7",
"svelte": "^3.49.0",
"svelte": "^4.0.0",
"tailwindcss": "^3.3.2",
"typescript": "^5.4.5",
"uuid": "^8.3.2",
19 changes: 18 additions & 1 deletion demos/src/Demos/CollaborationSplitPane/React/index.spec.js
Original file line number Diff line number Diff line change
@@ -3,5 +3,22 @@ context('/src/Demos/CollaborationSplitPane/React/', () => {
cy.visit('/src/Demos/CollaborationSplitPane/React/')
})

// TODO: Write tests
it('should have a working tiptap instance', () => {
cy.get('.tiptap').then(([{ editor }]) => {
// eslint-disable-next-line
expect(editor).to.not.be.null
})
})

it('should have a ydoc', () => {
cy.get('.tiptap').then(([{ editor }]) => {
/**
* @type {import('yjs').Doc}
*/
const yDoc = editor.extensionManager.extensions.find(a => a.name === 'collaboration').options.document

// eslint-disable-next-line
expect(yDoc).to.not.be.null
})
})
})
19 changes: 18 additions & 1 deletion demos/src/Extensions/Collaboration/React/index.spec.js
Original file line number Diff line number Diff line change
@@ -3,5 +3,22 @@ context('/src/Extensions/Collaboration/React/', () => {
cy.visit('/src/Extensions/Collaboration/React/')
})

// TODO: Write tests
it('should have a working tiptap instance', () => {
cy.get('.tiptap').then(([{ editor }]) => {
// eslint-disable-next-line
expect(editor).to.not.be.null
})
})

it('should have a ydoc', () => {
cy.get('.tiptap').then(([{ editor }]) => {
/**
* @type {import('yjs').Doc}
*/
const yDoc = editor.extensionManager.extensions.find(a => a.name === 'collaboration').options.document

// eslint-disable-next-line
expect(yDoc).to.not.be.null
})
})
})
19 changes: 18 additions & 1 deletion demos/src/Extensions/Collaboration/Vue/index.spec.js
Original file line number Diff line number Diff line change
@@ -3,5 +3,22 @@ context('/src/Extensions/Collaboration/Vue/', () => {
cy.visit('/src/Extensions/Collaboration/Vue/')
})

// TODO: Write tests
it('should have a working tiptap instance', () => {
cy.get('.tiptap').then(([{ editor }]) => {
// eslint-disable-next-line
expect(editor).to.not.be.null
})
})

it('should have a ydoc', () => {
cy.get('.tiptap').then(([{ editor }]) => {
/**
* @type {import('yjs').Doc}
*/
const yDoc = editor.extensionManager.extensions.find(a => a.name === 'collaboration').options.document

// eslint-disable-next-line
expect(yDoc).to.not.be.null
})
})
})
21 changes: 19 additions & 2 deletions demos/src/Extensions/CollaborationCursor/React/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
context('/src/Extensions/CollaborationCursor/React', () => {
before(() => {
cy.visit('/src/Extensions/CollaborationCursor/React')
cy.visit('/src/Extensions/CollaborationCursor/React/')
})

// TODO: Write tests
it('should have a working tiptap instance', () => {
cy.get('.tiptap').then(([{ editor }]) => {
// eslint-disable-next-line
expect(editor).to.not.be.null
})
})

it('should have a ydoc', () => {
cy.get('.tiptap').then(([{ editor }]) => {
/**
* @type {import('yjs').Doc}
*/
const yDoc = editor.extensionManager.extensions.find(a => a.name === 'collaboration').options.document

// eslint-disable-next-line
expect(yDoc).to.not.be.null
})
})
})
21 changes: 19 additions & 2 deletions demos/src/Extensions/CollaborationCursor/Vue/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
context('/src/Extensions/CollaborationCursor/Vue', () => {
before(() => {
cy.visit('/src/Extensions/CollaborationCursor/Vue')
cy.visit('/src/Extensions/CollaborationCursor/Vue/')
})

// TODO: Write tests
it('should have a working tiptap instance', () => {
cy.get('.tiptap').then(([{ editor }]) => {
// eslint-disable-next-line
expect(editor).to.not.be.null
})
})

it('should have a ydoc', () => {
cy.get('.tiptap').then(([{ editor }]) => {
/**
* @type {import('yjs').Doc}
*/
const yDoc = editor.extensionManager.extensions.find(a => a.name === 'collaboration').options.document

// eslint-disable-next-line
expect(yDoc).to.not.be.null
})
})
})
4 changes: 4 additions & 0 deletions demos/vite.config.ts
Original file line number Diff line number Diff line change
@@ -21,6 +21,10 @@ const getPackageDependencies = () => {
find: 'yjs',
replacement: resolve('../node_modules/yjs/src/index.js'),
})
paths.push({
find: 'y-prosemirror',
replacement: resolve('../node_modules/y-prosemirror/src/y-prosemirror.js'),
})

fg.sync('../packages/*', { onlyDirectories: true })
.map(name => name.replace('../packages/', ''))
Loading