Skip to content

Commit 25ec82e

Browse files
authored
Rename CollaborationCursor extension to CollaborationCaret (#6173)
* rename collaboration-cursor to collaboration-caret * added changeset
1 parent d8a3d93 commit 25ec82e

File tree

28 files changed

+77
-72
lines changed

28 files changed

+77
-72
lines changed

.changeset/chilled-trees-agree.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
'@tiptap/extension-collaboration-cursor': major
2+
'@tiptap/extension-collaboration-caret': major
33
'@tiptap/extension-code-block-lowlight': major
44
'@tiptap/extension-character-count': major
55
'@tiptap/extension-horizontal-rule': major

.changeset/cuddly-impalas-heal.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
'@tiptap/extension-code-block': patch
1212
'@tiptap/extension-code-block-lowlight': patch
1313
'@tiptap/extension-collaboration': patch
14-
'@tiptap/extension-collaboration-cursor': patch
14+
'@tiptap/extension-collaboration-caret': patch
1515
'@tiptap/extension-color': patch
1616
'@tiptap/extension-document': patch
1717
'@tiptap/extension-dropcursor': patch

.changeset/eighty-gifts-matter.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
'@tiptap/extension-collaboration-cursor': major
2+
'@tiptap/extension-collaboration-caret': major
33
'@tiptap/extension-collaboration': major
44
---
55

.changeset/many-laws-vanish.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@tiptap/extension-collaboration-caret': major
3+
---
4+
5+
Renamed `@tiptap/extension-collaboration-cursor` to `@tiptap/extension-collaboration-caret` to clarify what kind of cursor this extension is implementing.

.changeset/pre.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@tiptap/extension-code-block": "2.11.4",
1414
"@tiptap/extension-code-block-lowlight": "2.11.4",
1515
"@tiptap/extension-collaboration": "2.11.4",
16-
"@tiptap/extension-collaboration-cursor": "2.11.4",
16+
"@tiptap/extension-collaboration-caret": "2.11.4",
1717
"@tiptap/extension-color": "2.11.4",
1818
"@tiptap/extension-document": "2.11.4",
1919
"@tiptap/extension-dropcursor": "2.11.4",

.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"extension/code-block",
1616
"extension/code-block-lowlight",
1717
"extension/collaboration",
18-
"extension/collaboration-cursor",
18+
"extension/collaboration-caret",
1919
"extension/color",
2020
"extension/document",
2121
"extension/dropcursor",

demos/src/Demos/CollaborationSplitPane/React/Editor.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Collaboration from '@tiptap/extension-collaboration'
2-
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
2+
import CollaborationCaret from '@tiptap/extension-collaboration-caret'
33
import Highlight from '@tiptap/extension-highlight'
44
import { TaskItem, TaskList } from '@tiptap/extension-list'
55
import { CharacterCount } from '@tiptap/extensions'
@@ -106,7 +106,7 @@ const Editor = ({ ydoc, provider, room }) => {
106106
Collaboration.extend().configure({
107107
document: ydoc,
108108
}),
109-
CollaborationCursor.extend().configure({
109+
CollaborationCaret.extend().configure({
110110
provider,
111111
}),
112112
],
@@ -187,8 +187,8 @@ const Editor = ({ ydoc, provider, room }) => {
187187
<div className="collab-status-group" data-state={status === 'connected' ? 'online' : 'offline'}>
188188
<label>
189189
{status === 'connected'
190-
? `${editor.storage.collaborationCursor.users.length} user${
191-
editor.storage.collaborationCursor.users.length === 1 ? '' : 's'
190+
? `${editor.storage.collaborationCaret.users.length} user${
191+
editor.storage.collaborationCaret.users.length === 1 ? '' : 's'
192192
} online in ${room}`
193193
: 'offline'}
194194
</label>

demos/src/Demos/CollaborationSplitPane/React/styles.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
}
133133

134134
/* Give a remote user a caret */
135-
.collaboration-cursor__caret {
135+
.collaboration-carets__caret {
136136
border-left: 1px solid #0d0d0d;
137137
border-right: 1px solid #0d0d0d;
138138
margin-left: -1px;
@@ -143,7 +143,7 @@
143143
}
144144

145145
/* Render the username above the caret */
146-
.collaboration-cursor__label {
146+
.collaboration-carets__label {
147147
border-radius: 3px 3px 3px 0;
148148
color: #0d0d0d;
149149
font-size: 12px;

demos/src/Demos/SingleRoomCollab/React/index.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import './styles.scss'
22

33
import { TiptapCollabProvider } from '@hocuspocus/provider'
44
import Collaboration from '@tiptap/extension-collaboration'
5-
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
5+
import CollaborationCaret from '@tiptap/extension-collaboration-caret'
66
import { CharacterCount } from '@tiptap/extensions'
77
import { EditorContent, useEditor } from '@tiptap/react'
88
import StarterKit from '@tiptap/starter-kit'
@@ -75,7 +75,7 @@ export default () => {
7575
Collaboration.configure({
7676
document: ydoc,
7777
}),
78-
CollaborationCursor.configure({
78+
CollaborationCaret.configure({
7979
provider: websocketProvider,
8080
}),
8181
],
@@ -115,7 +115,7 @@ export default () => {
115115
<div className="editor__users">
116116
<div className={`editor__status editor__status--${status}`}>
117117
{status === 'connected'
118-
? `${editor.storage.collaborationCursor.users.length} user${editor.storage.collaborationCursor.users.length === 1 ? '' : 's'} online in ${room}`
118+
? `${editor.storage.collaborationCaret.users.length} user${editor.storage.collaborationCaret.users.length === 1 ? '' : 's'} online in ${room}`
119119
: 'offline'}
120120
</div>
121121
<div className="editor__name">

demos/src/Demos/SingleRoomCollab/React/styles.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
}
161161

162162
/* Give a remote user a caret */
163-
.collaboration-cursor__caret {
163+
.collaboration-carets__caret {
164164
border-left: 1px solid #0d0d0d;
165165
border-right: 1px solid #0d0d0d;
166166
margin-left: -1px;
@@ -171,7 +171,7 @@
171171
}
172172

173173
/* Render the username above the caret */
174-
.collaboration-cursor__label {
174+
.collaboration-carets__label {
175175
border-radius: 3px 3px 3px 0;
176176
color: #0d0d0d;
177177
font-size: 0.75rem;

demos/src/Examples/CollaborativeEditing/React/index.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import './styles.scss'
22

33
import { TiptapCollabProvider } from '@hocuspocus/provider'
44
import Collaboration from '@tiptap/extension-collaboration'
5-
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
5+
import CollaborationCaret from '@tiptap/extension-collaboration-caret'
66
import Highlight from '@tiptap/extension-highlight'
77
import { TaskItem, TaskList } from '@tiptap/extension-list'
88
import { CharacterCount } from '@tiptap/extensions'
@@ -89,7 +89,7 @@ export default () => {
8989
Collaboration.configure({
9090
document: ydoc,
9191
}),
92-
CollaborationCursor.configure({
92+
CollaborationCaret.configure({
9393
provider: websocketProvider,
9494
}),
9595
],
@@ -125,7 +125,7 @@ export default () => {
125125
<div className="editor__footer">
126126
<div className={`editor__status editor__status--${status}`}>
127127
{status === 'connected'
128-
? `${editor.storage.collaborationCursor.users.length} user${editor.storage.collaborationCursor.users.length === 1 ? '' : 's'} online in ${room}`
128+
? `${editor.storage.collaborationCaret.users.length} user${editor.storage.collaborationCaret.users.length === 1 ? '' : 's'} online in ${room}`
129129
: 'offline'}
130130
</div>
131131
<div className="editor__name">

demos/src/Examples/CollaborativeEditing/React/styles.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
}
173173

174174
/* Give a remote user a caret */
175-
.collaboration-cursor__caret {
175+
.collaboration-carets__caret {
176176
border-left: 1px solid #0d0d0d;
177177
border-right: 1px solid #0d0d0d;
178178
margin-left: -1px;
@@ -183,7 +183,7 @@
183183
}
184184

185185
/* Render the username above the caret */
186-
.collaboration-cursor__label {
186+
.collaboration-carets__label {
187187
border-radius: 3px 3px 3px 0;
188188
color: #0d0d0d;
189189
font-size: 12px;

demos/src/Examples/CollaborativeEditing/Vue/index.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<div class="editor__footer">
66
<div :class="`editor__status editor__status--${status}`">
77
<template v-if="status === 'connected'">
8-
{{ editor.storage.collaborationCursor.users.length }} user{{
9-
editor.storage.collaborationCursor.users.length === 1 ? '' : 's'
8+
{{ editor.storage.collaborationCaret.users.length }} user{{
9+
editor.storage.collaborationCaret.users.length === 1 ? '' : 's'
1010
}}
1111
online in {{ room }}
1212
</template>
@@ -24,7 +24,7 @@
2424
<script>
2525
import { TiptapCollabProvider } from '@hocuspocus/provider'
2626
import Collaboration from '@tiptap/extension-collaboration'
27-
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
27+
import CollaborationCaret from '@tiptap/extension-collaboration-caret'
2828
import Highlight from '@tiptap/extension-highlight'
2929
import { TaskItem, TaskList } from '@tiptap/extension-list'
3030
import { CharacterCount } from '@tiptap/extensions'
@@ -88,7 +88,7 @@ export default {
8888
Collaboration.configure({
8989
document: ydoc,
9090
}),
91-
CollaborationCursor.configure({
91+
CollaborationCaret.configure({
9292
provider: this.provider,
9393
user: this.currentUser,
9494
}),
@@ -251,7 +251,7 @@ export default {
251251
}
252252
253253
/* Give a remote user a caret */
254-
.collaboration-cursor__caret {
254+
.collaboration-carets__caret {
255255
border-left: 1px solid #0d0d0d;
256256
border-right: 1px solid #0d0d0d;
257257
margin-left: -1px;
@@ -262,7 +262,7 @@ export default {
262262
}
263263
264264
/* Render the username above the caret */
265-
.collaboration-cursor__label {
265+
.collaboration-carets__label {
266266
border-radius: 3px 3px 3px 0;
267267
color: #0d0d0d;
268268
font-size: 12px;

demos/src/Extensions/CollaborationCursor/React/index.jsx demos/src/Extensions/CollaborationCaret/React/index.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import './styles.scss'
22

33
import Collaboration from '@tiptap/extension-collaboration'
4-
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
4+
import CollaborationCaret from '@tiptap/extension-collaboration-caret'
55
import Document from '@tiptap/extension-document'
66
import Paragraph from '@tiptap/extension-paragraph'
77
import Text from '@tiptap/extension-text'
@@ -12,7 +12,7 @@ import { WebrtcProvider } from 'y-webrtc'
1212
import * as Y from 'yjs'
1313

1414
const ydoc = new Y.Doc()
15-
const provider = new WebrtcProvider('tiptap-collaboration-cursor-extension', ydoc)
15+
const provider = new WebrtcProvider('tiptap-collaboration-caret-extension', ydoc)
1616

1717
function Component() {
1818
const editor = useEditor({
@@ -23,7 +23,7 @@ function Component() {
2323
Collaboration.configure({
2424
document: ydoc,
2525
}),
26-
CollaborationCursor.configure({
26+
CollaborationCaret.configure({
2727
provider,
2828
user: {
2929
name: 'Cyndi Lauper',

demos/src/Extensions/CollaborationCursor/React/index.spec.js demos/src/Extensions/CollaborationCaret/React/index.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
context('/src/Extensions/CollaborationCursor/React', () => {
1+
context('/src/Extensions/CollaborationCaret/React', () => {
22
beforeEach(() => {
3-
cy.visit('/src/Extensions/CollaborationCursor/React/')
3+
cy.visit('/src/Extensions/CollaborationCaret/React/')
44
})
55

66
it('should have a working tiptap instance', () => {

demos/src/Extensions/CollaborationCursor/React/styles.scss demos/src/Extensions/CollaborationCaret/React/styles.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919

2020
/* Give a remote user a caret */
21-
.collaboration-cursor__caret {
21+
.collaboration-carets__caret {
2222
border-left: 1px solid #0d0d0d;
2323
border-right: 1px solid #0d0d0d;
2424
margin-left: -1px;
@@ -29,7 +29,7 @@
2929
}
3030

3131
/* Render the username above the caret */
32-
.collaboration-cursor__label {
32+
.collaboration-carets__label {
3333
border-radius: 3px 3px 3px 0;
3434
color: #0d0d0d;
3535
font-size: 12px;

demos/src/Extensions/CollaborationCursor/Vue/index.spec.js demos/src/Extensions/CollaborationCaret/Vue/index.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
context('/src/Extensions/CollaborationCursor/Vue', () => {
1+
context('/src/Extensions/CollaborationCaret/Vue', () => {
22
beforeEach(() => {
3-
cy.visit('/src/Extensions/CollaborationCursor/Vue/')
3+
cy.visit('/src/Extensions/CollaborationCaret/Vue/')
44
})
55

66
it('should have a working tiptap instance', () => {

demos/src/Extensions/CollaborationCursor/Vue/index.vue demos/src/Extensions/CollaborationCaret/Vue/index.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
import Collaboration from '@tiptap/extension-collaboration'
7-
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
7+
import CollaborationCaret from '@tiptap/extension-collaboration-caret'
88
import Document from '@tiptap/extension-document'
99
import Paragraph from '@tiptap/extension-paragraph'
1010
import Text from '@tiptap/extension-text'
@@ -28,7 +28,7 @@ export default {
2828
mounted() {
2929
const ydoc = new Y.Doc()
3030
31-
this.provider = new WebrtcProvider('tiptap-collaboration-cursor-extension', ydoc)
31+
this.provider = new WebrtcProvider('tiptap-collaboration-caret-extension', ydoc)
3232
3333
this.editor = new Editor({
3434
extensions: [
@@ -38,7 +38,7 @@ export default {
3838
Collaboration.configure({
3939
document: ydoc,
4040
}),
41-
CollaborationCursor.configure({
41+
CollaborationCaret.configure({
4242
provider: this.provider,
4343
user: {
4444
name: 'Cyndi Lauper',
@@ -80,7 +80,7 @@ export default {
8080
}
8181
8282
/* Give a remote user a caret */
83-
.collaboration-cursor__caret {
83+
.collaboration-carets__caret {
8484
border-left: 1px solid #0d0d0d;
8585
border-right: 1px solid #0d0d0d;
8686
margin-left: -1px;
@@ -91,7 +91,7 @@ export default {
9191
}
9292
9393
/* Render the username above the caret */
94-
.collaboration-cursor__label {
94+
.collaboration-carets__label {
9595
border-radius: 3px 3px 3px 0;
9696
color: #0d0d0d;
9797
font-size: 12px;

packages/extension-collaboration-cursor/README.md packages/extension-collaboration-caret/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# @tiptap/extension-collaboration-cursor
1+
# @tiptap/extension-collaboration-caret
22

3-
[![Version](https://img.shields.io/npm/v/@tiptap/extension-collaboration-cursor.svg?label=version)](https://www.npmjs.com/package/@tiptap/extension-collaboration-cursor)
4-
[![Downloads](https://img.shields.io/npm/dm/@tiptap/extension-collaboration-cursor.svg)](https://npmcharts.com/compare/tiptap?minimal=true)
5-
[![License](https://img.shields.io/npm/l/@tiptap/extension-collaboration-cursor.svg)](https://www.npmjs.com/package/@tiptap/extension-collaboration-cursor)
3+
[![Version](https://img.shields.io/npm/v/@tiptap/extension-collaboration-caret.svg?label=version)](https://www.npmjs.com/package/@tiptap/extension-collaboration-caret)
4+
[![Downloads](https://img.shields.io/npm/dm/@tiptap/extension-collaboration-caret.svg)](https://npmcharts.com/compare/tiptap?minimal=true)
5+
[![License](https://img.shields.io/npm/l/@tiptap/extension-collaboration-caret.svg)](https://www.npmjs.com/package/@tiptap/extension-collaboration-caret)
66
[![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/ueberdosis)
77

88
## Introduction

packages/extension-collaboration-cursor/package.json packages/extension-collaboration-caret/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@tiptap/extension-collaboration-cursor",
3-
"description": "collaboration cursor extension for tiptap",
2+
"name": "@tiptap/extension-collaboration-caret",
3+
"description": "collaboration caret extension for tiptap",
44
"version": "3.0.0-next.6",
55
"homepage": "https://tiptap.dev",
66
"keywords": [
@@ -43,7 +43,7 @@
4343
"repository": {
4444
"type": "git",
4545
"url": "https://github.com/ueberdosis/tiptap",
46-
"directory": "packages/extension-collaboration-cursor"
46+
"directory": "packages/extension-collaboration-caret"
4747
},
4848
"scripts": {
4949
"build": "tsup",

0 commit comments

Comments
 (0)