Skip to content
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
2 changes: 0 additions & 2 deletions plugins/text-editor-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,12 @@
"prosemirror-codemark": "^0.4.2",
"y-protocols": "^1.0.6",
"y-prosemirror": "^1.3.7",
"y-websocket": "^2.1.0",
"yjs": "^13.6.27",
"fast-equals": "^5.2.2",
"rfc6902": "^5.0.1",
"diff": "^5.1.0",
"slugify": "^1.6.6",
"lib0": "^0.2.109",
"y-indexeddb": "^9.0.12",
"lowlight": "^3.3.0",
"mermaid": "^11.12.0",
"@hcengineering/theme": "^0.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
import { deleteAttachment } from '../command/deleteAttachment'
import { textEditorCommandHandler } from '../commands'
import { Provider } from '../provider/types'
import { createLocalProvider, createRemoteProvider } from '../provider/utils'
import { createRemoteProvider } from '../provider/utils'
import { addTableHandler } from '../utils'

import { noSelectionRender, renderCursor } from './editor/collaboration'
Expand Down Expand Up @@ -124,23 +124,17 @@
const ydoc = getContext<YDoc>(CollaborationIds.Doc) ?? new YDoc({ guid: generateId(), gc: false })
const contextProvider = getContext<Provider>(CollaborationIds.Provider)

const localProvider = createLocalProvider(ydoc, collaborativeDoc)
const remoteProvider = contextProvider ?? createRemoteProvider(ydoc, collaborativeDoc, content)
const provider = contextProvider ?? createRemoteProvider(ydoc, collaborativeDoc, content)

let contentError = false
let localSynced = false
let remoteSynced = false
let synced = false
let editorReady = false

$: loading = !localSynced
$: editable = !readonly && !contentError && remoteSynced && editorReady && hasAccountRole(account, AccountRole.User)
$: loading = !synced
$: editable = !readonly && !contentError && synced && editorReady && hasAccountRole(account, AccountRole.User)

void localProvider.loaded.then(() => (localSynced = true))
void remoteProvider.loaded.then(() => (remoteSynced = true))

void Promise.all([localProvider.loaded, remoteProvider.loaded]).then(() => {
dispatch('loaded')
})
void provider.loaded.then(() => (synced = true))
void provider.loaded.then(() => dispatch('loaded'))

let editor: Editor
let element: HTMLElement
Expand Down Expand Up @@ -313,14 +307,12 @@

const throttle = new ThrottledCaller(100)
const updateLastUpdateTime = (): void => {
remoteProvider.awareness?.setLocalStateField('lastUpdate', Date.now())
provider.awareness?.setLocalStateField('lastUpdate', Date.now())
}

interface SavedBoardRaw {
ydoc: YDoc
localProvider: Provider
remoteProvider: Provider
localSynced: boolean
remoteSynced: boolean
}
const savedBoards: Record<string, SavedBoardRaw> = {}
Expand All @@ -337,25 +329,23 @@
objectId: id as Ref<Doc>,
objectAttr: 'content'
}
const localProvider = createLocalProvider(ydoc, collabId)
const remoteProvider = createRemoteProvider(ydoc, collabId, id as Ref<Blob>)
savedBoards[id] = { ydoc, localProvider, remoteProvider, localSynced: false, remoteSynced: false }
void localProvider.loaded.then(() => (savedBoards[id].localSynced = true))
savedBoards[id] = { ydoc, remoteProvider, remoteSynced: false }
void remoteProvider.loaded.then(() => (savedBoards[id].remoteSynced = true))
board = savedBoards[id]
}
return {
document: board.ydoc,
props: board.ydoc.getMap('props'),
commands: board.ydoc.getArray<DrawingCmd>('commands'),
loading: !board.localSynced || !board.remoteSynced
loading: !board.remoteSynced
}
}

onMount(async () => {
// it is recommended to wait for the local provider to be loaded
// https://discuss.yjs.dev/t/initial-offline-value-of-a-shared-document/465/4
await localProvider.loaded
await provider.loaded

const canAttachFiles = attachFile != null

Expand Down Expand Up @@ -410,7 +400,7 @@
collaboration: {
collaboration: { document: ydoc, field },
collaborationCursor: {
provider: remoteProvider,
provider,
user,
render: renderCursor,
selectionRender: noSelectionRender
Expand All @@ -420,7 +410,7 @@
boundary,
popupContainer: editorPopupContainer,
requestSideSpace,
whenSync: remoteProvider.loaded
whenSync: provider.loaded
}
}
},
Expand Down Expand Up @@ -480,9 +470,8 @@
} catch (err: any) {}
}
if (contextProvider === undefined) {
void remoteProvider.destroy()
void provider.destroy()
}
void localProvider.destroy()
})
</script>

Expand Down
46 changes: 0 additions & 46 deletions plugins/text-editor-resources/src/provider/cloud.ts

This file was deleted.

37 changes: 0 additions & 37 deletions plugins/text-editor-resources/src/provider/indexeddb.ts

This file was deleted.

6 changes: 0 additions & 6 deletions plugins/text-editor-resources/src/provider/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,13 @@ import { Doc as Ydoc } from 'yjs'
import plugin from '../plugin'

import { HocuspocusCollabProvider } from './hocuspocus'
import { IndexeddbProvider } from './indexeddb'
import { type Provider } from './types'

function getDocumentId (doc: CollaborativeDoc): string {
const workspace = getMetadata(presentation.metadata.WorkspaceUuid) ?? ''
return encodeDocumentId(workspace, doc)
}

export function createLocalProvider (ydoc: Ydoc, doc: CollaborativeDoc): Provider {
const documentId = getDocumentId(doc)
return new IndexeddbProvider(documentId, ydoc)
}

export function createRemoteProvider (ydoc: Ydoc, doc: CollaborativeDoc, content: Ref<Blob> | null): Provider {
const token = getMetadata(presentation.metadata.Token) ?? ''
const collaboratorUrl = getMetadata(presentation.metadata.CollaboratorUrl) ?? ''
Expand Down