From 1356e35ad1d90be9e8e95a61675e80a3513643b0 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sun, 30 Sep 2018 18:42:27 -0700 Subject: [PATCH] Closes #686 - null does not trigger default param --- shared/utils/naturalSort.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/shared/utils/naturalSort.js b/shared/utils/naturalSort.js index 5c564bb4a..2165dc9f5 100644 --- a/shared/utils/naturalSort.js +++ b/shared/utils/naturalSort.js @@ -1,9 +1,11 @@ // @flow -import _ from 'lodash'; +import { sortBy } from 'lodash'; import naturalSort from 'natural-sort'; -export default (sortableArray: Object[] = [], key: string) => { +export default (sortableArray: Object[], key: string) => { + if (!sortableArray) return []; + let keys = sortableArray.map(object => object[key]); keys.sort(naturalSort()); - return _.sortBy(sortableArray, object => keys.indexOf(object[key])); + return sortBy(sortableArray, object => keys.indexOf(object[key])); };