Skip to content

fix(ui): chonk styling for compactSelect #88093

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

Merged
TkDodo merged 2 commits into from
Mar 27, 2025
Merged

fix(ui): chonk styling for compactSelect #88093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc85b8
fix: always use size="xs" for SearchInput in compactSelect
TkDodo Mar 27, 2025
4705b5f
fix: align menu items with section headings
TkDodo Mar 27, 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
8 changes: 1 addition & 7 deletions static/app/components/core/compactSelect/control.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ export function Control({
onFocus={onSearchFocus}
onBlur={onSearchBlur}
onChange={e => updateSearch(e.target.value)}
size={searchInputSizeMapping[size]}
size="xs"
{...searchKeyboardProps}
/>
)}
Expand Down Expand Up @@ -655,12 +655,6 @@ const ClearButton = styled(Button)`
margin: -${space(0.25)} -${space(0.5)};
`;

const searchInputSizeMapping: Record<FormSize, FormSize> = {
md: 'sm',
sm: 'xs',
xs: 'xs',
};

const SearchInput = styled(Input)`
appearance: none;
width: calc(100% - ${space(0.5)} * 2);
Expand Down
12 changes: 10 additions & 2 deletions static/app/components/core/compactSelect/gridList/option.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Fragment, useMemo, useRef, useState} from 'react';
import styled from '@emotion/styled';
import type {AriaGridListItemOptions} from '@react-aria/gridlist';
import {useGridListItem, useGridListSelectionCheckbox} from '@react-aria/gridlist';
import {useFocusWithin, useHover} from '@react-aria/interactions';
Expand All @@ -7,8 +8,9 @@ import type {ListState} from '@react-stately/list';
import type {Node} from '@react-types/shared';

import {Checkbox} from 'sentry/components/core/checkbox';
import {MenuListItem} from 'sentry/components/core/menuListItem';
import {InnerWrap, MenuListItem} from 'sentry/components/core/menuListItem';
import {IconCheckmark} from 'sentry/icons';
import {space} from 'sentry/styles/space';
import type {FormSize} from 'sentry/utils/theme';

import {CheckWrap} from '../styles';
Expand Down Expand Up @@ -111,7 +113,7 @@ export function GridListOption({node, listState, size}: GridListOptionProps) {
}, [multiple, isSelected, isDisabled, size, leadingItems, hideCheck]);

return (
<MenuListItem
<StyledMenuListItem
{...rowPropsMemo}
ref={ref}
size={size}
Expand All @@ -132,3 +134,9 @@ export function GridListOption({node, listState, size}: GridListOptionProps) {
/>
);
}

const StyledMenuListItem = styled(MenuListItem)`
> ${InnerWrap} {
padding-left: ${space(1)};
}
`;
12 changes: 10 additions & 2 deletions static/app/components/core/compactSelect/listBox/option.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import {Fragment, useMemo, useRef} from 'react';
import styled from '@emotion/styled';
import type {AriaOptionProps} from '@react-aria/listbox';
import {useOption} from '@react-aria/listbox';
import type {ListState} from '@react-stately/list';
import type {Node} from '@react-types/shared';

import {Checkbox} from 'sentry/components/core/checkbox';
import {MenuListItem} from 'sentry/components/core/menuListItem';
import {InnerWrap, MenuListItem} from 'sentry/components/core/menuListItem';
import {IconCheckmark} from 'sentry/icons';
import {space} from 'sentry/styles/space';
import type {FormSize} from 'sentry/utils/theme';

import {CheckWrap} from '../styles';
Expand Down Expand Up @@ -90,7 +92,7 @@ export function ListBoxOption({
}, [multiple, isSelected, isDisabled, size, leadingItems, hideCheck]);

return (
<MenuListItem
<StyledMenuListItem
{...optionPropsMemo}
ref={ref}
size={size}
Expand All @@ -111,3 +113,9 @@ export function ListBoxOption({
/>
);
}

const StyledMenuListItem = styled(MenuListItem)`
> ${InnerWrap} {
padding-left: ${space(1)};
}
`;
Loading