turn functions to boolean constants

simularium · Nov 22, 2023 · c4e554b · c4e554b
1 parent dba1710
commit c4e554b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/src/components/DownloadTrajectoryMenu/index.tsx b/src/components/DownloadTrajectoryMenu/index.tsx
@@ -53,33 +53,26 @@ const DownloadTrajectoryMenu = ({
         downloadFile(simulariumFile.name);
     };
 
-    const isDisabled = () => {
-        return !fileIsLoaded() || isBuffering;
-    };
-
-    const getTooltipOffset = () => {
-        if (isDisabled()) {
-            return [25, -30];
-        } else return [40, -18];
-    };
+    const isDisabled = !fileIsLoaded() || isBuffering;
+    const tooltipOffset = isDisabled ? [25, -30] : [40, -18];
 
     return (
         <div className={styles.container}>
             <Tooltip
                 placement="bottomLeft"
                 title={
-                    isDisabled()
+                    isDisabled
                         ? "Load a model to perform this action"
                         : "Download trajectory"
                 }
                 color={TOOLTIP_COLOR}
-                align={{ offset: getTooltipOffset() }}
+                align={{ offset: tooltipOffset }}
             >
                 <Button
-                    className={isDisabled() ? styles.disabled : undefined}
+                    className={isDisabled ? styles.disabled : undefined}
                     onClick={onClick}
                     type="primary"
-                    disabled={isDisabled()}
+                    disabled={isDisabled}
                 >
                     Download {Download}
                 </Button>

diff --git a/src/components/ShareTrajectoryButton/index.tsx b/src/components/ShareTrajectoryButton/index.tsx
@@ -26,15 +26,8 @@ const ShareTrajectoryButton = ({
         setIsSharing(!isSharing);
     };
 
-    const isDisabled = () => {
-        return !simulariumFile.name || isSharing || isBuffering;
-    };
-
-    const getTooltipOffset = () => {
-        if (isDisabled()) {
-            return [0, -30];
-        } else return [0, -18];
-    };
+    const isDisabled = !simulariumFile.name || isSharing || isBuffering;
+    const tooltipOffset = isDisabled ? [0, -30] : [0, -18];
 
     return (
         <div className={styles.container}>
@@ -48,19 +41,19 @@ const ShareTrajectoryButton = ({
             ) : null}
             <Tooltip
                 title={
-                    isDisabled()
+                    isDisabled
                         ? "Load a model to perform this action"
                         : "Share trajectory"
                 }
                 placement="bottomLeft"
                 color={TOOLTIP_COLOR}
-                align={{ offset: getTooltipOffset() }}
+                align={{ offset: tooltipOffset }}
             >
                 <Button
-                    className={isDisabled() ? styles.disabled : undefined}
+                    className={isDisabled ? styles.disabled : undefined}
                     onClick={handleShare}
                     type="primary"
-                    disabled={isDisabled()}
+                    disabled={isDisabled}
                 >
                     Share {Share}
                 </Button>