From f5617abbb6fe96527dca064dfd1c4ac0fc6085e9 Mon Sep 17 00:00:00 2001
From: Luke <39926192+LukeWasTakenn@users.noreply.github.com>
Date: Fri, 27 Jan 2023 22:02:16 +0100
Subject: [PATCH] refactor(web/menu): rename planet menu to radial menu
---
web/src/App.tsx | 4 ++--
web/src/features/menu/{planet => radial}/index.tsx | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
rename web/src/features/menu/{planet => radial}/index.tsx (93%)
diff --git a/web/src/App.tsx b/web/src/App.tsx
index 9f18ab5..ac0734e 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -12,7 +12,7 @@ import ListMenu from './features/menu/list';
import Dev from './features/dev';
import { isEnvBrowser } from './utils/misc';
import SkillCheck from './features/skillcheck';
-import PlanetMenu from './features/menu/planet';
+import RadialMenu from './features/menu/radial';
const App: React.FC = () => {
useNuiEvent('setClipboard', (data: string) => {
@@ -31,7 +31,7 @@ const App: React.FC = () => {
-
+
{isEnvBrowser() && }
>
diff --git a/web/src/features/menu/planet/index.tsx b/web/src/features/menu/radial/index.tsx
similarity index 93%
rename from web/src/features/menu/planet/index.tsx
rename to web/src/features/menu/radial/index.tsx
index 249ae11..20929e6 100644
--- a/web/src/features/menu/planet/index.tsx
+++ b/web/src/features/menu/radial/index.tsx
@@ -25,9 +25,10 @@ interface MenuItem {
debugData<{ items: MenuItem[]; sub?: boolean }>([
{
- action: 'openPlanetMenu',
+ action: 'openRadialMenu',
data: {
items: [
+ // TODO: Fix wheel being broken when there's only one item
{ icon: 'palette', label: 'Paint' },
{ icon: 'warehouse', label: 'Garage' },
{ icon: 'palette', label: 'Quite long text' },
@@ -40,7 +41,6 @@ debugData<{ items: MenuItem[]; sub?: boolean }>([
},
]);
-// TODO: remove unused styling
const useStyles = createStyles((theme) => ({
wrapper: {
position: 'absolute',
@@ -82,16 +82,15 @@ const useStyles = createStyles((theme) => ({
const degToRad = (deg: number) => deg * (Math.PI / 180);
-const PlanetMenu: React.FC = () => {
+const RadialMenu: React.FC = () => {
const { classes } = useStyles();
const [visible, setVisible] = useState(false);
const [menu, setMenu] = useState<{ items: MenuItem[]; sub?: boolean }>({
items: [],
sub: false,
});
- const [currentItem, setCurrentItem] = useState({ label: '', visible: false });
- useNuiEvent('openPlanetMenu', (data: { items: MenuItem[]; sub?: boolean }) => {
+ useNuiEvent('openRadialMenu', (data: { items: MenuItem[]; sub?: boolean }) => {
setMenu(data);
setVisible(true);
});
@@ -141,6 +140,7 @@ const PlanetMenu: React.FC = () => {
);
})}
+ {/*TODO: Fix background circle when there's 2 items*/}
{
);
};
-export default PlanetMenu;
+export default RadialMenu;