Skip to content
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

Jump to bottom

feat(SelectPanel): Convert SelectPanel to CSS modules behind feature flag #5324

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat(SelectPanel): Convert SelectPanel to CSS modules behind feature flag #5324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b18d021
feat(SelectPanel): Convert SelectPanel to CSS modules behind feature …
hussam-i-am Nov 21, 2024
6dd6368
format css
hussam-i-am Nov 21, 2024
ef0c298
Merge branch 'main' into hussam-i-am/select-panel-1-css-modules
hussam-i-am Nov 21, 2024
1ced713
Merge branch 'main' into hussam-i-am/select-panel-1-css-modules
hussam-i-am Nov 25, 2024
f900723
Merge branch 'main' into hussam-i-am/select-panel-1-css-modules
hussam-i-am Nov 26, 2024
f093d76
Merge branch 'main' into hussam-i-am/select-panel-1-css-modules
hussam-i-am Nov 27, 2024
47b1c75
Merge branch 'main' into hussam-i-am/select-panel-1-css-modules
hussam-i-am Nov 27, 2024
a1faf46
Merge branch 'main' into hussam-i-am/select-panel-1-css-modules
hussam-i-am Nov 27, 2024
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
5 changes: 5 additions & 0 deletions .changeset/cyan-buses-visit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": minor
---

Convert SelectPanel to CSS modules behind feature flag
33 changes: 33 additions & 0 deletions packages/react/src/SelectPanel/SelectPanel.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.Wrapper {
display: flex;
height: inherit;
max-height: inherit;
flex-direction: column;
}

.Content {
padding-top: var(--base-size-8);
padding-right: var(--base-size-16);
padding-left: var(--base-size-16);
}

.Title {
font-size: var(--text-body-size-medium);
}

.Subtitle {
font-size: var(--text-body-size-small);
color: var(--fgColor-muted);
}

.Footer {
display: flex;
padding: var(--base-size-8);
border-color: var(--borderColor-default);
border-top: var(--borderWidth-thin) solid;
}

.FilteredActionList {
height: inherit;
max-height: inherit;
}
47 changes: 35 additions & 12 deletions packages/react/src/SelectPanel/SelectPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import {useProvidedStateOrCreate} from '../hooks/useProvidedStateOrCreate'
import {LiveRegion, LiveRegionOutlet, Message} from '../internal/components/LiveRegion'
import {useFeatureFlag} from '../FeatureFlags'

import classes from './SelectPanel.module.css'
import {clsx} from 'clsx'

interface SelectPanelSingleSelection {
selected: ItemInput | undefined
onSelectedChange: (selected: ItemInput | undefined) => void
Expand Down Expand Up @@ -112,6 +115,9 @@ export function SelectPanel({
[externalOnFilterChange, setInternalFilterValue],
)

const CSS_MODULES_FEATURE_FLAG = 'primer_react_css_modules_team'
const enabled = useFeatureFlag(CSS_MODULES_FEATURE_FLAG)

const anchorRef = useProvidedRefOrCreate(externalAnchorRef)
const onOpen: AnchoredOverlayProps['onOpen'] = useCallback(
(gesture: Parameters<Exclude<AnchoredOverlayProps['onOpen'], undefined>>[0]) => onOpenChange(true, gesture),
Expand Down Expand Up @@ -220,13 +226,25 @@ export function SelectPanel({
}
/>
)}
<Box sx={{display: 'flex', flexDirection: 'column', height: 'inherit', maxHeight: 'inherit'}}>
<Box sx={{pt: 2, px: 3}}>
<Heading as="h1" id={titleId} sx={{fontSize: 1}}>
<Box
sx={enabled ? undefined : {display: 'flex', flexDirection: 'column', height: 'inherit', maxHeight: 'inherit'}}
className={enabled ? classes.Wrapper : undefined}
>
<Box sx={enabled ? undefined : {pt: 2, px: 3}} className={enabled ? classes.Content : undefined}>
<Heading
as="h1"
id={titleId}
sx={enabled ? undefined : {fontSize: 1}}
className={enabled ? classes.Title : undefined}
>
{title}
</Heading>
{subtitle ? (
<Box id={subtitleId} sx={{fontSize: 0, color: 'fg.muted'}}>
<Box
id={subtitleId}
sx={enabled ? undefined : {fontSize: 0, color: 'fg.muted'}}
className={enabled ? classes.Subtitle : undefined}
>
{subtitle}
</Box>
) : null}
Expand All @@ -247,17 +265,22 @@ export function SelectPanel({
inputRef={inputRef}
// inheriting height and maxHeight ensures that the FilteredActionList is never taller
// than the Overlay (which would break scrolling the items)
sx={{...sx, height: 'inherit', maxHeight: 'inherit'}}
className={className}
sx={enabled ? sx : {...sx, height: 'inherit', maxHeight: 'inherit'}}
className={enabled ? clsx(className, classes.FilteredActionList) : className}
/>
{footer && (
<Box
sx={{
display: 'flex',
borderTop: '1px solid',
borderColor: 'border.default',
padding: 2,
}}
sx={
enabled
? undefined
: {
display: 'flex',
borderTop: '1px solid',
borderColor: 'border.default',
padding: 2,
}
}
className={enabled ? classes.Footer : undefined}
>
{footer}
</Box>
Expand Down
Loading