Skip to content

Theme color direct access #105296

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

Closed
JonasBa wants to merge 4 commits into from
Closed

Theme color direct access #105296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e8ca1b
Refactor: Use theme for duration comparison colors
cursoragent Dec 18, 2025
96fb420
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] Dec 18, 2025
c933b8f
Merge branch 'master' into cursor/theme-color-direct-access-58bf
JonasBa Dec 18, 2025
5c1b658
tracedrawer: allow passing direct color to underline
JonasBa Dec 18, 2025
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
7 changes: 4 additions & 3 deletions static/app/utils/theme/theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,13 @@ const generateThemeUtils = (
colors: ReturnType<typeof deprecatedColorMappings>,
aliases: Aliases
) => ({
tooltipUnderline: (underlineColor: ColorOrAlias = 'gray300') => ({
tooltipUnderline: (underlineColor: ColorOrAlias | string = 'gray300') => ({
Copy link
Collaborator

@TkDodo TkDodo Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JonasBa there’s only a handful of usages that use tooltipUnderline with a specific color, and it’s only:

  • linkUnderline
  • gray200
  • background
  • success
  • successText, warningText, errorText
  • green300, red300, gray300

I think we should be able to find token replacements for those and just use our color tokens here?

Copy link
Member Author

@JonasBa JonasBa Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iirc there was another component that was using this, so I wanted to keep the changes small, but let me see if we can indeed one shot this

textDecoration: 'underline' as const,
textDecorationThickness: '0.75px',
textUnderlineOffset: '1.25px',
// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
textDecorationColor: colors[underlineColor] ?? aliases[underlineColor],
textDecorationColor:
// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
colors[underlineColor] ?? aliases[underlineColor] ?? underlineColor,
textDecorationStyle: 'dotted' as const,
}),
overflowEllipsis: css`
Expand Down
2 changes: 1 addition & 1 deletion static/app/utils/useHoverOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ interface UseHoverOverlayProps {
/**
* Color of the dotted underline, if available. See also: showUnderline.
*/
underlineColor?: ColorOrAlias;
underlineColor?: ColorOrAlias | string;
}

export function isOverflown(el: Element): boolean {
Expand Down
59 changes: 31 additions & 28 deletions static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Fragment, useMemo, useState, type PropsWithChildren} from 'react';
import {css, useTheme} from '@emotion/react';
import type {Theme} from '@emotion/react';
import styled from '@emotion/styled';
import {useHover} from '@react-aria/interactions';
import type {LocationDescriptor} from 'history';
Expand Down Expand Up @@ -53,7 +54,7 @@ import type {Project} from 'sentry/types/project';
import {trackAnalytics} from 'sentry/utils/analytics';
import getDuration from 'sentry/utils/duration/getDuration';
import {MarkedText} from 'sentry/utils/marked/markedText';
import type {Color, ColorOrAlias} from 'sentry/utils/theme';
import type {Color} from 'sentry/utils/theme';
import {useLocation} from 'sentry/utils/useLocation';
import useOrganization from 'sentry/utils/useOrganization';
import {useParams} from 'sentry/utils/useParams';
Expand Down Expand Up @@ -254,24 +255,22 @@ const HeaderContainer = styled(FlexBox)`
margin-bottom: ${space(1)};
`;

const DURATION_COMPARISON_STATUS_COLORS: {
equal: {light: ColorOrAlias; normal: ColorOrAlias};
faster: {light: ColorOrAlias; normal: ColorOrAlias};
slower: {light: ColorOrAlias; normal: ColorOrAlias};
} = {
faster: {
light: 'green100',
normal: 'green300',
},
slower: {
light: 'red100',
normal: 'red300',
},
equal: {
light: 'gray100',
normal: 'gray300',
},
};
function makeDurationComparisonStatusColors(theme: Theme) {
return {
faster: {
light: theme.colors.green100,
normal: theme.colors.green400,
},
slower: {
light: theme.colors.red100,
normal: theme.colors.red400,
},
equal: {
light: theme.colors.gray100,
normal: theme.colors.gray400,
},
};
}

const MIN_PCT_DURATION_DIFFERENCE = 10;

Expand All @@ -284,6 +283,7 @@ type DurationComparison = {
const getDurationComparison = (
baseline: number | undefined,
duration: number,
theme: Theme,
baseDescription?: string
): DurationComparison => {
if (!baseline) {
Expand All @@ -294,12 +294,10 @@ const getDurationComparison = (
const deltaPct = Math.round(Math.abs((delta / baseline) * 100));
const status = delta > 0 ? 'slower' : delta < 0 ? 'faster' : 'equal';

const colors = makeDurationComparisonStatusColors(theme);

const formattedBaseDuration = (
<Tooltip
title={baseDescription}
showUnderline
underlineColor={DURATION_COMPARISON_STATUS_COLORS[status].normal}
>
<Tooltip title={baseDescription} showUnderline underlineColor={colors[status].normal}>
{getDuration(baseline, 2, true)}
</Tooltip>
);
Expand Down Expand Up @@ -332,6 +330,8 @@ type DurationProps = {
};

function Duration(props: DurationProps) {
const theme = useTheme();

if (typeof props.duration !== 'number' || Number.isNaN(props.duration)) {
return <DurationContainer>{t('unknown')}</DurationContainer>;
}
Expand All @@ -348,6 +348,7 @@ function Duration(props: DurationProps) {
const comparison = getDurationComparison(
props.baseline,
props.duration,
theme,
props.baseDescription
);

Expand Down Expand Up @@ -429,6 +430,7 @@ function Highlights({
}: HighlightProps) {
const location = useLocation();
const organization = useOrganization();
const theme = useTheme();

const isAiNode = getIsAiNode(node);
const isMCPNode = getIsMCPNode(node);
Expand All @@ -442,6 +444,7 @@ function Highlights({
const comparison = getDurationComparison(
avgDuration,
durationInSeconds,
theme,
comparisonDescription
);

Expand Down Expand Up @@ -650,9 +653,9 @@ const HiglightsDurationComparison = styled('div')<
>`
white-space: nowrap;
border-radius: 12px;
color: ${p => p.theme[DURATION_COMPARISON_STATUS_COLORS[p.status].normal]};
background-color: ${p => p.theme[DURATION_COMPARISON_STATUS_COLORS[p.status].light]};
border: solid 1px ${p => p.theme[DURATION_COMPARISON_STATUS_COLORS[p.status].light]};
color: ${p => makeDurationComparisonStatusColors(p.theme)[p.status].normal};
background-color: ${p => makeDurationComparisonStatusColors(p.theme)[p.status].light};
border: solid 1px ${p => makeDurationComparisonStatusColors(p.theme)[p.status].light};
font-size: ${p => p.theme.fontSize.xs};
padding: ${space(0.25)} ${space(1)};
display: inline-block;
Expand Down Expand Up @@ -776,7 +779,7 @@ const DurationContainer = styled('span')`
`;

const Comparison = styled('span')<{status: 'faster' | 'slower' | 'equal'}>`
color: ${p => p.theme[DURATION_COMPARISON_STATUS_COLORS[p.status].normal]};
color: ${p => makeDurationComparisonStatusColors(p.theme)[p.status].normal};
`;

const TableValueRow = styled('div')`
Expand Down
Loading