diff --git a/.changeset/clever-parents-bathe.md b/.changeset/clever-parents-bathe.md deleted file mode 100644 index 083645355df..00000000000 --- a/.changeset/clever-parents-bathe.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@primer/react': patch ---- - -Update @react-aria/ssr dependency to ^3.5.0 to address server-side rendering mismatch when using React StrictMode - - diff --git a/.changeset/eleven-humans-sneeze.md b/.changeset/eleven-humans-sneeze.md new file mode 100644 index 00000000000..e881e43ce14 --- /dev/null +++ b/.changeset/eleven-humans-sneeze.md @@ -0,0 +1,5 @@ +--- +"@primer/react": patch +--- + +PageLayout.Content no longer renders as `main` by default. Instead, developers may add a `main` landmark within `Pagelayout.Content` themselves. diff --git a/package-lock.json b/package-lock.json index bf5b7875e61..a6dd6bdcedc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@primer/behaviors": "^1.3.4", "@primer/octicons-react": "^19.3.0", "@primer/primitives": "^7.11.11", - "@react-aria/ssr": "^3.5.0", + "@react-aria/ssr": "^3.1.0", "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", "@styled-system/theme-get": "^5.1.2", diff --git a/package.json b/package.json index 913dc6a6ff9..d5105e32b8b 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "@primer/behaviors": "^1.3.4", "@primer/octicons-react": "^19.3.0", "@primer/primitives": "^7.11.11", - "@react-aria/ssr": "^3.5.0", + "@react-aria/ssr": "^3.1.0", "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", "@styled-system/theme-get": "^5.1.2", diff --git a/src/PageLayout/PageLayout.test.tsx b/src/PageLayout/PageLayout.test.tsx index 03abd241912..46a6da2beb3 100644 --- a/src/PageLayout/PageLayout.test.tsx +++ b/src/PageLayout/PageLayout.test.tsx @@ -123,7 +123,9 @@ describe('PageLayout', () => { Header - Content + +
Content
+
Pane Footer
@@ -154,7 +156,7 @@ describe('PageLayout', () => { ) expect(screen.getByRole('banner')).toHaveAccessibleName('header') - expect(screen.getByRole('main')).toHaveAccessibleName('content') + expect(screen.getByLabelText('content')).toBeInTheDocument() expect(screen.getByRole('contentinfo')).toHaveAccessibleName('footer') }) diff --git a/src/PageLayout/PageLayout.tsx b/src/PageLayout/PageLayout.tsx index 71371fc4233..54af5598b73 100644 --- a/src/PageLayout/PageLayout.tsx +++ b/src/PageLayout/PageLayout.tsx @@ -421,7 +421,6 @@ const Content: React.FC> = ({ return ( ( diff --git a/src/PageLayout/__snapshots__/PageLayout.test.tsx.snap b/src/PageLayout/__snapshots__/PageLayout.test.tsx.snap index 97b5bfbea64..30144461b0c 100644 --- a/src/PageLayout/__snapshots__/PageLayout.test.tsx.snap +++ b/src/PageLayout/__snapshots__/PageLayout.test.tsx.snap @@ -199,7 +199,7 @@ exports[`PageLayout renders condensed layout 1`] = `
-
-
+
@@ -493,7 +493,7 @@ exports[`PageLayout renders default layout 1`] = `
-
-
+
@@ -787,7 +787,7 @@ exports[`PageLayout renders pane in different position when narrow 1`] = `
-
-
+
@@ -1081,7 +1081,7 @@ exports[`PageLayout renders with dividers 1`] = `
-
-
+
diff --git a/src/SplitPageLayout/__snapshots__/SplitPageLayout.test.tsx.snap b/src/SplitPageLayout/__snapshots__/SplitPageLayout.test.tsx.snap index c35d5dc97cd..1486e3792bb 100644 --- a/src/SplitPageLayout/__snapshots__/SplitPageLayout.test.tsx.snap +++ b/src/SplitPageLayout/__snapshots__/SplitPageLayout.test.tsx.snap @@ -234,7 +234,7 @@ exports[`SplitPageLayout renders default layout 1`] = `
-
-
+