From 7dcda589610802adc45265db1cb391e3f0f1cd93 Mon Sep 17 00:00:00 2001
From: Chloe Rice <chloe.rice@shopify.com>
Date: Thu, 10 Oct 2024 17:24:47 -0400
Subject: [PATCH] Make select all action menu activator a MenuGroup

---
 .../src/components/ActionMenu/index.ts        |  1 +
 .../components/BulkActions/BulkActions.tsx    | 40 +++++++------------
 .../src/components/Filters/Filters.module.css |  2 +-
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/polaris-react/src/components/ActionMenu/index.ts b/polaris-react/src/components/ActionMenu/index.ts
index ef0c9807a59..65febc0d00e 100644
--- a/polaris-react/src/components/ActionMenu/index.ts
+++ b/polaris-react/src/components/ActionMenu/index.ts
@@ -1 +1,2 @@
 export * from './ActionMenu';
+export {SecondaryAction, MenuGroup} from './components';
diff --git a/polaris-react/src/components/BulkActions/BulkActions.tsx b/polaris-react/src/components/BulkActions/BulkActions.tsx
index 5f2e023ef90..f1cf637f05a 100644
--- a/polaris-react/src/components/BulkActions/BulkActions.tsx
+++ b/polaris-react/src/components/BulkActions/BulkActions.tsx
@@ -19,6 +19,7 @@ import {Button} from '../Button';
 import {ActionList} from '../ActionList';
 import {Popover} from '../Popover';
 import {InlineStack} from '../InlineStack';
+import {MenuGroup} from '../ActionMenu';
 import type {ButtonProps} from '../Button';
 
 import {
@@ -210,33 +211,22 @@ export const BulkActions = ({
 
   const selectAllActionsMarkup = selectMode ? (
     <div aria-live={ariaLive}>
-      <Popover
+      <MenuGroup
+        title={i18n.translate(
+          'Polaris.ResourceList.BulkActions.selectAllMenu.activator',
+          {selectedItemsCount},
+        )}
         active={selectedAllMenuActive}
+        actions={[
+          selectAllOnPageItem,
+          ...(selectAllInStoreItem
+            ? [selectAllInStoreItem, unselectAllItem]
+            : [unselectAllItem]),
+        ]}
+        onOpen={() => {}}
         onClose={toggleSelectAllMenu}
-        activator={
-          <Button
-            disclosure
-            pressed={selectedAllMenuActive}
-            variant="tertiary"
-            onClick={toggleSelectAllMenu}
-          >
-            {i18n.translate(
-              'Polaris.ResourceList.BulkActions.selectAllMenu.activator',
-              {selectedItemsCount},
-            )}
-          </Button>
-        }
-      >
-        <ActionList
-          items={[
-            selectAllOnPageItem,
-            ...(selectAllInStoreItem
-              ? [selectAllInStoreItem, unselectAllItem]
-              : [unselectAllItem]),
-          ]}
-          onActionAnyItem={toggleSelectAllMenu}
-        />
-      </Popover>
+        onClick={toggleSelectAllMenu}
+      />
     </div>
   ) : null;
 
diff --git a/polaris-react/src/components/Filters/Filters.module.css b/polaris-react/src/components/Filters/Filters.module.css
index 1cdd02dbbfc..9751c1d5095 100644
--- a/polaris-react/src/components/Filters/Filters.module.css
+++ b/polaris-react/src/components/Filters/Filters.module.css
@@ -43,7 +43,7 @@
     z-index: var(--p-z-index-1);
     position: absolute;
     top: 0;
-    right: calc((-1 * var(--p-space-100)) - 1);
+    right: calc(-1 * var(--p-space-100));
     width: var(--p-width-200);
     height: 100%;
     pointer-events: none;