sort bug fix

Author: gyaaniguy

resources/js/Pages/Drive/Components/FileBrowserSection.jsx

@@ -1,10 +1,10 @@
 import {
     memo,
     useCallback,
+    useContext,
     useEffect,
     useRef,
     useState,
-    useContext,
 } from "react";
 import { useNavigate } from "react-router-dom";
 import { Grid, List, StepBackIcon } from "lucide-react";
@@ -19,7 +19,7 @@ import DownloadButton from "@/Pages/Drive/Components/DownloadButton.jsx";
 import ShowShareModalButton from "@/Pages/Drive/Components/Shares/ShowShareModalButton.jsx";
 import DeleteButton from "@/Pages/Drive/Components/DeleteButton.jsx";
 import UploadMenu from "@/Pages/Drive/Components/UploadMenu.jsx";
-import { usePage, router } from "@inertiajs/react";
+import { router, usePage } from "@inertiajs/react";
 import RenameModal from "@/Pages/Drive/Components/FileList/RenameModal.jsx";
 import CutButton from "./CutButton.jsx";
 import PasteButton from "./PasteButton.jsx";
@@ -45,7 +45,8 @@ const FileBrowserSection = memo(({ files, path, token, isAdmin, slug }) => {
     const [fileToRename, setFileToRename] = useState(new Set());
     const [isRenameModalOpen, setIsRenameModalOpen] = useState(false);
 
-    const { cutFiles, setCutFiles, cutPath, setCutPath } = useContext(CutFilesContext);
+    const { cutFiles, setCutFiles, cutPath, setCutPath } =
+        useContext(CutFilesContext);
 
     const handleCut = () => {
         setCutFiles?.(new Set(selectedFiles));
@@ -120,8 +121,13 @@ const FileBrowserSection = memo(({ files, path, token, isAdmin, slug }) => {
 
     function sortArrayByKey(arr, key, direction) {
         return [...arr].sort((a, b) => {
-            const valA = a[key]?.toLowerCase?.() || a[key] || "";
-            const valB = b[key]?.toLowerCase?.() || b[key] || "";
+            let valA =
+                a[key]?.toLowerCase?.() || (a[key] != null ? a[key] : "");
+            let valB =
+                b[key]?.toLowerCase?.() || (b[key] != null ? b[key] : "");
+            // empty string are for folders sizes
+            valA = valA === "" ? -1 : valA;
+            valB = valB === "" ? -1 : valB;
 
             if (direction === "desc") {
                 return valA > valB ? -1 : valA < valB ? 1 : 0;

resources/js/Pages/Drive/Components/FileList/TxtViewer.jsx

@@ -66,7 +66,7 @@ const TxtViewer = ({
             }
             if (response.data?.message.includes("success")) {
                 setSavedMessage("Changes saved successfully!");
-                let src = "/fetch-file/" + previewFile.id ;
+                let src = "/fetch-file/" + previewFile.id;
                 appendParamsToTxtFileUrl(src);
             } else {
                 setSavedMessage("Error: " + response.data?.message);
@@ -99,7 +99,7 @@ const TxtViewer = ({
     };
 
     useEffect(() => {
-        let src = "/fetch-file/" + previewFile.id ;
+        let src = "/fetch-file/" + previewFile.id;
         appendParamsToTxtFileUrl(src);
     }, [previewFile, slug]);
 
@@ -146,7 +146,10 @@ const TxtViewer = ({
                     onClick={startEditing}
                 />
             ) : (
-                <pre className={`w-[70vw]  ${isAdmin ? "cursor-pointer" : ""}`} onClick={startEditing}>
+                <pre
+                    className={`w-[70vw]  ${isAdmin ? "cursor-pointer" : ""}`}
+                    onClick={startEditing}
+                >
                     {content || (isAdmin ? "Click to edit..." : "Empty File")}
                 </pre>
             )}