Merge pull request #14 from devklick/dev

Dev

Author: devklick

src/programs/FileBrowser/MainContent/MainContent.tsx

@@ -39,6 +39,20 @@ function MainContent({
     setContextMenuOpen(true);
   }
 
+  function getFSObjects() {
+    const objects = Object.values<FSObject>(currentDirectory.contents).sort(
+      (a, b) => {
+        const nameA = a.name.toLowerCase();
+        const nameB = b.name.toLowerCase();
+        if (nameA < nameB) return -1;
+        if (nameA > nameB) return 1;
+        return 0;
+      }
+    );
+
+    return objects;
+  }
+
   return (
     <StyledMainContent onContextMenu={handleRightClick}>
       {contextMenuOpen && (
@@ -56,7 +70,7 @@ function MainContent({
           close={() => setPromptFor(null)}
         />
       )}
-      {Object.values<FSObject>(currentDirectory.contents).map((fsObject) => (
+      {getFSObjects().map((fsObject) => (
         <DirectoryOrFile
           fsObject={fsObject}
           openFSObject={openFSObject}

src/stores/localFS.ts

@@ -295,10 +295,8 @@ export const useLocalFS = create<LocalFSState>()(
         // store the path on each FSObject and instead store a reference to
         // the parent FSDirectory, but this would very tricky to persist
         function updatePathRecursive(fsObject: FSObject) {
-          console.log("Updating", fsObject.path);
           const regex = new RegExp(`^${oldPath}`);
           fsObject.path = fsObject.path.replace(regex, newPath);
-          console.log("Updated to", fsObject.path);
 
           if (!isFSDirectory(fsObject)) return;