Просмотр исходного кода

improve ISearchConditions type

Yuki Takei 4 лет назад
Родитель
Сommit
dc905674c8
1 измененных файлов с 4 добавлено и 6 удалено
  1. 4 6
      packages/app/src/stores/search.tsx

+ 4 - 6
packages/app/src/stores/search.tsx

@@ -24,11 +24,9 @@ type ISearchConfigurationsFixed = {
   includeUserPages: boolean,
 }
 
-export type ISearchConditions = {
-  conditions: ISearchConfigurationsFixed & {
-    keyword: string,
-    rawQuery: string,
-  }
+export type ISearchConditions = ISearchConfigurationsFixed & {
+  keyword: string,
+  rawQuery: string,
 }
 
 const createSearchQuery = (keyword: string, includeTrashPages: boolean, includeUserPages: boolean): string => {
@@ -47,7 +45,7 @@ const createSearchQuery = (keyword: string, includeTrashPages: boolean, includeU
 
 export const useSWRxFullTextSearch = (
     keyword: string, configurations: ISearchConfigurations,
-): SWRResponse<IFormattedSearchResult, Error> & ISearchConditions => {
+): SWRResponse<IFormattedSearchResult, Error> & { conditions: ISearchConditions } => {
 
   const {
     limit, offset, sort, order, includeTrashPages, includeUserPages,