ref(components): extracted a DragReorderButton component

JoshuaKGoldberg · JoshuaKGoldberg · commit fedd98e63672 · 2026-03-18T10:07:46.000-04:00
diff --git a/static/app/components/dnd/dragReorderButton.tsx b/static/app/components/dnd/dragReorderButton.tsx
@@ -0,0 +1,36 @@
+import type {DraggableAttributes, DraggableSyntheticListeners} from '@dnd-kit/core';
+
+import {Button, type ButtonProps} from '@sentry/scraps/button';
+
+import {IconGrabbable} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import type {IconSize} from 'sentry/utils/theme';
+
+type DragReorderButtonProps = Omit<ButtonProps, 'children'> & {
+  attributes?: DraggableAttributes;
+  iconSize?: IconSize;
+  listeners?: DraggableSyntheticListeners;
+};
+
+export function DragReorderButton({
+  listeners,
+  attributes,
+  size = 'zero',
+  iconSize = 'xs',
+  ref,
+  ...props
+}: DragReorderButtonProps) {
+  return (
+    <Button
+      aria-label={t('Drag to reorder')}
+      priority="transparent"
+      size={size}
+      style={{cursor: 'grab'}}
+      icon={<IconGrabbable size={iconSize} />}
+      ref={ref}
+      {...listeners}
+      {...attributes}
+      {...props}
+    />
+  );
+}
diff --git a/static/app/views/alerts/rules/uptime/assertions/opCommon.tsx b/static/app/views/alerts/rules/uptime/assertions/opCommon.tsx
@@ -7,8 +7,9 @@ import type {SelectOption} from '@sentry/scraps/compactSelect';
 import {Flex, Grid} from '@sentry/scraps/layout';
 import {Text} from '@sentry/scraps/text';
 
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
 import {QuestionTooltip} from 'sentry/components/questionTooltip';
-import {IconDelete, IconGrabbable} from 'sentry/icons';
+import {IconDelete} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {AssertionFormError} from 'sentry/views/alerts/rules/uptime/formErrors';
 import {
@@ -85,15 +86,11 @@ export function OpContainer({
             <Text size="sm" bold>
               <label htmlFor={inputId}>{label}</label>
             </Text>
-            <Button
-              size="zero"
-              priority="transparent"
-              icon={<IconGrabbable size="xs" />}
+            <DragReorderButton
               aria-label={t('Reorder assertion')}
               ref={setActivatorNodeRef}
-              style={{cursor: 'grab'}}
-              {...listeners}
-              {...attributes}
+              listeners={listeners}
+              attributes={attributes}
             />
             {tooltip && <QuestionTooltip size="xs" title={tooltip} isHoverable />}
           </Flex>
diff --git a/static/app/views/alerts/rules/uptime/assertions/opGroup.tsx b/static/app/views/alerts/rules/uptime/assertions/opGroup.tsx
@@ -9,7 +9,8 @@ import {Container, Stack} from '@sentry/scraps/layout';
 import {OverlayTrigger} from '@sentry/scraps/overlayTrigger';
 import {Text} from '@sentry/scraps/text';
 
-import {IconAdd, IconDelete, IconGrabbable} from 'sentry/icons';
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
+import {IconAdd, IconDelete} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {uniqueId} from 'sentry/utils/guid';
 import {
@@ -231,14 +232,11 @@ export function AssertionOpGroup({
             options={[{value: 'negated', label: t('Negate result')}]}
           />
         </CompositeSelect>
-        <Button
-          size="zero"
-          priority="transparent"
-          icon={<IconGrabbable size="xs" />}
+        <DragReorderButton
           aria-label={t('Reorder assertion group')}
           ref={setActivatorNodeRef}
-          {...listeners}
-          {...attributes}
+          listeners={listeners}
+          attributes={attributes}
         />
         <TopBorder rightBorder={!onRemove} />
         {onRemove && (
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/queryField.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/groupByStep/queryField.tsx
@@ -1,10 +1,11 @@
 import {Fragment, type ReactNode} from 'react';
-import type {DraggableSyntheticListeners, UseDraggableArguments} from '@dnd-kit/core';
+import type {DraggableAttributes, DraggableSyntheticListeners} from '@dnd-kit/core';
 import styled from '@emotion/styled';
 
 import {Button} from '@sentry/scraps/button';
 
-import {IconDelete, IconGrabbable} from 'sentry/icons';
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
+import {IconDelete} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {QueryFieldValue} from 'sentry/utils/discover/fields';
 import {QueryField as TableQueryField} from 'sentry/views/discover/table/queryField';
@@ -14,7 +15,7 @@ export interface QueryFieldProps {
   fieldOptions: React.ComponentProps<typeof TableQueryField>['fieldOptions'];
   onChange: (newValue: QueryFieldValue) => void;
   value: QueryFieldValue;
-  attributes?: UseDraggableArguments['attributes'];
+  attributes?: DraggableAttributes;
   canDelete?: boolean;
   canDrag?: boolean;
   disabled?: boolean;
@@ -52,14 +53,7 @@ export function QueryField({
       {isDragging ? null : (
         <Fragment>
           {canDrag && (
-            <DragAndReorderButton
-              {...listeners}
-              {...attributes}
-              aria-label={t('Drag to reorder')}
-              icon={<IconGrabbable size="xs" />}
-              size="zero"
-              priority="transparent"
-            />
+            <StyledDragReorderButton listeners={listeners} attributes={attributes} />
           )}
           <TableQueryField
             placeholder={t('Select group')}
@@ -88,7 +82,7 @@ export function QueryField({
   );
 }
 
-const DragAndReorderButton = styled(Button)`
+const StyledDragReorderButton = styled(DragReorderButton)`
   height: ${p => p.theme.form.md.height};
 `;
 
diff --git a/static/app/views/dashboards/widgetBuilder/components/common/sortableFieldWrapper.tsx b/static/app/views/dashboards/widgetBuilder/components/common/sortableFieldWrapper.tsx
@@ -3,10 +3,7 @@ import {CSS} from '@dnd-kit/utilities';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
-import {Button} from '@sentry/scraps/button';
-
-import {IconGrabbable} from 'sentry/icons';
-import {t} from 'sentry/locale';
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
 
 export function SortableVisualizeFieldWrapper({
   dragId,
@@ -47,13 +44,9 @@ export function SortableVisualizeFieldWrapper({
   return (
     <div ref={setNodeRef} style={style}>
       {canDrag && (
-        <DragAndReorderButton
-          {...listeners}
-          {...attributes}
-          aria-label={t('Drag to reorder')}
-          icon={<IconGrabbable size="xs" />}
-          size="zero"
-          priority="transparent"
+        <StyledDragReorderButton
+          listeners={listeners}
+          attributes={attributes}
           isDragging={isDragging}
         />
       )}
@@ -62,7 +55,7 @@ export function SortableVisualizeFieldWrapper({
   );
 }
 
-const DragAndReorderButton = styled(Button)<{isDragging: boolean}>`
+const StyledDragReorderButton = styled(DragReorderButton)<{isDragging: boolean}>`
   height: ${p => p.theme.form.md.height};
 
   ${p => p.isDragging && p.theme.visuallyHidden}
diff --git a/static/app/views/dashboards/widgetBuilder/components/visualize/visualizeGhostField.tsx b/static/app/views/dashboards/widgetBuilder/components/visualize/visualizeGhostField.tsx
@@ -3,7 +3,8 @@ import styled from '@emotion/styled';
 
 import {Button} from '@sentry/scraps/button';
 
-import {IconDelete, IconGrabbable} from 'sentry/icons';
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
+import {IconDelete} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {SelectValue} from 'sentry/types/core';
 import {
@@ -91,12 +92,7 @@ export function VisualizeGhostField({
   return (
     <Ghost>
       <FieldRow>
-        <DragAndReorderButton
-          aria-label={t('Drag to reorder')}
-          icon={<IconGrabbable size="xs" />}
-          size="zero"
-          priority="transparent"
-        />
+        <StyledDragReorderButton />
         <FieldBar>
           {draggingField?.kind === FieldValueKind.EQUATION ? (
             <StyledArithmeticInput
@@ -237,6 +233,6 @@ const Ghost = styled('div')`
   }
 `;
 
-const DragAndReorderButton = styled(Button)`
+const StyledDragReorderButton = styled(DragReorderButton)`
   height: ${p => p.theme.form.md.height};
 `;
diff --git a/static/app/views/discover/table/columnEditCollection.tsx b/static/app/views/discover/table/columnEditCollection.tsx
@@ -10,8 +10,9 @@ import {Tooltip} from '@sentry/scraps/tooltip';
 
 import {parseArithmetic} from 'sentry/components/arithmeticInput/parser';
 import {SectionHeading} from 'sentry/components/charts/styles';
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
 import {getOffsetOfElement} from 'sentry/components/performance/waterfall/utils';
-import {IconAdd, IconDelete, IconGrabbable, IconWarning} from 'sentry/icons';
+import {IconAdd, IconDelete, IconWarning} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
@@ -484,13 +485,9 @@ class ColumnEditCollection extends Component<Props, State> {
           className={isGhost ? '' : DRAG_CLASS}
         >
           {canDrag ? (
-            <DragAndReorderButton
-              aria-label={t('Drag to reorder')}
+            <StyledDragReorderButton
               onMouseDown={event => this.startDrag(event, i)}
               onTouchStart={event => this.startDrag(event, i)}
-              icon={<IconGrabbable size="xs" />}
-              size="zero"
-              priority="transparent"
             />
           ) : singleColumn && showAliasField ? null : (
             <span />
@@ -789,7 +786,7 @@ const RemoveButton = styled(Button)`
   height: ${p => p.theme.form.md.height};
 `;
 
-const DragAndReorderButton = styled(Button)`
+const StyledDragReorderButton = styled(DragReorderButton)`
   height: ${p => p.theme.form.md.height};
 `;
 
diff --git a/static/app/views/explore/components/toolbar/toolbarGroupBy/index.tsx b/static/app/views/explore/components/toolbar/toolbarGroupBy/index.tsx
@@ -9,9 +9,9 @@ import {CompactSelect} from '@sentry/scraps/compactSelect';
 import {OverlayTrigger} from '@sentry/scraps/overlayTrigger';
 import {Tooltip} from '@sentry/scraps/tooltip';
 
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
 import {IconAdd} from 'sentry/icons/iconAdd';
 import {IconDelete} from 'sentry/icons/iconDelete';
-import {IconGrabbable} from 'sentry/icons/iconGrabbable';
 import {t} from 'sentry/locale';
 import {
   ToolbarFooterButton,
@@ -80,15 +80,7 @@ export function ToolbarGroupByDropdown({
       style={{transform: CSS.Transform.toString(transform)}}
       {...attributes}
     >
-      {canDelete ? (
-        <Button
-          aria-label={t('Drag to reorder')}
-          priority="transparent"
-          size="zero"
-          icon={<IconGrabbable size="sm" />}
-          {...listeners}
-        />
-      ) : null}
+      {canDelete ? <DragReorderButton iconSize="sm" listeners={listeners} /> : null}
       <StyledCompactSelect
         data-test-id="editor-column"
         options={options}
diff --git a/static/app/views/explore/components/toolbar/toolbarVisualize/index.tsx b/static/app/views/explore/components/toolbar/toolbarVisualize/index.tsx
@@ -8,9 +8,9 @@ import type {SelectKey, SelectOption} from '@sentry/scraps/compactSelect';
 import {CompactSelect} from '@sentry/scraps/compactSelect';
 import {Tooltip} from '@sentry/scraps/tooltip';
 
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
 import {IconAdd} from 'sentry/icons';
 import {IconDelete} from 'sentry/icons/iconDelete';
-import {IconGrabbable} from 'sentry/icons/iconGrabbable';
 import {t} from 'sentry/locale';
 import type {ParsedFunction} from 'sentry/utils/discover/fields';
 import {getFieldDefinition} from 'sentry/utils/fields';
@@ -80,13 +80,7 @@ export function ToolbarVisualizeDropdown({
       {...attributes}
     >
       {dragColumnId === undefined ? null : (
-        <Button
-          aria-label={t('Drag to reorder')}
-          priority="transparent"
-          size="zero"
-          icon={<IconGrabbable size="sm" />}
-          {...listeners}
-        />
+        <DragReorderButton iconSize="sm" listeners={listeners} />
       )}
       {label}
       <AggregateCompactSelect
diff --git a/static/app/views/explore/components/toolbar/toolbarVisualize/visualizeEquation.tsx b/static/app/views/explore/components/toolbar/toolbarVisualize/visualizeEquation.tsx
@@ -8,8 +8,8 @@ import {Flex} from '@sentry/scraps/layout';
 import {ArithmeticBuilder} from 'sentry/components/arithmeticBuilder';
 import type {Expression} from 'sentry/components/arithmeticBuilder/expression';
 import type {FunctionArgument} from 'sentry/components/arithmeticBuilder/types';
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
 import {IconDelete} from 'sentry/icons/iconDelete';
-import {IconGrabbable} from 'sentry/icons/iconGrabbable';
 import {t} from 'sentry/locale';
 import {EQUATION_PREFIX, stripEquationPrefix} from 'sentry/utils/discover/fields';
 import {
@@ -98,13 +98,7 @@ export function VisualizeEquation({
       {...attributes}
     >
       {dragColumnId === undefined ? null : (
-        <Button
-          aria-label={t('Drag to reorder')}
-          priority="transparent"
-          size="zero"
-          icon={<IconGrabbable size="sm" />}
-          {...listeners}
-        />
+        <DragReorderButton iconSize="sm" listeners={listeners} />
       )}
       {label}
       <Flex flex={1}>
diff --git a/static/app/views/explore/tables/aggregateColumnEditorModal.tsx b/static/app/views/explore/tables/aggregateColumnEditorModal.tsx
@@ -14,11 +14,11 @@ import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import {ArithmeticBuilder} from 'sentry/components/arithmeticBuilder';
 import type {Expression} from 'sentry/components/arithmeticBuilder/expression';
 import type {FunctionArgument} from 'sentry/components/arithmeticBuilder/types';
+import {DragReorderButton} from 'sentry/components/dnd/dragReorderButton';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import {SPAN_PROPS_DOCS_URL} from 'sentry/constants';
 import {IconAdd} from 'sentry/icons/iconAdd';
 import {IconDelete} from 'sentry/icons/iconDelete';
-import {IconGrabbable} from 'sentry/icons/iconGrabbable';
 import {t} from 'sentry/locale';
 import type {TagCollection} from 'sentry/types/group';
 import type {Organization} from 'sentry/types/organization';
@@ -230,13 +230,7 @@ function ColumnEditorRow({
       }}
       {...attributes}
     >
-      <StyledButton
-        aria-label={t('Drag to reorder')}
-        priority="transparent"
-        size="sm"
-        icon={<IconGrabbable size="sm" />}
-        {...listeners}
-      />
+      <StyledDragReorderButton size="sm" iconSize="sm" listeners={listeners} />
       {isGroupBy(column.column) ? (
         <GroupBySelector
           groupBy={column.column}
@@ -538,6 +532,11 @@ const RowContainer = styled('div')`
   }
 `;
 
+const StyledDragReorderButton = styled(DragReorderButton)`
+  padding-left: 0;
+  padding-right: 0;
+`;
+
 const StyledButton = styled(Button)`
   padding-left: 0;
   padding-right: 0;
diff --git a/static/app/views/explore/tables/columnEditorModal.tsx b/static/app/views/explore/tables/columnEditorModal.tsx
