Refactor LoadingButton

AntonelliLab · Sep 30, 2024 · 0d6a2d3 · 0d6a2d3
1 parent a34f1ee
commit 0d6a2d3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js
@@ -150,12 +150,7 @@ function _ModelTestButton({ alignment }) {
   }
   return (
     <LoadingButton
-      variant="contained"
-      color="default"
       style={{ marginLeft: 10 }}
-      classes={{
-        root: classes.primaryButton,
-      }}
       loading={alignment.modeltestLoading}
       onClick={alignment.runModelTest}
       disabled={alignment.modeltestDisabled}

diff --git a/src/app/Raxml.js b/src/app/Raxml.js
@@ -83,11 +83,6 @@ class Raxml extends React.Component {
             </Button>
           ) : null}
           <LoadingButton
-            variant="contained"
-            color="default"
-            classes={{
-              root: classes.primaryButton,
-            }}
             loading={run.running}
             disabled={run.startDisabled}
             onClick={run.start}

diff --git a/src/app/components/LoadingButton.js b/src/app/components/LoadingButton.js
@@ -28,13 +28,21 @@ function LoadingButton(props) {
   return (
     <div className={clsx(classes.wrapper, className)}>
       <Button
+        variant="contained"
         disabled={disabled}
+        classes={{
+          root: classes.primaryButton,
+        }}
         {...buttonProps}
       >
         { props.children }
       </Button>
       {loading && (
-        <CircularProgress size={24} className={classes.progress} {...progressProps} />
+        <CircularProgress
+          size={24}
+          className={classes.progress}
+          {...progressProps}
+        />
       )}
     </div>
   );