Merge branch 'develop' into update-meteor-2.5.2

client/sidebar/header/actions/Search.js

@@ -1,9 +1,8 @@
 import { Sidebar } from '@rocket.chat/fuselage';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useMutableCallback, useOutsideClick } from '@rocket.chat/fuselage-hooks';
 import React, { useState, useEffect, useRef } from 'react';
 import tinykeys from 'tinykeys';
 
-import { useOutsideClick } from '../../../hooks/useOutsideClick';
 import SearchList from '../../search/SearchList';
 
 const Search = (props) => {
@@ -20,7 +19,7 @@ const Search = (props) => {
 		setSearchOpen(true);
 	});
 
-	useOutsideClick(ref, handleCloseSearch);
+	useOutsideClick([ref], handleCloseSearch);
 
 	useEffect(() => {
 		const unsubscribe = tinykeys(window, {

client/sidebar/header/hooks/useDropdownVisibility.ts

@@ -1,8 +1,6 @@
-import { useToggle } from '@rocket.chat/fuselage-hooks';
+import { useToggle, useOutsideClick } from '@rocket.chat/fuselage-hooks';
 import { RefObject, useCallback } from 'react';
 
-import { useOutsideClick } from '../../../hooks/useOutsideClick';
-
 /**
  * useDropdownVisibility
  * is used to control the visibility of a dropdown
@@ -19,7 +17,7 @@ export const useDropdownVisibility = <T extends HTMLElement>({
 	reference,
 	target,
 }: {
-	reference?: RefObject<T>;
+	reference: RefObject<T>;
 	target: RefObject<T>;
 }): {
 	isVisible: boolean;
@@ -28,15 +26,8 @@ export const useDropdownVisibility = <T extends HTMLElement>({
 	const [isVisible, toggle] = useToggle(false);
 
 	useOutsideClick(
-		target,
-		useCallback(
-			(event: MouseEvent) => {
-				if (!reference || !reference.current || !reference.current.contains(event.target as Node)) {
-					toggle(false);
-				}
-			},
-			[reference, toggle],
-		),
+		[target, reference],
+		useCallback(() => toggle(false), [toggle]),
 	);
 
 	return {

package.json

@@ -177,8 +177,8 @@
 		"@rocket.chat/apps-engine": "^1.29.1",
 		"@rocket.chat/css-in-js": "^0.31.0",
 		"@rocket.chat/emitter": "^0.31.0",
-		"@rocket.chat/fuselage": "^0.31.0",
-		"@rocket.chat/fuselage-hooks": "^0.6.3-dev.385",
+		"@rocket.chat/fuselage": "^0.6.3-dev.392",
+		"@rocket.chat/fuselage-hooks": "^0.6.3-dev.392",
 		"@rocket.chat/fuselage-polyfills": "^0.31.0",
 		"@rocket.chat/fuselage-tokens": "^0.31.0",
 		"@rocket.chat/fuselage-ui-kit": "^0.31.0",

packages/rocketchat-i18n/i18n/fr.i18n.json

@@ -2166,6 +2166,7 @@
   "Importer_ExternalUrl_Description": "Vous pouvez également utilsier une URL pour un fichier accessible au public : ",
   "Importer_finishing": "Finalisation de l'importation.",
   "Importer_From_Description": "Importer les données de __from__ dans Rocket.Chat.",
+  "Importer_From_Description_CSV": "Importe des données CSV dans Rocket.Chat. Le fichier envoyé doit être un fichier ZIP.",
   "Importer_HipChatEnterprise_BetaWarning": "Veuillez noter que cette importation est toujours en cours de développement, veuillez signaler toute erreur qui se produit dans GitHub :",
   "Importer_HipChatEnterprise_Information": "Le fichier envoyé doit être un tar.gz déchiffré, veuillez lire la documentation pour plus d'informations :",
   "Importer_import_cancelled": "Importation annulée.",

packages/rocketchat-i18n/i18n/nl.i18n.json

@@ -2166,6 +2166,7 @@
   "Importer_ExternalUrl_Description": "U kunt ook een URL gebruiken voor een publiek toegankelijk bestand:",
   "Importer_finishing": "Afwerking van de import.",
   "Importer_From_Description": "Impoort __from__-gegevens in Rocket.Chat.",
+  "Importer_From_Description_CSV": "Importeert CSV-gegevens in Rocket.Chat. De geüploade file moet een ZIP-bestand zijn.",
   "Importer_HipChatEnterprise_BetaWarning": "Houd er rekening mee dat deze import nog steeds in uitvoering is, meld eventuele fouten die optreden op GitHub:",
   "Importer_HipChatEnterprise_Information": "Het geüploade bestand moet een gedecodeerde tar.gz zijn, lees de documentatie voor meer informatie:",
   "Importer_import_cancelled": "Import geannuleerd.",

packages/rocketchat-i18n/i18n/pt-BR.i18n.json

@@ -438,7 +438,7 @@
   "Apps_Framework_Development_Mode": "Habilitar modo de desenvolvimento",
   "Apps_Framework_Development_Mode_Description": "O modo de desenvolvimento permite a instalação de aplicativos que não são do Marketplace do Rocket.Chat.",
   "Apps_Framework_enabled": "Ativar o App Framework",
-  "Apps_Framework_Source_Package_Storage_Type": "Tipo de armazenamento pata o código fonte dos apps",
+  "Apps_Framework_Source_Package_Storage_Type": "Tipo de armazenamento para o código fonte dos apps",
   "Apps_Framework_Source_Package_Storage_Type_Description": "Escolha como o código fonte dos apps serão armazenamos. Apps podem ter vários megabytes em tamanho.",
   "Apps_Framework_Source_Package_Storage_Type_Alert": "Mudar o tipo de armazenamento dos apps pode causar instabilidade em apps que já estão instalados.",
   "Apps_Framework_Source_Package_Storage_FileSystem_Path": "Diretório de armazenamento de código fonte dos apps",
@@ -2162,8 +2162,8 @@
   "Importer_done": "Importação concluída!",
   "Importer_ExternalUrl_Description": "Você também pode usar uma URL para um arquivo acessível publicamente:",
   "Importer_finishing": "Terminando a importação.",
-  "Importer_From_Description_CSV": "Importa dados de CSV para o Rocket.Chat. O arquivo importado deve ser um arquivo ZIP.",
   "Importer_From_Description": "Importa dados de __from__  para o Rocket.Chat.",
+  "Importer_From_Description_CSV": "Importa dados de CSV para o Rocket.Chat. O arquivo importado deve ser um arquivo ZIP.",
   "Importer_HipChatEnterprise_BetaWarning": "Por favor esteja ciente que esta importação é ainda um trabalho em andamento, favor reportar quaisquer erros que ocorrerem no GitHub:",
   "Importer_HipChatEnterprise_Information": "O arquivo carregado deve ser um tar.gz descriptografado, leia a documentação para obter mais informações:",
   "Importer_import_cancelled": "Importação cancelada.",