From a504d92911e6ec79ba905ba1434de2e03aec9241 Mon Sep 17 00:00:00 2001 From: Nicola Benaglia Date: Thu, 29 May 2025 14:19:21 +0200 Subject: [PATCH] Refactor selector positions --- src/App.tsx | 2 +- src/components/Apps/AppsDesktop.tsx | 24 +++++++++++++++++++++++ src/components/Apps/AppsDevMode.tsx | 20 +++++++++++++++++++ src/components/Apps/AppsDevModeNavBar.tsx | 1 - src/components/Apps/AppsHomeDesktop.tsx | 22 --------------------- 5 files changed, 45 insertions(+), 24 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 7ae6df1..9b69315 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -3966,7 +3966,7 @@ function App() { bottom: '1%', display: 'flex', flexDirection: 'column', - left: '1%', + left: '3px', position: 'absolute', width: 'auto', }} diff --git a/src/components/Apps/AppsDesktop.tsx b/src/components/Apps/AppsDesktop.tsx index 5297e59..98dfe6d 100644 --- a/src/components/Apps/AppsDesktop.tsx +++ b/src/components/Apps/AppsDesktop.tsx @@ -25,6 +25,8 @@ import { CoreSyncStatus } from '../CoreSyncStatus'; import { MessagingIconFilled } from '../../assets/Icons/MessagingIconFilled'; import { useAtom } from 'jotai'; import { useTranslation } from 'react-i18next'; +import LanguageSelector from '../Language/LanguageSelector'; +import ThemeSelector from '../Theme/ThemeSelector'; const uid = new ShortUniqueId({ length: 8 }); @@ -457,6 +459,7 @@ export const AppsDesktop = ({ )} + {mode !== 'home' && ( )} + {mode === 'appInfo-from-category' && !selectedTab && ( )} @@ -553,6 +557,26 @@ export const AppsDesktop = ({ )} + + + + + + + + + + ); }; diff --git a/src/components/Apps/AppsDevMode.tsx b/src/components/Apps/AppsDevMode.tsx index 7d90e0b..9881157 100644 --- a/src/components/Apps/AppsDevMode.tsx +++ b/src/components/Apps/AppsDevMode.tsx @@ -18,6 +18,8 @@ import { IconWrapper } from '../Desktop/DesktopFooter'; import { CoreSyncStatus } from '../CoreSyncStatus'; import { MessagingIconFilled } from '../../assets/Icons/MessagingIconFilled'; import { useTranslation } from 'react-i18next'; +import LanguageSelector from '../Language/LanguageSelector'; +import ThemeSelector from '../Theme/ThemeSelector'; const uid = new ShortUniqueId({ length: 8 }); @@ -351,6 +353,24 @@ export const AppsDevMode = ({ {mode !== 'home' && } + + + + + + + + + {mode === 'home' && ( diff --git a/src/components/Apps/AppsDevModeNavBar.tsx b/src/components/Apps/AppsDevModeNavBar.tsx index a720a75..0bfc0c9 100644 --- a/src/components/Apps/AppsDevModeNavBar.tsx +++ b/src/components/Apps/AppsDevModeNavBar.tsx @@ -35,7 +35,6 @@ export const AppsDevModeNavBar = () => { const [isNewTabWindow, setIsNewTabWindow] = useState(false); const tabsRef = useRef(null); const [anchorEl, setAnchorEl] = useState(null); - const open = Boolean(anchorEl); const handleClick = (event) => { setAnchorEl(event.currentTarget); diff --git a/src/components/Apps/AppsHomeDesktop.tsx b/src/components/Apps/AppsHomeDesktop.tsx index 5352692..28edd64 100644 --- a/src/components/Apps/AppsHomeDesktop.tsx +++ b/src/components/Apps/AppsHomeDesktop.tsx @@ -14,8 +14,6 @@ import { SortablePinnedApps } from './SortablePinnedApps'; import { extractComponents } from '../Chat/MessageDisplay'; import ArrowOutwardIcon from '@mui/icons-material/ArrowOutward'; import { AppsPrivate } from './AppsPrivate'; -import ThemeSelector from '../Theme/ThemeSelector'; -import LanguageSelector from '../Language/LanguageSelector'; import { useTranslation } from 'react-i18next'; export const AppsHomeDesktop = ({ @@ -169,26 +167,6 @@ export const AppsHomeDesktop = ({ myApp={myApp} /> - - - - - - - - - - ); };