Merge pull request #11 from devklick/dev

Add/remove file browser favorites

Author: devklick

src/programs/FileBrowser/DirectoryOrFile/DirectoryOrFile.tsx

@@ -40,6 +40,7 @@ function DirectoryOrFile({
     null
   );
   const settings = useSystemSettings();
+  const fs = useLocalFS();
 
   function handleRightClick(event: React.MouseEvent) {
     clickPosition.current = { x: event.clientX, y: event.clientY };
@@ -61,7 +62,8 @@ function DirectoryOrFile({
         <ContextMenu
           position={clickPosition.current}
           items={getFSObjectContextMenu(
-            fsObject.type,
+            fsObject,
+            fs,
             setContextAction,
             setContextMenuOpen
           )}

src/programs/FileBrowser/contextMenus.ts

@@ -1,5 +1,5 @@
 import { MenuItemProps } from "../../components/MenuItems";
-import { FSObjectType } from "../../stores/localFS";
+import { FSObject, FSObjectType, LocalFSState } from "../../stores/localFS";
 
 export type ContextMenuAction = "delete" | "rename";
 
@@ -29,15 +29,21 @@ export function getMainContentContextItems(
 }
 
 export function getFSObjectContextMenu(
-  fsObjectType: FSObjectType,
+  fsObject: FSObject,
+  fs: LocalFSState,
   setContextAction: (action: ContextMenuAction) => void,
   setContextMenuOpen: (open: boolean) => void
 ): Array<MenuItemProps> {
-  switch (fsObjectType) {
+  switch (fsObject.type) {
     case "file":
       return getFSFileContextMenu(setContextAction, setContextMenuOpen);
     case "directory":
-      return getFSDirectoryContextMenu(setContextAction, setContextMenuOpen);
+      return getFSDirectoryContextMenu(
+        fsObject,
+        fs,
+        setContextAction,
+        setContextMenuOpen
+      );
   }
 }
 
@@ -64,7 +70,10 @@ function getFSFileContextMenu(
 }
 
 function getFSDirectoryContextMenu(
+  fsObject: FSObject,
+  fs: LocalFSState,
   setContextAction: (action: ContextMenuAction) => void,
+
   setContextMenuOpen: (open: boolean) => void
 ): Array<MenuItemProps> {
   return [
@@ -82,5 +91,16 @@ function getFSDirectoryContextMenu(
         setContextMenuOpen(false);
       },
     },
+    {
+      title: fs.favorites.includes(fsObject.path)
+        ? "Remove from Favorites"
+        : "Add to Favorites",
+      action: () => {
+        fs.favorites.includes(fsObject.path)
+          ? fs.removeFromFavorites(fsObject.path)
+          : fs.addToFavorites(fsObject.path);
+        setContextMenuOpen(false);
+      },
+    },
   ];
 }

src/stores/localFS.ts

@@ -123,6 +123,8 @@ export interface LocalFSState {
   delete: (parentDirectory: FSDirectory, fsObject: FSObject) => void;
   getParentDirectory: (path: string) => FSDirectory | null;
   getLastFromPath: (path: string) => string | null;
+  addToFavorites: (path: string) => void;
+  removeFromFavorites: (path: string) => void;
 }
 
 export const useLocalFS = create<LocalFSState>()(
@@ -290,12 +292,32 @@ export const useLocalFS = create<LocalFSState>()(
         // If the FSObject is in the favorites, update that too.
         const favorites = get().favorites;
         const favIndex = favorites.findIndex((fav) => fav === oldPath);
-        if (favIndex) {
+        if (favIndex >= 0) {
           favorites[favIndex] = fsObject.path;
         }
 
         set({ root: get().root, favorites });
       };
+
+      const addToFavorites: LocalFSState["addToFavorites"] = (path) => {
+        const oldFavorites = get().favorites;
+        const favorites = [...oldFavorites];
+        if (!favorites.includes(path)) {
+          favorites.push(path);
+        }
+        set({ favorites });
+      };
+      const removeFromFavorites: LocalFSState["removeFromFavorites"] = (
+        path
+      ) => {
+        const oldFavorites = get().favorites;
+        const favorites = [...oldFavorites];
+        const index = favorites.indexOf(path);
+        if (index >= 0) {
+          favorites.splice(index, 1);
+        }
+        set({ favorites });
+      };
       return {
         root: rootDir,
         favorites: [
@@ -316,6 +338,8 @@ export const useLocalFS = create<LocalFSState>()(
         getParentDirectory,
         rename,
         validateFSObjectName,
+        addToFavorites,
+        removeFromFavorites,
       };
     },
     {