|
@@ -7,6 +7,7 @@ import { IPageWithMeta, isIPageInfoForListing } from '~/interfaces/page';
|
|
|
import { IPageSearchMeta } from '~/interfaces/search';
|
|
import { IPageSearchMeta } from '~/interfaces/search';
|
|
|
import { useIsGuestUser } from '~/stores/context';
|
|
import { useIsGuestUser } from '~/stores/context';
|
|
|
import { useSWRxPageInfoForList } from '~/stores/page';
|
|
import { useSWRxPageInfoForList } from '~/stores/page';
|
|
|
|
|
+import { usePageTreeTermManager } from '~/stores/page-listing';
|
|
|
import { useFullTextSearchTermManager } from '~/stores/search';
|
|
import { useFullTextSearchTermManager } from '~/stores/search';
|
|
|
import { ForceHideMenuItems } from '../Common/Dropdown/PageItemControl';
|
|
import { ForceHideMenuItems } from '../Common/Dropdown/PageItemControl';
|
|
|
|
|
|
|
@@ -35,7 +36,9 @@ const SearchResultListSubstance: ForwardRefRenderFunction<ISelectableAll, Props>
|
|
|
const { data: isGuestUser } = useIsGuestUser();
|
|
const { data: isGuestUser } = useIsGuestUser();
|
|
|
const { data: idToPageInfo } = useSWRxPageInfoForList(pageIdsWithNoSnippet);
|
|
const { data: idToPageInfo } = useSWRxPageInfoForList(pageIdsWithNoSnippet);
|
|
|
|
|
|
|
|
- const { advance: advanceFullTextSearchTerm } = useFullTextSearchTermManager();
|
|
|
|
|
|
|
+ // for mutation
|
|
|
|
|
+ const { advance: advancePt } = usePageTreeTermManager();
|
|
|
|
|
+ const { advance: advanceFts } = useFullTextSearchTermManager();
|
|
|
|
|
|
|
|
const itemsRef = useRef<(ISelectable|null)[]>([]);
|
|
const itemsRef = useRef<(ISelectable|null)[]>([]);
|
|
|
|
|
|
|
@@ -62,7 +65,6 @@ const SearchResultListSubstance: ForwardRefRenderFunction<ISelectableAll, Props>
|
|
|
}
|
|
}
|
|
|
}, [onPageSelected, pages]);
|
|
}, [onPageSelected, pages]);
|
|
|
|
|
|
|
|
-
|
|
|
|
|
let injectedPage;
|
|
let injectedPage;
|
|
|
// inject data to list
|
|
// inject data to list
|
|
|
if (idToPageInfo != null) {
|
|
if (idToPageInfo != null) {
|
|
@@ -98,7 +100,7 @@ const SearchResultListSubstance: ForwardRefRenderFunction<ISelectableAll, Props>
|
|
|
forceHideMenuItems={forceHideMenuItems}
|
|
forceHideMenuItems={forceHideMenuItems}
|
|
|
onClickItem={clickItemHandler}
|
|
onClickItem={clickItemHandler}
|
|
|
onCheckboxChanged={props.onCheckboxChanged}
|
|
onCheckboxChanged={props.onCheckboxChanged}
|
|
|
- onPageDeleted={advanceFullTextSearchTerm}
|
|
|
|
|
|
|
+ onPageDeleted={() => { advancePt(); advanceFts() }}
|
|
|
/>
|
|
/>
|
|
|
);
|
|
);
|
|
|
})}
|
|
})}
|