Skip to content

fix(editor): render visible highlight + popover for Flag marks #70

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

Open
vishalsachdev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(editor): render visible highlight + popover for Flag marks #70

Show file tree
Hide file tree
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
43 changes: 43 additions & 0 deletions src/editor/plugins/mark-popover.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,6 +1215,10 @@ class MarkPopoverController {
}

private renderSuggestion(mark: Mark): void {
if (mark.kind === 'flagged') {
this.renderFlag(mark);
return;
}
this.popover.innerHTML = '';

const header = document.createElement('div');
Expand Down Expand Up @@ -1286,6 +1290,45 @@ class MarkPopoverController {
this.popover.appendChild(actions);
}

private renderFlag(mark: Mark): void {
this.popover.innerHTML = '';

const header = document.createElement('div');
header.className = 'mark-popover-header';
header.textContent = `Flagged by ${getActorName(mark.by)}`;

const body = document.createElement('div');
body.className = 'mark-popover-body';
const note = (mark.data as { note?: string } | undefined)?.note;
body.textContent = note || mark.quote || '';

const actions = document.createElement('div');
actions.className = 'mark-popover-actions';

if (canCommentInRuntime()) {
const removeButton = document.createElement('button');
removeButton.type = 'button';
removeButton.textContent = 'Remove flag';
installTouchSafeButton(removeButton, () => {
deleteMark(this.view, mark.id);
this.close();
});
actions.appendChild(removeButton);
}

const closeButton = document.createElement('button');
closeButton.type = 'button';
closeButton.textContent = 'Close';
installTouchSafeButton(closeButton, () => {
this.close();
});
actions.appendChild(closeButton);

this.popover.appendChild(header);
this.popover.appendChild(body);
this.popover.appendChild(actions);
}

private cacheActionRange(): void {
const { from, to } = this.view.state.selection;
if (from === to) return;
Expand Down
16 changes: 15 additions & 1 deletion src/editor/plugins/marks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3110,9 +3110,14 @@ function createDecorations(
switch (mark.kind) {
case 'authored':
case 'approved':
case 'flagged':
continue;

case 'flagged': {
style = STYLES.flagged;
cssClass = `mark-flagged ${isActive ? 'mark-active' : ''}`;
break;
}

case 'comment': {
const data = mark.data as CommentData;
if (data?.resolved) continue;
Expand Down Expand Up @@ -3223,6 +3228,15 @@ function injectGlowStyles(): void {
100% { box-shadow: none; }
}

/* Flag glow (dusty rose, box-shadow only so the flag background persists) */
.mark-flagged.proof-mark-new {
animation-name: proof-flag-glow;
}
@keyframes proof-flag-glow {
0% { box-shadow: 0 0 8px rgba(252, 165, 165, 0.8); }
100% { box-shadow: none; }
}

/* Refresh transition animations */
.proof-refreshing { opacity: 0.3; transition: opacity 200ms ease-out; }
.proof-refreshed { opacity: 1; transition: opacity 300ms ease-in; }
Expand Down