diff --git a/plugins/turnstone-recent-searches/index.jsx b/plugins/turnstone-recent-searches/index.jsx index b652df9..db3398d 100644 --- a/plugins/turnstone-recent-searches/index.jsx +++ b/plugins/turnstone-recent-searches/index.jsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' import { useLocalStorage } from 'react-use' +// TODO: Do we need to pass in Container? Plugins could just act upon props. + const recentSearchesPlugin = (Container, containerProps = {}, pluginProps = {}) => { const { ratio = 1, diff --git a/src/lib/components/hooks/useData.js b/src/lib/components/hooks/useData.js index 91153e2..fc13ac5 100644 --- a/src/lib/components/hooks/useData.js +++ b/src/lib/components/hooks/useData.js @@ -87,8 +87,9 @@ export const fetcher = (query, listbox, defaultListbox, minQueryLength, maxItems const promises = listboxProp.map((group) => { if (typeof group.data === 'function') { return group.data(query) - } else { - return Promise.resolve({ data: filterSuppliedData(group, query) }) + } + else { + return Promise.resolve(filterSuppliedData(group, query)) } }) @@ -96,7 +97,7 @@ export const fetcher = (query, listbox, defaultListbox, minQueryLength, maxItems groups = groups.reduce((prevGroups, group, groupIndex) => { return [ ...prevGroups, - group.data.map((item) => ({ + group.map((item) => ({ value: item, text: itemText(item, listboxProp[groupIndex].displayField), groupIndex, diff --git a/src/lib/components/hooks/useData.test.js b/src/lib/components/hooks/useData.test.js index 089235e..c0625b6 100644 --- a/src/lib/components/hooks/useData.test.js +++ b/src/lib/components/hooks/useData.test.js @@ -15,14 +15,14 @@ import { fruits, vegetables, books } from '../../../data' const server = setupServer( rest.get('http://mock-api-site.com/api/books', (req, res, ctx) => { return res( - ctx.json({data: books}) + ctx.json(books) ) }), rest.get('http://mock-api-site.com/api/fruits', (req, res, ctx) => { const q = req.url.searchParams.get('q') return res( - ctx.json({data: fruits.filter(fruit => fruit.toLowerCase().startsWith(q.toLowerCase()))}) + ctx.json(fruits.filter(fruit => fruit.toLowerCase().startsWith(q.toLowerCase()))) ) }) )