feat(actiongroup)!: migrate to S2 (#2453)

BREAKING CHANGE: migrates `Action Group` to Spectrum 2, Removes some mod properties
adobe · May 1, 2024 · 5c63236 · 5c63236
1 parent 07288a5
commit 5c63236
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 40 deletions.
diff --git a/components/actiongroup/index.css b/components/actiongroup/index.css
@@ -16,6 +16,7 @@ governing permissions and limitations under the License.
   --spectrum-actiongroup-button-spacing-reset: 0;
   --spectrum-actiongroup-border-radius-reset: 0;
   --spectrum-actiongroup-border-radius: var(--spectrum-corner-radius-100);
+  --spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50);
 }
 
 .spectrum-ActionGroup--sizeXS,
@@ -76,15 +77,6 @@ governing permissions and limitations under the License.
 
       border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
       border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
-      margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
-    }
-
-    & + .spectrum-ActionGroup-item {
-      /* Action button passthrough styling */
-      --mod-actionbutton-focus-indicator-border-radius: 0px;
-
-      margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
-      margin-inline-end: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
     }
 
     &:last-child {
@@ -93,8 +85,6 @@ governing permissions and limitations under the License.
 
       border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
       border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
-      margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
-      margin-inline-end: var(--mod-actiongroup-border-radius-reset, var(--spectrum-actiongroup-border-radius-reset));
     }
 
     &.is-selected {
@@ -128,16 +118,6 @@ governing permissions and limitations under the License.
 
       border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
       border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
-      margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
-      margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
-      margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
-    }
-
-    & + .spectrum-ActionGroup-item {
-      margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
-      margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
-      margin-block-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
-      margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
     }
 
     &:last-child {
@@ -146,8 +126,6 @@ governing permissions and limitations under the License.
 
       border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
       border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
-      margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
-      margin-block-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
     }
   }
 }

diff --git a/components/actiongroup/metadata/mods.md b/components/actiongroup/metadata/mods.md
@@ -2,9 +2,6 @@
 | ---------------------------------------------- |
 | `--mod-actiongroup-border-radius`              |
 | `--mod-actiongroup-border-radius-reset`        |
-| `--mod-actiongroup-button-spacing-reset`       |
 | `--mod-actiongroup-gap-size-compact`           |
-| `--mod-actiongroup-horizontal-spacing-compact` |
 | `--mod-actiongroup-horizontal-spacing-regular` |
-| `--mod-actiongroup-vertical-spacing-compact`   |
 | `--mod-actiongroup-vertical-spacing-regular`   |
diff --git a/components/actiongroup/stories/actiongroup.stories.js b/components/actiongroup/stories/actiongroup.stories.js
@@ -117,8 +117,22 @@ Justified.args = {
 	content: items
 };
 
+export const JustifiedCompact = Template.bind({});
+JustifiedCompact.args = {
+	justified: true,
+	compact: true,
+	content: items,
+};
+
 export const Quiet = Template.bind({});
 Quiet.args = {
 	areQuiet: true,
 	content: items
 };
+
+export const QuietCompact = Template.bind({});
+QuietCompact.args = {
+	areQuiet: true,
+	compact: true,
+	content: items,
+};
diff --git a/components/actiongroup/themes/express.css b/components/actiongroup/themes/express.css
@@ -13,11 +13,4 @@ governing permissions and limitations under the License.
 @import "./spectrum.css";
 
 @container (--system: express) {
-  .spectrum-ActionGroup {
-    --spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50);
-
-    /* account for button border */
-    --spectrum-actiongroup-horizontal-spacing-compact: calc(-1px * var(--spectrum-spacing-50));
-    --spectrum-actiongroup-vertical-spacing-compact: calc(-1px * var(--spectrum-spacing-50));
-  }
 }
diff --git a/components/actiongroup/themes/spectrum.css b/components/actiongroup/themes/spectrum.css
@@ -11,11 +11,4 @@ governing permissions and limitations under the License.
 */
 
 @container (--system: spectrum) {
-  .spectrum-ActionGroup {
-    --spectrum-actiongroup-gap-size-compact: 0;
-
-    /* account for button border */
-    --spectrum-actiongroup-horizontal-spacing-compact: -1px;
-    --spectrum-actiongroup-vertical-spacing-compact: -1px;
-  }
 }