diff --git a/src/components/pages/gallery/CollectionSort.tsx b/src/components/pages/gallery/CollectionSort.tsx index 772d18886..9d0c2a68c 100644 --- a/src/components/pages/gallery/CollectionSort.tsx +++ b/src/components/pages/gallery/CollectionSort.tsx @@ -9,7 +9,7 @@ import { IconWithMessage } from './SelectedFileOptions'; interface Props { setCollectionSortBy: (sortBy: COLLECTION_SORT_BY) => void; - collectionSortBy: COLLECTION_SORT_BY; + activeSortBy: COLLECTION_SORT_BY; } export default function CollectionSort(props: Props) { const collectionSortOptions = CollectionSortOptions(props); diff --git a/src/components/pages/gallery/CollectionSortOptions.tsx b/src/components/pages/gallery/CollectionSortOptions.tsx index 9dce7e4da..73241c145 100644 --- a/src/components/pages/gallery/CollectionSortOptions.tsx +++ b/src/components/pages/gallery/CollectionSortOptions.tsx @@ -7,8 +7,8 @@ import styled from 'styled-components'; import constants from 'utils/strings/constants'; import { MenuItem, MenuLink } from './CollectionOptions'; -interface Props { - collectionSortBy: COLLECTION_SORT_BY; +interface OptionProps { + activeSortBy: COLLECTION_SORT_BY; setCollectionSortBy: (sortBy: COLLECTION_SORT_BY) => void; } @@ -17,31 +17,35 @@ const TickWrapper = styled.span` margin-left: 5px; `; -const CollectionSortOptions = (props: Props) => { - const { setCollectionSortBy, collectionSortBy: activeSortBy } = props; - const SortByOption = (props: { - sortBy: COLLECTION_SORT_BY; - children: any; - }) => ( - - - - - setCollectionSortBy(props.sortBy)} - variant={activeSortBy === props.sortBy && 'success'}> - {props.children} - - - - - ); +const SortByOptionCreator = + ({ setCollectionSortBy, activeSortBy }: OptionProps) => + (props: { sortBy: COLLECTION_SORT_BY; children: any }) => + ( + + + + + setCollectionSortBy(props.sortBy)} + variant={ + activeSortBy === props.sortBy && 'success' + }> + {props.children} + + + + + ); + +const CollectionSortOptions = (props: OptionProps) => { + const SortByOption = SortByOptionCreator(props); + return (