Regression: Remove extra call to `useOutsideClick` hook not following the function signature (#24243)

pull/24233/head^2
Tasso Evangelista 4 years ago committed by GitHub
parent 86c457e3fc
commit a91e8a3dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      client/sidebar/header/actions/Search.tsx
  2. 3
      client/sidebar/search/SearchList.js

@ -1,25 +1,26 @@
import { Sidebar } from '@rocket.chat/fuselage';
import { useMutableCallback, useOutsideClick } from '@rocket.chat/fuselage-hooks';
import React, { useState, useEffect, useRef } from 'react';
import React, { useState, useEffect, useRef, ReactElement, ComponentProps } from 'react';
import tinykeys from 'tinykeys';
import SearchList from '../../search/SearchList';
const Search = (props) => {
type SearchProps = Omit<ComponentProps<typeof Sidebar.TopBar.Action>, 'icon'>;
const Search = (props: SearchProps): ReactElement => {
const [searchOpen, setSearchOpen] = useState(false);
const ref = useRef();
const ref = useRef<HTMLElement>(null);
const handleCloseSearch = useMutableCallback(() => {
setSearchOpen(false);
});
useOutsideClick(ref, handleCloseSearch);
useOutsideClick([ref], handleCloseSearch);
const openSearch = useMutableCallback(() => {
setSearchOpen(true);
});
useOutsideClick([ref], handleCloseSearch);
useEffect(() => {
const unsubscribe = tinykeys(window, {
'$mod+K': (event) => {
@ -31,7 +32,8 @@ const Search = (props) => {
openSearch();
},
});
return () => {
return (): void => {
unsubscribe();
};
}, [openSearch]);

@ -130,6 +130,9 @@ const toggleSelectionState = (next, current, input) => {
}
};
/**
* @type import('react').ForwardRefExoticComponent<{ onClose: unknown } & import('react').RefAttributes<HTMLElement>>
*/
const SearchList = forwardRef(function SearchList({ onClose }, ref) {
const listId = useUniqueId();
const t = useTranslation();

Loading…
Cancel
Save