From 5b65efc5b003e7d47e5ad9f29e27b6ec9baec46c Mon Sep 17 00:00:00 2001 From: Dustin Brett Date: Sun, 24 Sep 2023 15:12:48 -0700 Subject: [PATCH] Sort more imports with vscode --- components/apps/Browser/index.tsx | 6 +-- components/apps/Chat/index.tsx | 16 +++---- components/apps/FileExplorer/AddressBar.tsx | 4 +- components/apps/FileExplorer/Navigation.tsx | 4 +- components/apps/FileExplorer/SearchBar.tsx | 22 ++++----- components/apps/FileExplorer/index.tsx | 6 +-- components/apps/IRC/index.tsx | 2 +- components/apps/Messenger/GetMoreMessages.tsx | 2 +- components/apps/Messenger/Profile.tsx | 2 +- components/apps/MonacoEditor/StatusBar.tsx | 6 +-- components/apps/OpenType/index.tsx | 4 +- components/apps/PDF/Controls.tsx | 2 +- components/apps/Paint/index.tsx | 4 +- components/apps/Photos/index.tsx | 6 +-- components/apps/StableDiffusion/index.tsx | 2 +- components/apps/Vim/index.tsx | 6 +-- components/apps/Webamp/index.tsx | 8 ++-- components/pages/Metadata.tsx | 10 ++-- components/pages/StyledApp.tsx | 2 +- components/system/Apps/AppContainer.tsx | 4 +- components/system/Apps/AppsLoader.tsx | 2 +- components/system/Apps/RenderComponent.tsx | 4 +- components/system/Desktop/index.tsx | 2 +- components/system/Dialogs/OpenWith/index.tsx | 2 +- .../system/Dialogs/Properties/GeneralTab.tsx | 12 ++--- .../system/Dialogs/Properties/index.tsx | 4 +- components/system/Dialogs/Transfer/index.tsx | 4 +- .../system/Files/FileEntry/RenameBox.tsx | 4 +- .../system/Files/FileEntry/SubIcons.tsx | 2 +- components/system/Files/FileEntry/index.tsx | 46 +++++++++---------- .../system/Files/FileManager/StatusBar.tsx | 8 ++-- components/system/Files/FileManager/index.tsx | 6 +-- components/system/Menu/MenuItemEntry.tsx | 16 +++---- components/system/Menu/index.tsx | 6 +-- .../StartMenu/Sidebar/SidebarButton.tsx | 2 +- components/system/StartMenu/Sidebar/index.tsx | 4 +- components/system/StartMenu/index.tsx | 6 +-- components/system/Taskbar/Calendar/index.tsx | 4 +- components/system/Taskbar/Clock/index.tsx | 8 ++-- .../system/Taskbar/StartButton/index.tsx | 2 +- .../system/Taskbar/TaskbarEntries/index.tsx | 4 +- .../Taskbar/TaskbarEntry/Peek/PeekWindow.tsx | 4 +- .../system/Taskbar/TaskbarEntry/index.tsx | 6 +-- components/system/Taskbar/index.tsx | 6 +-- components/system/Window/RndWindow/index.tsx | 4 +- components/system/Window/Titlebar/index.tsx | 8 ++-- components/system/Window/index.tsx | 2 +- contexts/viewport/index.tsx | 2 +- hooks/useProcessesRef.tsx | 2 +- pages/_app.tsx | 2 +- pages/index.tsx | 2 +- 51 files changed, 152 insertions(+), 152 deletions(-) diff --git a/components/apps/Browser/index.tsx b/components/apps/Browser/index.tsx index 2471a692..adf2886e 100644 --- a/components/apps/Browser/index.tsx +++ b/components/apps/Browser/index.tsx @@ -1,13 +1,13 @@ -import { useCallback, useEffect, useRef, useState } from "react"; -import { bookmarks, HOME_PAGE } from "components/apps/Browser/config"; import { Arrow, Refresh, Stop } from "components/apps/Browser/NavigationIcons"; import StyledBrowser from "components/apps/Browser/StyledBrowser"; +import { HOME_PAGE, bookmarks } from "components/apps/Browser/config"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import useTitle from "components/system/Window/useTitle"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; import processDirectory from "contexts/process/directory"; import useHistory from "hooks/useHistory"; +import { useCallback, useEffect, useRef, useState } from "react"; import Button from "styles/common/Button"; import Icon from "styles/common/Icon"; import { @@ -16,9 +16,9 @@ import { ONE_TIME_PASSIVE_EVENT, } from "utils/constants"; import { + GOOGLE_SEARCH_QUERY, getExtension, getUrlOrSearch, - GOOGLE_SEARCH_QUERY, label, } from "utils/functions"; diff --git a/components/apps/Chat/index.tsx b/components/apps/Chat/index.tsx index e22b6e2a..1213868d 100644 --- a/components/apps/Chat/index.tsx +++ b/components/apps/Chat/index.tsx @@ -1,11 +1,3 @@ -import { basename, join } from "path"; -import { useCallback, useEffect, useMemo, useRef, useState } from "react"; -import { - AI_IMAGES_FOLDER, - commandMap, - EngineErrorMessage, -} from "components/apps/Chat/config"; -import { getLetterTypingSpeed } from "components/apps/Chat/functions"; import { Reset, Send, Settings } from "components/apps/Chat/Icons"; import StyledChat from "components/apps/Chat/StyledChat"; import StyledInfo from "components/apps/Chat/StyledInfo"; @@ -13,6 +5,12 @@ import StyledInputArea from "components/apps/Chat/StyledInputArea"; import StyledLoadingEllipsis from "components/apps/Chat/StyledLoadingEllipsis"; import StyledMessage from "components/apps/Chat/StyledMessage"; import StyledWarning from "components/apps/Chat/StyledWarning"; +import { + AI_IMAGES_FOLDER, + EngineErrorMessage, + commandMap, +} from "components/apps/Chat/config"; +import { getLetterTypingSpeed } from "components/apps/Chat/functions"; import type { Message } from "components/apps/Chat/types"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import { getMimeType } from "components/system/Files/FileEntry/functions"; @@ -25,6 +23,8 @@ import processDirectory from "contexts/process/directory"; import { useSession } from "contexts/session"; import { useInference } from "hooks/useInference/useInference"; import { useWebGPUCheck } from "hooks/useWebGPUCheck"; +import { basename, join } from "path"; +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import Button from "styles/common/Button"; import { IMAGE_FILE_EXTENSIONS, diff --git a/components/apps/FileExplorer/AddressBar.tsx b/components/apps/FileExplorer/AddressBar.tsx index 17016ea9..9afa11fb 100644 --- a/components/apps/FileExplorer/AddressBar.tsx +++ b/components/apps/FileExplorer/AddressBar.tsx @@ -1,10 +1,10 @@ -import { basename } from "path"; -import { forwardRef, useEffect, useState } from "react"; import { Refresh } from "components/apps/FileExplorer/NavigationIcons"; import StyledAddressBar from "components/apps/FileExplorer/StyledAddressBar"; import useAddressBarContextMenu from "components/apps/FileExplorer/useAddressBarContextMenu"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; +import { basename } from "path"; +import { forwardRef, useEffect, useState } from "react"; import Button from "styles/common/Button"; import Icon from "styles/common/Icon"; import { ROOT_NAME } from "utils/constants"; diff --git a/components/apps/FileExplorer/Navigation.tsx b/components/apps/FileExplorer/Navigation.tsx index 349bb275..f0a2b2f1 100644 --- a/components/apps/FileExplorer/Navigation.tsx +++ b/components/apps/FileExplorer/Navigation.tsx @@ -1,5 +1,3 @@ -import { basename, dirname } from "path"; -import { forwardRef, useMemo } from "react"; import AddressBar from "components/apps/FileExplorer/AddressBar"; import { Back, @@ -13,6 +11,8 @@ import useTitlebarContextMenu from "components/system/Window/Titlebar/useTitleba import { useMenu } from "contexts/menu"; import { useProcesses } from "contexts/process"; import useHistory from "hooks/useHistory"; +import { basename, dirname } from "path"; +import { forwardRef, useMemo } from "react"; import Button from "styles/common/Button"; import { ROOT_NAME } from "utils/constants"; import { haltEvent, label } from "utils/functions"; diff --git a/components/apps/FileExplorer/SearchBar.tsx b/components/apps/FileExplorer/SearchBar.tsx index 9faf79f5..ecf059e8 100644 --- a/components/apps/FileExplorer/SearchBar.tsx +++ b/components/apps/FileExplorer/SearchBar.tsx @@ -1,12 +1,21 @@ -import { basename, join } from "path"; -import { memo, useEffect, useRef, useState } from "react"; +import type { FSModule } from "browserfs/dist/node/core/FS"; import { Search } from "components/apps/FileExplorer/NavigationIcons"; import StyledSearch from "components/apps/FileExplorer/StyledSearch"; import { TEXT_EDITORS } from "components/system/Files/FileEntry/extensions"; import { getInfoWithExtension } from "components/system/Files/FileEntry/functions"; +import type { FileInfo } from "components/system/Files/FileEntry/useFileInfo"; +import { useFileSystem } from "contexts/fileSystem"; import { useMenu } from "contexts/menu"; import type { MenuItem } from "contexts/menu/useMenuContextState"; import { useProcesses } from "contexts/process"; +import { basename, join } from "path"; +import { memo, useEffect, useRef, useState } from "react"; +import { + ICON_CACHE, + ICON_CACHE_EXTENSION, + SHORTCUT_EXTENSION, + YT_ICON_CACHE, +} from "utils/constants"; import { bufferToUrl, getExtension, @@ -14,15 +23,6 @@ import { preloadLibs, } from "utils/functions"; import { SEARCH_LIBS, useSearch } from "utils/search"; -import { useFileSystem } from "contexts/fileSystem"; -import type { FSModule } from "browserfs/dist/node/core/FS"; -import type { FileInfo } from "components/system/Files/FileEntry/useFileInfo"; -import { - ICON_CACHE, - ICON_CACHE_EXTENSION, - SHORTCUT_EXTENSION, - YT_ICON_CACHE, -} from "utils/constants"; type SearchBarProps = { id: string; diff --git a/components/apps/FileExplorer/index.tsx b/components/apps/FileExplorer/index.tsx index b3c7a511..50a3c0ac 100644 --- a/components/apps/FileExplorer/index.tsx +++ b/components/apps/FileExplorer/index.tsx @@ -1,12 +1,13 @@ -import { basename } from "path"; -import { useCallback, useEffect, useRef, useState } from "react"; import Navigation from "components/apps/FileExplorer/Navigation"; import StyledFileExplorer from "components/apps/FileExplorer/StyledFileExplorer"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import { getIconFromIni } from "components/system/Files/FileEntry/functions"; import FileManager from "components/system/Files/FileManager"; import { useFileSystem } from "contexts/fileSystem"; +import { isMountedFolder } from "contexts/fileSystem/functions"; import { useProcesses } from "contexts/process"; +import { basename } from "path"; +import { useCallback, useEffect, useRef, useState } from "react"; import { COMPRESSED_FOLDER_ICON, MOUNTED_FOLDER_ICON, @@ -14,7 +15,6 @@ import { ROOT_NAME, } from "utils/constants"; import { haltEvent } from "utils/functions"; -import { isMountedFolder } from "contexts/fileSystem/functions"; const FileExplorer: FC = ({ id }) => { const { diff --git a/components/apps/IRC/index.tsx b/components/apps/IRC/index.tsx index 0994c458..5111c4b7 100644 --- a/components/apps/IRC/index.tsx +++ b/components/apps/IRC/index.tsx @@ -1,9 +1,9 @@ -import { useEffect, useRef, useState } from "react"; import { getNetworkConfig } from "components/apps/IRC/config"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import StyledLoading from "components/system/Files/FileManager/StyledLoading"; import { useProcesses } from "contexts/process"; import processDirectory from "contexts/process/directory"; +import { useEffect, useRef, useState } from "react"; import { IFRAME_CONFIG } from "utils/constants"; type KiwiIrcClient = { diff --git a/components/apps/Messenger/GetMoreMessages.tsx b/components/apps/Messenger/GetMoreMessages.tsx index b34e5c6f..e0f36a94 100644 --- a/components/apps/Messenger/GetMoreMessages.tsx +++ b/components/apps/Messenger/GetMoreMessages.tsx @@ -1,7 +1,7 @@ +import StyledGetMoreMessages from "components/apps/Messenger/StyledGetMoreMessages"; import { useState } from "react"; import Button from "styles/common/Button"; import { MILLISECONDS_IN_DAY } from "utils/constants"; -import StyledGetMoreMessages from "components/apps/Messenger/StyledGetMoreMessages"; type TimeScale = "day" | "week" | "month" | "trimester" | "infinite"; diff --git a/components/apps/Messenger/Profile.tsx b/components/apps/Messenger/Profile.tsx index 33053ee9..29c58090 100644 --- a/components/apps/Messenger/Profile.tsx +++ b/components/apps/Messenger/Profile.tsx @@ -1,6 +1,6 @@ import { Avatar, Verified } from "components/apps/Messenger/Icons"; -import { useNip05Domain } from "components/apps/Messenger/hooks"; import StyledProfile from "components/apps/Messenger/StyledProfile"; +import { useNip05Domain } from "components/apps/Messenger/hooks"; import { useState } from "react"; type ProfileProps = { diff --git a/components/apps/MonacoEditor/StatusBar.tsx b/components/apps/MonacoEditor/StatusBar.tsx index 424204b0..295789c1 100644 --- a/components/apps/MonacoEditor/StatusBar.tsx +++ b/components/apps/MonacoEditor/StatusBar.tsx @@ -1,16 +1,16 @@ -import { basename, dirname } from "path"; -import { memo, useEffect, useState } from "react"; +import StyledStatusBar from "components/apps/MonacoEditor/StyledStatusBar"; import { getSaveFileInfo } from "components/apps/MonacoEditor/functions"; import { isPrettyLanguage, prettyPrint, } from "components/apps/MonacoEditor/language"; -import StyledStatusBar from "components/apps/MonacoEditor/StyledStatusBar"; import type { Model } from "components/apps/MonacoEditor/types"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import useTitle from "components/system/Window/useTitle"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; +import { basename, dirname } from "path"; +import { memo, useEffect, useState } from "react"; import Button from "styles/common/Button"; import { haltEvent, label } from "utils/functions"; diff --git a/components/apps/OpenType/index.tsx b/components/apps/OpenType/index.tsx index f465d82d..1b37fd6d 100644 --- a/components/apps/OpenType/index.tsx +++ b/components/apps/OpenType/index.tsx @@ -1,11 +1,11 @@ -import type { Font, LocalizedName } from "opentype.js"; -import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"; import StyledOpenType from "components/apps/OpenType/StyledOpenType"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import useFileDrop from "components/system/Files/FileManager/useFileDrop"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; import processDirectory from "contexts/process/directory"; +import type { Font, LocalizedName } from "opentype.js"; +import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"; import { haltEvent } from "utils/functions"; type FontCanvasProps = { diff --git a/components/apps/PDF/Controls.tsx b/components/apps/PDF/Controls.tsx index a2abbce6..46739e22 100644 --- a/components/apps/PDF/Controls.tsx +++ b/components/apps/PDF/Controls.tsx @@ -1,4 +1,3 @@ -import { basename } from "path"; import { Add, Download, @@ -10,6 +9,7 @@ import { scales } from "components/apps/PDF/usePDF"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; +import { basename } from "path"; import Button from "styles/common/Button"; import { MILLISECONDS_IN_SECOND } from "utils/constants"; import { bufferToUrl, isSafari, label } from "utils/functions"; diff --git a/components/apps/Paint/index.tsx b/components/apps/Paint/index.tsx index 46e687d4..b6f0be26 100644 --- a/components/apps/Paint/index.tsx +++ b/components/apps/Paint/index.tsx @@ -1,5 +1,3 @@ -import { basename, dirname, join } from "path"; -import { useCallback, useEffect, useRef, useState } from "react"; import StyledPaint from "components/apps/Paint/StyledPaint"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import StyledLoading from "components/system/Files/FileManager/StyledLoading"; @@ -9,6 +7,8 @@ import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; import { useSession } from "contexts/session"; import type { WallpaperFit } from "contexts/session/types"; +import { basename, dirname, join } from "path"; +import { useCallback, useEffect, useRef, useState } from "react"; import { DESKTOP_PATH, IFRAME_CONFIG, diff --git a/components/apps/Photos/index.tsx b/components/apps/Photos/index.tsx index af5e1468..9ff0415d 100644 --- a/components/apps/Photos/index.tsx +++ b/components/apps/Photos/index.tsx @@ -1,5 +1,3 @@ -import { basename, dirname, extname, join } from "path"; -import { useCallback, useEffect, useRef, useState } from "react"; import { ExitFullscreen, Fullscreen, @@ -13,7 +11,10 @@ import useFileDrop from "components/system/Files/FileManager/useFileDrop"; import useTitle from "components/system/Window/useTitle"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; +import { useViewport } from "contexts/viewport"; import useDoubleClick from "hooks/useDoubleClick"; +import { basename, dirname, extname, join } from "path"; +import { useCallback, useEffect, useRef, useState } from "react"; import Button from "styles/common/Button"; import { HIGH_PRIORITY_ELEMENT, @@ -32,7 +33,6 @@ import { imgDataToBuffer, label, } from "utils/functions"; -import { useViewport } from "contexts/viewport"; const { maxScale, minScale } = panZoomConfig; diff --git a/components/apps/StableDiffusion/index.tsx b/components/apps/StableDiffusion/index.tsx index f7015f31..b4fd158f 100644 --- a/components/apps/StableDiffusion/index.tsx +++ b/components/apps/StableDiffusion/index.tsx @@ -1,10 +1,10 @@ -import { useCallback, useMemo, useRef, useState } from "react"; import StyledStableDiffusion from "components/apps/StableDiffusion/StyledStableDiffusion"; import type { StableDiffusionConfig } from "components/apps/StableDiffusion/types"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import { runStableDiffusion } from "components/system/Desktop/Wallpapers/StableDiffusion"; import { useWebGPUCheck } from "hooks/useWebGPUCheck"; import useWorker from "hooks/useWorker"; +import { useCallback, useMemo, useRef, useState } from "react"; type WorkerMessage = { data: { message: string; type: string } }; diff --git a/components/apps/Vim/index.tsx b/components/apps/Vim/index.tsx index 28442f23..659988cb 100644 --- a/components/apps/Vim/index.tsx +++ b/components/apps/Vim/index.tsx @@ -1,15 +1,15 @@ -import { basename, dirname } from "path"; -import { useCallback, useEffect, useRef, useState } from "react"; import StyledVim from "components/apps/Vim/StyledVim"; import type { QueueItem } from "components/apps/Vim/types"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; +import useEmscriptenMount from "components/system/Files/FileManager/useEmscriptenMount"; import useFileDrop from "components/system/Files/FileManager/useFileDrop"; import useTitle from "components/system/Window/useTitle"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; +import { basename, dirname } from "path"; +import { useCallback, useEffect, useRef, useState } from "react"; import { DEFAULT_TEXT_FILE_SAVE_PATH } from "utils/constants"; import { haltEvent, loadFiles } from "utils/functions"; -import useEmscriptenMount from "components/system/Files/FileManager/useEmscriptenMount"; const Vim: FC = ({ id }) => { const { diff --git a/components/apps/Webamp/index.tsx b/components/apps/Webamp/index.tsx index cfbc0453..ed881657 100644 --- a/components/apps/Webamp/index.tsx +++ b/components/apps/Webamp/index.tsx @@ -1,6 +1,4 @@ -import { basename, extname } from "path"; -import { useCallback, useEffect, useMemo, useRef, useState } from "react"; -import type { Options } from "webamp"; +import StyledWebamp from "components/apps/Webamp/StyledWebamp"; import { cleanBufferOnSkinLoad, focusWindow, @@ -8,15 +6,17 @@ import { tracksFromPlaylist, unFocus, } from "components/apps/Webamp/functions"; -import StyledWebamp from "components/apps/Webamp/StyledWebamp"; import useWebamp from "components/apps/Webamp/useWebamp"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import useFocusable from "components/system/Window/useFocusable"; import useWindowTransitions from "components/system/Window/useWindowTransitions"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; +import { basename, extname } from "path"; +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { AUDIO_PLAYLIST_EXTENSIONS } from "utils/constants"; import { bufferToUrl, getExtension, loadFiles } from "utils/functions"; +import type { Options } from "webamp"; const Webamp: FC = ({ id }) => { const containerRef = useRef(null); diff --git a/components/pages/Metadata.tsx b/components/pages/Metadata.tsx index f11c7317..6e1dddaa 100644 --- a/components/pages/Metadata.tsx +++ b/components/pages/Metadata.tsx @@ -1,9 +1,11 @@ -import { extname } from "path"; -import Head from "next/head"; -import { memo, useCallback, useEffect, useMemo, useState } from "react"; +import { getFirstAniImage } from "components/system/Files/FileEntry/functions"; +import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; import { useSession } from "contexts/session"; +import Head from "next/head"; +import { extname } from "path"; import desktopIcons from "public/.index/desktopIcons.json"; +import { memo, useCallback, useEffect, useMemo, useState } from "react"; import { FAVICON_BASE_PATH, HIGH_PRIORITY_ELEMENT, @@ -14,8 +16,6 @@ import { USER_ICON_PATH, } from "utils/constants"; import { getDpi, imageSrc, imageSrcs, imageToBufferUrl } from "utils/functions"; -import { getFirstAniImage } from "components/system/Files/FileEntry/functions"; -import { useFileSystem } from "contexts/fileSystem"; const { alias, description } = PACKAGE_DATA; diff --git a/components/pages/StyledApp.tsx b/components/pages/StyledApp.tsx index 0a3ea8bb..8372f73c 100644 --- a/components/pages/StyledApp.tsx +++ b/components/pages/StyledApp.tsx @@ -1,8 +1,8 @@ +import { useSession } from "contexts/session"; import type { FeatureBundle } from "framer-motion"; import { LazyMotion } from "framer-motion"; import { memo } from "react"; import { StyleSheetManager, ThemeProvider } from "styled-components"; -import { useSession } from "contexts/session"; import GlobalStyle from "styles/GlobalStyle"; import themes from "styles/themes"; import { DEFAULT_THEME } from "utils/constants"; diff --git a/components/system/Apps/AppContainer.tsx b/components/system/Apps/AppContainer.tsx index ac661b3e..9ec94d48 100644 --- a/components/system/Apps/AppContainer.tsx +++ b/components/system/Apps/AppContainer.tsx @@ -1,8 +1,8 @@ +import useFileDrop from "components/system/Files/FileManager/useFileDrop"; +import { useProcesses } from "contexts/process"; import dynamic from "next/dynamic"; import { memo, useMemo, useRef, useState } from "react"; import type { styled } from "styled-components"; -import { useProcesses } from "contexts/process"; -import useFileDrop from "components/system/Files/FileManager/useFileDrop"; const StyledLoading = dynamic( () => import("components/system/Files/FileManager/StyledLoading") diff --git a/components/system/Apps/AppsLoader.tsx b/components/system/Apps/AppsLoader.tsx index 12eb3313..47de9c0d 100644 --- a/components/system/Apps/AppsLoader.tsx +++ b/components/system/Apps/AppsLoader.tsx @@ -1,7 +1,7 @@ +import { useProcesses } from "contexts/process"; import { AnimatePresence } from "framer-motion"; import dynamic from "next/dynamic"; import { memo } from "react"; -import { useProcesses } from "contexts/process"; const RenderComponent = dynamic( () => import("components/system/Apps/RenderComponent") diff --git a/components/system/Apps/RenderComponent.tsx b/components/system/Apps/RenderComponent.tsx index 921eb636..15c19d50 100644 --- a/components/system/Apps/RenderComponent.tsx +++ b/components/system/Apps/RenderComponent.tsx @@ -1,7 +1,7 @@ -import dynamic from "next/dynamic"; -import { memo } from "react"; import { ErrorBoundary } from "components/pages/ErrorBoundary"; import ComponentError from "components/system/Apps/ComponentError"; +import dynamic from "next/dynamic"; +import { memo } from "react"; const Window = dynamic(() => import("components/system/Window")); diff --git a/components/system/Desktop/index.tsx b/components/system/Desktop/index.tsx index 58cd36be..e43f2975 100644 --- a/components/system/Desktop/index.tsx +++ b/components/system/Desktop/index.tsx @@ -1,8 +1,8 @@ -import { useRef } from "react"; import StyledDesktop from "components/system/Desktop/StyledDesktop"; import useWallpaper from "components/system/Desktop/Wallpapers/useWallpaper"; import FileManager from "components/system/Files/FileManager"; import useHeightOverride from "hooks/useHeightOverride"; +import { useRef } from "react"; import { DESKTOP_PATH } from "utils/constants"; const Desktop: FC = ({ children }) => { diff --git a/components/system/Dialogs/OpenWith/index.tsx b/components/system/Dialogs/OpenWith/index.tsx index 7b719464..eb7e9947 100644 --- a/components/system/Dialogs/OpenWith/index.tsx +++ b/components/system/Dialogs/OpenWith/index.tsx @@ -1,4 +1,3 @@ -import { memo, useCallback, useEffect, useRef, useState } from "react"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import StyledOpenWith from "components/system/Dialogs/OpenWith/StyledOpenWith"; import StyledOpenWithList from "components/system/Dialogs/OpenWith/StyledOpenWithList"; @@ -6,6 +5,7 @@ import { getProcessByFileExtension } from "components/system/Files/FileEntry/fun import { useProcesses } from "contexts/process"; import directory from "contexts/process/directory"; import { useSession } from "contexts/session"; +import { memo, useCallback, useEffect, useRef, useState } from "react"; import Button from "styles/common/Button"; import Icon from "styles/common/Icon"; import { TRANSITIONS_IN_MILLISECONDS } from "utils/constants"; diff --git a/components/system/Dialogs/Properties/GeneralTab.tsx b/components/system/Dialogs/Properties/GeneralTab.tsx index 7a8d83f9..0167709a 100644 --- a/components/system/Dialogs/Properties/GeneralTab.tsx +++ b/components/system/Dialogs/Properties/GeneralTab.tsx @@ -1,18 +1,18 @@ -import { basename, dirname, extname, join } from "path"; -import { memo, useEffect, useMemo, useRef, useState } from "react"; import Buttons from "components/system/Dialogs/Properties/Buttons"; import useStats from "components/system/Dialogs/Properties/useStats"; import extensions from "components/system/Files/FileEntry/extensions"; +import { getModifiedTime } from "components/system/Files/FileEntry/functions"; +import type { FileStat } from "components/system/Files/FileManager/functions"; +import { removeInvalidFilenameCharacters } from "components/system/Files/FileManager/functions"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; import directory from "contexts/process/directory"; +import { useSession } from "contexts/session"; +import { basename, dirname, extname, join } from "path"; +import { memo, useEffect, useMemo, useRef, useState } from "react"; import Icon from "styles/common/Icon"; import { DEFAULT_LOCALE, DESKTOP_PATH, SHORTCUT_ICON } from "utils/constants"; import { getExtension, getFormattedSize } from "utils/functions"; -import type { FileStat } from "components/system/Files/FileManager/functions"; -import { removeInvalidFilenameCharacters } from "components/system/Files/FileManager/functions"; -import { useSession } from "contexts/session"; -import { getModifiedTime } from "components/system/Files/FileEntry/functions"; type TabProps = { icon: string; diff --git a/components/system/Dialogs/Properties/index.tsx b/components/system/Dialogs/Properties/index.tsx index ffcf0861..2a1cc239 100644 --- a/components/system/Dialogs/Properties/index.tsx +++ b/components/system/Dialogs/Properties/index.tsx @@ -1,5 +1,3 @@ -import { basename, extname } from "path"; -import { useEffect, useRef } from "react"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import GeneralTab from "components/system/Dialogs/Properties/GeneralTab"; import StyledProperties from "components/system/Dialogs/Properties/StyledProperties"; @@ -8,6 +6,8 @@ import StyledButton from "components/system/Dialogs/StyledButton"; import useFileInfo from "components/system/Files/FileEntry/useFileInfo"; import useTitle from "components/system/Window/useTitle"; import { useProcesses } from "contexts/process"; +import { basename, extname } from "path"; +import { useEffect, useRef } from "react"; import { FOCUSABLE_ELEMENT } from "utils/constants"; import { haltEvent } from "utils/functions"; diff --git a/components/system/Dialogs/Transfer/index.tsx b/components/system/Dialogs/Transfer/index.tsx index 005ccf9f..4b8807fc 100644 --- a/components/system/Dialogs/Transfer/index.tsx +++ b/components/system/Dialogs/Transfer/index.tsx @@ -1,5 +1,3 @@ -import { basename, dirname } from "path"; -import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import StyledButton from "components/system/Dialogs/StyledButton"; import StyledTransfer from "components/system/Dialogs/Transfer/StyledTransfer"; @@ -8,6 +6,8 @@ import type { ObjectReaders, } from "components/system/Dialogs/Transfer/useTransferDialog"; import { useProcesses } from "contexts/process"; +import { basename, dirname } from "path"; +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { ONE_TIME_PASSIVE_EVENT } from "utils/constants"; import { haltEvent } from "utils/functions"; diff --git a/components/system/Files/FileEntry/RenameBox.tsx b/components/system/Files/FileEntry/RenameBox.tsx index 011c495e..a38ca3b0 100644 --- a/components/system/Files/FileEntry/RenameBox.tsx +++ b/components/system/Files/FileEntry/RenameBox.tsx @@ -1,8 +1,8 @@ +import StyledRenameBox from "components/system/Files/FileEntry/StyledRenameBox"; +import { getTextWrapData } from "components/system/Files/FileEntry/functions"; import { extname } from "path"; import { useCallback, useLayoutEffect, useRef } from "react"; import { useTheme } from "styled-components"; -import StyledRenameBox from "components/system/Files/FileEntry/StyledRenameBox"; -import { getTextWrapData } from "components/system/Files/FileEntry/functions"; import { PREVENT_SCROLL } from "utils/constants"; import { haltEvent } from "utils/functions"; diff --git a/components/system/Files/FileEntry/SubIcons.tsx b/components/system/Files/FileEntry/SubIcons.tsx index 21c29d5c..a00f9d4c 100644 --- a/components/system/Files/FileEntry/SubIcons.tsx +++ b/components/system/Files/FileEntry/SubIcons.tsx @@ -1,6 +1,6 @@ -import { memo, useMemo } from "react"; import type { FileManagerViewNames } from "components/system/Files/Views"; import { FileEntryIconSize } from "components/system/Files/Views"; +import { memo, useMemo } from "react"; import Icon from "styles/common/Icon"; import { FOLDER_BACK_ICON, diff --git a/components/system/Files/FileEntry/index.tsx b/components/system/Files/FileEntry/index.tsx index e498975a..19a25cff 100644 --- a/components/system/Files/FileEntry/index.tsx +++ b/components/system/Files/FileEntry/index.tsx @@ -1,6 +1,28 @@ -import { basename, dirname, extname, join } from "path"; +import StyledFigure from "components/system/Files/FileEntry/StyledFigure"; +import SubIcons from "components/system/Files/FileEntry/SubIcons"; +import extensions from "components/system/Files/FileEntry/extensions"; +import { + getModifiedTime, + getTextWrapData, +} from "components/system/Files/FileEntry/functions"; +import useFile from "components/system/Files/FileEntry/useFile"; +import useFileContextMenu from "components/system/Files/FileEntry/useFileContextMenu"; +import useFileInfo from "components/system/Files/FileEntry/useFileInfo"; +import FileManager from "components/system/Files/FileManager"; +import { isSelectionIntersecting } from "components/system/Files/FileManager/Selection/functions"; +import type { SelectionRect } from "components/system/Files/FileManager/Selection/useSelection"; +import type { FileStat } from "components/system/Files/FileManager/functions"; +import useFileDrop from "components/system/Files/FileManager/useFileDrop"; +import type { FocusEntryFunctions } from "components/system/Files/FileManager/useFocusableEntries"; +import type { FileActions } from "components/system/Files/FileManager/useFolder"; +import type { FileManagerViewNames } from "components/system/Files/Views"; +import { FileEntryIconSize } from "components/system/Files/Views"; +import { useFileSystem } from "contexts/fileSystem"; +import { useProcesses } from "contexts/process"; import { m as motion } from "framer-motion"; +import useDoubleClick from "hooks/useDoubleClick"; import dynamic from "next/dynamic"; +import { basename, dirname, extname, join } from "path"; import { useCallback, useEffect, @@ -10,28 +32,6 @@ import { useState, } from "react"; import { useTheme } from "styled-components"; -import extensions from "components/system/Files/FileEntry/extensions"; -import { - getModifiedTime, - getTextWrapData, -} from "components/system/Files/FileEntry/functions"; -import StyledFigure from "components/system/Files/FileEntry/StyledFigure"; -import SubIcons from "components/system/Files/FileEntry/SubIcons"; -import useFile from "components/system/Files/FileEntry/useFile"; -import useFileContextMenu from "components/system/Files/FileEntry/useFileContextMenu"; -import useFileInfo from "components/system/Files/FileEntry/useFileInfo"; -import FileManager from "components/system/Files/FileManager"; -import type { FileStat } from "components/system/Files/FileManager/functions"; -import { isSelectionIntersecting } from "components/system/Files/FileManager/Selection/functions"; -import type { SelectionRect } from "components/system/Files/FileManager/Selection/useSelection"; -import useFileDrop from "components/system/Files/FileManager/useFileDrop"; -import type { FocusEntryFunctions } from "components/system/Files/FileManager/useFocusableEntries"; -import type { FileActions } from "components/system/Files/FileManager/useFolder"; -import type { FileManagerViewNames } from "components/system/Files/Views"; -import { FileEntryIconSize } from "components/system/Files/Views"; -import { useFileSystem } from "contexts/fileSystem"; -import { useProcesses } from "contexts/process"; -import useDoubleClick from "hooks/useDoubleClick"; import Button from "styles/common/Button"; import Icon from "styles/common/Icon"; import { diff --git a/components/system/Files/FileManager/StatusBar.tsx b/components/system/Files/FileManager/StatusBar.tsx index 52fd1d8e..4f57f2ca 100644 --- a/components/system/Files/FileManager/StatusBar.tsx +++ b/components/system/Files/FileManager/StatusBar.tsx @@ -1,3 +1,7 @@ +import StyledStatusBar from "components/system/Files/FileManager/StyledStatusBar"; +import type { FileDrop } from "components/system/Files/FileManager/useFileDrop"; +import { useFileSystem } from "contexts/fileSystem"; +import useResizeObserver from "hooks/useResizeObserver"; import { join } from "path"; import { useCallback, @@ -6,10 +10,6 @@ import { useRef, useState, } from "react"; -import StyledStatusBar from "components/system/Files/FileManager/StyledStatusBar"; -import type { FileDrop } from "components/system/Files/FileManager/useFileDrop"; -import { useFileSystem } from "contexts/fileSystem"; -import useResizeObserver from "hooks/useResizeObserver"; import { getFormattedSize, haltEvent, label } from "utils/functions"; type StatusBarProps = { diff --git a/components/system/Files/FileManager/index.tsx b/components/system/Files/FileManager/index.tsx index a4634b0e..e00270ff 100644 --- a/components/system/Files/FileManager/index.tsx +++ b/components/system/Files/FileManager/index.tsx @@ -1,6 +1,3 @@ -import { basename, join } from "path"; -import dynamic from "next/dynamic"; -import { memo, useEffect, useMemo, useRef, useState } from "react"; import FileEntry from "components/system/Files/FileEntry"; import StyledSelection from "components/system/Files/FileManager/Selection/StyledSelection"; import useSelection from "components/system/Files/FileManager/Selection/useSelection"; @@ -13,6 +10,9 @@ import useFolderContextMenu from "components/system/Files/FileManager/useFolderC import type { FileManagerViewNames } from "components/system/Files/Views"; import { FileManagerViews } from "components/system/Files/Views"; import { useFileSystem } from "contexts/fileSystem"; +import dynamic from "next/dynamic"; +import { basename, join } from "path"; +import { memo, useEffect, useMemo, useRef, useState } from "react"; import { FOCUSABLE_ELEMENT, MOUNTABLE_EXTENSIONS, diff --git a/components/system/Menu/MenuItemEntry.tsx b/components/system/Menu/MenuItemEntry.tsx index eaf78c7a..c08cea4e 100644 --- a/components/system/Menu/MenuItemEntry.tsx +++ b/components/system/Menu/MenuItemEntry.tsx @@ -1,3 +1,11 @@ +import Menu, { topLeftPosition } from "components/system/Menu"; +import { + Checkmark, + ChevronRight, + Circle, + Share, +} from "components/system/Menu/MenuIcons"; +import type { MenuItem } from "contexts/menu/useMenuContextState"; import { useCallback, useEffect, @@ -7,14 +15,6 @@ import { } from "react"; import type { Position } from "react-rnd"; import { useTheme } from "styled-components"; -import Menu, { topLeftPosition } from "components/system/Menu"; -import { - Checkmark, - ChevronRight, - Circle, - Share, -} from "components/system/Menu/MenuIcons"; -import type { MenuItem } from "contexts/menu/useMenuContextState"; import Button from "styles/common/Button"; import Icon from "styles/common/Icon"; import { diff --git a/components/system/Menu/index.tsx b/components/system/Menu/index.tsx index 0eb061ee..f278d80e 100644 --- a/components/system/Menu/index.tsx +++ b/components/system/Menu/index.tsx @@ -1,10 +1,10 @@ -import { useCallback, useEffect, useRef, useState } from "react"; -import type { Position } from "react-rnd"; import MenuItemEntry from "components/system/Menu/MenuItemEntry"; -import menuTransition from "components/system/Menu/menuTransition"; import StyledMenu from "components/system/Menu/StyledMenu"; +import menuTransition from "components/system/Menu/menuTransition"; import { useMenu } from "contexts/menu/index"; import type { MenuState } from "contexts/menu/useMenuContextState"; +import { useCallback, useEffect, useRef, useState } from "react"; +import type { Position } from "react-rnd"; import { FOCUSABLE_ELEMENT, ONE_TIME_PASSIVE_EVENT, diff --git a/components/system/StartMenu/Sidebar/SidebarButton.tsx b/components/system/StartMenu/Sidebar/SidebarButton.tsx index fc45c786..54a23788 100644 --- a/components/system/StartMenu/Sidebar/SidebarButton.tsx +++ b/components/system/StartMenu/Sidebar/SidebarButton.tsx @@ -1,5 +1,5 @@ -import { useCallback } from "react"; import StyledSidebarButton from "components/system/StartMenu/Sidebar/StyledSidebarButton"; +import { useCallback } from "react"; import { spotlightEffect } from "utils/spotlightEffect"; type SidebarButton = { diff --git a/components/system/StartMenu/Sidebar/index.tsx b/components/system/StartMenu/Sidebar/index.tsx index 0ebf8c8b..99d4c126 100644 --- a/components/system/StartMenu/Sidebar/index.tsx +++ b/components/system/StartMenu/Sidebar/index.tsx @@ -1,5 +1,3 @@ -import { memo, useEffect, useMemo, useRef, useState } from "react"; -import { useTheme } from "styled-components"; import type { SidebarButtons } from "components/system/StartMenu/Sidebar/SidebarButton"; import SidebarButton from "components/system/StartMenu/Sidebar/SidebarButton"; import { @@ -14,6 +12,8 @@ import StyledSidebar from "components/system/StartMenu/Sidebar/StyledSidebar"; import { useFileSystem } from "contexts/fileSystem"; import { useProcesses } from "contexts/process"; import { useSession } from "contexts/session"; +import { memo, useEffect, useMemo, useRef, useState } from "react"; +import { useTheme } from "styled-components"; import { HOME, TASKBAR_HEIGHT } from "utils/constants"; import { haltEvent, viewHeight } from "utils/functions"; diff --git a/components/system/StartMenu/index.tsx b/components/system/StartMenu/index.tsx index aa97f232..88860167 100644 --- a/components/system/StartMenu/index.tsx +++ b/components/system/StartMenu/index.tsx @@ -1,11 +1,11 @@ -import type { Variant } from "framer-motion"; -import { useLayoutEffect, useRef, useState } from "react"; -import { useTheme } from "styled-components"; import FileManager from "components/system/Files/FileManager"; import Sidebar from "components/system/StartMenu/Sidebar"; import StyledStartMenu from "components/system/StartMenu/StyledStartMenu"; import StyledStartMenuBackground from "components/system/StartMenu/StyledStartMenuBackground"; import useTaskbarItemTransition from "components/system/Taskbar/useTaskbarItemTransition"; +import type { Variant } from "framer-motion"; +import { useLayoutEffect, useRef, useState } from "react"; +import { useTheme } from "styled-components"; import { DEFAULT_SCROLLBAR_WIDTH, FOCUSABLE_ELEMENT, diff --git a/components/system/Taskbar/Calendar/index.tsx b/components/system/Taskbar/Calendar/index.tsx index c6fe32dc..884786de 100644 --- a/components/system/Taskbar/Calendar/index.tsx +++ b/components/system/Taskbar/Calendar/index.tsx @@ -1,10 +1,10 @@ -import { memo, useEffect, useMemo, useRef, useState } from "react"; -import { useTheme } from "styled-components"; import { Down, Up } from "components/system/Taskbar/Calendar/Icons"; import StyledCalendar from "components/system/Taskbar/Calendar/StyledCalendar"; import type { Calendar as ICalendar } from "components/system/Taskbar/Calendar/functions"; import { createCalendar } from "components/system/Taskbar/Calendar/functions"; import useTaskbarItemTransition from "components/system/Taskbar/useTaskbarItemTransition"; +import { memo, useEffect, useMemo, useRef, useState } from "react"; +import { useTheme } from "styled-components"; import Button from "styles/common/Button"; import { FOCUSABLE_ELEMENT, PREVENT_SCROLL } from "utils/constants"; import { haltEvent } from "utils/functions"; diff --git a/components/system/Taskbar/Clock/index.tsx b/components/system/Taskbar/Clock/index.tsx index 768bb1b7..da528a12 100644 --- a/components/system/Taskbar/Clock/index.tsx +++ b/components/system/Taskbar/Clock/index.tsx @@ -1,10 +1,12 @@ -import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"; -import type { LocaleTimeDate } from "components/system/Taskbar/Clock/functions"; +import { measureText } from "components/system/Files/FileEntry/functions"; import StyledClock from "components/system/Taskbar/Clock/StyledClock"; +import type { LocaleTimeDate } from "components/system/Taskbar/Clock/functions"; import useClockContextMenu from "components/system/Taskbar/Clock/useClockContextMenu"; import type { Size } from "components/system/Window/RndWindow/useResizable"; import { useSession } from "contexts/session"; import useWorker from "hooks/useWorker"; +import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { useTheme } from "styled-components"; import { CLOCK_CANVAS_BASE_WIDTH, FOCUSABLE_ELEMENT, @@ -12,8 +14,6 @@ import { TASKBAR_HEIGHT, } from "utils/constants"; import { createOffscreenCanvas } from "utils/functions"; -import { measureText } from "components/system/Files/FileEntry/functions"; -import { useTheme } from "styled-components"; type ClockWorkerResponse = LocaleTimeDate | "source"; diff --git a/components/system/Taskbar/StartButton/index.tsx b/components/system/Taskbar/StartButton/index.tsx index 378577cb..ced81f10 100644 --- a/components/system/Taskbar/StartButton/index.tsx +++ b/components/system/Taskbar/StartButton/index.tsx @@ -1,7 +1,7 @@ -import { useState } from "react"; import StartButtonIcon from "components/system/Taskbar/StartButton/StartButtonIcon"; import StyledStartButton from "components/system/Taskbar/StartButton/StyledStartButton"; import useTaskbarContextMenu from "components/system/Taskbar/useTaskbarContextMenu"; +import { useState } from "react"; import { ICON_PATH, USER_ICON_PATH } from "utils/constants"; import { getDpi, imageSrc, imageSrcs, isSafari, label } from "utils/functions"; diff --git a/components/system/Taskbar/TaskbarEntries/index.tsx b/components/system/Taskbar/TaskbarEntries/index.tsx index 7d381fd9..0bf69a49 100644 --- a/components/system/Taskbar/TaskbarEntries/index.tsx +++ b/components/system/Taskbar/TaskbarEntries/index.tsx @@ -1,8 +1,8 @@ +import StyledTaskbarEntries from "components/system/Taskbar/TaskbarEntries/StyledTaskbarEntries"; +import { useProcesses } from "contexts/process"; import { AnimatePresence } from "framer-motion"; import dynamic from "next/dynamic"; import { memo } from "react"; -import { useProcesses } from "contexts/process"; -import StyledTaskbarEntries from "components/system/Taskbar/TaskbarEntries/StyledTaskbarEntries"; const TaskbarEntry = dynamic( () => import("components/system/Taskbar/TaskbarEntry") diff --git a/components/system/Taskbar/TaskbarEntry/Peek/PeekWindow.tsx b/components/system/Taskbar/TaskbarEntry/Peek/PeekWindow.tsx index 4be1a7a0..f66aee3f 100644 --- a/components/system/Taskbar/TaskbarEntry/Peek/PeekWindow.tsx +++ b/components/system/Taskbar/TaskbarEntry/Peek/PeekWindow.tsx @@ -1,11 +1,11 @@ -import { memo, useLayoutEffect, useRef, useState } from "react"; import StyledPeekWindow from "components/system/Taskbar/TaskbarEntry/Peek/StyledPeekWindow"; import usePeekTransition from "components/system/Taskbar/TaskbarEntry/Peek/usePeekTransition"; import useWindowPeek from "components/system/Taskbar/TaskbarEntry/Peek/useWindowPeek"; -import useWindowActions from "components/system/Window/Titlebar/useWindowActions"; import { CloseIcon } from "components/system/Window/Titlebar/WindowActionIcons"; +import useWindowActions from "components/system/Window/Titlebar/useWindowActions"; import { useProcesses } from "contexts/process"; import { useSession } from "contexts/session"; +import { memo, useLayoutEffect, useRef, useState } from "react"; import Button from "styles/common/Button"; import { FOCUSABLE_ELEMENT, HIGH_PRIORITY_ELEMENT } from "utils/constants"; import { label, viewWidth } from "utils/functions"; diff --git a/components/system/Taskbar/TaskbarEntry/index.tsx b/components/system/Taskbar/TaskbarEntry/index.tsx index 2bcac110..517f4015 100644 --- a/components/system/Taskbar/TaskbarEntry/index.tsx +++ b/components/system/Taskbar/TaskbarEntry/index.tsx @@ -1,12 +1,12 @@ -import { AnimatePresence } from "framer-motion"; -import dynamic from "next/dynamic"; -import { memo, useCallback, useMemo, useState } from "react"; import StyledTaskbarEntry from "components/system/Taskbar/TaskbarEntry/StyledTaskbarEntry"; import useTaskbarTransition from "components/system/Taskbar/TaskbarEntry/useTaskbarTransition"; import useTitlebarContextMenu from "components/system/Window/Titlebar/useTitlebarContextMenu"; import useNextFocusable from "components/system/Window/useNextFocusable"; import { useProcesses } from "contexts/process"; import { useSession } from "contexts/session"; +import { AnimatePresence } from "framer-motion"; +import dynamic from "next/dynamic"; +import { memo, useCallback, useMemo, useState } from "react"; import Button from "styles/common/Button"; import Icon from "styles/common/Icon"; import { DIV_BUTTON_PROPS } from "utils/constants"; diff --git a/components/system/Taskbar/index.tsx b/components/system/Taskbar/index.tsx index afe3ef46..7525d6f4 100644 --- a/components/system/Taskbar/index.tsx +++ b/components/system/Taskbar/index.tsx @@ -1,11 +1,11 @@ -import { AnimatePresence } from "framer-motion"; -import dynamic from "next/dynamic"; -import { memo, useCallback, useState } from "react"; import Clock from "components/system/Taskbar/Clock"; import StartButton from "components/system/Taskbar/StartButton"; import StyledTaskbar from "components/system/Taskbar/StyledTaskbar"; import TaskbarEntries from "components/system/Taskbar/TaskbarEntries"; import useTaskbarContextMenu from "components/system/Taskbar/useTaskbarContextMenu"; +import { AnimatePresence } from "framer-motion"; +import dynamic from "next/dynamic"; +import { memo, useCallback, useState } from "react"; import { CLOCK_CANVAS_BASE_WIDTH, FOCUSABLE_ELEMENT } from "utils/constants"; const Calendar = dynamic(() => import("components/system/Taskbar/Calendar")); diff --git a/components/system/Window/RndWindow/index.tsx b/components/system/Window/RndWindow/index.tsx index 61c8c713..f2e7c07f 100644 --- a/components/system/Window/RndWindow/index.tsx +++ b/components/system/Window/RndWindow/index.tsx @@ -1,7 +1,7 @@ -import { useCallback, useEffect, useMemo, useRef } from "react"; -import { Rnd } from "react-rnd"; import useRnd from "components/system/Window/RndWindow/useRnd"; import { useProcesses } from "contexts/process"; +import { useCallback, useEffect, useMemo, useRef } from "react"; +import { Rnd } from "react-rnd"; import { FOCUSABLE_ELEMENT, PREVENT_SCROLL } from "utils/constants"; import { haltEvent } from "utils/functions"; diff --git a/components/system/Window/Titlebar/index.tsx b/components/system/Window/Titlebar/index.tsx index 6626187e..d09f3d56 100644 --- a/components/system/Window/Titlebar/index.tsx +++ b/components/system/Window/Titlebar/index.tsx @@ -1,17 +1,17 @@ -import { memo, useCallback, useRef } from "react"; import rndDefaults from "components/system/Window/RndWindow/rndDefaults"; import StyledTitlebar from "components/system/Window/Titlebar/StyledTitlebar"; -import useTitlebarContextMenu from "components/system/Window/Titlebar/useTitlebarContextMenu"; -import useWindowActions from "components/system/Window/Titlebar/useWindowActions"; import { CloseIcon, - MaximizedIcon, MaximizeIcon, + MaximizedIcon, MinimizeIcon, } from "components/system/Window/Titlebar/WindowActionIcons"; +import useTitlebarContextMenu from "components/system/Window/Titlebar/useTitlebarContextMenu"; +import useWindowActions from "components/system/Window/Titlebar/useWindowActions"; import { useProcesses } from "contexts/process"; import { useSession } from "contexts/session"; import useDoubleClick from "hooks/useDoubleClick"; +import { memo, useCallback, useRef } from "react"; import Button from "styles/common/Button"; import Icon from "styles/common/Icon"; import { LONG_PRESS_DELAY_MS, PREVENT_SCROLL } from "utils/constants"; diff --git a/components/system/Window/index.tsx b/components/system/Window/index.tsx index aee470fc..ea4f6692 100644 --- a/components/system/Window/index.tsx +++ b/components/system/Window/index.tsx @@ -1,4 +1,3 @@ -import { useCallback } from "react"; import type { ComponentProcessProps } from "components/system/Apps/RenderComponent"; import StyledPeekViewport from "components/system/Taskbar/TaskbarEntry/Peek/StyledPeekViewport"; import RndWindow from "components/system/Window/RndWindow"; @@ -8,6 +7,7 @@ import useFocusable from "components/system/Window/useFocusable"; import useWindowTransitions from "components/system/Window/useWindowTransitions"; import { useProcesses } from "contexts/process"; import { useSession } from "contexts/session"; +import { useCallback } from "react"; const Window: FC = ({ children, id }) => { const { diff --git a/contexts/viewport/index.tsx b/contexts/viewport/index.tsx index 7ab1e722..9514d882 100644 --- a/contexts/viewport/index.tsx +++ b/contexts/viewport/index.tsx @@ -1,5 +1,5 @@ -import useViewportContextState from "contexts/viewport/useViewportContextState"; import contextFactory from "contexts/contextFactory"; +import useViewportContextState from "contexts/viewport/useViewportContextState"; const { Provider, useContext } = contextFactory(useViewportContextState); diff --git a/hooks/useProcessesRef.tsx b/hooks/useProcessesRef.tsx index c70446c8..0cbb0b3c 100644 --- a/hooks/useProcessesRef.tsx +++ b/hooks/useProcessesRef.tsx @@ -1,6 +1,6 @@ -import { useEffect, useRef } from "react"; import { useProcesses } from "contexts/process"; import type { Processes } from "contexts/process/types"; +import { useEffect, useRef } from "react"; export const useProcessesRef = (): React.MutableRefObject => { const { processes } = useProcesses(); diff --git a/pages/_app.tsx b/pages/_app.tsx index 2478d195..e093b3a6 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,4 +1,3 @@ -import type { AppProps } from "next/app"; import { ErrorBoundary } from "components/pages/ErrorBoundary"; import Metadata from "components/pages/Metadata"; import StyledApp from "components/pages/StyledApp"; @@ -7,6 +6,7 @@ import { MenuProvider } from "contexts/menu"; import { ProcessProvider } from "contexts/process"; import { SessionProvider } from "contexts/session"; import { ViewportProvider } from "contexts/viewport"; +import type { AppProps } from "next/app"; const App = ({ Component, pageProps }: AppProps): React.ReactElement => ( diff --git a/pages/index.tsx b/pages/index.tsx index 41a02a7f..34b7eac4 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,4 +1,3 @@ -import { memo } from "react"; import AppsLoader from "components/system/Apps/AppsLoader"; import Desktop from "components/system/Desktop"; import Taskbar from "components/system/Taskbar"; @@ -6,6 +5,7 @@ import useGlobalErrorHandler from "hooks/useGlobalErrorHandler"; import useGlobalKeyboardShortcuts from "hooks/useGlobalKeyboardShortcuts"; import useIFrameFocuser from "hooks/useIFrameFocuser"; import useUrlLoader from "hooks/useUrlLoader"; +import { memo } from "react"; const Index = (): React.ReactElement => { useIFrameFocuser();