Skip to content

Commit 8d5ca13

Browse files
committed
#127 - folder and file with the same (base) name advanced sorting support:
- bugfix for `files-first` or `folders-first` sorting methods
1 parent ac8cbc0 commit 8d5ca13

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/custom-sort/custom-sort.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ const Sorters: { [key in CustomSortOrder]: SorterFn } = {
202202
[CustomSortOrder.byMetadataFieldTrueAlphabeticalReverse]: sorterByMetadataField(ReverseOrder, TrueAlphabetical, SortingLevelId.forPrimary),
203203
[CustomSortOrder.byBookmarkOrder]: sorterByBookmarkOrder(StraightOrder),
204204
[CustomSortOrder.byBookmarkOrderReverse]: sorterByBookmarkOrder(ReverseOrder),
205-
[CustomSortOrder.fileFirst]: (a: FolderItemForSorting, b: FolderItemForSorting) => (a.isFolder && b.isFolder) ? EQUAL_OR_UNCOMPARABLE : (a.isFolder ? 1 : -1),
206-
[CustomSortOrder.folderFirst]: (a: FolderItemForSorting, b: FolderItemForSorting) => (a.isFolder && b.isFolder) ? EQUAL_OR_UNCOMPARABLE : (a.isFolder ? -1 : 0),
205+
[CustomSortOrder.fileFirst]: (a: FolderItemForSorting, b: FolderItemForSorting) => (a.isFolder === b.isFolder) ? EQUAL_OR_UNCOMPARABLE : (a.isFolder ? 1 : -1),
206+
[CustomSortOrder.folderFirst]: (a: FolderItemForSorting, b: FolderItemForSorting) => (a.isFolder === b.isFolder) ? EQUAL_OR_UNCOMPARABLE : (a.isFolder ? -1 : 1),
207207

208208
// A fallback entry which should not be used - the getSorterFor() function below should protect against it
209209
[CustomSortOrder.standardObsidian]: (a: FIFS, b: FIFS) => CollatorCompare(a.sortString, b.sortString),

0 commit comments

Comments
 (0)