Skip to content

Commit 03b1f20

Browse files
authored
Merge pull request #226 from scribear/tooltips
Tooltips
2 parents 69f274d + 98f5f1c commit 03b1f20

4 files changed

Lines changed: 96 additions & 21 deletions

File tree

package-lock.json

Lines changed: 67 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
"react-color": "^2.19.3",
3636
"react-dom": "^17.0.2",
3737
"react-google-charts": "^3.0.15",
38+
"react-hotkeys-hook": "^3.4.7",
39+
"react-keyboard": "^1.0.10",
3840
"react-qr-code": "^2.0.15",
3941
"react-redux": "^8.0.5",
4042
"react-scripts": "^5.0.1",
@@ -74,5 +76,8 @@
7476
"last 1 firefox version",
7577
"last 1 safari version"
7678
]
79+
},
80+
"devDependencies": {
81+
"prettier": "^3.6.2"
7782
}
7883
}

src/components/navbars/appNavBar.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
AppBar,
1111
Toolbar,
1212
Typography,
13+
Tooltip,
1314
// useMediaQuery,
1415
// useTheme
1516
} from '@mui/material';
@@ -59,9 +60,11 @@ export default function AppNavBar(props) {
5960
<Grid container alignItems="center" justifyContent="space-between" sx={{ width: '100%' }}>
6061
{/* Left Section: Menu Icon and Title */}
6162
<Grid item sx={{ display: 'flex', alignItems: 'center' }}>
62-
<IconButton edge="start" sx={{ color: 'white' }} aria-label="menu" onClick={toggleDrawer(true)}>
63-
<MenuIcon />
64-
</IconButton>
63+
<Tooltip title = "Menu">
64+
<IconButton edge="start" sx={{ color: 'white' }} aria-label="menu" onClick={toggleDrawer(true)}>
65+
<MenuIcon />
66+
</IconButton>
67+
</Tooltip>
6568
<Drawer anchor="left" open={isDrawerOpen} onClose={toggleDrawer(false)}>
6669
<SideBar isRecording={props.isRecording} onClose={toggleDrawer(false)} />
6770
</Drawer>
@@ -94,4 +97,4 @@ export default function AppNavBar(props) {
9497
</AppBar>
9598
</ThemeProvider>
9699
);
97-
}
100+
}

src/components/navbars/topbar/listening.tsx

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@ import { ControlStatus } from '../../../react-redux&middleware/redux/typesImport
55
import Theme from '../../theme'
66
import * as React from 'react';
77

8-
98
export default function CustomizedMenus(props) {
109
console.log(Theme())
1110
const dispatch = useDispatch()
11+
1212

1313
let controlStatus = useSelector((state: RootState) => {
1414
return state.ControlReducer as ControlStatus;
1515
});
1616

17-
const handleClick = (event: React.KeyboardEvent | React.MouseEvent) => {
17+
const handleClick = (event: React.KeyboardEvent | React.MouseEvent | KeyboardEvent) => {
1818
controlStatus.listening = !controlStatus.listening
1919
dispatch({type: 'FLIP_RECORDING', payload: controlStatus})
20-
}
20+
}
21+
2122
const {myTheme} = Theme()
2223

2324
// color "primary" comes from Theme()
2425
return (
25-
<div>
26-
<ThemeProvider theme={myTheme}>
27-
<Tooltip title =
28-
{props.listening === false ? "Begin Listening" : "Pause Listening"}>
29-
<IconButton color="primary" onClick={handleClick}>
30-
{props.listening ?
31-
<MicIcon color="primary" fontSize="large"/> :
32-
<MicOffIcon color="primary" fontSize="large"/>
33-
}
34-
</IconButton>
35-
</Tooltip>
36-
</ThemeProvider>
37-
38-
</div>
26+
<div>
27+
<ThemeProvider theme={myTheme}>
28+
<Tooltip title =
29+
{props.listening === false ? "Begin Listening" : "Pause Listening"}>
30+
<IconButton color="primary" onClick={handleClick}>
31+
{props.listening ?
32+
<MicIcon color="primary" fontSize="large"/> :
33+
<MicOffIcon color="primary" fontSize="large"/>
34+
}
35+
</IconButton>
36+
</Tooltip>
37+
</ThemeProvider>
38+
</div>
3939
);
4040
}

0 commit comments

Comments
 (0)