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 remoteSelection to Update Remote Decoration at Once #115

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Fix remoteSelection to Update Remote Decoration at Once #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
153 changes: 79 additions & 74 deletions frontend/src/utils/yorkie/remoteSelection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,81 +130,7 @@ export class YorkieRemoteSelectionsPluginValue {
this.conf = view.state.facet(yorkieSyncFacet);

this.unsubscribe = this.conf.doc.subscribe("others", (event) => {
const decorations: Array<cmState.Range<cmView.Decoration>> = [];
if (["presence-changed", "unwatched"].includes(event.type)) {
this.conf.doc.getPresences().forEach((presence) => {
if (presence.clientID === this.conf.client.getID()) {
return;
}
if (presence.presence.selection == null) {
return;
}
const cursor = this.conf.doc
.getRoot()
.content.posRangeToIndexRange(presence.presence.selection);
const color = presence.presence.color;
const name = presence.presence.name;
const start = Math.min(cursor[0], cursor[1]);
const end = Math.max(cursor[0], cursor[1]);
const startLine = view.state.doc.lineAt(start);
const endLine = view.state.doc.lineAt(end);
if (startLine.number === endLine.number) {
// selected content in a single line.
decorations.push({
from: start,
to: end,
value: cmView.Decoration.mark({
attributes: { style: `background-color: ${color}` },
class: "cm-ySelection",
}),
});
} else {
// selected content in multiple lines
// first, render text-selection in the first line
decorations.push({
from: start,
to: startLine.from + startLine.length,
value: cmView.Decoration.mark({
attributes: { style: `background-color: ${color}` },
class: "cm-ySelection",
}),
});
// render text-selection in the last line
decorations.push({
from: endLine.from,
to: end,
value: cmView.Decoration.mark({
attributes: { style: `background-color: ${color}` },
class: "cm-ySelection",
}),
});
for (let i = startLine.number + 1; i < endLine.number; i++) {
const linePos = view.state.doc.line(i).from;
const linePosTo = view.state.doc.line(i).to;
decorations.push({
from: linePos,
to: linePosTo,
value: cmView.Decoration.mark({
attributes: {
style: `background-color: ${color}`,
class: "cm-ySelection",
},
}),
});
}
}
decorations.push({
from: cursor[0],
to: cursor[0],
value: cmView.Decoration.widget({
side: cursor[0] - cursor[1] > 0 ? -1 : 1, // the local cursor should be rendered outside the remote selection
block: false,
widget: new YRemoteCaretWidget(color, name),
}),
});
});
this.decorations = cmView.Decoration.set(decorations, true);

view.dispatch({ annotations: [yorkieRemoteSelectionsAnnotation.of([])] });
}
});
Expand All @@ -216,6 +142,8 @@ export class YorkieRemoteSelectionsPluginValue {
}

update(update: cmView.ViewUpdate) {
const decorations: Array<cmState.Range<cmView.Decoration>> = [];

this.conf.doc.update((root, presence) => {
const hasFocus = update.view.hasFocus && update.view.dom.ownerDocument.hasFocus();
const sel = hasFocus ? update.state.selection.main : null;
Expand All @@ -225,8 +153,85 @@ export class YorkieRemoteSelectionsPluginValue {
presence.set({
selection,
});
} else if (presence.get("selection")) {
presence.set({
selection: null,
});
}
});

this.conf.doc.getPresences().forEach((presence) => {
if (presence.clientID === this.conf.client.getID()) {
return;
}
if (presence.presence.selection == null) {
return;
}
const cursor = this.conf.doc
.getRoot()
.content.posRangeToIndexRange(presence.presence.selection);
const color = presence.presence.color;
const name = presence.presence.name;
const start = Math.min(cursor[0], cursor[1]);
const end = Math.max(cursor[0], cursor[1]);
const startLine = update.view.state.doc.lineAt(start);
const endLine = update.view.state.doc.lineAt(end);
if (startLine.number === endLine.number) {
// selected content in a single line.
decorations.push({
from: start,
to: end,
value: cmView.Decoration.mark({
attributes: { style: `background-color: ${color}` },
class: "cm-ySelection",
}),
});
} else {
// selected content in multiple lines
// first, render text-selection in the first line
decorations.push({
from: start,
to: startLine.from + startLine.length,
value: cmView.Decoration.mark({
attributes: { style: `background-color: ${color}` },
class: "cm-ySelection",
}),
});
// render text-selection in the last line
decorations.push({
from: endLine.from,
to: end,
value: cmView.Decoration.mark({
attributes: { style: `background-color: ${color}` },
class: "cm-ySelection",
}),
});
for (let i = startLine.number + 1; i < endLine.number; i++) {
const linePos = update.view.state.doc.line(i).from;
const linePosTo = update.view.state.doc.line(i).to;
decorations.push({
from: linePos,
to: linePosTo,
value: cmView.Decoration.mark({
attributes: {
style: `background-color: ${color}`,
class: "cm-ySelection",
},
}),
});
}
}
decorations.push({
from: cursor[0],
to: cursor[0],
value: cmView.Decoration.widget({
side: cursor[0] - cursor[1] > 0 ? -1 : 1, // the local cursor should be rendered outside the remote selection
block: false,
widget: new YRemoteCaretWidget(color, name),
}),
});
});
this.decorations = cmView.Decoration.set(decorations, true);
}
}

Expand Down
Loading