Fix path navigation in file browser

Author: devklick

src/common/utils/stringUtils.ts

@@ -7,3 +7,23 @@ export function toKebabCase(str: string) {
     .replace(/^-+|-+$/g, "") // trim leading/trailing -
     .toLowerCase();
 }
+
+export function trimStart(input: string, trim: string): string {
+  if (!trim) return input;
+
+  while (input.startsWith(trim)) {
+    input = input.slice(trim.length);
+  }
+
+  return input;
+}
+
+export function trimEnd(input: string, trim: string): string {
+  if (!trim) return input;
+
+  while (input.endsWith(trim)) {
+    input = input.slice(0, -trim.length);
+  }
+
+  return input;
+}

src/hooks/useLocalFSWithHistory.ts

@@ -4,6 +4,7 @@ import useLocalFS, {
   FSObject,
   isFSDirectory,
 } from "../stores/localFS";
+import { trimEnd } from "../common/utils/stringUtils";
 
 function useLocalFSWithHistory(currentPath: string) {
   const history = useRef<string[]>([currentPath]);
@@ -14,7 +15,7 @@ function useLocalFSWithHistory(currentPath: string) {
   );
 
   function getDirOrDefault(path: string, defaultValue = "/home/user") {
-    let dir = fs.getDirectory(path);
+    let dir = fs.getDirectory(trimEnd(path, fs.separator));
     if (!dir) {
       // TODO: Some kind of user notification
       console.warn("Invalid path");

src/stores/localFS.ts

@@ -97,28 +97,29 @@ export function isFSFile(fsObject: FSObject): fsObject is FSFile {
 
 export interface LocalFSState {
   root: FSObject;
+  separator: string;
   getDirectory: (path: string) => FSDirectory | null;
   createDirectory: (
     name: string,
-    parentDirectory: FSDirectory
+    parentDirectory: FSDirectory,
   ) => FSDirectory | null;
   createFile: (
     name: string,
     parentDirectory: FSDirectory,
-    contents?: string
+    contents?: string,
   ) => FSFile | null;
   favorites: Array<string>;
   validateFSObjectName: (name: string) => string | null;
   fsObjectNameIsAvailable: (name: string, directory: FSDirectory) => boolean;
   create: (
     type: FSObjectType,
     name: string,
-    parentDirectory: FSDirectory
+    parentDirectory: FSDirectory,
   ) => FSObject | null;
   rename: (
     parentDirectory: FSDirectory,
     fsObject: FSObject,
-    newName: string
+    newName: string,
   ) => void;
   delete: (parentDirectory: FSDirectory, fsObject: FSObject) => void;
   getParentDirectory: (path: string) => FSDirectory | null;
@@ -149,7 +150,7 @@ export const useLocalFS = create<LocalFSState>()(
 
       const createDirectory: LocalFSState["createDirectory"] = (
         name,
-        parentDirectory
+        parentDirectory,
       ) => {
         if (parentDirectory.contents[name]) return null;
 
@@ -173,7 +174,7 @@ export const useLocalFS = create<LocalFSState>()(
       const createFile: LocalFSState["createFile"] = (
         name,
         parentDirectory,
-        contents
+        contents,
       ) => {
         if (parentDirectory.contents[name]) {
           return null;
@@ -198,7 +199,7 @@ export const useLocalFS = create<LocalFSState>()(
       };
 
       const validateFSObjectName: LocalFSState["validateFSObjectName"] = (
-        name
+        name,
       ) => {
         if (!name) {
           return "A value is required";
@@ -221,7 +222,7 @@ export const useLocalFS = create<LocalFSState>()(
 
       const fsObjectNameIsAvailable: LocalFSState["fsObjectNameIsAvailable"] = (
         name,
-        directory
+        directory,
       ) => {
         return !directory.contents[name];
       };
@@ -262,7 +263,7 @@ export const useLocalFS = create<LocalFSState>()(
 
       const deleteFSObject: LocalFSState["delete"] = (
         parentDirectory,
-        fsObject
+        fsObject,
       ) => {
         delete parentDirectory.contents[fsObject.name];
         get().removeFromFavorites(fsObject.path);
@@ -272,7 +273,7 @@ export const useLocalFS = create<LocalFSState>()(
       const rename: LocalFSState["rename"] = (
         parentDirectory,
         fsObject,
-        newName
+        newName,
       ) => {
         const oldName = fsObject.name;
         const oldPath = fsObject.path;
@@ -326,7 +327,7 @@ export const useLocalFS = create<LocalFSState>()(
         set({ favorites });
       };
       const removeFromFavorites: LocalFSState["removeFromFavorites"] = (
-        path
+        path,
       ) => {
         const oldFavorites = get().favorites;
         const favorites = [...oldFavorites];
@@ -338,6 +339,7 @@ export const useLocalFS = create<LocalFSState>()(
       };
       return {
         root: rootDir,
+        separator: pathSeparator,
         favorites: [
           userDir.path,
           documentsDir.path,
@@ -362,8 +364,13 @@ export const useLocalFS = create<LocalFSState>()(
     },
     {
       name: "local-fs",
-    }
-  )
+      partialize: (state) => {
+        const updated = { ...state } as Partial<LocalFSState>;
+        delete updated.separator;
+        return updated;
+      },
+    },
+  ),
 );
 
 export default useLocalFS;

src/stores/systemSettingsStore.ts

@@ -21,8 +21,8 @@ const defaultTheme: Theme = {
   warningColor: "#ebcb8b",
   successColor: "#a3be8c",
   background: "https://regolith-linux.org/images/releases/nord-dark.png",
-  opacity: 0.5,
-  blur: 5,
+  opacity: 0.1,
+  blur: 3,
 };
 
 export interface SystemSettingState {