fix(swatch+swatchgroup): duplicate custom properties

Author: cdransf

components/swatch/dist/metadata.json

@@ -128,7 +128,6 @@
     "--spectrum-gray-25",
     "--spectrum-gray-900-rgb",
     "--spectrum-mixed-button-background",
-    "--spectrum-mod-focus-indicator-color",
     "--spectrum-negative-visual-color",
     "--spectrum-neutral-content-color-default",
     "--spectrum-picked-color",

components/swatch/index.css

@@ -24,8 +24,6 @@
 	--spectrum-swatch-border-thickness-selected: var(--mod-swatch-border-thickness-selected, var(--spectrum-border-width-200));
 	--spectrum-swatch-disabled-icon-size: var(--mod-swatch-disabled-icon-size, var(--spectrum-workflow-icon-size-75));
 	--spectrum-swatch-slash-thickness: var(--mod-swatch-slash-thickness, var(--spectrum-swatch-slash-thickness-small));
-	--spectrum-swatch-focus-indicator-thickness: var(--mod-swatch-focus-indicator-thickness, var(--spectrum-focus-indicator-thickness));
-	--spectrum-swatch-focus-indicator-gap: var(--mod-swatch-focus-indicator-gap, var(--spectrum-focus-indicator-gap));
 
 	/* Color */
 	--spectrum-swatch-border-color-selected: var(--highcontrast-swatch-border-color-selected, var(--mod-swatch-border-color-selected, var(--spectrum-gray-1000)));
@@ -34,17 +32,16 @@
 	--spectrum-swatch-disabled-icon-color: var(--highcontrast-swatch-disabled-icon-color, var(--mod-swatch-disabled-icon-color, var(--spectrum-white)));
 	--spectrum-swatch-icon-color: var(--spectrum-neutral-content-color-default);
 	--spectrum-swatch-slash-icon-color: var(--highcontrast-swatch-fill-foreground-color, var(--mod-swatch-slash-icon-color, var(--spectrum-negative-visual-color)));
-	--spectrum-swatch-focus-indicator-color: var(--highcontrast-swatch-focus-indicator-color, var(--mod-swatch-focus-indicator-color, var(--spectrum-focus-indicator-color)));
 	--spectrum-mixed-button-background: var(--spectrum-gray-25);
 	--spectrum-add-button-background: var(--spectrum-gray-100);
 	--spectrum-add-button-background-hover: var(--spectrum-gray-200);
 	--spectrum-add-button-background-down: var(--spectrum-gray-200);
 	--spectrum-add-button-background-keyboard-focus: var(--spectrum-gray-200);
 
 	/* Focus ring */
-	--spectrum-swatch-focus-indicator-color: var(--spectrum-focus-indicator-color);
-	--spectrum-swatch-focus-indicator-thickness: var(--spectrum-focus-indicator-thickness);
-	--spectrum-swatch-focus-indicator-gap: var(--spectrum-focus-indicator-gap);
+	--spectrum-swatch-focus-indicator-color: var(--highcontrast-swatch-focus-indicator-color, var(--mod-swatch-focus-indicator-color, var(--spectrum-focus-indicator-color)));
+	--spectrum-swatch-focus-indicator-thickness: var(--mod-swatch-focus-indicator-thickness, var(--spectrum-focus-indicator-thickness));
+	--spectrum-swatch-focus-indicator-gap: var(--mod-swatch-focus-indicator-gap, var(--spectrum-focus-indicator-gap));
 }
 
 .spectrum-Swatch--sizeXS {
@@ -128,7 +125,7 @@
 
 	&.is-keyboardFocused,
 	&:focus-visible {
-		outline: var(--mod-swatch-focus-indicator-thickness, var(--spectrum-swatch-focus-indicator-thickness)) solid var(--spectrum-mod-focus-indicator-color, var(--spectrum-swatch-focus-indicator-color));
+		outline: var(--mod-swatch-focus-indicator-thickness, var(--spectrum-swatch-focus-indicator-thickness)) solid var(--mod-swatch-focus-indicator-color, var(--spectrum-swatch-focus-indicator-color));
 		outline-offset: var(--mod-swatch-focus-indicator-gap, var(--spectrum-swatch-focus-indicator-gap));
 	}