Chore: Convert UserAutoCompleteMultiple (#25587)

Co-authored-by: julia foresti <juliaforesti@julias-MacBook-Pro.local>
RocketChat · Jun 1, 2022 · bcd4b1b · bcd4b1b
1 parent 08656e3
commit bcd4b1b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/...pleteMultiple/UserAutoCompleteMultiple.js → ...leteMultiple/UserAutoCompleteMultiple.tsx b/...pleteMultiple/UserAutoCompleteMultiple.js → ...leteMultiple/UserAutoCompleteMultiple.tsx
@@ -1,33 +1,47 @@
 import { AutoComplete, Box, Option, Chip } from '@rocket.chat/fuselage';
 import { useMutableCallback, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import React, { memo, useMemo, useState } from 'react';
+import React, { ComponentProps, memo, ReactElement, useMemo, useState } from 'react';
 
 import { useEndpointData } from '../../hooks/useEndpointData';
 import UserAvatar from '../avatar/UserAvatar';
 
-const query = (term = '') => ({ selector: JSON.stringify({ term }) });
+const query = (
+	term = '',
+): {
+	selector: string;
+} => ({ selector: JSON.stringify({ term }) });
 
-const UserAutoCompleteMultiple = (props) => {
+type UserAutoCompleteMultipleProps = Omit<ComponentProps<typeof AutoComplete>, 'value' | 'filter' | 'onChange'> &
+	Omit<ComponentProps<typeof Option>, 'value' | 'is' | 'className' | 'onChange'> & {
+		onChange: (value: unknown, action: 'remove' | undefined) => void;
+		value: any;
+		filter?: string;
+	};
+
+const UserAutoCompleteMultiple = ({ onChange, ...props }: UserAutoCompleteMultipleProps): ReactElement => {
 	const [filter, setFilter] = useState('');
 	const debouncedFilter = useDebouncedValue(filter, 1000);
 	const { value: data } = useEndpointData(
 		'users.autocomplete',
 		useMemo(() => query(debouncedFilter), [debouncedFilter]),
 	);
-	const options = useMemo(() => (data && data.items.map((user) => ({ value: user.username, label: user.name }))) || [], [data]);
+
+	const options = useMemo(() => data?.items.map((user) => ({ value: user.username, label: user.name })) || [], [data]);
+
 	const onClickRemove = useMutableCallback((e) => {
 		e.stopPropagation();
 		e.preventDefault();
-		props.onChange(e.currentTarget.value, 'remove');
+		onChange?.(e.currentTarget.value, 'remove');
 	});
 
 	return (
 		<AutoComplete
 			{...props}
+			onChange={onChange}
 			filter={filter}
 			setFilter={setFilter}
-			renderSelected={({ value: selected }) =>
-				selected?.map((value) => (
+			renderSelected={({ value: selected }): ReactElement =>
+				selected?.map((value: any) => (
 					<Chip key={value} {...props} height='x20' value={value} onClick={onClickRemove} mie='x4'>
 						<UserAvatar size='x20' username={value} />
 						<Box is='span' margin='none' mis='x4'>
@@ -36,7 +50,7 @@ const UserAutoCompleteMultiple = (props) => {
 					</Chip>
 				))
 			}
-			renderItem={({ value, label, ...props }) => (
+			renderItem={({ value, label, ...props }): ReactElement => (
 				<Option key={value} {...props}>
 					<Option.Avatar>
 						<UserAvatar username={value} size='x20' />

diff --git a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
@@ -20,7 +20,7 @@ const CreateDirectMessage: FC<CreateDirectMessageProps> = ({ onClose }) => {
 
 	const createDirect = useEndpointActionExperimental('POST', 'dm.create');
 
-	const onChangeUsers = useMutableCallback((value: Username, action: string) => {
+	const onChangeUsers = useMutableCallback((value: Username | any, action: 'remove' | undefined) => {
 		if (!action) {
 			if (users.includes(value)) {
 				return;