diff --git a/static/app/components/activity/note/header.tsx b/static/app/components/activity/note/header.tsx
index 899dc5003faad0..96c6915d61d733 100644
--- a/static/app/components/activity/note/header.tsx
+++ b/static/app/components/activity/note/header.tsx
@@ -30,7 +30,7 @@ function NoteHeader({authorName, user, onEdit, onDelete}: Props) {
triggerProps={{
size: 'xs',
showChevron: false,
- priority: 'transparent',
+ variant: 'transparent',
icon: ,
'aria-label': t('Comment Actions'),
}}
diff --git a/static/app/components/clippedBox.stories.tsx b/static/app/components/clippedBox.stories.tsx
index aa69199fc8b022..d44af18059b297 100644
--- a/static/app/components/clippedBox.stories.tsx
+++ b/static/app/components/clippedBox.stories.tsx
@@ -52,7 +52,7 @@ export default Storybook.story('ClippedBox', story => {
render={ClippedBox}
propMatrix={{
btnText: ['Custom Label'],
- buttonProps: [undefined, {priority: 'danger'}],
+ buttonProps: [undefined, {variant: 'danger'}],
clipHeight: [100],
clipFade: [
undefined,
diff --git a/static/app/components/core/button/button.figma.tsx b/static/app/components/core/button/button.figma.tsx
index 0621574f892096..dfac4e2f2339dd 100644
--- a/static/app/components/core/button/button.figma.tsx
+++ b/static/app/components/core/button/button.figma.tsx
@@ -14,8 +14,8 @@ figma.connect(
'https://www.figma.com/design/eTJz6aPgudMY9E6mzyZU0B/%F0%9F%90%A6-Components?node-id=384-2119&t=pFp9KphF6dQ7XjDm-0',
{
props: {
- priority: figma.enum('priority', {
- default: 'default',
+ variant: figma.enum('priority', {
+ default: 'secondary',
primary: 'primary',
danger: 'danger',
warning: 'warning',
@@ -34,7 +34,7 @@ figma.connect(
children: figma.textContent('Children'),
},
example: (props: ButtonProps) => (
-
),
{
group: `${themeName} – with icon`,
- display_name: `${themeName} / ${priority} / ${size} / with icon`,
+ display_name: `${themeName} / ${variant} / ${size} / with icon`,
}
);
@@ -69,7 +69,7 @@ describe('Button', () => {
() => (
}
aria-label="Edit"
@@ -78,7 +78,7 @@ describe('Button', () => {
),
{
group: `${themeName} – icon-only`,
- display_name: `${themeName} / ${priority} / ${size} / icon-only`,
+ display_name: `${themeName} / ${variant} / ${size} / icon-only`,
}
);
});
diff --git a/static/app/components/core/button/styles.tsx b/static/app/components/core/button/styles.tsx
index 9235b82929260e..78948e47a15ac3 100644
--- a/static/app/components/core/button/styles.tsx
+++ b/static/app/components/core/button/styles.tsx
@@ -6,7 +6,6 @@ import type {StrictCSSObject, Theme} from 'sentry/utils/theme';
import {
type ButtonVariant,
type DO_NOT_USE_CommonButtonProps as CommonButtonProps,
- DO_NOT_USE_resolveButtonVariant as resolveButtonVariant,
} from './types';
export const DO_NOT_USE_BUTTON_ICON_SIZES: Record<
@@ -29,14 +28,14 @@ const elevation = {
const hoverElevation = '1px';
export function DO_NOT_USE_getButtonStyles(
- p: Pick &
+ p: Pick &
Pick & {
shapeVariant: 'rectangular' | 'square';
size: NonNullable;
theme: Theme;
}
): StrictCSSObject {
- const variant = resolveButtonVariant(p);
+ const variant = p.variant ?? 'secondary';
const buttonSizes = {
...p.theme.form,
diff --git a/static/app/components/core/button/types.tsx b/static/app/components/core/button/types.tsx
index 47c51d6926ef90..9e0d2f96ca7fbd 100644
--- a/static/app/components/core/button/types.tsx
+++ b/static/app/components/core/button/types.tsx
@@ -2,16 +2,6 @@ import type {LocationDescriptor} from 'history';
import type {TooltipProps} from '@sentry/scraps/tooltip';
-// We do not want people using this type as it should only be used
-// internally by the different button implementations
-type ButtonPriority =
- | 'default'
- | 'primary'
- | 'danger'
- | 'warning'
- | 'link'
- | 'transparent';
-
export type ButtonVariant =
| 'secondary'
| 'primary'
@@ -20,18 +10,6 @@ export type ButtonVariant =
| 'link'
| 'transparent';
-export function DO_NOT_USE_resolveButtonVariant(
- props: Pick
-): ButtonVariant {
- if (props.variant !== undefined) {
- return props.variant;
- }
- if (props.priority === 'default') {
- return 'secondary';
- }
- return props.priority ?? 'secondary';
-}
-
// eslint-disable-next-line @typescript-eslint/naming-convention
export interface DO_NOT_USE_CommonButtonProps {
/**
@@ -56,13 +34,6 @@ export interface DO_NOT_USE_CommonButtonProps {
* appropriately based on the size of the button.
*/
icon?: React.ReactNode;
- /**
- * The semantic "priority" of the button. Use `primary` when the action is
- * contextually the primary action, `danger` if the button will do something
- * destructive, `link` for visual similarity to a link.
- * @deprecated use `variant`
- */
- priority?: ButtonPriority;
/**
* The size of the button
*/
diff --git a/static/app/components/core/button/useButtonFunctionality.tsx b/static/app/components/core/button/useButtonFunctionality.tsx
index 43db27ff4649fc..e7cdb3f7dea771 100644
--- a/static/app/components/core/button/useButtonFunctionality.tsx
+++ b/static/app/components/core/button/useButtonFunctionality.tsx
@@ -17,7 +17,7 @@ export function useButtonFunctionality(props: ButtonProps | LinkButtonProps) {
analyticsEventName: props.analyticsEventName,
analyticsEventKey: props.analyticsEventKey,
analyticsParams: {
- priority: props.priority,
+ variant: props.variant,
href: 'href' in props ? props.href : undefined,
...props.analyticsParams,
},
diff --git a/static/app/components/core/compactSelect/utils.tsx b/static/app/components/core/compactSelect/utils.tsx
index bddbf4cf5031bd..c797ae4122979d 100644
--- a/static/app/components/core/compactSelect/utils.tsx
+++ b/static/app/components/core/compactSelect/utils.tsx
@@ -341,7 +341,7 @@ export function SectionToggle({item, listState, onToggle}: SectionToggleProps) {
data-key={item.key}
visible={visible}
size="zero"
- priority="transparent"
+ variant="transparent"
// Remove this button from keyboard navigation and the accessibility tree, since
// the outer list component implements a roving `tabindex` system that would be
// messed up if there was a focusable, non-selectable button in the middle of it.
diff --git a/static/app/components/core/modal/__stories__/demos.tsx b/static/app/components/core/modal/__stories__/demos.tsx
index edd15987010122..8f6c5eda464003 100644
--- a/static/app/components/core/modal/__stories__/demos.tsx
+++ b/static/app/components/core/modal/__stories__/demos.tsx
@@ -14,7 +14,7 @@ export function BasicDemo() {
This is the modal content.
@@ -54,7 +54,7 @@ export function CloseEventsDemo() {
This modal can only be closed via the button below.
@@ -100,8 +100,8 @@ export function SubComponentsDemo() {
This is a standalone ModalBody — useful for previewing styles outside a modal.
- Cancel
- Confirm
+ Cancel
+ Confirm
);
diff --git a/static/app/components/core/segmentedControl/segmentedControl.tsx b/static/app/components/core/segmentedControl/segmentedControl.tsx
index 56cf3d187a44a6..b83cb83d40c5b6 100644
--- a/static/app/components/core/segmentedControl/segmentedControl.tsx
+++ b/static/app/components/core/segmentedControl/segmentedControl.tsx
@@ -278,7 +278,7 @@ const SegmentWrap = styled('label')<{
...DO_NOT_USE_getButtonStyles({
...p,
disabled: p.isDisabled,
- priority: p.isSelected && p.priority === 'primary' ? 'primary' : 'default',
+ variant: p.isSelected && p.priority === 'primary' ? 'primary' : 'secondary',
shapeVariant: p.shapeVariant,
}),
})}
diff --git a/static/app/components/core/trackingContext.tsx b/static/app/components/core/trackingContext.tsx
index f6df3f6a1eef5c..e9bb70e32e255d 100644
--- a/static/app/components/core/trackingContext.tsx
+++ b/static/app/components/core/trackingContext.tsx
@@ -12,7 +12,7 @@ const defaultButtonTracking = (props: ButtonProps) => {
console.log('buttonAnalyticsEvent', {
eventKey: props.analyticsEventKey,
eventName: props.analyticsEventName,
- priority: props.priority,
+ variant: props.variant,
href: 'href' in props ? props.href : undefined,
...props.analyticsParams,
});
diff --git a/static/app/components/dropdownButton.tsx b/static/app/components/dropdownButton.tsx
index 6b5fd4c6df08ff..02614508d07e69 100644
--- a/static/app/components/dropdownButton.tsx
+++ b/static/app/components/dropdownButton.tsx
@@ -4,8 +4,6 @@ import type {DistributedOmit} from 'type-fest';
import type {ButtonProps} from '@sentry/scraps/button';
import {Button} from '@sentry/scraps/button';
-// eslint-disable-next-line boundaries/dependencies
-import {DO_NOT_USE_resolveButtonVariant as resolveButtonVariant} from '@sentry/scraps/button/types';
import {IconChevron} from 'sentry/icons';
@@ -53,7 +51,7 @@ export function DropdownButton({
{showChevron && (
diff --git a/static/app/components/events/interfaces/crashContent/exception/androidNativeTombstonesBanner.tsx b/static/app/components/events/interfaces/crashContent/exception/androidNativeTombstonesBanner.tsx
index f0bed93421e3eb..d88ebe093d5c86 100644
--- a/static/app/components/events/interfaces/crashContent/exception/androidNativeTombstonesBanner.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/androidNativeTombstonesBanner.tsx
@@ -190,7 +190,7 @@ export function AndroidNativeTombstonesBanner({event, projectId}: Props) {
position="bottom-end"
triggerProps={{
showChevron: false,
- priority: 'transparent',
+ variant: 'transparent',
icon: ,
}}
size="xs"
diff --git a/static/app/components/feedback/feedbackItem/feedbackShortId.tsx b/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
index 012a14a25bc7dc..960d2d0af46bbb 100644
--- a/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
@@ -76,7 +76,7 @@ export function FeedbackShortId({className, feedbackItem, style}: Props) {
'aria-label': t('Short-ID copy actions'),
icon: ,
size: 'zero',
- priority: 'transparent',
+ variant: 'transparent',
showChevron: false,
}}
position="bottom"
diff --git a/static/app/stories/view/landing/index.tsx b/static/app/stories/view/landing/index.tsx
index 3ecd5ddc6ad8f0..1e2f30d2266282 100644
--- a/static/app/stories/view/landing/index.tsx
+++ b/static/app/stories/view/landing/index.tsx
@@ -34,7 +34,7 @@ const frontmatter = {
{
children: 'Get Started',
to: '/stories/principles/tokens/',
- priority: 'primary',
+ variant: 'primary',
},
{
children: 'View on GitHub',
diff --git a/static/app/views/dashboards/addWidget.tsx b/static/app/views/dashboards/addWidget.tsx
index 265f7307583c95..a3fbe25a6122a5 100644
--- a/static/app/views/dashboards/addWidget.tsx
+++ b/static/app/views/dashboards/addWidget.tsx
@@ -77,7 +77,7 @@ export function AddWidget({onAddWidget}: Props) {
size: 'md',
showChevron: false,
icon: ,
- priority: 'transparent',
+ variant: 'transparent',
}}
/>
diff --git a/static/app/views/detectors/components/details/cron/index.tsx b/static/app/views/detectors/components/details/cron/index.tsx
index b55b6d7dd25644..6b565143aa947f 100644
--- a/static/app/views/detectors/components/details/cron/index.tsx
+++ b/static/app/views/detectors/components/details/cron/index.tsx
@@ -282,7 +282,7 @@ export function CronDetectorDetails({detector, project}: CronDetectorDetailsProp
text={dataSource.queryObj.slug}
aria-label={t('Copy monitor slug to clipboard')}
size="zero"
- priority="transparent"
+ variant="transparent"
/>
}
diff --git a/static/app/views/detectors/components/forms/cron/instrumentationGuide.tsx b/static/app/views/detectors/components/forms/cron/instrumentationGuide.tsx
index 24bea2cb835771..3688e599df3b85 100644
--- a/static/app/views/detectors/components/forms/cron/instrumentationGuide.tsx
+++ b/static/app/views/detectors/components/forms/cron/instrumentationGuide.tsx
@@ -201,7 +201,7 @@ export function InstrumentationGuide() {
trigger={triggerProps => (
)}
diff --git a/static/app/views/detectors/components/forms/metric/metricDetectorChart.tsx b/static/app/views/detectors/components/forms/metric/metricDetectorChart.tsx
index 7ebfe36cc6e469..c6d5b3bf460b8b 100644
--- a/static/app/views/detectors/components/forms/metric/metricDetectorChart.tsx
+++ b/static/app/views/detectors/components/forms/metric/metricDetectorChart.tsx
@@ -424,7 +424,7 @@ export function MetricDetectorChart({
trigger={triggerProps => (
)}
diff --git a/static/app/views/explore/components/chartContextMenu.tsx b/static/app/views/explore/components/chartContextMenu.tsx
index 932d123c28c9fc..a24aa63af12fb0 100644
--- a/static/app/views/explore/components/chartContextMenu.tsx
+++ b/static/app/views/explore/components/chartContextMenu.tsx
@@ -177,7 +177,7 @@ export function ChartContextMenu({
,
}}
diff --git a/static/app/views/explore/conversations/components/messagesPanel.tsx b/static/app/views/explore/conversations/components/messagesPanel.tsx
index 014c923a1728c7..66ec349ff8d437 100644
--- a/static/app/views/explore/conversations/components/messagesPanel.tsx
+++ b/static/app/views/explore/conversations/components/messagesPanel.tsx
@@ -121,7 +121,7 @@ export function MessagesPanel({nodes, selectedNodeId, onSelectNode}: MessagesPan
)}
diff --git a/static/app/views/explore/errors/charts/chartContextMenu.tsx b/static/app/views/explore/errors/charts/chartContextMenu.tsx
index 20ab3dd78fcd84..81407ca56d4833 100644
--- a/static/app/views/explore/errors/charts/chartContextMenu.tsx
+++ b/static/app/views/explore/errors/charts/chartContextMenu.tsx
@@ -76,7 +76,7 @@ export function ChartContextMenu({visible, setVisible}: ChartContextMenuProps) {
,
diff --git a/static/app/views/explore/logs/logsGraph.tsx b/static/app/views/explore/logs/logsGraph.tsx
index 471da40c296664..c6513895d1a131 100644
--- a/static/app/views/explore/logs/logsGraph.tsx
+++ b/static/app/views/explore/logs/logsGraph.tsx
@@ -417,7 +417,7 @@ function ContextMenu({
,
}}
diff --git a/static/app/views/explore/multiQueryMode/queryVisualizations/chart.tsx b/static/app/views/explore/multiQueryMode/queryVisualizations/chart.tsx
index 32a7379f6d53c4..17f299ee186b5e 100644
--- a/static/app/views/explore/multiQueryMode/queryVisualizations/chart.tsx
+++ b/static/app/views/explore/multiQueryMode/queryVisualizations/chart.tsx
@@ -207,7 +207,7 @@ export function MultiQueryModeChart({
key="contextMenu"
triggerProps={{
size: 'xs',
- priority: 'transparent',
+ variant: 'transparent',
showChevron: false,
icon: ,
}}
diff --git a/static/app/views/insights/common/components/chartActionDropdown.tsx b/static/app/views/insights/common/components/chartActionDropdown.tsx
index 1f022005cd8985..aba1fbb82f6b03 100644
--- a/static/app/views/insights/common/components/chartActionDropdown.tsx
+++ b/static/app/views/insights/common/components/chartActionDropdown.tsx
@@ -200,7 +200,7 @@ export function BaseChartActionDropdown({
triggerProps={{
'aria-label': t('Widget actions'),
size: 'xs',
- priority: 'transparent',
+ variant: 'transparent',
showChevron: false,
icon: ,
}}
diff --git a/static/app/views/issueDetails/streamline/sidebar/noteDropdown.tsx b/static/app/views/issueDetails/streamline/sidebar/noteDropdown.tsx
index 4a5ce9f0b9d1c2..598552602a5e0d 100644
--- a/static/app/views/issueDetails/streamline/sidebar/noteDropdown.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/noteDropdown.tsx
@@ -31,7 +31,7 @@ function NoteDropdown({
triggerProps={{
size: 'zero',
showChevron: false,
- priority: 'transparent',
+ variant: 'transparent',
icon: ,
'aria-label': t('Comment Actions'),
}}
diff --git a/static/app/views/navigation/primary/components.tsx b/static/app/views/navigation/primary/components.tsx
index 0f18b8aa837206..ba22ca8770e482 100644
--- a/static/app/views/navigation/primary/components.tsx
+++ b/static/app/views/navigation/primary/components.tsx
@@ -455,9 +455,9 @@ function NavigationButton(props: DistributedOmit) {
{...props}
{...(layout === 'mobile'
? hasPageFrame
- ? {priority: 'default'}
- : {size: 'zero' as const, priority: 'transparent'}
- : {priority: props.priority})}
+ ? {variant: 'secondary'}
+ : {size: 'zero' as const, variant: 'transparent'}
+ : {variant: props.variant})}
/>
)}
diff --git a/static/app/views/navigation/primary/userDropdown.tsx b/static/app/views/navigation/primary/userDropdown.tsx
index ec9b5c0f1e652f..1b3710fcdceccc 100644
--- a/static/app/views/navigation/primary/userDropdown.tsx
+++ b/static/app/views/navigation/primary/userDropdown.tsx
@@ -82,7 +82,7 @@ export function UserDropdown() {
analyticsKey="user-settings"
label={t('User Settings')}
buttonProps={{
- priority: 'transparent',
+ variant: 'transparent',
onClick: e => {
handleTriggerClick();
triggerProps.onClick?.(e);
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiInput.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiInput.tsx
index bfaeb11cf10123..ce19571345e5fe 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiInput.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/aiInput.tsx
@@ -256,7 +256,7 @@ function MessagesArrayRenderer({
const renderSystemMessageContent = (message: AIMessage) => (
{renderMessageContent(message)}
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
index 5ec00ad6bed7f0..e4f849691fa605 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
@@ -1208,7 +1208,7 @@ function MultilineText({
return (
-
+
{isHovered && (
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/styles.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/styles.tsx
index 938bd1ba4d1f2f..7530cf29cfeac0 100644
--- a/static/app/views/performance/newTraceDetails/traceTypeWarnings/styles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceTypeWarnings/styles.tsx
@@ -69,7 +69,7 @@ function Banner(props: BannerProps) {
position="bottom-end"
triggerProps={{
showChevron: false,
- priority: 'transparent',
+ variant: 'transparent',
icon: ,
}}
size="xs"
diff --git a/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx b/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx
index 2d44105ade9e61..4ca4b50f2168fb 100644
--- a/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx
+++ b/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx
@@ -239,7 +239,7 @@ function TransactionThresholdModal({