From 17c244f8ce0fc64b21fa175c4bd828ed04d081c9 Mon Sep 17 00:00:00 2001
From: Michael Jordan <mijordan@adobe.com>
Date: Tue, 6 Dec 2022 15:59:54 -0500
Subject: [PATCH 1/2] fix(#3672): WHCM/forced-colors support for column resizer

---
 .../components/table/skin.css                 | 37 +++++++++++++++++--
 packages/@react-spectrum/table/src/Nubbin.tsx | 12 +++---
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/packages/@adobe/spectrum-css-temp/components/table/skin.css b/packages/@adobe/spectrum-css-temp/components/table/skin.css
index 9a597f6e39f..13d0580cf77 100644
--- a/packages/@adobe/spectrum-css-temp/components/table/skin.css
+++ b/packages/@adobe/spectrum-css-temp/components/table/skin.css
@@ -303,11 +303,42 @@ tbody.spectrum-Table-body {
 }
 
 .spectrum-Table-colResizeIndicator {
+  --spectrum-table-col-resize-indicator-background-color: var(--spectrum-global-color-blue-600);
   &.spectrum-Table-colResizeIndicator--resizing {
-    background-color: var(--spectrum-global-color-blue-600);
+    background-color: var(--spectrum-table-col-resize-indicator-background-color);
+  }
+}
+.spectrum-Table-colResizeNubbin {
+  --spectrum-table-col-resize-nubbin-background-color: var(--spectrum-global-color-blue-600);
+  --spectrum-table-col-resize-nubbin-icon-color: var(--spectrum-global-color-static-white);
+  svg {
+    > g {
+      fill: var(--spectrum-table-col-resize-nubbin-background-color);
+      stroke: var(--spectrum-table-col-resize-nubbin-background-color);
+    }
+    > path {
+      fill: var(--spectrum-table-col-resize-nubbin-icon-color);
+      stroke: var(--spectrum-table-col-resize-nubbin-icon-color);
+    }
   }
 }
-.spectrum-Table-colResizeNubbin {}
 .spectrum-Table-bodyResizeIndicator {
-  background-color: var(--spectrum-global-color-blue-600);
+  --spectrum-table-body-resize-indicator-background-color: var(--spectrum-global-color-blue-600);
+  background-color: var(--spectrum-table-body-resize-indicator-background-color);
+}
+
+@media (forced-colors: active) {
+  .spectrum-Table-columnResizer {
+    --spectrum-table-divider-border-color: CanvasText;
+  }
+  .spectrum-Table-colResizeIndicator {
+    --spectrum-table-col-resize-indicator-background-color: Highlight;
+  }
+  .spectrum-Table-colResizeNubbin {
+    --spectrum-table-col-resize-nubbin-background-color: Highlight;
+    --spectrum-table-col-resize-nubbin-icon-color: HighlightText;
+  }
+  .spectrum-Table-bodyResizeIndicator {
+    --spectrum-table-body-resize-indicator-background-color: Highlight;
+  }
 }
diff --git a/packages/@react-spectrum/table/src/Nubbin.tsx b/packages/@react-spectrum/table/src/Nubbin.tsx
index 4800aac19ee..ac5b8c4bb2e 100644
--- a/packages/@react-spectrum/table/src/Nubbin.tsx
+++ b/packages/@react-spectrum/table/src/Nubbin.tsx
@@ -17,14 +17,12 @@ import React from 'react';
 export function Nubbin() {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-      <g id="Group_175838" data-name="Group 175838">
-        <g id="Ellipse_10104" data-name="Ellipse 10104" fill="var(--spectrum-global-color-blue-600)" stroke="var(--spectrum-global-color-blue-600)" strokeWidth="2">
-          <circle cx="8" cy="8" r="8" stroke="none" />
-          <circle cx="8" cy="8" r="7" fill="none" />
-        </g>
+      <g fill="var(--spectrum-global-color-blue-600)" stroke="var(--spectrum-global-color-blue-600)" strokeWidth="2">
+        <circle cx="8" cy="8" r="8" stroke="none" />
+        <circle cx="8" cy="8" r="7" fill="none" />
       </g>
-      <path id="Path_104166" data-name="Path 104166" d="M-2106-7380.263v5l2.5-2.551Z" transform="translate(2116 7385.763)" fill="#fff" stroke="#fff" strokeLinejoin="round" strokeWidth="2" />
-      <path id="Path_104167" data-name="Path 104167" d="M-2106-7380.263v5l2.5-2.551Z" transform="translate(-2100 -7369.763) rotate(180)" fill="#fff" stroke="#fff" strokeLinejoin="round" strokeWidth="2" />
+      <path d="M-2106-7380.263v5l2.5-2.551Z" transform="translate(2116 7385.763)" fill="#fff" stroke="#fff" strokeLinejoin="round" strokeWidth="2" />
+      <path d="M-2106-7380.263v5l2.5-2.551Z" transform="translate(-2100 -7369.763) rotate(180)" fill="#fff" stroke="#fff" strokeLinejoin="round" strokeWidth="2" />
     </svg>
   );
 }

From 7c694a2e66ff56da3e728229b1438db3787501f9 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Thu, 15 Dec 2022 15:49:43 +1100
Subject: [PATCH 2/2] simplify color assignment

---
 .../components/table/skin.css                 | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/@adobe/spectrum-css-temp/components/table/skin.css b/packages/@adobe/spectrum-css-temp/components/table/skin.css
index 13d0580cf77..843a7fa2667 100644
--- a/packages/@adobe/spectrum-css-temp/components/table/skin.css
+++ b/packages/@adobe/spectrum-css-temp/components/table/skin.css
@@ -13,6 +13,12 @@ governing permissions and limitations under the License.
 :root {
   --spectrum-table-header-sort-icon-color-hover: var(--spectrum-global-color-gray-700);
 }
+.spectrum-Table {
+  --spectrum-table-col-resize-indicator-background-color: var(--spectrum-global-color-blue-600);
+  --spectrum-table-col-resize-nubbin-background-color: var(--spectrum-global-color-blue-600);
+  --spectrum-table-col-resize-nubbin-icon-color: var(--spectrum-global-color-static-white);
+  --spectrum-table-body-resize-indicator-background-color: var(--spectrum-global-color-blue-600);
+}
 
 .spectrum-Table-headWrapper {
   border-inline-start-color: transparent;
@@ -303,14 +309,11 @@ tbody.spectrum-Table-body {
 }
 
 .spectrum-Table-colResizeIndicator {
-  --spectrum-table-col-resize-indicator-background-color: var(--spectrum-global-color-blue-600);
   &.spectrum-Table-colResizeIndicator--resizing {
     background-color: var(--spectrum-table-col-resize-indicator-background-color);
   }
 }
 .spectrum-Table-colResizeNubbin {
-  --spectrum-table-col-resize-nubbin-background-color: var(--spectrum-global-color-blue-600);
-  --spectrum-table-col-resize-nubbin-icon-color: var(--spectrum-global-color-static-white);
   svg {
     > g {
       fill: var(--spectrum-table-col-resize-nubbin-background-color);
@@ -323,22 +326,15 @@ tbody.spectrum-Table-body {
   }
 }
 .spectrum-Table-bodyResizeIndicator {
-  --spectrum-table-body-resize-indicator-background-color: var(--spectrum-global-color-blue-600);
   background-color: var(--spectrum-table-body-resize-indicator-background-color);
 }
 
 @media (forced-colors: active) {
-  .spectrum-Table-columnResizer {
-    --spectrum-table-divider-border-color: CanvasText;
-  }
-  .spectrum-Table-colResizeIndicator {
+  .spectrum-Table {
     --spectrum-table-col-resize-indicator-background-color: Highlight;
-  }
-  .spectrum-Table-colResizeNubbin {
     --spectrum-table-col-resize-nubbin-background-color: Highlight;
     --spectrum-table-col-resize-nubbin-icon-color: HighlightText;
-  }
-  .spectrum-Table-bodyResizeIndicator {
     --spectrum-table-body-resize-indicator-background-color: Highlight;
+    --spectrum-table-divider-border-color: CanvasText;
   }
 }