From 2e3bc3c2be30e92cf7cd23d9c8cefa7555667432 Mon Sep 17 00:00:00 2001
From: Katie McFaul <kmcfaul@redhat.com>
Date: Sun, 7 May 2023 23:17:47 -0400
Subject: [PATCH 1/5] feat(misc): dark theme docs fixes

---
 .../DataList/examples/DataListWidthModifiers.tsx           | 7 +++----
 packages/react-core/src/components/Divider/Divider.tsx     | 2 +-
 .../src/components/Table/examples/TableMisc.tsx            | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx b/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
index 190e7feabba..e9b04ee34ee 100644
--- a/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
@@ -45,10 +45,9 @@ export const DataListWidthModifiers: React.FunctionComponent = () => {
     display: 'block',
     width: '100%',
     padding: '.25rem .5rem',
-    color: '#004e8a',
-    backgroundColor: '#def3ff',
-    border: '1px solid rgba(0,0,0,.1)',
-    borderRadius: '4px'
+    color: 'var(--pf-global--Color--100)',
+    backgroundColor: 'var(--pf-global--BackgroundColor--200)',
+    border: 'var(--pf-global--BorderWidth--sm) var(--pf-global--BorderColor--100) solid'
   };
 
   return (
diff --git a/packages/react-core/src/components/Divider/Divider.tsx b/packages/react-core/src/components/Divider/Divider.tsx
index 35ccaba4555..cbb41116354 100644
--- a/packages/react-core/src/components/Divider/Divider.tsx
+++ b/packages/react-core/src/components/Divider/Divider.tsx
@@ -51,7 +51,7 @@ export const Divider: React.FunctionComponent<DividerProps> = ({
         formatBreakpointMods(orientation, styles),
         className
       )}
-      {...(component !== 'hr' && { role: 'separator' })}
+      {...(component !== 'hr' && component !== 'li' && { role: 'separator' })}
       {...props}
     />
   );
diff --git a/packages/react-table/src/components/Table/examples/TableMisc.tsx b/packages/react-table/src/components/Table/examples/TableMisc.tsx
index 1ca6f67c798..4cf63338519 100644
--- a/packages/react-table/src/components/Table/examples/TableMisc.tsx
+++ b/packages/react-table/src/components/Table/examples/TableMisc.tsx
@@ -65,7 +65,7 @@ export const TableMisc: React.FunctionComponent = () => {
         {repositories.map((repo, rowIndex) => {
           const isOddRow = (rowIndex + 1) % 2;
           const customStyle = {
-            backgroundColor: 'var(--pf-v5-global--palette--blue-50)'
+            backgroundColor: 'var(--pf-global--BackgroundColor--150)'
           };
           // Some arbitrary logic to demonstrate that cell styles can be based on anything
           const nameColSpan = repo.branches === null && repo.prs === null ? 3 : 1;

From 6fc69e4dc6149ee110ba6998df9b668da4bc486a Mon Sep 17 00:00:00 2001
From: Katie McFaul <kmcfaul@redhat.com>
Date: Mon, 8 May 2023 09:15:57 -0400
Subject: [PATCH 2/5] snap

---
 .../Divider/__tests__/__snapshots__/Divider.test.tsx.snap        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap b/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
index 03b490d6b5b..a149fc3626e 100644
--- a/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
+++ b/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
@@ -21,7 +21,6 @@ exports[`divider using li 1`] = `
 <DocumentFragment>
   <li
     class="pf-v5-c-divider"
-    role="separator"
   />
 </DocumentFragment>
 `;

From 11297584c850906bc4c9cef5b49d09972524718c Mon Sep 17 00:00:00 2001
From: Katie McFaul <kmcfaul@redhat.com>
Date: Mon, 8 May 2023 09:59:04 -0400
Subject: [PATCH 3/5] snap

---
 .../Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap  | 1 -
 .../__tests__/__snapshots__/OptionsMenu.test.tsx.snap           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap
index e68cacc5780..0b7e1308efa 100644
--- a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`OptionsMenuSeparator should match snapshot (auto-generated) 1`] = `
 <DocumentFragment>
   <li
     class="pf-v5-c-divider ''"
-    role="separator"
   />
 </DocumentFragment>
 `;
diff --git a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
index 7ef48756587..8f851373e33 100644
--- a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
@@ -132,7 +132,6 @@ exports[`optionsMenu expanded 1`] = `
       <li
         class="pf-v5-c-divider"
         index="1"
-        role="separator"
       />
       <section
         class="pf-v5-c-options-menu__group"
@@ -482,7 +481,6 @@ exports[`optionsMenu renders in strict mode 1`] = `
       <li
         class="pf-v5-c-divider"
         index="1"
-        role="separator"
       />
       <section
         class="pf-v5-c-options-menu__group"

From 478b34ba828853504122d1a43d594b72aef9afe4 Mon Sep 17 00:00:00 2001
From: Katie McFaul <kmcfaul@redhat.com>
Date: Mon, 8 May 2023 10:50:32 -0400
Subject: [PATCH 4/5] revert divider change and update example

---
 packages/react-core/src/components/Divider/Divider.tsx          | 2 +-
 .../Divider/__tests__/__snapshots__/Divider.test.tsx.snap       | 1 +
 .../src/components/Divider/examples/DividerUsingLi.tsx          | 2 +-
 .../Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap  | 1 +
 .../__tests__/__snapshots__/OptionsMenu.test.tsx.snap           | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/react-core/src/components/Divider/Divider.tsx b/packages/react-core/src/components/Divider/Divider.tsx
index cbb41116354..35ccaba4555 100644
--- a/packages/react-core/src/components/Divider/Divider.tsx
+++ b/packages/react-core/src/components/Divider/Divider.tsx
@@ -51,7 +51,7 @@ export const Divider: React.FunctionComponent<DividerProps> = ({
         formatBreakpointMods(orientation, styles),
         className
       )}
-      {...(component !== 'hr' && component !== 'li' && { role: 'separator' })}
+      {...(component !== 'hr' && { role: 'separator' })}
       {...props}
     />
   );
diff --git a/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap b/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
index a149fc3626e..03b490d6b5b 100644
--- a/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
+++ b/packages/react-core/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
@@ -21,6 +21,7 @@ exports[`divider using li 1`] = `
 <DocumentFragment>
   <li
     class="pf-v5-c-divider"
+    role="separator"
   />
 </DocumentFragment>
 `;
diff --git a/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx b/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx
index b6da6ce09f4..f8e0c4269ea 100644
--- a/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx
@@ -4,7 +4,7 @@ import { Divider } from '@patternfly/react-core';
 export const DividerUsingLi: React.FunctionComponent = () => (
   <ul role="list">
     <li>List item one</li>
-    <Divider component="li" />
+    <Divider component="li" role="none" />
     <li>List item two</li>
   </ul>
 );
diff --git a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap
index 0b7e1308efa..e68cacc5780 100644
--- a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuSeparator.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`OptionsMenuSeparator should match snapshot (auto-generated) 1`] = `
 <DocumentFragment>
   <li
     class="pf-v5-c-divider ''"
+    role="separator"
   />
 </DocumentFragment>
 `;
diff --git a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
index 8f851373e33..7ef48756587 100644
--- a/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
+++ b/packages/react-core/src/deprecated/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
@@ -132,6 +132,7 @@ exports[`optionsMenu expanded 1`] = `
       <li
         class="pf-v5-c-divider"
         index="1"
+        role="separator"
       />
       <section
         class="pf-v5-c-options-menu__group"
@@ -481,6 +482,7 @@ exports[`optionsMenu renders in strict mode 1`] = `
       <li
         class="pf-v5-c-divider"
         index="1"
+        role="separator"
       />
       <section
         class="pf-v5-c-options-menu__group"

From e761f037e46f09a197ad06a4b0f8de68c2378c82 Mon Sep 17 00:00:00 2001
From: Katie McFaul <kmcfaul@redhat.com>
Date: Mon, 8 May 2023 11:06:51 -0400
Subject: [PATCH 5/5] add v5 namespace to css

---
 .../components/DataList/examples/DataListWidthModifiers.tsx | 6 +++---
 .../react-table/src/components/Table/examples/TableMisc.tsx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx b/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
index e9b04ee34ee..e3102e97fdb 100644
--- a/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
@@ -45,9 +45,9 @@ export const DataListWidthModifiers: React.FunctionComponent = () => {
     display: 'block',
     width: '100%',
     padding: '.25rem .5rem',
-    color: 'var(--pf-global--Color--100)',
-    backgroundColor: 'var(--pf-global--BackgroundColor--200)',
-    border: 'var(--pf-global--BorderWidth--sm) var(--pf-global--BorderColor--100) solid'
+    color: 'var(--pf-v5-global--Color--100)',
+    backgroundColor: 'var(--pf-v5-global--BackgroundColor--200)',
+    border: 'var(--pf-v5-global--BorderWidth--sm) var(--pf-v5-global--BorderColor--100) solid'
   };
 
   return (
diff --git a/packages/react-table/src/components/Table/examples/TableMisc.tsx b/packages/react-table/src/components/Table/examples/TableMisc.tsx
index 4cf63338519..fbe764241b1 100644
--- a/packages/react-table/src/components/Table/examples/TableMisc.tsx
+++ b/packages/react-table/src/components/Table/examples/TableMisc.tsx
@@ -65,7 +65,7 @@ export const TableMisc: React.FunctionComponent = () => {
         {repositories.map((repo, rowIndex) => {
           const isOddRow = (rowIndex + 1) % 2;
           const customStyle = {
-            backgroundColor: 'var(--pf-global--BackgroundColor--150)'
+            backgroundColor: 'var(--pf-v5-global--BackgroundColor--150)'
           };
           // Some arbitrary logic to demonstrate that cell styles can be based on anything
           const nameColSpan = repo.branches === null && repo.prs === null ? 3 : 1;