From c0a63bbbbc2114239158d93f02773e79d76c9fd8 Mon Sep 17 00:00:00 2001
From: porink0424 <daichi2120@gmail.com>
Date: Wed, 14 Feb 2024 09:39:42 +0900
Subject: [PATCH] Improve modal position and size & add close button

---
 optuna_dashboard/ts/components/AppDrawer.tsx |  13 ++-
 optuna_dashboard/ts/components/Settings.tsx  | 115 ++++++++++++-------
 optuna_dashboard/ts/types/index.d.ts         |   7 +-
 3 files changed, 88 insertions(+), 47 deletions(-)

diff --git a/optuna_dashboard/ts/components/AppDrawer.tsx b/optuna_dashboard/ts/components/AppDrawer.tsx
index 1d4d9c78..068dcff2 100644
--- a/optuna_dashboard/ts/components/AppDrawer.tsx
+++ b/optuna_dashboard/ts/components/AppDrawer.tsx
@@ -361,15 +361,16 @@ export const AppDrawer: FC<{
               <Box
                 sx={{
                   position: "absolute",
-                  top: "10%",
-                  left: "10%",
-                  overflow: "auto",
-                  width: "80%",
-                  height: "80%",
+                  top: "50%",
+                  left: "50%",
+                  transform: "translate(-50%, -50%)",
+                  overflow: "scroll",
+                  width: "500px",
+                  height: "400px",
                   bgcolor: "background.paper",
                 }}
               >
-                <Settings />
+                <Settings handleClose={handleSettingClose} />
               </Box>
             </Modal>
           </ListItem>
diff --git a/optuna_dashboard/ts/components/Settings.tsx b/optuna_dashboard/ts/components/Settings.tsx
index 328521c0..f3d5b2af 100644
--- a/optuna_dashboard/ts/components/Settings.tsx
+++ b/optuna_dashboard/ts/components/Settings.tsx
@@ -1,17 +1,25 @@
-import React, { FC, useState } from "react"
+import React, { useState } from "react"
 
 import {
   Typography,
   Select,
   MenuItem,
-  Grid,
   SelectChangeEvent,
+  Stack,
+  useTheme,
+  IconButton,
 } from "@mui/material"
+import ClearIcon from "@mui/icons-material/Clear"
 
 import { useRecoilValue, useSetRecoilState } from "recoil"
 import { plotlyColorTheme } from "../state"
 
-export const Settings: FC = () => {
+interface SettingsProps {
+  handleClose: () => void
+}
+
+export const Settings = ({ handleClose }: SettingsProps) => {
+  const theme = useTheme()
   const colorTheme = useRecoilValue<PlotlyColorTheme>(plotlyColorTheme)
   const setPlotlyColorTheme = useSetRecoilState(plotlyColorTheme)
 
@@ -29,45 +37,74 @@ export const Settings: FC = () => {
   }
 
   return (
-    <Grid container spacing={4} sx={{ padding: "40px" }}>
-      <Grid item xs={12}>
-        <Typography variant="h3" gutterBottom color="textSecondary">
-          Settings
-        </Typography>
-      </Grid>
-      <Grid item xs={12}>
-        <Typography variant="h5" gutterBottom color="textPrimary">
+    <Stack
+      spacing={4}
+      sx={{
+        position: "relative",
+        p: "2rem",
+      }}
+    >
+      <IconButton
+        sx={{
+          position: "absolute",
+          top: "1rem",
+          right: "1rem",
+          width: "2rem",
+          height: "2rem",
+        }}
+        onClick={handleClose}
+      >
+        <ClearIcon />
+      </IconButton>
+
+      <Typography
+        variant="h4"
+        sx={{ fontWeight: theme.typography.fontWeightBold, marginTop: 0 }}
+      >
+        Settings
+      </Typography>
+
+      <Stack spacing={2}>
+        <Typography
+          variant="h5"
+          sx={{ fontWeight: theme.typography.fontWeightBold }}
+        >
           Plotly Color Scales
         </Typography>
-      </Grid>
-
-      <Grid item xs={2}>
-        <Typography variant="h6" color="textSecondary">
-          Dark Mode
+        <Stack direction="row" spacing={2} alignItems="center">
+          <Typography variant="h6">Dark Mode</Typography>
+          <Select
+            disabled
+            value={darkModeColor}
+            onChange={handleDarkModeColorChange}
+          >
+            <MenuItem value={"default" as PlotlyColorThemeDark}>
+              Default
+            </MenuItem>
+          </Select>
+        </Stack>
+        <Typography color="textSecondary">
+          Only the "Default" color scale is supported in dark mode
         </Typography>
-      </Grid>
-      <Grid item xs={10} sx={{ display: "flex", alignItems: "center" }}>
-        <Select value={darkModeColor} onChange={handleDarkModeColorChange}>
-          <MenuItem value={"default"}>Default</MenuItem>
-          <MenuItem value={"seaborn"}>Seaborn</MenuItem>
-          <MenuItem value={"presentation"}>Presentation</MenuItem>
-          <MenuItem value={"ggplot2"}>GGPlot2</MenuItem>
-        </Select>
-      </Grid>
 
-      <Grid item xs={2}>
-        <Typography variant="h6" color="textSecondary">
-          Light Mode
-        </Typography>
-      </Grid>
-      <Grid item xs={10} sx={{ display: "flex", alignItems: "center" }}>
-        <Select value={lightModeColor} onChange={handleLightModeColorChange}>
-          <MenuItem value={"default"}>Default</MenuItem>
-          <MenuItem value={"seaborn"}>Seaborn</MenuItem>
-          <MenuItem value={"presentation"}>Presentation</MenuItem>
-          <MenuItem value={"ggplot2"}>GGPlot2</MenuItem>
-        </Select>
-      </Grid>
-    </Grid>
+        <Stack direction="row" spacing={2} alignItems="center">
+          <Typography variant="h6">Light Mode</Typography>
+          <Select value={lightModeColor} onChange={handleLightModeColorChange}>
+            <MenuItem value={"default" as PlotlyColorThemeLight}>
+              Default
+            </MenuItem>
+            <MenuItem value={"seaborn" as PlotlyColorThemeLight}>
+              Seaborn
+            </MenuItem>
+            <MenuItem value={"presentation" as PlotlyColorThemeLight}>
+              Presentation
+            </MenuItem>
+            <MenuItem value={"ggplot2" as PlotlyColorThemeLight}>
+              GGPlot2
+            </MenuItem>
+          </Select>
+        </Stack>
+      </Stack>
+    </Stack>
   )
 }
diff --git a/optuna_dashboard/ts/types/index.d.ts b/optuna_dashboard/ts/types/index.d.ts
index 30d6708f..78ca0386 100644
--- a/optuna_dashboard/ts/types/index.d.ts
+++ b/optuna_dashboard/ts/types/index.d.ts
@@ -240,7 +240,10 @@ type PreferenceHistory = {
   is_removed: boolean
 }
 
+type PlotlyColorThemeDark = "default"
+type PlotlyColorThemeLight = "default" | "seaborn" | "presentation" | "ggplot2"
+
 type PlotlyColorTheme = {
-  dark: string
-  light: string
+  dark: PlotlyColorThemeDark
+  light: PlotlyColorThemeLight
 }