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.

Sign up for GitHub

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

Fix/collabs cursors #89

Merged
merged 2 commits into from
Nov 25, 2023
Merged

Fix/collabs cursors #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
464996e
refactor: collab cursors
vincentdchan Nov 25, 2023
c42af5f
fix: collab cursors
vincentdchan Nov 25, 2023
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
1 change: 1 addition & 0 deletions packages/blocky-core/src/view/collaborativeCursors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ export class CollaborativeCursor {
cursorRect.x = rect.x;
cursorRect.y = rect.y;
cursorRect.setWidth(Math.max(minWidthOfCursor, rect.width));
cursorRect.setHeight(rect.height);
this.#rects.push(cursorRect);
}

Expand Down
221 changes: 158 additions & 63 deletions packages/blocky-core/src/view/editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ import {
type IDisposable,
type Position,
} from "blocky-common/es";
import { Subject, takeUntil, take, fromEvent, BehaviorSubject } from "rxjs";
import {
Subject,
takeUntil,
take,
fromEvent,
BehaviorSubject,
timer,
} from "rxjs";
import {
debounce,
isFunction,
Expand All @@ -15,7 +22,12 @@ import {
isNumber,
} from "lodash-es";
import { DocRenderer, RenderFlag, RenderOption } from "@pkg/view/renderer";
import { EditorState, SearchContext, blockyDefaultFonts } from "@pkg/model";
import {
EditorState,
NodeTraverser,
SearchContext,
blockyDefaultFonts,
} from "@pkg/model";
import {
type CursorStateUpdateEvent,
BlockyTextModel,
Expand Down Expand Up @@ -49,6 +61,7 @@ import { getTextTypeForTextBlock } from "@pkg/block/textBlock";
import {
CollaborativeCursorManager,
type CollaborativeCursorFactory,
CollaborativeCursor,
} from "./collaborativeCursors";
import { TitleBlock } from "@pkg/block/titleBlock";
import type { ThemeData } from "@pkg/model/theme";
Expand Down Expand Up @@ -328,80 +341,163 @@ export class Editor {
}

drawCollaborativeCursor(id: string, state: CursorState | null) {
setTimeout(() => {
if (!state) {
this.collaborativeCursorManager.deleteById(id);
return;
}
const cursor = this.collaborativeCursorManager.getOrInit(id);

const containerRect = this.#container.getBoundingClientRect();
if (state.isCollapsed) {
const blockId = state.id;
const offset = state.offset;

const block = this.state.blocks.get(blockId);
if (!block) {
timer(15)
.pipe(takeUntil(this.dispose$))
.subscribe(() => {
if (!state) {
this.collaborativeCursorManager.deleteById(id);
return;
}
cursor.height = block.getCursorHeight();

const cursorDom = block.getCursorDomByOffset?.(offset);
if (!cursorDom) {
this.collaborativeCursorManager.deleteById(id);
const cursor = this.collaborativeCursorManager.getOrInit(id);

const containerRect = this.#container.getBoundingClientRect();
if (state.isCollapsed) {
this.#indeedDrawCollabCollapsedCursor(
id,
state,
cursor,
containerRect
);
return;
}
const range = document.createRange();
range.setStart(cursorDom.node, cursorDom.offset);
range.setEnd(cursorDom.node, cursorDom.offset);

const rects = range.getClientRects();
if (rects.length === 0) {
return;
}
this.#indeedDrawCollabOpenCursor(id, state, cursor, containerRect);
});
}

const firstRect = rects[0];
#indeedDrawCollabCollapsedCursor(
id: string,
state: CursorState,
cursor: CollaborativeCursor,
containerRect: DOMRect
) {
const blockId = state.id;
const offset = state.offset;

cursor.drawCollapsedRect(
firstRect.x - containerRect.x,
firstRect.y - containerRect.y
);
return;
}
const block = this.state.blocks.get(blockId);
if (!block) {
this.collaborativeCursorManager.deleteById(id);
return;
}
cursor.height = block.getCursorHeight();

if (state.startId != state.endId) {
return;
const cursorDom = block.getCursorDomByOffset?.(offset);
if (!cursorDom) {
this.collaborativeCursorManager.deleteById(id);
return;
}
const range = document.createRange();
range.setStart(cursorDom.node, cursorDom.offset);
range.setEnd(cursorDom.node, cursorDom.offset);

const rects = range.getClientRects();
if (rects.length === 0) {
return;
}

const firstRect = rects[0];

cursor.drawCollapsedRect(
firstRect.x - containerRect.x,
firstRect.y - containerRect.y
);
}

#indeedDrawCollabOpenCursor(
id: string,
state: CursorState,
cursor: CollaborativeCursor,
containerRect: DOMRect
) {
const startBlock = this.state.blocks.get(state.startId);
if (!startBlock) {
this.collaborativeCursorManager.deleteById(id);
return;
}

const endBlock = this.state.blocks.get(state.endId);
if (!endBlock) {
this.collaborativeCursorManager.deleteById(id);
return;
}

const traverser = new NodeTraverser(this.state, startBlock.elementData);

const rects: DOMRect[] = [];

while (traverser.peek()) {
const currentNode = traverser.next();

if (currentNode instanceof BlockDataElement) {
let startOffset = 0;
let endOffset = 0;
if (currentNode.t === TextBlock.Name) {
const textModel = currentNode.getAttribute(
"textContent"
) as BlockyTextModel;

if (currentNode === startBlock.elementData) {
startOffset = state.startOffset;
}

if (currentNode === endBlock.elementData) {
endOffset = state.endOffset;
} else {
endOffset = textModel.length;
}

const block = this.state.blocks.get(currentNode.id)!;
this.#collectDrawOneBlockForOpenCursorRect(
block,
cursor,
containerRect,
startOffset,
endOffset,
rects
);
}
}

const block = this.state.blocks.get(state.startId);
if (!block) {
this.collaborativeCursorManager.deleteById(id);
return;
if (currentNode === endBlock.elementData) {
break;
}
}

if (rects.length === 0) {
return;
}

cursor.height = block.getCursorHeight();
cursor.drawRects(rects);
}

const startCursorDom = block.getCursorDomByOffset?.(state.startOffset);
const endCursorDom = block.getCursorDomByOffset?.(state.endOffset);
if (!startCursorDom || !endCursorDom) {
this.collaborativeCursorManager.deleteById(id);
return;
}
const range = document.createRange();
range.setStart(startCursorDom.node, startCursorDom.offset);
range.setEnd(endCursorDom.node, endCursorDom.offset);

const rects = [...range.getClientRects()].map((rect) => {
return new DOMRect(
rect.x - containerRect.x,
rect.y - containerRect.y,
rect.width,
rect.height
);
});
cursor.drawRects(rects);
}, 15);
#collectDrawOneBlockForOpenCursorRect(
block: Block,
cursor: CollaborativeCursor,
containerRect: DOMRect,
startOffset: number,
endOffset: number,
rects: DOMRect[]
) {
cursor.height = block.getCursorHeight();

const startCursorDom = block.getCursorDomByOffset?.(startOffset);
const endCursorDom = block.getCursorDomByOffset?.(endOffset);
if (!startCursorDom || !endCursorDom) {
return;
}
const range = document.createRange();
range.setStart(startCursorDom.node, startCursorDom.offset);
range.setEnd(endCursorDom.node, endCursorDom.offset);

const blockRects = [...range.getClientRects()].map((rect) => {
return new DOMRect(
rect.x - containerRect.x,
rect.y - containerRect.y,
rect.width,
rect.height
);
});
rects.push(...blockRects);
}

fullRender(done?: AfterFn) {
Expand Down Expand Up @@ -1482,7 +1578,6 @@ export class Editor {
}

const blockData = blockElement.toJSON();
console.log(JSON.stringify(blockData).replace(/"/g, '\\"'));
e.clipboardData?.clearData();
e.clipboardData?.setData(
"text/html",
Expand Down
Loading