gio
/
think
mirror of https://github.com/fantasticit/think.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tiptap: fix lock node

This commit is contained in:
fantasticit 2022-04-27 14:43:38 +08:00
parent c65a519945
commit a9eefd3c37
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/client/src/tiptap/collaboration-cursor/index.ts
View File

@ -6,11 +6,11 @@ type CollaborationCursorStorage = {
users: { clientId: number; [key: string]: any }[]; users: { clientId: number; [key: string]: any }[];
}; };
export function findNodeAt(state: EditorState, from, to) { export function findNodeAt(editor, state: EditorState, from, to) {
let target = null; let target = null;
let pos = -1; let pos = -1;
if (state && state.doc) { if (editor && !editor.isDestroyed) {
state.doc.nodesBetween(from, to, (node, p) => { state.doc.nodesBetween(from, to, (node, p) => {
target = node; target = node;
pos = p; pos = p;
@ -61,6 +61,10 @@ const awarenessStatesToArray = (states: Map<number, Record<string, any>>) => {
const lockCollaborationUserEditingNodes = (extensionThis, users) => { const lockCollaborationUserEditingNodes = (extensionThis, users) => {
const { editor, options } = extensionThis; const { editor, options } = extensionThis;
if (!editor || editor.isDestroyed) {
return;
}
while (options.lockedDOMNodes.length) { while (options.lockedDOMNodes.length) {
const dom = options.lockedDOMNodes.shift(); const dom = options.lockedDOMNodes.shift();
dom && dom.classList && dom.classList.remove(options.lockClassName); dom && dom.classList && dom.classList.remove(options.lockClassName);
@ -82,9 +86,10 @@ const lockCollaborationUserEditingNodes = (extensionThis, users) => {
users.forEach((user) => { users.forEach((user) => {
if (user.name === options.user.name) return; if (user.name === options.user.name) return;
try {
const cursor = user.cursor; const cursor = user.cursor;
if (cursor) { if (cursor) {
const { node, pos } = findNodeAt(editor.state, cursor.originAnchor, cursor.originHead); const { node, pos } = findNodeAt(editor, editor.state, cursor.originAnchor, cursor.originHead);
if (node && node.isAtom) { if (node && node.isAtom) {
const dom = editor.view.nodeDOM(pos) as HTMLElement; const dom = editor.view.nodeDOM(pos) as HTMLElement;
@ -96,6 +101,7 @@ const lockCollaborationUserEditingNodes = (extensionThis, users) => {
options.collaborationUserCursorCache.set(user.clientId, { user, cursor }); options.collaborationUserCursorCache.set(user.clientId, { user, cursor });
} }
} }
} catch (e) {}
}); });
} }
}; };