perf(web): speed up folder menu sorting (#10190)

Akshar Patel committed 2 months ago

Commit 64fafbd1 parent 72cb6382 files · +12 −3Browse files

Unified · Split

2 files

     ]);
   });
-  it("uses natural file-name ordering", () => {
+  it("uses natural file-name ordering and preserves input order for equivalent names", () => {
-    expect(fileBreadcrumbChildren(entries, "src/lib").map((entry) => entry.label)).toEqual([
+    const files = ["file10.ts", "File2.ts", "file02.ts", "file2.ts"].map((name) => ({
+      path: `src/lib/${name}`,
+      kind: "file" as const,
+    }));
+    expect(fileBreadcrumbChildren(files, "src/lib").map((entry) => entry.label)).toEqual([
+      "File2.ts",
+      "file02.ts",
       "file2.ts",
       "file10.ts",
     ]);

   entries: readonly ProjectEntry[],
   directoryPath: string,
 ): FileBreadcrumbChild[] {
+  let collator: Intl.Collator | undefined;
   const prefix = directoryPath ? `${directoryPath}/` : "";
   return entries
     .flatMap((entry) => {
     })
     .toSorted((left, right) => {
       if (left.kind !== right.kind) return left.kind === "directory" ? -1 : 1;
-      return left.label.localeCompare(right.label, undefined, {
+      collator ??= new Intl.Collator(undefined, {
         numeric: true,
         sensitivity: "base",
       });
+      return collator.compare(left.label, right.label);
     });
 }