chore(swatch+swatchgroup): spacing token updates and refactoring

Author: cdransf

components/swatchgroup/dist/metadata.json

@@ -6,16 +6,15 @@
     ".spectrum-SwatchGroup--spacious"
   ],
   "modifiers": [
-    "--mod-swatchgroup-spacing-compact",
-    "--mod-swatchgroup-spacing-regular",
-    "--mod-swatchgroup-spacing-spacious"
+    "--mod-swatch-group-spacing-spacious",
+    "--mod-swatchgroup-spacing",
+    "--mod-swatchgroup-spacing-compact"
   ],
-  "component": ["--spectrum-swatchgroup-spacing"],
-  "global": [
-    "--spectrum-spacing-100",
-    "--spectrum-spacing-50",
-    "--spectrum-spacing-75"
+  "component": [
+    "--spectrum-swatch-group-spacing-spacious",
+    "--spectrum-swatchgroup-spacing"
   ],
+  "global": ["--spectrum-spacing-50", "--spectrum-spacing-75"],
   "passthroughs": [],
   "high-contrast": []
 }

components/swatchgroup/index.css

@@ -20,17 +20,15 @@
 	justify-content: flex-start;
 
 	/* Regular (Default) */
-	gap: var(--mod-swatchgroup-spacing-regular, var(--spectrum-swatchgroup-spacing));
+	gap: var(--mod-swatchgroup-spacing, var(--spectrum-swatchgroup-spacing));
 }
 
 /* Compact */
 .spectrum-SwatchGroup--compact {
-	--mod-swatchgroup-spacing-regular: var(--mod-swatchgroup-spacing-compact);
-	--spectrum-swatchgroup-spacing: var(--spectrum-spacing-50);
+	--mod-swatchgroup-spacing: var(--mod-swatchgroup-spacing-compact, var(--spectrum-spacing-50));
 }
 
 /* Spacious */
 .spectrum-SwatchGroup--spacious {
-	--mod-swatchgroup-spacing-regular: var(--mod-swatchgroup-spacing-spacious);
-	--spectrum-swatchgroup-spacing: var(--spectrum-spacing-100);
+	--mod-swatchgroup-spacing: var(--mod-swatch-group-spacing-spacious, var(--spectrum-swatch-group-spacing-spacious));
 }