Skip to content

Commit 118b21a

Browse files
committed
Hindrer query fra å resettes ved nullstilling av settings
1 parent 6d4b15e commit 118b21a

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/components/left-section/search/search-input/search-settings/SearchSettings.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const SearchSettings = () => {
1414
const { appContext } = useAppState();
1515
const { rootCategories } = appContext;
1616

17-
const { searchParams, updateSearchParams, resetSearchParams } = useSearchState();
17+
const { searchParams, updateSearchParams, resetSearchSettings } = useSearchState();
1818
const { sort, categoryKeys, type, isCustom } = searchParams;
1919

2020
const { titlesToKeys, keysToTitles } = createKeysTitlesMaps(rootCategories);
@@ -32,7 +32,7 @@ export const SearchSettings = () => {
3232
size={'xsmall'}
3333
variant={'tertiary'}
3434
className={style.toggle}
35-
onClick={resetSearchParams}
35+
onClick={resetSearchSettings}
3636
>
3737
{'Nullstill'}
3838
<XMarkIcon />

src/context/search-state/SearchStateContext.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export type SearchState = {
99
searchParams: ContentSearchParams;
1010
setSearchParams: (params: ContentSearchParams) => void;
1111
updateSearchParams: (params: Partial<ContentSearchParams>) => void;
12-
resetSearchParams: () => void;
12+
resetSearchSettings: () => void;
1313
};
1414

1515
export const initialSearchParams: ContentSearchParams = {
@@ -26,5 +26,5 @@ export const SearchStateContext = createContext<SearchState>({
2626
searchParams: initialSearchParams,
2727
setSearchParams: () => ({}),
2828
updateSearchParams: () => ({}),
29-
resetSearchParams: () => ({}),
29+
resetSearchSettings: () => ({}),
3030
});

src/context/search-state/SearchStateProvider.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ export const SearchStateProvider = ({ children }: { children: React.ReactNode })
2020
setSearchParams(newParams);
2121
};
2222

23-
const resetSearchParams = () => setSearchParams(initialSearchParams);
23+
const resetSearchSettings = () =>
24+
setSearchParams({ ...initialSearchParams, query: searchParams.query });
2425

2526
useEffect(() => {
2627
setSearchResultIsOpen(!!searchResult);
@@ -36,7 +37,7 @@ export const SearchStateProvider = ({ children }: { children: React.ReactNode })
3637
searchResultIsOpen,
3738
setSearchResultIsOpen,
3839
updateSearchParams,
39-
resetSearchParams,
40+
resetSearchSettings,
4041
}}
4142
>
4243
{children}

0 commit comments

Comments
 (0)