Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dropdown-closing-issue-fixed #31437

Closed
wants to merge 2 commits into from
Closed

fix: dropdown-closing-issue-fixed #31437

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9febf6
dropdown-closing-issue-fixed
umangutkarsh Jan 12, 2024
44e4aa6
Merge branch 'develop' into fix/31396-dropdown-fix
umangutkarsh Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 33 additions & 9 deletions apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
usePermissionWithScopedRoles,
} from '@rocket.chat/ui-contexts';
import type { ComponentProps, ReactElement } from 'react';
import React, { useEffect, useMemo } from 'react';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { useForm, Controller } from 'react-hook-form';

import { useHasLicenseModule } from '../../../../ee/client/hooks/useHasLicenseModule';
Expand Down Expand Up @@ -58,6 +58,7 @@ const getFederationHintKey = (licenseModule: ReturnType<typeof useHasLicenseModu
};

const CreateChannelModal = ({ teamId = '', onClose }: CreateChannelModalProps): ReactElement => {

const t = useTranslation();
const canSetReadOnly = usePermissionWithScopedRoles('set-readonly', ['owner']);
const e2eEnabled = useSetting('E2E_Enable');
Expand Down Expand Up @@ -193,6 +194,25 @@ const CreateChannelModal = ({ teamId = '', onClose }: CreateChannelModalProps):
const broadcastId = useUniqueId();
const addMembersId = useUniqueId();

const [dropdownVisible, setDropdownVisible] = useState(false);
const dropdownRef = useRef(null);

useEffect(() => {
const handleClickOutside = (e) => {
const { target } = e;

if (dropdownRef.current && !dropdownRef.current.contains(target)) {
setDropdownVisible(false);
}
};

document.addEventListener('mousedown', handleClickOutside);

return () => {
document.removeEventListener('mousedown', handleClickOutside);
};
}, [setDropdownVisible]);

return (
<Modal
data-qa='create-channel-modal'
Expand Down Expand Up @@ -347,14 +367,18 @@ const CreateChannelModal = ({ teamId = '', onClose }: CreateChannelModalProps):
<FieldHint id={`${broadcastId}-hint`}>{t('Broadcast_channel_Description')}</FieldHint>
</Field>
<Field>
<FieldLabel htmlFor={addMembersId}>{t('Add_members')}</FieldLabel>
<Controller
control={control}
name='members'
render={({ field: { onChange, value } }): ReactElement => (
<UserAutoCompleteMultipleFederated id={addMembersId} value={value} onChange={onChange} />
)}
/>
<FieldRow>
<FieldLabel htmlFor={addMembersId}>{t('Add_members')}</FieldLabel>
<div ref={dropdownRef} onClick={() => setDropdownVisible(!dropdownVisible)}>
<Controller
control={control}
name='members'
render={({ field: { onChange, value } }): ReactElement => (
<UserAutoCompleteMultipleFederated id={addMembersId} value={value} onChange={onChange} />
)}
/>
</div>
</FieldRow>
</Field>
</FieldGroup>
</Modal.Content>
Expand Down