Prevents inactive indicator icon/tooltip from appearing in ActionMenu…

… items (#4770) * prevents inactive indicator icon/tooltip from appearing in ActionMenu items * adds changeset * test(vrt): update snapshots --------- Co-authored-by: broccolinisoup <broccolinisoup@users.noreply.github.com>
primer · Jul 24, 2024 · 8574027 · 8574027
1 parent 533f997
commit 8574027
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/curvy-shrimps-agree.md b/.changeset/curvy-shrimps-agree.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+Prevents inactive indicator icon/tooltip from appearing in ActionMenu items
diff --git a/...ctionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-colorblind-linux.png b/...ctionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-colorblind-linux.png
diff --git a/...ts/ActionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-dimmed-linux.png b/...ts/ActionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-dimmed-linux.png
diff --git a/...onMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-high-contrast-linux.png b/...onMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-high-contrast-linux.png
diff --git a/...omponents/ActionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-linux.png b/...omponents/ActionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-linux.png
diff --git a/...ctionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-tritanopia-linux.png b/...ctionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-dark-tritanopia-linux.png
diff --git a/...tionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-colorblind-linux.png b/...tionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-colorblind-linux.png
diff --git a/...nMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-high-contrast-linux.png b/...nMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-high-contrast-linux.png
diff --git a/...mponents/ActionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-linux.png b/...mponents/ActionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-linux.png
diff --git a/...tionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-tritanopia-linux.png b/...tionMenu.test.ts-snapshots/ActionMenu-Inactive-Items-light-tritanopia-linux.png
diff --git a/packages/react/src/ActionList/Item.tsx b/packages/react/src/ActionList/Item.tsx
@@ -345,7 +345,7 @@ export const Item = React.forwardRef<HTMLLIElement, ActionListItemProps>(
           <ItemWrapper {...wrapperProps}>
             <Selection selected={selected} />
             <VisualOrIndicator
-              inactiveText={inactiveText}
+              inactiveText={showInactiveIndicator ? inactiveText : undefined}
               itemHasLeadingVisual={Boolean(slots.leadingVisual)}
               labelId={labelId}
               loading={loading}
@@ -386,7 +386,7 @@ export const Item = React.forwardRef<HTMLLIElement, ActionListItemProps>(
                   {slots.inlineDescription}
                 </ConditionalWrapper>
                 <VisualOrIndicator
-                  inactiveText={inactiveText}
+                  inactiveText={showInactiveIndicator ? inactiveText : undefined}
                   itemHasLeadingVisual={Boolean(slots.leadingVisual)}
                   labelId={labelId}
                   loading={loading}