Skip to content

ActionListGroup description style bug fix #5036

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
merged 6 commits into from
Sep 27, 2024
Merged

ActionListGroup description style bug fix #5036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
101cd79
add classname
langermank Sep 26, 2024
d3ecec7
fix description styles
langermank Sep 26, 2024
91603df
remove role on story
langermank Sep 26, 2024
db27cbc
add fallback
langermank Sep 26, 2024
d463545
Create angry-tigers-jump.md
langermank Sep 26, 2024
242afcc
lint
langermank Sep 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/angry-tigers-jump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

ActionListGroup description style bug fix
27 changes: 20 additions & 7 deletions packages/react/src/ActionList/Group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from 'react'
import {useId} from '../hooks/useId'
import Box from '../Box'
import type {SxProp, BetterSystemStyleObject} from '../sx'
import {merge} from '../sx'
import type {SxProp} from '../sx'
import {ListContext, type ActionListProps} from './shared'
import type {AriaRole} from '../utils/types'
import {default as Heading} from '../Heading'
Expand Down Expand Up @@ -165,6 +164,20 @@ export const GroupHeading: React.FC<React.PropsWithChildren<GroupHeadingProps>>
borderBottom: '1px solid',
borderColor: 'neutral.muted',
}),

[`.ActionListGroupHeading`]: {
fontSize: 'var(--text-body-size-small), 12px',
fontWeight: 'var(--base-text-weight-semibold, 600)',
lineHeight: 'var(--text-body-lineHeight-small, 1.6666)',
color: 'var(--fgColor-muted)',
},

[`.ActionListGroupHeadingDescription`]: {
fontSize: 'var(--text-body-size-small, 12px)',
fontWeight: 'var(--base-text-weight-normal, 400)',
lineHeight: 'var(--text-body-lineHeight-small, 1.6666)',
color: 'var(--fgColor-muted)',
},
}

return (
Expand All @@ -173,16 +186,16 @@ export const GroupHeading: React.FC<React.PropsWithChildren<GroupHeadingProps>>
{listRole && listRole !== 'list' ? (
<Box sx={styles} role="presentation" aria-hidden="true" {...props}>
<span id={groupHeadingId}>{_internalBackwardCompatibleTitle ?? children}</span>
{auxiliaryText && <span>{auxiliaryText}</span>}
{auxiliaryText && <div className="ActionListGroupHeadingDescription">{auxiliaryText}</div>}
</Box>
) : (
// for explicit (role="list" is passed as prop) and implicit list roles (ActionList ins rendered as list by default), group titles are proper heading tags.
<>
<Heading as={as || 'h3'} id={groupHeadingId} sx={merge<BetterSystemStyleObject>(styles, sx)} {...props}>
<Box sx={styles}>
<Heading className="ActionListGroupHeading" as={as || 'h3'} id={groupHeadingId} sx={sx} {...props}>
{_internalBackwardCompatibleTitle ?? children}
</Heading>
{auxiliaryText && <span>{auxiliaryText}</span>}
</>
{auxiliaryText && <div className="ActionListGroupHeadingDescription">{auxiliaryText}</div>}
</Box>
)}
</>
)
Expand Down
42 changes: 32 additions & 10 deletions packages/react/src/NavList/__snapshots__/NavList.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,20 @@ exports[`NavList renders with groups 1`] = `
color: var(--fgColor-muted,var(--color-fg-muted,#656d76));
}

.c3 .ActionListGroupHeading {
font-size: var(--text-body-size-small),12px;
font-weight: var(--base-text-weight-semibold,600);
line-height: var(--text-body-lineHeight-small,1.6666);
color: var(--fgColor-muted);
}

.c3 .ActionListGroupHeadingDescription {
font-size: var(--text-body-size-small,12px);
font-weight: var(--base-text-weight-normal,400);
line-height: var(--text-body-lineHeight-small,1.6666);
color: var(--fgColor-muted);
}

.c4 {
padding-inline-start: 0;
}
Expand Down Expand Up @@ -853,12 +867,16 @@ exports[`NavList renders with groups 1`] = `
<li
class="c2"
>
<h3
class="c3 Heading"
id=":r7:"
<div
class="c3"
>
Overview
</h3>
<h3
class="ActionListGroupHeading Heading"
id=":r7:"
>
Overview
</h3>
</div>
<ul
aria-labelledby=":r7:"
class="c4"
Expand Down Expand Up @@ -897,12 +915,16 @@ exports[`NavList renders with groups 1`] = `
<li
class="c2"
>
<h3
class="c3 Heading"
id=":r9:"
<div
class="c3"
>
Components
</h3>
<h3
class="ActionListGroupHeading Heading"
id=":r9:"
>
Components
</h3>
</div>
<ul
aria-labelledby=":r9:"
class="c4"
Expand Down
Loading