Skip to content

Commit fcfccff

Browse files
committed
Revert "feat(SelectPanel): Convert SelectPanel to CSS modules behind feature flag (#5324)"
This reverts commit bd5f0d4.
1 parent 616102a commit fcfccff

File tree

3 files changed

+12
-73
lines changed

3 files changed

+12
-73
lines changed

.changeset/cyan-buses-visit.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

packages/react/src/SelectPanel/SelectPanel.module.css

Lines changed: 0 additions & 33 deletions
This file was deleted.

packages/react/src/SelectPanel/SelectPanel.tsx

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ import {useProvidedStateOrCreate} from '../hooks/useProvidedStateOrCreate'
1919
import {LiveRegion, LiveRegionOutlet, Message} from '../internal/components/LiveRegion'
2020
import {useFeatureFlag} from '../FeatureFlags'
2121

22-
import classes from './SelectPanel.module.css'
23-
import {clsx} from 'clsx'
24-
2522
interface SelectPanelSingleSelection {
2623
selected: ItemInput | undefined
2724
onSelectedChange: (selected: ItemInput | undefined) => void
@@ -115,9 +112,6 @@ export function SelectPanel({
115112
[externalOnFilterChange, setInternalFilterValue],
116113
)
117114

118-
const CSS_MODULES_FEATURE_FLAG = 'primer_react_css_modules_team'
119-
const enabled = useFeatureFlag(CSS_MODULES_FEATURE_FLAG)
120-
121115
const anchorRef = useProvidedRefOrCreate(externalAnchorRef)
122116
const onOpen: AnchoredOverlayProps['onOpen'] = useCallback(
123117
(gesture: Parameters<Exclude<AnchoredOverlayProps['onOpen'], undefined>>[0]) => onOpenChange(true, gesture),
@@ -226,25 +220,13 @@ export function SelectPanel({
226220
}
227221
/>
228222
)}
229-
<Box
230-
sx={enabled ? undefined : {display: 'flex', flexDirection: 'column', height: 'inherit', maxHeight: 'inherit'}}
231-
className={enabled ? classes.Wrapper : undefined}
232-
>
233-
<Box sx={enabled ? undefined : {pt: 2, px: 3}} className={enabled ? classes.Content : undefined}>
234-
<Heading
235-
as="h1"
236-
id={titleId}
237-
sx={enabled ? undefined : {fontSize: 1}}
238-
className={enabled ? classes.Title : undefined}
239-
>
223+
<Box sx={{display: 'flex', flexDirection: 'column', height: 'inherit', maxHeight: 'inherit'}}>
224+
<Box sx={{pt: 2, px: 3}}>
225+
<Heading as="h1" id={titleId} sx={{fontSize: 1}}>
240226
{title}
241227
</Heading>
242228
{subtitle ? (
243-
<Box
244-
id={subtitleId}
245-
sx={enabled ? undefined : {fontSize: 0, color: 'fg.muted'}}
246-
className={enabled ? classes.Subtitle : undefined}
247-
>
229+
<Box id={subtitleId} sx={{fontSize: 0, color: 'fg.muted'}}>
248230
{subtitle}
249231
</Box>
250232
) : null}
@@ -265,22 +247,17 @@ export function SelectPanel({
265247
inputRef={inputRef}
266248
// inheriting height and maxHeight ensures that the FilteredActionList is never taller
267249
// than the Overlay (which would break scrolling the items)
268-
sx={enabled ? sx : {...sx, height: 'inherit', maxHeight: 'inherit'}}
269-
className={enabled ? clsx(className, classes.FilteredActionList) : className}
250+
sx={{...sx, height: 'inherit', maxHeight: 'inherit'}}
251+
className={className}
270252
/>
271253
{footer && (
272254
<Box
273-
sx={
274-
enabled
275-
? undefined
276-
: {
277-
display: 'flex',
278-
borderTop: '1px solid',
279-
borderColor: 'border.default',
280-
padding: 2,
281-
}
282-
}
283-
className={enabled ? classes.Footer : undefined}
255+
sx={{
256+
display: 'flex',
257+
borderTop: '1px solid',
258+
borderColor: 'border.default',
259+
padding: 2,
260+
}}
284261
>
285262
{footer}
286263
</Box>

0 commit comments

Comments
 (0)