some fixes

SenseNet · Nov 16, 2023 · fbdc01a · fbdc01a
1 parent eee2b6d
commit fbdc01a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/apps/sensenet/src/components/search/filters/type-filter.tsx b/apps/sensenet/src/components/search/filters/type-filter.tsx
@@ -84,16 +84,16 @@ type moreOptionsItem = {
 }
 
 export const TypeFilter = () => {
-  const ac = new AbortController()
   const repo = useRepository()
   const classes = useStyles()
   const localization = useLocalization().search.filters.type
   const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | null>(null)
   const searchState = useSearch()
   const [otherContentTypes, setOtherContentTypes] = useState<moreOptionsItem[]>([])
-  const categoryField = repo.schemas.getFieldTypeByName('Categories')
 
   useEffect(() => {
+    const ac = new AbortController()
+    const categoryField = repo.schemas.getFieldTypeByName('Categories')
     const fetchData = async () => {
       try {
         if (categoryField) {
@@ -118,6 +118,10 @@ export const TypeFilter = () => {
       }
     }
     fetchData()
+
+    return () => {
+      ac.abort()
+    }
   }, [repo])
 
   const [[activeFromMore], othersFromMore] = otherContentTypes.reduce(

diff --git a/apps/sensenet/src/components/search/search-bar.tsx b/apps/sensenet/src/components/search/search-bar.tsx
@@ -59,15 +59,13 @@ export const SearchBar = () => {
                     className={classes.inputButton}
                     aria-label={localization.clearTerm}
                     title={localization.clearTerm}
-                    onClick={() => null}>
-                    <Cancel
-                      onClick={() => {
-                        if (searchInputRef.current) {
-                          searchInputRef.current.value = ''
-                        }
-                        searchState.setTerm('')
-                      }}
-                    />
+                    onClick={() => {
+                      if (searchInputRef.current) {
+                        searchInputRef.current.value = ''
+                      }
+                      searchState.setTerm('')
+                    }}>
+                    <Cancel />
                   </IconButton>
                 )}
                 <IconButton