Skip to content

Add support for making PR comments #18

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
247 changes: 139 additions & 108 deletions bun.lock

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"@sveltejs/vite-plugin-svelte": "^6.0.0",
"@tailwindcss/vite": "^4.1.11",
"@types/chroma-js": "^3.1.1",
"@types/dompurify": "^3.2.0",
"@types/luxon": "^3.6.2",
"@types/marked": "^6.0.0",
"@types/wicg-file-system-access": "^2023.10.6",
"eslint": "^9.30.1",
"eslint-config-prettier": "^10.1.5",
Expand All @@ -48,8 +50,11 @@
"dependencies": {
"bits-ui": "^2.8.10",
"chroma-js": "^3.1.2",
"date-fns": "^4.1.0",
"diff": "^8.0.2",
"dompurify": "^3.2.6",
"luxon": "^3.7.1",
"marked": "^16.0.0",
"runed": "^0.30.0",
"shiki": "^3.7.0",
"svelte-toolbelt": "^0.9.3",
Expand Down
349 changes: 349 additions & 0 deletions web/src/lib/components/diff/CommentDisplay.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,349 @@
<script lang="ts">
import type { GithubPRComment } from "$lib/github.svelte";
import { formatDistance } from "date-fns";
import { CommentDisplayState } from "./comment-state.svelte";
import MarkdownRenderer from "./MarkdownRenderer.svelte";

interface Props {
comment: GithubPRComment;
isReply?: boolean;
owner: string;
repo: string;
onCommentUpdated?: (comment: GithubPRComment) => void;
onCommentDeleted?: (commentId: number) => void;
originalContentForSuggestion?: string;
startLine?: number;
}

let { comment, isReply = false, owner, repo, onCommentUpdated, onCommentDeleted, originalContentForSuggestion, startLine }: Props = $props();

const displayState = new CommentDisplayState(comment, owner, repo, onCommentUpdated, onCommentDeleted);

function formatTimestamp(dateString: string): string {
const date = new Date(dateString);
return formatDistance(date, new Date(), { addSuffix: true });
}
</script>

<div class="comment-display" class:is-reply={isReply}>
<div class="comment-header">
<img src={comment.user.avatar_url} alt={comment.user.login} class="avatar" />
<div class="comment-meta">
<a href={comment.user.html_url} target="_blank" rel="noopener noreferrer" class="username">
{comment.user.login}
</a>
<span class="timestamp">
{formatTimestamp(comment.created_at)}
</span>
{#if comment.created_at !== comment.updated_at}
<span class="edited-indicator"> (edited) </span>
{/if}
{#if comment.html_url}
<div class="github-link">
<a href={comment.html_url} target="_blank" rel="noopener noreferrer" class="view-on-github"> View on GitHub </a>
</div>
{/if}
</div>

{#if (displayState.canEdit || displayState.canDelete) && !displayState.isEditing}
<div class="comment-actions">
{#if displayState.canEdit}
<button class="action-button edit-button" aria-label="Edit" onclick={displayState.startEdit} disabled={displayState.isDeleting}>
<span class="iconify octicon--pencil-16"></span>
</button>
{/if}
{#if displayState.canDelete}
<button class="action-button delete-button" aria-label="Delete" onclick={displayState.deleteComment} disabled={displayState.isDeleting}>
{#if displayState.isDeleting}
<span class="spinning iconify octicon--sync-16"></span>
{:else}
<span class="iconify octicon--trash-16"></span>
{/if}
</button>
{/if}
</div>
{/if}
</div>

{#if displayState.error}
<div class="error-message">
{displayState.error}
</div>
{/if}

{#if displayState.isEditing}
<div class="edit-form">
<textarea
bind:value={displayState.editText}
class="edit-textarea"
rows="3"
disabled={displayState.isSubmitting}
onkeydown={displayState.handleKeyDown}
></textarea>
<div class="edit-actions">
<div class="edit-hint">
<span class="iconify octicon--info-16"></span>
Use Cmd/Ctrl + Enter to save, Escape to cancel
</div>
<div class="button-group">
<button class="cancel-button" onclick={displayState.cancelEdit} disabled={displayState.isSubmitting}> Cancel </button>
<button class="save-button" onclick={displayState.saveEdit} disabled={displayState.isSubmitting || !displayState.editText.trim()}>
{#if displayState.isSubmitting}
<span class="spinning iconify octicon--sync-16"></span>
Saving...
{:else}
Save
{/if}
</button>
</div>
</div>
</div>
{:else}
<div class="comment-body">
<MarkdownRenderer content={comment.body} originalContentForSuggestion={originalContentForSuggestion ?? ""} {startLine} />
</div>
{/if}
</div>

<style>
.comment-display {
background: var(--color-neutral-2);
border: 1px solid var(--color-border);
border-radius: 3px;
padding: 3px 6px;
margin-bottom: 2px;
font-size: 0.75rem;
display: flex;
flex-direction: column;
gap: 2px;
}

.comment-display.is-reply {
margin-left: 8px;
background: var(--color-neutral-1);
border-left: 2px solid var(--color-border);
border-radius: 0 3px 3px 0;
}

.comment-header {
display: flex;
align-items: center;
}

.avatar {
width: 14px;
height: 14px;
border-radius: 50%;
margin-right: 4px;
}

.comment-meta {
display: flex;
align-items: center;
gap: 4px;
flex: 1;
}

.username {
font-weight: 600;
color: var(--color-blue-600);
text-decoration: none;
font-size: 0.75rem;
}

.username:hover {
text-decoration: underline;
}

.timestamp {
color: var(--color-em-med);
font-size: 0.6875rem;
}

.edited-indicator {
color: var(--color-em-med);
font-size: 0.6875rem;
font-style: italic;
}

.comment-actions {
display: flex;
gap: 2px;
opacity: 0.7;
transition: opacity 0.2s;
}

.comment-display:hover .comment-actions {
opacity: 1;
}

.action-button {
background: none;
border: 1px solid var(--color-border);
border-radius: 2px;
padding: 2px 4px;
cursor: pointer;
color: var(--color-em-med);
font-size: 10px;
transition: all 0.2s;
}

.action-button:hover:not(:disabled) {
background: var(--color-neutral-3);
color: var(--color-em-high);
}

.action-button:disabled {
opacity: 0.5;
cursor: not-allowed;
}

.edit-button:hover:not(:disabled) {
border-color: var(--color-blue-400);
color: var(--color-blue-600);
}

.delete-button:hover:not(:disabled) {
border-color: var(--color-red-400);
color: var(--color-red-600);
}

.error-message {
background: var(--color-red-100);
border: 1px solid var(--color-red-300);
color: var(--color-red-700);
padding: 4px 8px;
border-radius: 2px;
font-size: 0.6875rem;
margin-bottom: 4px;
}

.edit-form {
display: flex;
flex-direction: column;
gap: 4px;
}

.edit-textarea {
width: 100%;
min-height: 48px;
padding: 6px 8px;
border: 1px solid var(--color-border);
border-radius: 2px;
font-family: inherit;
font-size: 0.75rem;
line-height: 1.3;
resize: vertical;
background: var(--color-neutral);
color: var(--color-em-high);
}

.edit-textarea:focus {
outline: none;
border-color: var(--color-primary);
box-shadow: 0 0 0 1px var(--color-primary-20);
}

.edit-textarea:disabled {
opacity: 0.6;
cursor: not-allowed;
}

.edit-actions {
display: flex;
align-items: center;
justify-content: space-between;
}

.edit-hint {
display: flex;
align-items: center;
gap: 3px;
color: var(--color-em-med);
font-size: 0.6875rem;
}

.button-group {
display: flex;
gap: 4px;
}

.cancel-button {
background: none;
border: 1px solid var(--color-border);
color: var(--color-em-high);
padding: 3px 6px;
border-radius: 2px;
cursor: pointer;
font-size: 0.6875rem;
transition: all 0.2s;
}

.cancel-button:hover:not(:disabled) {
background: var(--color-neutral-2);
}

.cancel-button:disabled {
opacity: 0.6;
cursor: not-allowed;
}

.save-button {
background: var(--color-primary);
border: none;
color: white;
padding: 3px 6px;
border-radius: 2px;
cursor: pointer;
font-size: 0.6875rem;
transition: all 0.2s;
display: flex;
align-items: center;
gap: 3px;
}

.save-button:hover:not(:disabled) {
background: var(--color-primary-hover);
}

.save-button:disabled {
opacity: 0.6;
cursor: not-allowed;
}

.comment-body {
margin-bottom: 4px;
}

.github-link {
display: flex;
justify-content: flex-end;
margin-top: 2px;
}

.view-on-github {
color: var(--color-blue-600);
text-decoration: none;
font-size: 0.6875rem;
opacity: 0.7;
}

.view-on-github:hover {
text-decoration: underline;
opacity: 1;
}

.spinning {
animation: spin 1s linear infinite;
}

@keyframes spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
</style>
Loading
Loading