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

+ 4 - 2
packages/app/src/components/SearchTypeahead.tsx

@@ -106,7 +106,6 @@ const SearchTypeahead: ForwardRefRenderFunction<IFocusable, Props> = (props: Pro
    * Callback function which is occured when search is exit successfully
    */
   const searchSuccessHandler = useCallback((res: AxiosResponse<IPage[]>) => {
-    setLoading(false);
     setPages(res.data);
 
     if (onSearchSuccess != null) {
@@ -118,7 +117,6 @@ const SearchTypeahead: ForwardRefRenderFunction<IFocusable, Props> = (props: Pro
    * Callback function which is occured when search is exit abnormaly
    */
   const searchErrorHandler = useCallback((err: Error) => {
-    setLoading(false);
     setSearchError(err);
 
     if (onSearchError != null) {
@@ -140,6 +138,10 @@ const SearchTypeahead: ForwardRefRenderFunction<IFocusable, Props> = (props: Pro
     catch (err) {
       searchErrorHandler(err);
     }
+    finally {
+      setLoading(false);
+    }
+
   }, [searchErrorHandler, searchSuccessHandler]);
 
   const inputChangeHandler = useCallback((text: string) => {