cleanup

YeonV · Oct 9, 2024 · da09cfd · da09cfd
1 parent dddad61
commit da09cfd
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 32 deletions.
diff --git a/src/components/Midi/LaunchpadButtonMap.tsx b/src/components/Midi/LaunchpadButtonMap.tsx
@@ -1,5 +1,5 @@
 import { ArrowForwardIos,  BrightnessHigh, Collections, Pause, PlayArrow, ViewSidebar, Menu as MenuIcon, Save, Delete, DeleteForever, Visibility, Autorenew, Fullscreen, FullscreenExit, BugReport } from '@mui/icons-material'
-import { Box, Button, Divider, IconButton, ListItemIcon, ListItemText, Menu, MenuItem, Stack, Typography, useTheme } from '@mui/material'
+import { Box, Button, Divider, ListItemIcon, ListItemText, Menu, MenuItem, Stack, Typography, useTheme } from '@mui/material'
 import BladeIcon from '../Icons/BladeIcon/BladeIcon'
 import useStore from '../../store/useStore'
 import Assign from '../Gamepad/Assign'
@@ -224,12 +224,35 @@ const LaunchpadButtonMap = ({toggleSidebar, sideBarOpen, fullScreen, setFullScre
                             <ListItemText primary="Load Mapping" />
                         </label>
                     </MenuItem>
+                    <Divider />
                     <MenuItem onClick={() => {
-                        setMidiMapping({ 0: defaultMapping } as IMapping)            
-                        handleClose()
+                        setMidiMapping({ 0: defaultMapping } as IMapping)
+                        setTimeout(() => {
+                            window.location.reload()
+                        }, 100)
                     }}>
                         <ListItemIcon><DeleteForever /></ListItemIcon>
                         <ListItemText primary="Reset Mapping" />
+                    </MenuItem>                    
+                    <MenuItem onClick={() => {
+                        const m = JSON.parse(JSON.stringify(midiMapping));
+                        Object.keys(m).forEach(mappingKey => {
+                            const nestedMapping = m[parseInt(mappingKey) as keyof typeof m];
+                            Object.keys(nestedMapping).forEach(key => {
+                                const b = nestedMapping[parseInt(key) as keyof typeof nestedMapping];
+                                delete b.colorCommand;
+                                delete b.colorSceneActive;
+                                delete b.colorSceneInactive;
+                            });
+                        });
+                        setMidiMapping(m);
+                        setTimeout(() => {
+                            initMidi()
+                        }, 100)
+                        handleClose()
+                    }}>
+                        <ListItemIcon><Delete /></ListItemIcon>
+                        <ListItemText primary="Reset Colors" />
                     </MenuItem>
                     <Divider />
                     <MenuItem onClick={() => {
@@ -262,23 +285,6 @@ const LaunchpadButtonMap = ({toggleSidebar, sideBarOpen, fullScreen, setFullScre
                         <ListItemIcon><BugReport /></ListItemIcon>
                         <ListItemText primary={`${ showMidiLogs ? 'Hide' : 'Show'} MIDI Logs`} />
                     </MenuItem>
-                    <MenuItem onClick={() => {
-                        const m = JSON.parse(JSON.stringify(midiMapping));
-                        Object.keys(m).forEach(mappingKey => {
-                            const nestedMapping = m[parseInt(mappingKey) as keyof typeof m];
-                            Object.keys(nestedMapping).forEach(key => {
-                                const b = nestedMapping[parseInt(key) as keyof typeof nestedMapping];
-                                delete b.colorCommand;
-                                delete b.colorSceneActive;
-                                delete b.colorSceneInactive;
-                            });
-                        });
-                        setMidiMapping(m);
-                        handleClose()
-                    }}>
-                        <ListItemIcon><Delete /></ListItemIcon>
-                        <ListItemText primary="Reset Colors" />
-                    </MenuItem>
                 </Menu>        
             </Stack>
         </Stack>

diff --git a/src/store/ui/storeMidi.tsx b/src/store/ui/storeMidi.tsx
@@ -30,18 +30,18 @@ for (let row = 1; row <= 9; row++) {
 }
 
 const presetMapping = {
-  91: {
-    command: 'brightness-up',
-    buttonNumber: 91,
-  },
-  92: {
-    command: 'brightness-down',
-    buttonNumber: 92,
-  },
-  94: {
-    command: 'play/pause',
-    buttonNumber: 94,
-  },
+  // 91: {
+  //   command: 'brightness-up',
+  //   buttonNumber: 91,
+  // },
+  // 92: {
+  //   command: 'brightness-down',
+  //   buttonNumber: 92,
+  // },
+  // 94: {
+  //   command: 'play/pause',
+  //   buttonNumber: 94,
+  // },
 } as IDefaultMapping
 
 export const defaultMapping = { ...baseMapping, ...presetMapping }