Skip to content

Commit

Permalink
Merge branch 'main' of github.com:ueberdosis/tiptap into 2924-pressin…
Browse files Browse the repository at this point in the history
…g-delete-on-an-empty-paragraph-clears-the-node-afterwards
  • Loading branch information
bdbch committed Nov 25, 2022
2 parents c01ae55 + 28d436f commit 4efbfef
Show file tree
Hide file tree
Showing 129 changed files with 1,789 additions and 356 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,29 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.0.0-beta.204](https://github.com/ueberdosis/tiptap/compare/v2.0.0-beta.203...v2.0.0-beta.204) (2022-11-25)


### Bug Fixes

* **core:** rename esm modules to esm.js ([c1a0c3a](https://github.com/ueberdosis/tiptap/commit/c1a0c3ae43baac9dd5ed90903d3a0d4eaeea7702))
* **tests:** fix autolink validation test ([5150095](https://github.com/ueberdosis/tiptap/commit/5150095c6b510c080f4aa35f54d2387543f86da8))





# [2.0.0-beta.203](https://github.com/ueberdosis/tiptap/compare/v2.0.0-beta.202...v2.0.0-beta.203) (2022-11-24)


### Bug Fixes

* **extension/table:** move dependency from @_ueberdosis to [@tiptap](https://github.com/tiptap) ([#3448](https://github.com/ueberdosis/tiptap/issues/3448)) ([31c3a9a](https://github.com/ueberdosis/tiptap/commit/31c3a9aad9eb37f445eadcd27135611291178ca6))





# [2.0.0-beta.202](https://github.com/ueberdosis/tiptap/compare/v2.0.0-beta.201...v2.0.0-beta.202) (2022-11-04)

**Note:** Version bump only for package tiptap
Expand Down
22 changes: 22 additions & 0 deletions demos/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.0.0-beta.204](https://github.com/ueberdosis/tiptap/compare/v2.0.0-beta.203...v2.0.0-beta.204) (2022-11-25)


### Bug Fixes

* **tests:** fix autolink validation test ([5150095](https://github.com/ueberdosis/tiptap/commit/5150095c6b510c080f4aa35f54d2387543f86da8))





# [2.0.0-beta.203](https://github.com/ueberdosis/tiptap/compare/v2.0.0-beta.202...v2.0.0-beta.203) (2022-11-24)


### Bug Fixes

* **extension/table:** move dependency from @_ueberdosis to [@tiptap](https://github.com/tiptap) ([#3448](https://github.com/ueberdosis/tiptap/issues/3448)) ([31c3a9a](https://github.com/ueberdosis/tiptap/commit/31c3a9aad9eb37f445eadcd27135611291178ca6))





# [2.0.0-beta.202](https://github.com/ueberdosis/tiptap/compare/v2.0.0-beta.201...v2.0.0-beta.202) (2022-11-04)

**Note:** Version bump only for package tiptap-demos
Expand Down
2 changes: 1 addition & 1 deletion demos/includeDependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ prosemirror-keymap
prosemirror-model
prosemirror-schema-list
prosemirror-state
@_ueberdosis/prosemirror-tables
@tiptap/prosemirror-tables
prosemirror-transform
prosemirror-view
react
Expand Down
4 changes: 2 additions & 2 deletions demos/package-lock.json

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

2 changes: 1 addition & 1 deletion demos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tiptap-demos",
"version": "2.0.0-beta.202",
"version": "2.0.0-beta.204",
"private": true,
"scripts": {
"start": "vite --host",
Expand Down
23 changes: 8 additions & 15 deletions demos/src/Examples/AutolinkValidation/React/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,17 @@ context('/src/Examples/AutolinkValidation/React/', () => {
'https://tiptap.dev',
]

validLinks.forEach(link => {
it(`${link[0]} should get autolinked`, () => {
cy.get('.ProseMirror').type(link[0])
cy.get('.ProseMirror').should('have.text', link[0])
cy.get('.ProseMirror')
.find('a')
.should('have.length', 1)
.should('have.attr', 'href', link[1])
it('valid links should get autolinked', () => {
validLinks.forEach(([rawTextInput, textThatShouldBeLinked]) => {
cy.get('.ProseMirror').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.ProseMirror a').contains(textThatShouldBeLinked)
})
})

invalidLinks.forEach(link => {
it(`${link} should NOT get autolinked`, () => {
cy.get('.ProseMirror').type(link)
cy.get('.ProseMirror').should('have.text', link)
cy.get('.ProseMirror')
.find('a')
.should('have.length', 0)
it('invalid links should not get autolinked', () => {
invalidLinks.forEach(rawTextInput => {
cy.get('.ProseMirror').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.ProseMirror a').should('not.exist')
})
})

Expand Down
23 changes: 8 additions & 15 deletions demos/src/Examples/AutolinkValidation/Vue/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,17 @@ context('/src/Examples/AutolinkValidation/Vue/', () => {
'https://tiptap.dev',
]

validLinks.forEach(link => {
it(`${link[0]} should get autolinked`, () => {
cy.get('.ProseMirror').type(link[0])
cy.get('.ProseMirror').should('have.text', link[0])
cy.get('.ProseMirror')
.find('a')
.should('have.length', 1)
.should('have.attr', 'href', link[1])
it('valid links should get autolinked', () => {
validLinks.forEach(([rawTextInput, textThatShouldBeLinked]) => {
cy.get('.ProseMirror').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.ProseMirror a').contains(textThatShouldBeLinked)
})
})

invalidLinks.forEach(link => {
it(`${link} should NOT get autolinked`, () => {
cy.get('.ProseMirror').type(link)
cy.get('.ProseMirror').should('have.text', link)
cy.get('.ProseMirror')
.find('a')
.should('have.length', 0)
it('invalid links should not get autolinked', () => {
invalidLinks.forEach(rawTextInput => {
cy.get('.ProseMirror').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.ProseMirror a').should('not.exist')
})
})
})
2 changes: 1 addition & 1 deletion demos/src/Examples/CollaborativeEditing/React/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import * as Y from 'yjs'
import MenuBar from './MenuBar'

const colors = ['#958DF1', '#F98181', '#FBBC88', '#FAF594', '#70CFF8', '#94FADB', '#B9F18D']
const rooms = ['rooms.50', 'rooms.51', 'rooms.52']
const rooms = ['rooms.60', 'rooms.61', 'rooms.62']
const names = [
'Lea Thompson',
'Cyndi Lauper',
Expand Down
6 changes: 3 additions & 3 deletions demos/src/Examples/CollaborativeEditing/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ const getRandomElement = list => {
const getRandomRoom = () => {
return getRandomElement([
'rooms.50',
'rooms.51',
'rooms.52',
'rooms.60',
'rooms.61',
'rooms.62',
])
}
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/custom-extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ const CustomParagraph = Paragraph.extend({
// <p data-color="pink" style="color: pink">Example Text</p>
```

You can completly disable the rendering of attributes with `rendered: false`.
You can completely disable the rendering of attributes with `rendered: false`.

#### Extend existing attributes
If you want to add an attribute to an extension and keep existing attributes, you can access them through `this.parent()`.
Expand Down
7 changes: 3 additions & 4 deletions docs/installation/svelte.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@ If you just want to jump into it right-away, here is a [Svelte REPL with Tiptap]

## Requirements
* [Node](https://nodejs.org/en/download/) installed on your machine
* Experience with [Svelte](https://vuejs.org/v2/guide/#Getting-Started)
* Experience with [Svelte](https://svelte.dev/docs#getting-started)

## 1. Create a project (optional)
If you already have an existing SvelteKit project, that’s fine too. Just skip this step and proceed with the next step.

For the sake of this guide, let’s start with a fresh SvelteKit project called `my-tiptap-project`. The following commands set up everything we need. It asks a lot of questions, but just use what floats your boat or use the defaults.

```bash
mkdir my-tiptap-project
npm create svelte@latest my-tiptap-project
cd my-tiptap-project
npm init svelte@next
npm install
npm run dev
```
Expand Down Expand Up @@ -101,7 +100,7 @@ This is the fastest way to get Tiptap up and running with SvelteKit. It will giv
```

## 4. Add it to your app
Now, let’s replace the content of `src/routes/index.svelte` with the following example code to use our new `Tiptap` component in our app.
Now, let’s replace the content of `src/routes/+page.svelte` with the following example code to use our new `Tiptap` component in our app.

```html
<script>
Expand Down
2 changes: 1 addition & 1 deletion docs/jobs.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ Tiptap · Remote · Berlin, Germany
- **[Frontend Developer](https://nextapphq.notion.site/nextapphq/Frontend-Developer-Prosemirror-244ccf55ca7248489aaea052be32cd36) @ NEXT**<br>
React · Remirror · Remote · Amsterdam, Netherlands

Is your company hiring, too? We have [200,000 page views/month](https://plausible.io/tiptap.dev?period=30d) from people who love to work with Tiptap. Maybe we can help you find the right person. Reach out to [humans@tiptap.dev](mailto:humans@tiptap.dev) with a link to your job description!
Is your company hiring, too? Maybe we can help you find the right person. Reach out to [humans@tiptap.dev](mailto:humans@tiptap.dev) with a link to your job description!
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
},
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useNx": true,
"version": "2.0.0-beta.202"
"version": "2.0.0-beta.204"
}
Loading

0 comments on commit 4efbfef

Please sign in to comment.