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

Table: Fixed background clipping when using ExpandableRow #3095

Merged
merged 6 commits into from
Aug 16, 2024
Merged

Table: Fixed background clipping when using ExpandableRow #3095

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4adfcaf
bug: Fixed backgroud clipping when using ExpandableRow in Table
KenAJoh Aug 14, 2024
d1dd184
Update .changeset/modern-items-leave.md
KenAJoh Aug 14, 2024
88589f0
refactor: Use onClick on expandable tablecell
KenAJoh Aug 16, 2024
8b3c626
fire: Removed duplicate eventhandler
KenAJoh Aug 16, 2024
0f4fb20
Merge branch 'main' into table-expadable-position
KenAJoh Aug 16, 2024
0a300a6
fire: removed testing-story
KenAJoh Aug 16, 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
6 changes: 6 additions & 0 deletions .changeset/modern-items-leave.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@navikt/ds-react": patch
"@navikt/ds-css": patch
---

Table: Fixed background-clipping when using ExapandableRow
KenAJoh marked this conversation as resolved.
Show resolved Hide resolved
21 changes: 17 additions & 4 deletions @navikt/core/css/table.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,16 @@
}

.navds-table__toggle-expand-cell {
padding: 0 var(--a-spacing-2);
padding: 0;
width: 3rem;
}

.navds-table__toggle-expand-cell > .navds-table__toggle-expand-wrapper {
position: relative;
width: 2.5rem;
width: 100%;
aspect-ratio: 1;
display: grid;
place-content: center;
}

.navds-table--large .navds-table__toggle-expand-cell {
Expand Down Expand Up @@ -211,15 +218,21 @@
background-color: var(--a-surface-hover);
}

.navds-table__toggle-expand-cell--open > :where(.navds-table__toggle-expand-button) :where(.navds-table__expandable-icon) {
.navds-table__toggle-expand-cell--open
> .navds-table__toggle-expand-wrapper
> :where(.navds-table__toggle-expand-button)
:where(.navds-table__expandable-icon) {
transform: translateY(0) rotate(180deg);
}

.navds-table__toggle-expand-button:hover > :where(.navds-table__expandable-icon) {
transform: translateY(1px);
}

.navds-table__toggle-expand-cell--open > .navds-table__toggle-expand-button:hover > :where(.navds-table__expandable-icon) {
.navds-table__toggle-expand-cell--open
> .navds-table__toggle-expand-wrapper
> .navds-table__toggle-expand-button:hover
> :where(.navds-table__expandable-icon) {
transform: translateY(-1px) rotate(180deg);
}

Expand Down
26 changes: 14 additions & 12 deletions @navikt/core/react/src/table/ExpandableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,20 @@ export const ExpandableRow: ExpandableRowType = forwardRef(
})}
>
{!expansionDisabled && (
<button
className="navds-table__toggle-expand-button"
type="button"
aria-controls={id}
aria-expanded={_open}
onClick={expansionHandler}
>
<ChevronDownIcon
className="navds-table__expandable-icon"
title={_open ? "Vis mindre" : "Vis mer"}
/>
</button>
<div className="navds-table__toggle-expand-wrapper">
<button
className="navds-table__toggle-expand-button"
type="button"
aria-controls={id}
aria-expanded={_open}
onClick={expansionHandler}
>
<ChevronDownIcon
className="navds-table__expandable-icon"
title={_open ? "Vis mindre" : "Vis mer"}
/>
</button>
</div>
)}
</DataCell>
{togglePlacement === "left" && children}
Expand Down
32 changes: 32 additions & 0 deletions @navikt/core/react/src/table/stories/table-2-expandable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,38 @@ const data = [
},
];

export const ExpandableButtonBleed = () => {
return (
<div style={{ background: "red" }}>
<Table zebraStripes>
<Table.Header style={{ background: "white" }}>
<Table.Row>
{columns.map(({ key, name }) => (
<Table.HeaderCell key={key}>{name}</Table.HeaderCell>
))}
<Table.HeaderCell />
</Table.Row>
</Table.Header>
<Table.Body style={{ background: "white" }}>
{data.map((row, i) => (
<Table.ExpandableRow
expansionDisabled={row.animal === "Sel"}
content={row.content}
key={row.name}
togglePlacement="right"
defaultOpen={i === 3}
>
{columns.map(({ key }) => (
<Table.DataCell key={key}>{row[key]}</Table.DataCell>
))}
</Table.ExpandableRow>
))}
</Table.Body>
</Table>
</div>
);
};

export const ClickableRow = () => {
const [isRowOpen1, setIsRowOpen1] = useState(false);
const [isRowOpen2, setIsRowOpen2] = useState(false);
Expand Down
34 changes: 17 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3543,7 +3543,7 @@ __metadata:
languageName: node
linkType: hard

"@navikt/aksel-icons@npm:^6.15.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
"@navikt/aksel-icons@npm:^6.16.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
version: 0.0.0-use.local
resolution: "@navikt/aksel-icons@workspace:@navikt/aksel-icons"
dependencies:
Expand Down Expand Up @@ -3572,8 +3572,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/aksel-stylelint@workspace:@navikt/aksel-stylelint"
dependencies:
"@navikt/ds-css": "npm:^6.15.0"
"@navikt/ds-tokens": "npm:^6.15.0"
"@navikt/ds-css": "npm:^6.16.0"
"@navikt/ds-tokens": "npm:^6.16.0"
concurrently: "npm:7.2.1"
postcss-selector-parser: "npm:^6.0.13"
postcss-value-parser: "npm:^4.2.0"
Expand All @@ -3588,7 +3588,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/aksel@workspace:@navikt/aksel"
dependencies:
"@navikt/ds-css": "npm:6.15.0"
"@navikt/ds-css": "npm:6.16.0"
axios: "npm:1.6.0"
chalk: "npm:4.1.0"
clipboardy: "npm:^2.3.0"
Expand All @@ -3609,11 +3609,11 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-css@npm:*, @navikt/ds-css@npm:6.15.0, @navikt/ds-css@npm:^6.15.0, @navikt/ds-css@workspace:@navikt/core/css":
"@navikt/ds-css@npm:*, @navikt/ds-css@npm:6.16.0, @navikt/ds-css@npm:^6.16.0, @navikt/ds-css@workspace:@navikt/core/css":
version: 0.0.0-use.local
resolution: "@navikt/ds-css@workspace:@navikt/core/css"
dependencies:
"@navikt/ds-tokens": "npm:^6.15.0"
"@navikt/ds-tokens": "npm:^6.16.0"
cssnano: "npm:6.0.0"
fast-glob: "npm:3.2.11"
lodash: "npm:4.17.21"
Expand All @@ -3626,14 +3626,14 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-react@npm:*, @navikt/ds-react@npm:^6.15.0, @navikt/ds-react@workspace:@navikt/core/react":
"@navikt/ds-react@npm:*, @navikt/ds-react@npm:^6.16.0, @navikt/ds-react@workspace:@navikt/core/react":
version: 0.0.0-use.local
resolution: "@navikt/ds-react@workspace:@navikt/core/react"
dependencies:
"@floating-ui/react": "npm:0.25.4"
"@floating-ui/react-dom": "npm:^2.0.9"
"@navikt/aksel-icons": "npm:^6.15.0"
"@navikt/ds-tokens": "npm:^6.15.0"
"@navikt/aksel-icons": "npm:^6.16.0"
"@navikt/ds-tokens": "npm:^6.16.0"
"@testing-library/dom": "npm:9.3.4"
"@testing-library/jest-dom": "npm:^5.16.0"
"@testing-library/react": "npm:^15.0.7"
Expand Down Expand Up @@ -3663,11 +3663,11 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-tailwind@npm:^6.15.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
"@navikt/ds-tailwind@npm:^6.16.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
version: 0.0.0-use.local
resolution: "@navikt/ds-tailwind@workspace:@navikt/core/tailwind"
dependencies:
"@navikt/ds-tokens": "npm:^6.15.0"
"@navikt/ds-tokens": "npm:^6.16.0"
color: "npm:4.2.3"
lodash: "npm:^4.17.21"
tailwindcss: "npm:^3.3.3"
Expand All @@ -3677,7 +3677,7 @@ __metadata:
languageName: unknown
linkType: soft

"@navikt/ds-tokens@npm:^6.15.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
"@navikt/ds-tokens@npm:^6.16.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
version: 0.0.0-use.local
resolution: "@navikt/ds-tokens@workspace:@navikt/core/tokens"
dependencies:
Expand Down Expand Up @@ -7654,11 +7654,11 @@ __metadata:
version: 0.0.0-use.local
resolution: "aksel.nav.no@workspace:aksel.nav.no"
dependencies:
"@navikt/aksel-icons": "npm:^6.15.0"
"@navikt/ds-css": "npm:^6.15.0"
"@navikt/ds-react": "npm:^6.15.0"
"@navikt/ds-tailwind": "npm:^6.15.0"
"@navikt/ds-tokens": "npm:^6.15.0"
"@navikt/aksel-icons": "npm:^6.16.0"
"@navikt/ds-css": "npm:^6.16.0"
"@navikt/ds-react": "npm:^6.16.0"
"@navikt/ds-tailwind": "npm:^6.16.0"
"@navikt/ds-tokens": "npm:^6.16.0"
languageName: unknown
linkType: soft

Expand Down
Loading