Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .changeset/gentle-countries-rest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@primer/react": patch
---

Fix overflow issues in `PageLayout.Content`

| Before | After |
|--------|--------|
| <img width="1224" alt="image" src="https://user-images.githubusercontent.com/3026298/167502059-81e0ef9e-2fd6-40fe-b1f1-708368286578.png"> | <img width="1247" alt="image" src="https://user-images.githubusercontent.com/3026298/167502084-1c4f247e-2713-4419-8f4c-bb1a20e24dca.png"> |
15 changes: 15 additions & 0 deletions src/PageLayout/PageLayout.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,21 @@ export const PullRequestPage = () => (
</PageLayout.Header>
<PageLayout.Content>
<Box sx={{border: '1px solid', borderRadius: 2, borderColor: 'border.default', height: 200}}></Box>
<Box
sx={{
maxWidth: '100%',
overflowX: 'auto',
border: '1px solid',
whiteSpace: 'nowrap',
borderColor: 'border.default',
mt: 3,
p: 3,
borderRadius: 2
}}
>
This box has really long content. If it is too long, it will cause x overflow and should show a scrollbar. When
this overflows, it should not break to overall page layout!
</Box>
</PageLayout.Content>
<PageLayout.Pane>
<Box sx={{display: 'flex', flexDirection: 'column', gap: 3}}>
Expand Down
5 changes: 3 additions & 2 deletions src/PageLayout/PageLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import {Box} from '..'
import {BetterSystemStyleObject, merge, SxProp} from '../sx'
import {Box} from '..'

const REGION_ORDER = {
header: 0,
Expand Down Expand Up @@ -238,7 +238,8 @@ const Content: React.FC<PageLayoutContentProps> = ({width = 'full', children, sx
// than the pane region on wide viewports if its contents are too wide.
flexBasis: 0,
flexGrow: 1,
flexShrink: 1
flexShrink: 1,
minWidth: 1 // Hack to prevent overflowing content from pushing the pane region to the next line
},
sx
)}
Expand Down
4 changes: 4 additions & 0 deletions src/PageLayout/__snapshots__/PageLayout.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ exports[`PageLayout renders condensed layout 1`] = `
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
min-width: 1px;
}

.c5 {
Expand Down Expand Up @@ -246,6 +247,7 @@ exports[`PageLayout renders default layout 1`] = `
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
min-width: 1px;
}

.c5 {
Expand Down Expand Up @@ -491,6 +493,7 @@ exports[`PageLayout renders pane in different position when narrow 1`] = `
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
min-width: 1px;
}

.c5 {
Expand Down Expand Up @@ -729,6 +732,7 @@ exports[`PageLayout renders with dividers 1`] = `
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
min-width: 1px;
}

.c5 {
Expand Down