Skip to content
Draft
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
2 changes: 2 additions & 0 deletions packages/review/app/src/review-home-styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ export const styles = stylex.create({
lineHeight: leading.px22,
},
parentTitle: { fontWeight: fontWeight.medium },
// Trails the title's last word, as a PR list writes it.
pullRequestNumber: { marginLeft: space.s8 },
nestedRow: { paddingLeft: space.s48 },
nestedConnector: {
position: "absolute",
Expand Down
12 changes: 11 additions & 1 deletion packages/review/app/src/review-home-view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { BoardIcon, PullRequestStateIcon } from "@canvas/ui/board-icons";
import {
BoardIcon,
PullRequestNumber,
PullRequestStateIcon,
} from "@canvas/ui/board-icons";
import { CopyableText, copyText } from "@canvas/ui/copy";
import { CrumbSeparator } from "@canvas/ui/crumbs";
import { DisclosureChevron, disclosureStyles } from "@canvas/ui/disclosure";
Expand Down Expand Up @@ -1816,6 +1820,12 @@ function HomeBoardTitle({
)}
>
<MatchedText text={boardTitle(review.title)} queries={queries} />
{review.origin?.pullRequestNumber ? (
<PullRequestNumber
number={review.origin.pullRequestNumber}
xstyle={styles.pullRequestNumber}
/>
) : null}
</span>
</button>
);
Expand Down
31 changes: 23 additions & 8 deletions packages/review/app/src/sidebar-sections.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { BoardDisclosure } from "@canvas/ui/board-disclosure";
import { BoardIcon, PullRequestStateIcon } from "@canvas/ui/board-icons";
import {
BoardIcon,
PullRequestNumber,
PullRequestStateIcon,
} from "@canvas/ui/board-icons";
import { IconButton, buttonStyles } from "@canvas/ui/button";
import { CrumbSeparator } from "@canvas/ui/crumbs";
import { EmptyState } from "@canvas/ui/empty-state";
Expand Down Expand Up @@ -222,6 +226,7 @@ function BoardRow({
}): ReactElement {
const [childError, setChildError] = useState("");
const isCurrent = board.reviewId === current;
const prNumber = board.origin?.pullRequestNumber;

const newChild =
onNewChild && canAddChildWhiteboard(board) ? onNewChild : undefined;
Expand Down Expand Up @@ -301,7 +306,10 @@ function BoardRow({
)}
</span>
<span
{...stylex.props(styles.rowText, newChild && styles.textWithAction)}
{...stylex.props(
styles.rowText,
newChild && !prNumber && styles.textWithAction,
)}
>
{parentTitle ? (
<span {...stylex.props(styles.path)}>
Expand Down Expand Up @@ -341,11 +349,18 @@ function BoardRow({
</span>
)}
</span>
{board.origin?.pullRequestNumber ? (
<PullRequestStateIcon
number={board.origin.pullRequestNumber}
state={board.pullRequestState}
/>
{prNumber ? (
<>
{/* The "+" for a child board sits between number and icon. */}
<PullRequestNumber
number={prNumber}
xstyle={newChild && styles.textWithAction}
/>
<PullRequestStateIcon
number={prNumber}
state={board.pullRequestState}
/>
</>
) : null}
</button>
{newChild ? (
Expand All @@ -355,7 +370,7 @@ function BoardRow({
onError={setChildError}
xstyle={[
styles.childAction,
!!board.origin?.pullRequestNumber && styles.childActionWithPr,
!!prNumber && styles.childActionWithPr,
]}
/>
) : null}
Expand Down
26 changes: 26 additions & 0 deletions packages/review/app/src/ui/board-icons.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { fontSize } from "@canvas/scale.stylex";
import { tokens } from "@canvas/tokens.stylex";
import { useTooltip } from "@canvas/ui/tooltip";
import {
Expand Down Expand Up @@ -93,6 +94,22 @@ export function PullRequestStateIcon({
);
}

/** "#908", the PR number a list row shows beside its state icon. The icon
* already names the PR to assistive tech, so this is hidden from it. */
export function PullRequestNumber({
number,
xstyle,
}: {
number: number;
xstyle?: stylex.StyleXStyles;
}): ReactElement {
return (
<span aria-hidden="true" {...stylex.props(styles.number, xstyle)}>
#{number}
</span>
);
}

const styles = stylex.create({
icon: {
flexShrink: 0,
Expand All @@ -105,6 +122,15 @@ const styles = stylex.create({
kind: { color: tokens.inkMuted },
current: { color: tokens.accent },
state: { display: "inline-flex", flexShrink: 0 },
// As a terminal prints it; digits keep their width down a list.
number: {
flexShrink: 0,
color: tokens.inkFaint,
fontFamily: tokens.fontMono,
fontSize: fontSize.small,
fontVariantNumeric: "tabular-nums",
whiteSpace: "nowrap",
},
});

const stateStyles = stylex.create({
Expand Down