github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-13 03:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3444 from overleaf/ta-file-tree-sort

Browse source 
[ReactFileTree] Sort Files Docs and Folders

GitOrigin-RevId: 720c66ad2018d8e1fa18ffb16b24f985eddc566b
This commit is contained in:
Hugh O'Brien 2020-12-09 11:56:16 +00:00 • committed by Copybot
parent 3fe462f06f
commit aa346e2da8
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
services/web/frontend/js/features/file-tree/components/file-tree-folder-list.js
View file

@ -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