Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add typedefs for collab nodes and remove unused members #5071

Merged
merged 2 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
fix collab
  • Loading branch information
zignis committed Sep 29, 2023
commit 6270e614e22ee8f77dfcf7ad83382186f70bda14
5 changes: 0 additions & 5 deletions packages/lexical-yjs/src/CollabDecoratorNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ export class CollabDecoratorNode {
_key: NodeKey;
_parent: CollabElementNode;
_type: string;
_unobservers: Set<() => void>;

constructor(xmlElem: XmlElement, parent: CollabElementNode, type: string) {
this._key = '';
this._xmlElem = xmlElem;
this._parent = parent;
this._type = type;
this._unobservers = new Set();
}

getPrevNode(nodeMap: null | NodeMap): null | DecoratorNode<unknown> {
Expand Down Expand Up @@ -98,8 +96,6 @@ export class CollabDecoratorNode {
destroy(binding: Binding): void {
const collabNodeMap = binding.collabNodeMap;
collabNodeMap.delete(this._key);
this._unobservers.forEach((unobserver) => unobserver());
this._unobservers.clear();
}
}

Expand All @@ -109,7 +105,6 @@ export function $createCollabDecoratorNode(
type: string,
): CollabDecoratorNode {
const collabNode = new CollabDecoratorNode(xmlElem, parent, type);
// @ts-expect-error: internal field
xmlElem._collabNode = collabNode;
return collabNode;
}
1 change: 0 additions & 1 deletion packages/lexical-yjs/src/CollabElementNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,6 @@ export function $createCollabElementNode(
type: string,
): CollabElementNode {
const collabNode = new CollabElementNode(xmlText, parent, type);
// @ts-expect-error: internal field
xmlText._collabNode = collabNode;
return collabNode;
}
1 change: 0 additions & 1 deletion packages/lexical-yjs/src/CollabLineBreakNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export function $createCollabLineBreakNode(
parent: CollabElementNode,
): CollabLineBreakNode {
const collabNode = new CollabLineBreakNode(map, parent);
// @ts-expect-error: internal field
map._collabNode = collabNode;
return collabNode;
}
1 change: 0 additions & 1 deletion packages/lexical-yjs/src/CollabTextNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ export function $createCollabTextNode(
type: string,
): CollabTextNode {
const collabNode = new CollabTextNode(map, text, parent, type);
// @ts-expect-error: internal field
map._collabNode = collabNode;
return collabNode;
}
29 changes: 29 additions & 0 deletions packages/lexical-yjs/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
*/

import {CollabDecoratorNode} from './src/CollabDecoratorNode';
import {CollabElementNode} from './src/CollabElementNode';
import {CollabLineBreakNode} from './src/CollabLineBreakNode';
import {CollabTextNode} from './src/CollabTextNode';

declare module 'yjs' {
interface XmlElement {
_collabNode: CollabDecoratorNode;
}

interface XmlText {
_collabNode: CollabElementNode;
}
}

declare module 'yjs/dist/src/internals' {
// @ts-ignore
interface YMap {
_collabNode: CollabLineBreakNode | CollabTextNode;
}
}