From aa346e2da83e0567b343c173eeb32e5e22e253b8 Mon Sep 17 00:00:00 2001
From: Hugh O'Brien <hugh.obrien@overleaf.com>
Date: Wed, 9 Dec 2020 11:56:16 +0000
Subject: [PATCH] Merge pull request #3444 from overleaf/ta-file-tree-sort

[ReactFileTree] Sort Files Docs and Folders

GitOrigin-RevId: 720c66ad2018d8e1fa18ffb16b24f985eddc566b
---
 .../components/file-tree-folder-list.js       | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-folder-list.js b/services/web/frontend/js/features/file-tree/components/file-tree-folder-list.js
index 8ca90b9064..ea95e0b215 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-folder-list.js
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-folder-list.js
@@ -12,9 +12,7 @@ function FileTreeFolderList({
   classes = {},
   dropRef = null
 }) {
-  const docsAndFiles = [...docs, ...files].sort(
-    (one, two) => one.name.toLowerCase() > two.name.toLowerCase()
-  )
+  const docsAndFiles = [...docs, ...files]
 
   return (
     <ul
@@ -22,7 +20,7 @@ function FileTreeFolderList({
       role="tree"
       ref={dropRef}
     >
-      {folders.map(folder => {
+      {folders.sort(compareFunction).map(folder => {
         return (
           <FileTreeFolder
             key={folder._id}
@@ -34,7 +32,7 @@ function FileTreeFolderList({
           />
         )
       })}
-      {docsAndFiles.map(doc => {
+      {docsAndFiles.sort(compareFunction).map(doc => {
         return (
           <FileTreeDoc
             key={doc._id}
@@ -58,4 +56,19 @@ FileTreeFolderList.propTypes = {
   dropRef: PropTypes.func
 }
 
+// the collator used to sort files docs and folders in the tree. Use english as
+// base language for consistency. Options used:
+// numeric: true so 10 comes after 2
+// sensitivity: 'variant' so case and accent are not equal
+// caseFirst: 'upper' so upper-case letters come first
+const collator = new Intl.Collator('en', {
+  numeric: true,
+  sensitivity: 'variant',
+  caseFirst: 'upper'
+})
+
+function compareFunction(one, two) {
+  return collator.compare(one.name, two.name)
+}
+
 export default FileTreeFolderList