Skip to content

Commit

Permalink
Merge branch 'develop' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
nperez0111 committed Dec 4, 2024
2 parents a018b63 + a0d2f28 commit 2a1d31c
Show file tree
Hide file tree
Showing 76 changed files with 2,648 additions and 1,330 deletions.
5 changes: 0 additions & 5 deletions .changeset/chatty-monkeys-hear.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/chatty-pianos-learn.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/chilled-pigs-drum.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-character-count": major
---

fix: #5851 - While setting `content` directly while using character-count
5 changes: 5 additions & 0 deletions .changeset/famous-bags-breathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-code": patch
---

Update inline code formatting for text enclosed in backticks
5 changes: 5 additions & 0 deletions .changeset/few-geckos-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-heading": patch
---

Fixed a bug causing the levels rule to be ignored if a level of 1 was **not allowed**
5 changes: 0 additions & 5 deletions .changeset/five-flowers-eat.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/five-lobsters-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-floating-menu": patch
---

Fixed an issue that cause the floating menu empty-node check to not respect leaf nodes that didn't count into a nodes text content
5 changes: 0 additions & 5 deletions .changeset/five-mice-turn.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/four-islands-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-list-keymap": patch
---

Improve selected text deletion at the end of list items
5 changes: 0 additions & 5 deletions .changeset/fresh-coats-relate.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/funny-otters-protect.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/happy-vans-smash.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/lazy-wombats-grab.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/core": patch
---

Fixed an issue on Android where the focus command would cause the keyboard to flash
5 changes: 0 additions & 5 deletions .changeset/lemon-berries-change.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/many-glasses-reflect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/core": patch
---

Added support for drag-and-drop between multiple editors
5 changes: 0 additions & 5 deletions .changeset/mean-moose-bow.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/nasty-turtles-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/suggestion": patch
---

Added a new option ´allowToIncludeChar` that allows the usage of the suggestion char inside the query
5 changes: 5 additions & 0 deletions .changeset/plenty-readers-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-text-align": patch
---

Fixed an issue that caused defaultAlignment options not being added as text-styles to elements. defaultAlignment is now nullable to **disable the enforced text-align styles**.
5 changes: 0 additions & 5 deletions .changeset/polite-buttons-wash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/serious-coins-fail.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/shy-pigs-exercise.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/silver-waves-deny.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/core": patch
---

Updates the typings to be inline with Prosemirror-view #5867
5 changes: 5 additions & 0 deletions .changeset/six-islands-breathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/core": patch
---

Use an AllSelection for the selectAll command #5516
5 changes: 5 additions & 0 deletions .changeset/stupid-shrimps-speak.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/core": patch
---

Fixed an issue with nodeviews preventing any drag events in child nodes of the nodeview wrapper element
5 changes: 0 additions & 5 deletions .changeset/swift-keys-collect.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/tasty-sheep-compare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-text-style": minor
---

Added `mergeNestedSpanStyles` option to the `TextStyle` extension to address issue #5720
5 changes: 0 additions & 5 deletions .changeset/two-rats-watch.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/unlucky-ravens-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tiptap/extension-link": patch
---

fix: #5679 - perform string sanitization to remove unwanted "object replacement characters" from the before performing link detection
6 changes: 0 additions & 6 deletions .changeset/witty-olives-protect.md

This file was deleted.

6 changes: 0 additions & 6 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
# Global
* @bdbch @svenadlung

# demos
/demos/ @bdbch

# LICENSE
LICENSE.md @philipisik
9 changes: 8 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:
- develop
- next
- release/*
tags:
- '*'
pull_request:
branches:
- main
Expand Down Expand Up @@ -103,7 +105,7 @@ jobs:

- name: Test ${{ matrix.test-spec.name }}
id: cypress
uses: cypress-io/[email protected].6
uses: cypress-io/[email protected].7
with:
cache-key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
start: npm run serve
Expand Down Expand Up @@ -152,6 +154,7 @@ jobs:
with:
path: |
**/node_modules
**/.turbo
/home/runner/.cache/Cypress
key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}

Expand All @@ -163,3 +166,7 @@ jobs:
- name: Try to build the packages
id: build-packages
run: npm run build:ci

- name: Soft release
id: soft-release
run: npx pkg-pr-new publish './packages/*' --compact
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
NPM_CONFIG_PROVENANCE: true

- name: Send release notification
if: steps.changesets.outputs.published == 'true'
Expand Down
38 changes: 19 additions & 19 deletions demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
},
"dependencies": {
"@hocuspocus/provider": "2.13.5",
"@lexical/react": "^0.11.1",
"@lexical/react": "^0.11.3",
"@shikijs/core": "1.10.3",
"d3": "^7.3.0",
"fast-glob": "^3.2.11",
"d3": "^7.9.0",
"fast-glob": "^3.3.2",
"highlight.js": "^11.10.0",
"lexical": "^0.11.1",
"lexical": "^0.11.3",
"lowlight": "^3.1.0",
"remixicon": "^2.5.0",
"shiki": "^1.10.3",
"shiki": "^1.23.1",
"simplify-js": "^1.2.4",
"y-prosemirror": "1.2.11",
"y-webrtc": "^10.3.0",
"yjs": "13.6.18"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@sveltejs/vite-plugin-svelte": "3.1.2",
"@types/uuid": "^8.3.4",
"@vitejs/plugin-react": "^1.3.2",
"@vitejs/plugin-vue": "^5.0.0",
"autoprefixer": "^10.4.2",
"@vitejs/plugin-vue": "^5.2.0",
"autoprefixer": "^10.4.20",
"esbuild": "0.21.5",
"iframe-resizer": "^4.3.2",
"postcss": "^8.4.31",
"iframe-resizer": "^4.4.5",
"postcss": "^8.4.49",
"postcss-import": "^15.1.0",
"prosemirror-dev-tools": "^4.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"sass": "^1.49.7",
"prosemirror-dev-tools": "^4.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.81.0",
"svelte": "^4.2.19",
"tailwindcss": "^3.3.2",
"typescript": "^5.4.5",
"tailwindcss": "^3.4.15",
"typescript": "^5.6.3",
"uuid": "^8.3.2",
"vite": "^5.4.6",
"vite": "^5.4.11",
"vite-plugin-checker": "^0.6.4",
"vue": "^3.0.0",
"vue-router": "^4.0.11"
"vue": "^3.5.13",
"vue-router": "^4.4.5"
}
}
12 changes: 10 additions & 2 deletions demos/src/Experiments/GlobalDragHandle/Vue/DragHandle.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ export default Extension.create({
}

function dragStart(e, view) {
view.composing = true
// Must delete this line, Otherwise: Uncaught TypeError: Cannot set property composing of #<EditorView> which has only a getter
// view.composing = true

if (!e.dataTransfer) {
return
Expand Down Expand Up @@ -75,6 +76,11 @@ export default Extension.create({
}
}

function dragEnd(e, view) {
// reset the dragging, otherwise wrong content after dragging across multi editors repeatedly
view.dragging = null
}

let dropElement
const WIDTH = 28

Expand All @@ -86,8 +92,10 @@ export default Extension.create({
element.draggable = 'true'
element.classList.add('global-drag-handle')
element.addEventListener('dragstart', e => dragStart(e, editorView))
element.addEventListener('dragend', e => dragEnd(e, editorView))
dropElement = element
document.body.appendChild(dropElement)
// append to editor's parentNode (not document.body), to match the logic of dragging across multi editors in pasteRule.ts
editorView.dom.parentNode.appendChild(dropElement)

return {
// update(view, prevState) {
Expand Down
6 changes: 6 additions & 0 deletions demos/src/Experiments/MultipleEditors/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import Bold from '@tiptap/extension-bold'
import Collaboration from '@tiptap/extension-collaboration'
import Document from '@tiptap/extension-document'
import DropCursor from '@tiptap/extension-dropcursor'
import Heading from '@tiptap/extension-heading'
import Paragraph from '@tiptap/extension-paragraph'
import TaskItem from '@tiptap/extension-task-item'
Expand Down Expand Up @@ -75,6 +76,8 @@ export default {
levels: [2],
}),
Text,
Bold,
DropCursor,
Collaboration.configure({
document: this.ydoc,
field: 'title',
Expand All @@ -88,6 +91,8 @@ export default {
TaskListDocument,
Paragraph,
Text,
Bold,
DropCursor,
TaskList,
CustomTaskItem,
Collaboration.configure({
Expand All @@ -110,6 +115,7 @@ export default {
Paragraph,
Text,
Bold,
DropCursor,
Collaboration.configure({
document: this.ydoc,
field: 'description',
Expand Down
Loading

0 comments on commit 2a1d31c

Please sign in to comment.