refactor(DownloadMenuItems): change to a simpler version

apache · Jan 24, 2025 · 37a4ead · 37a4ead
1 parent 6892c6a
commit 37a4ead
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsImage.tsx
@@ -45,10 +45,13 @@ export default function DownloadAsImage({
   };
 
   return (
-    <Menu.Item key="download-image">
-      <div onClick={onDownloadImage} role="button" tabIndex={0}>
-        {text}
-      </div>
+    <Menu.Item
+      key="download-image"
+      onClick={e => {
+        onDownloadImage(e.domEvent);
+      }}
+    >
+      {text}
     </Menu.Item>
   );
 }
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadAsPdf.tsx
@@ -45,10 +45,13 @@ export default function DownloadAsPdf({
   };
 
   return (
-    <Menu.Item key="download-pdf">
-      <div onClick={onDownloadPdf} role="button" tabIndex={0}>
-        {text}
-      </div>
+    <Menu.Item
+      key="download-pdf"
+      onClick={e => {
+        onDownloadPdf(e.domEvent);
+      }}
+    >
+      {text}
     </Menu.Item>
   );
 }
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx
@@ -32,7 +32,7 @@ const createProps = () => ({
 
 const renderComponent = () => {
   render(
-    <Menu>
+    <Menu forceSubMenuRender>
       <DownloadMenuItems {...createProps()} />
     </Menu>,
     {
@@ -43,10 +43,6 @@ const renderComponent = () => {
 
 test('Should render menu items', () => {
   renderComponent();
-  expect(
-    screen.getByRole('menuitem', { name: 'Export to PDF' }),
-  ).toBeInTheDocument();
-  expect(
-    screen.getByRole('menuitem', { name: 'Download as Image' }),
-  ).toBeInTheDocument();
+  expect(screen.getByText('Export to PDF')).toBeInTheDocument();
+  expect(screen.getByText('Download as Image')).toBeInTheDocument();
 });