Merge branch 'master' into m4_update

ProjectMirador · Nov 7, 2024 · dac6519 · dac6519
2 parents 11ed210 + 03e648c
commit dac6519
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -12,14 +12,18 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x, 22.x]    
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js 14.x
-      uses: actions/setup-node@v1
+    - uses: actions/checkout@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
       with:
-        node-version: 14.x
-    - run: npm install -g codecov
+        node-version: ${{ matrix.node-version }}
     - run: npm install
-    - run: npm test
-    - run: codecov
+    - run: npm run lint
+    - run: npm run test:coverage
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
diff --git a/src/miradorDownloadPlugin.js b/src/miradorDownloadPlugin.js
@@ -40,15 +40,19 @@ class MiradorDownload extends Component {
   }
 
   render() {
+    const { handleClose, openDownloadDialog, ...menuProps } = this.props;
+
     return (
-      <MenuItem onClick={() => this.openDialogAndCloseMenu()}>
-        <ListItemIcon>
-          <VerticalAlignBottomIcon />
-        </ListItemIcon>
-        <ListItemText primaryTypographyProps={{ variant: 'body1' }}>
-          Download
-        </ListItemText>
-      </MenuItem>
+      <React.Fragment>
+        <MenuItem {...menuProps} onClick={() => this.openDialogAndCloseMenu()}>
+          <ListItemIcon>
+            <DownloadIcon />
+          </ListItemIcon>
+          <ListItemText primaryTypographyProps={{ variant: 'body1' }}>
+            Download
+          </ListItemText>
+        </MenuItem>
+      </React.Fragment>
     );
   }
 }