From ddf488e3b7115e8df8c773e20d5b419a5fb8cfa9 Mon Sep 17 00:00:00 2001 From: Mauricio Navarro Miranda Date: Sun, 9 Aug 2020 23:16:58 -0500 Subject: [PATCH] fix: selected values must be at the start of the dropdown --- .../src/components/inputs/base/Autocomplete.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js b/new-lamassu-admin/src/components/inputs/base/Autocomplete.js index 47ca5702..a8536fe9 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.js @@ -42,10 +42,15 @@ const Autocomplete = ({ onChange(evt, rValue) } - const filterOptions = (options, { inputValue }) => - sort(options, inputValue, { keys: ['code', 'display'] }).slice( + const valueArray = () => (multiple ? value : [value]) + + const filter = (array, input) => + sort(array, input, { keys: ['code', 'display'] }) + + const filterOptions = (array, { inputValue }) => + R.union(valueArray(), filter(array, inputValue)).slice( 0, - R.defaultTo(undefined)(limit) + R.defaultTo(undefined)(limit) && Math.max(limit, valueArray().length) ) return (