Use issues page as issue row baseline
Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
@@ -10,9 +10,11 @@ type UnreadState = "hidden" | "visible" | "fading";
|
|||||||
interface IssueRowProps {
|
interface IssueRowProps {
|
||||||
issue: Issue;
|
issue: Issue;
|
||||||
issueLinkState?: unknown;
|
issueLinkState?: unknown;
|
||||||
statusControl?: ReactNode;
|
mobileLeading?: ReactNode;
|
||||||
|
desktopMetaLeading?: ReactNode;
|
||||||
|
desktopLeadingSpacer?: boolean;
|
||||||
mobileMeta?: ReactNode;
|
mobileMeta?: ReactNode;
|
||||||
trailingContent?: ReactNode;
|
desktopTrailing?: ReactNode;
|
||||||
trailingMeta?: ReactNode;
|
trailingMeta?: ReactNode;
|
||||||
unreadState?: UnreadState | null;
|
unreadState?: UnreadState | null;
|
||||||
onMarkRead?: () => void;
|
onMarkRead?: () => void;
|
||||||
@@ -22,9 +24,11 @@ interface IssueRowProps {
|
|||||||
export function IssueRow({
|
export function IssueRow({
|
||||||
issue,
|
issue,
|
||||||
issueLinkState,
|
issueLinkState,
|
||||||
statusControl,
|
mobileLeading,
|
||||||
|
desktopMetaLeading,
|
||||||
|
desktopLeadingSpacer = false,
|
||||||
mobileMeta,
|
mobileMeta,
|
||||||
trailingContent,
|
desktopTrailing,
|
||||||
trailingMeta,
|
trailingMeta,
|
||||||
unreadState = null,
|
unreadState = null,
|
||||||
onMarkRead,
|
onMarkRead,
|
||||||
@@ -40,39 +44,50 @@ export function IssueRow({
|
|||||||
to={`/issues/${issuePathId}`}
|
to={`/issues/${issuePathId}`}
|
||||||
state={issueLinkState}
|
state={issueLinkState}
|
||||||
className={cn(
|
className={cn(
|
||||||
"flex min-w-0 cursor-pointer items-start gap-2 px-3 py-3 no-underline text-inherit transition-colors hover:bg-accent/50 sm:items-center sm:gap-3 sm:px-4",
|
"flex items-start gap-2 border-b border-border py-2.5 pl-2 pr-3 text-sm no-underline text-inherit transition-colors hover:bg-accent/50 last:border-b-0 sm:items-center sm:py-2 sm:pl-1",
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<span className="hidden shrink-0 self-center sm:inline-flex">
|
<span className="shrink-0 pt-px sm:hidden">
|
||||||
<PriorityIcon priority={issue.priority} />
|
{mobileLeading ?? <StatusIcon status={issue.status} />}
|
||||||
</span>
|
</span>
|
||||||
<span className="inline-flex shrink-0 self-center">
|
<span className="flex min-w-0 flex-1 flex-col gap-1 sm:contents">
|
||||||
{statusControl ?? <StatusIcon status={issue.status} />}
|
<span className="line-clamp-2 text-sm sm:order-2 sm:min-w-0 sm:flex-1 sm:truncate sm:line-clamp-none">
|
||||||
</span>
|
|
||||||
<span className="hidden shrink-0 self-center text-xs font-mono text-muted-foreground sm:inline">
|
|
||||||
{identifier}
|
|
||||||
</span>
|
|
||||||
<span className="min-w-0 flex-1 text-sm">
|
|
||||||
<span className="line-clamp-2 min-w-0 sm:line-clamp-1 sm:block sm:truncate">
|
|
||||||
{issue.title}
|
{issue.title}
|
||||||
</span>
|
</span>
|
||||||
<span className="mt-1 flex items-center gap-2 text-[11px] text-muted-foreground sm:hidden">
|
<span className="flex items-center gap-2 sm:order-1 sm:shrink-0">
|
||||||
<span className="font-mono">{identifier}</span>
|
{desktopLeadingSpacer ? (
|
||||||
|
<span className="hidden w-3.5 shrink-0 sm:block" />
|
||||||
|
) : null}
|
||||||
|
{desktopMetaLeading ?? (
|
||||||
|
<>
|
||||||
|
<span className="hidden sm:inline-flex">
|
||||||
|
<PriorityIcon priority={issue.priority} />
|
||||||
|
</span>
|
||||||
|
<span className="hidden shrink-0 sm:inline-flex">
|
||||||
|
<StatusIcon status={issue.status} />
|
||||||
|
</span>
|
||||||
|
<span className="shrink-0 font-mono text-xs text-muted-foreground">
|
||||||
|
{identifier}
|
||||||
|
</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
{mobileMeta ? (
|
{mobileMeta ? (
|
||||||
<>
|
<>
|
||||||
<span aria-hidden="true">·</span>
|
<span className="text-xs text-muted-foreground sm:hidden" aria-hidden="true">
|
||||||
<span>{mobileMeta}</span>
|
·
|
||||||
|
</span>
|
||||||
|
<span className="text-xs text-muted-foreground sm:hidden">{mobileMeta}</span>
|
||||||
</>
|
</>
|
||||||
) : null}
|
) : null}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
{trailingContent ? (
|
{(desktopTrailing || trailingMeta) ? (
|
||||||
<span className="hidden shrink-0 items-center gap-2 sm:flex">{trailingContent}</span>
|
<span className="ml-auto hidden shrink-0 items-center gap-2 sm:order-3 sm:flex sm:gap-3">
|
||||||
) : null}
|
{desktopTrailing}
|
||||||
{trailingMeta ? (
|
{trailingMeta ? (
|
||||||
<span className="hidden shrink-0 self-center text-xs text-muted-foreground sm:block">
|
<span className="text-xs text-muted-foreground">{trailingMeta}</span>
|
||||||
{trailingMeta}
|
) : null}
|
||||||
</span>
|
</span>
|
||||||
) : null}
|
) : null}
|
||||||
{showUnreadSlot ? (
|
{showUnreadSlot ? (
|
||||||
|
|||||||
@@ -594,8 +594,8 @@ export function IssuesList({
|
|||||||
key={issue.id}
|
key={issue.id}
|
||||||
issue={issue}
|
issue={issue}
|
||||||
issueLinkState={issueLinkState}
|
issueLinkState={issueLinkState}
|
||||||
className="border-b border-border last:border-b-0 sm:px-3"
|
desktopLeadingSpacer
|
||||||
statusControl={(
|
mobileLeading={(
|
||||||
<span
|
<span
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -608,8 +608,41 @@ export function IssuesList({
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
|
desktopMetaLeading={(
|
||||||
|
<>
|
||||||
|
<span className="hidden sm:inline-flex">
|
||||||
|
<PriorityIcon priority={issue.priority} />
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
className="hidden shrink-0 sm:inline-flex"
|
||||||
|
onClick={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<StatusIcon
|
||||||
|
status={issue.status}
|
||||||
|
onChange={(s) => onUpdateIssue(issue.id, { status: s })}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
<span className="shrink-0 font-mono text-xs text-muted-foreground">
|
||||||
|
{issue.identifier ?? issue.id.slice(0, 8)}
|
||||||
|
</span>
|
||||||
|
{liveIssueIds?.has(issue.id) && (
|
||||||
|
<span className="inline-flex items-center gap-1 rounded-full bg-blue-500/10 px-1.5 py-0.5 sm:gap-1.5 sm:px-2">
|
||||||
|
<span className="relative flex h-2 w-2">
|
||||||
|
<span className="absolute inline-flex h-full w-full animate-pulse rounded-full bg-blue-400 opacity-75" />
|
||||||
|
<span className="relative inline-flex h-2 w-2 rounded-full bg-blue-500" />
|
||||||
|
</span>
|
||||||
|
<span className="hidden text-[11px] font-medium text-blue-600 dark:text-blue-400 sm:inline">
|
||||||
|
Live
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
mobileMeta={timeAgo(issue.updatedAt)}
|
mobileMeta={timeAgo(issue.updatedAt)}
|
||||||
trailingContent={(
|
desktopTrailing={(
|
||||||
<>
|
<>
|
||||||
{(issue.labels ?? []).length > 0 && (
|
{(issue.labels ?? []).length > 0 && (
|
||||||
<span className="hidden items-center gap-1 overflow-hidden md:flex md:max-w-[240px]">
|
<span className="hidden items-center gap-1 overflow-hidden md:flex md:max-w-[240px]">
|
||||||
@@ -633,17 +666,6 @@ export function IssuesList({
|
|||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{liveIssueIds?.has(issue.id) && (
|
|
||||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-blue-500/10 px-2 py-0.5">
|
|
||||||
<span className="relative flex h-2 w-2">
|
|
||||||
<span className="absolute inline-flex h-full w-full animate-pulse rounded-full bg-blue-400 opacity-75" />
|
|
||||||
<span className="relative inline-flex h-2 w-2 rounded-full bg-blue-500" />
|
|
||||||
</span>
|
|
||||||
<span className="text-[11px] font-medium text-blue-600 dark:text-blue-400">
|
|
||||||
Live
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
<Popover
|
<Popover
|
||||||
open={assigneePickerIssueId === issue.id}
|
open={assigneePickerIssueId === issue.id}
|
||||||
onOpenChange={(open) => {
|
onOpenChange={(open) => {
|
||||||
|
|||||||
@@ -799,7 +799,7 @@ export function Inbox() {
|
|||||||
<>
|
<>
|
||||||
{showSeparatorBefore("issues_i_touched") && <Separator />}
|
{showSeparatorBefore("issues_i_touched") && <Separator />}
|
||||||
<div>
|
<div>
|
||||||
<div className="divide-y divide-border border border-border">
|
<div className="border border-border">
|
||||||
{(tab === "unread" ? unreadTouchedIssues : touchedIssues).map((issue) => {
|
{(tab === "unread" ? unreadTouchedIssues : touchedIssues).map((issue) => {
|
||||||
const isUnread = issue.isUnreadForMe && !fadingOutIssues.has(issue.id);
|
const isUnread = issue.isUnreadForMe && !fadingOutIssues.has(issue.id);
|
||||||
const isFading = fadingOutIssues.has(issue.id);
|
const isFading = fadingOutIssues.has(issue.id);
|
||||||
|
|||||||
Reference in New Issue
Block a user