From 68be52a87d78b9e74be227f4538a13277c41aa21 Mon Sep 17 00:00:00 2001
From: Ken Chen <chengusky@gmail.com>
Date: Sun, 5 May 2019 23:23:01 +0800
Subject: [PATCH] fix: #438 to sort files in folder (#1005)

* fix: #438 to sort files in folder

* Change to use localeCompare as per review
---
 .github/CHANGELOG.md           |  1 +
 src/renderer/store/project.js  |  4 +++-
 src/renderer/store/treeCtrl.js | 10 +++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 04b76246..b4f9f8b7 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -141,6 +141,7 @@ foo<section>bar</section>zar
 - Mark Text didn't remove highlight when I delete the markdown symbol like * or `. (#893)
 - After delete ``` at the beginning to paragraph by backspace, then type other text foo, the color will be strange, if you type 1. bar. error happened. (#892)
 - Fix highlight error in code block (#545 #890)
+- Fix files sorting in folder (#438)
 
 ### 0.13.65
 
diff --git a/src/renderer/store/project.js b/src/renderer/store/project.js
index 464108c1..acbd7eaf 100644
--- a/src/renderer/store/project.js
+++ b/src/renderer/store/project.js
@@ -28,7 +28,9 @@ const getters = {
     }
 
     if (state.projectTree) travel(state.projectTree)
-    return files.sort()
+    files.sort((f1, f2) => f1.name.localeCompare(f2.name))
+
+    return files
   }
 }
 
diff --git a/src/renderer/store/treeCtrl.js b/src/renderer/store/treeCtrl.js
index c3d5eabd..0ee28ef0 100644
--- a/src/renderer/store/treeCtrl.js
+++ b/src/renderer/store/treeCtrl.js
@@ -56,7 +56,15 @@ export const addFile = (tree, file) => {
   // Add file to related directory
   if (!currentFolder.files.find(f => f.name === name)) {
     file.id = getUniqueId()
-    currentFolder.files.push(file)
+
+    const idx = currentFolder.files.findIndex(f => {
+      return f.name.localeCompare(name) > 0
+    })
+    if (idx !== -1) {
+      currentFolder.files.splice(idx, 0, file)
+    } else {
+      currentFolder.files.push(file)
+    }
   }
 }