Skip to content

feat: add search bar for members list in channel details #3668

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

Open
szuperaz wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: add search bar for members list in channel details #3668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
416 changes: 265 additions & 151 deletions package/src/components/ChannelDetails/__tests__/members/ChannelMemberList.test.tsx
View file
Open in desktop

Large diffs are not rendered by default.

234 changes: 0 additions & 234 deletions package/src/components/ChannelDetails/__tests__/members/useChannelAllMembers.test.tsx
View file
Open in desktop

This file was deleted.

14 changes: 10 additions & 4 deletions package/src/components/ChannelDetails/components/members/ChannelAddMembers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { UserListLoadingSkeleton } from './UserListLoadingSkeleton';

import { useChannelAddMembersContext } from '../../../../contexts/channelAddMembersContext/ChannelAddMembersContext';
import { useChannelDetailsContext } from '../../../../contexts/channelDetailsContext/channelDetailsContext';
import { useTheme } from '../../../../contexts/themeContext/ThemeContext';
import { useTranslationContext } from '../../../../contexts/translationContext/TranslationContext';
import { getNotificationErrorOptions } from '../../../../hooks/actions/useChannelActions';
import { useStateStore } from '../../../../hooks/useStateStore';
Expand Down Expand Up @@ -43,6 +44,11 @@ const listStateSelector = (state: SearchSourceState<UserResponse>) => {
export const ChannelAddMembers = ({ additionalFlatListProps }: ChannelAddMembersProps) => {
const { t } = useTranslationContext();
const styles = useStyles();
const {
theme: {
channelDetails: { addMembers },
},
} = useTheme();

const { channel } = useChannelDetailsContext();
const { addNotification } = useNotificationApi();
Expand Down Expand Up @@ -103,14 +109,14 @@ export const ChannelAddMembers = ({ additionalFlatListProps }: ChannelAddMembers
const loadingMoreIndicator = <>{loading && users && users.length > 0 && <ActivityIndicator />}</>;

return (
<View style={styles.container}>
<View style={[styles.container, addMembers.container]}>
<SearchInput
accessibilityLabel={t('a11y/Search users to add')}
onChangeText={(text) => searchSource.search(text)}
/>

<FlatList
contentContainerStyle={styles.listContent}
contentContainerStyle={[styles.listContent, addMembers.listContent]}
data={users}
keyboardDismissMode='interactive'
keyboardShouldPersistTaps='handled'
Expand All @@ -120,7 +126,7 @@ export const ChannelAddMembers = ({ additionalFlatListProps }: ChannelAddMembers
onEndReached={loadMore}
onEndReachedThreshold={0.2}
renderItem={renderItem}
style={styles.list}
style={[styles.list, addMembers.list]}
testID='channel-add-members-list'
{...additionalFlatListProps}
/>
Expand All @@ -140,7 +146,7 @@ const useStyles = () => {
},
listContent: {
flexGrow: 1,
paddingBottom: primitives.spacingXl,
paddingBottom: primitives.spacing3xl,
},
}),
[],
Expand Down
29 changes: 4 additions & 25 deletions package/src/components/ChannelDetails/components/members/ChannelAllMembersModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { useTranslationContext } from '../../../../contexts/translationContext/T
import { useChannelMemberCount } from '../../../../hooks';
import { useChannelOwnCapabilities } from '../../../../hooks/useChannelOwnCapabilities';
import { UserAdd } from '../../../../icons/user-add';
import { NotificationList } from '../../../Notifications/NotificationList';
import { NotificationTargetProvider } from '../../../Notifications/NotificationTargetContext';
import { Button } from '../../../ui/Button/Button';
import { ChannelDetailsModal } from '../modal/Modal';
import { ModalHeader } from '../modal/ModalHeader';
Expand All @@ -20,7 +18,10 @@ export type ChannelAllMembersModalProps = {

type ChannelAllMembersModalContentProps = Omit<ChannelAllMembersModalProps, 'visible'>;

const ChannelAllMembersModalBody = ({
/**
* @experimental This component is experimental and is subject to change.
*/
export const ChannelAllMembersModalContent = ({
onAddMembersPress,
onClose,
}: ChannelAllMembersModalContentProps) => {
Expand Down Expand Up @@ -52,32 +53,10 @@ const ChannelAllMembersModalBody = ({
title={t('{{count}} members', { count: total })}
/>
<ChannelMemberList />
<NotificationList />
</>
);
};

/**
* @experimental This component is experimental and is subject to change.
*/
export const ChannelAllMembersModalContent = ({
onAddMembersPress,
onClose,
}: ChannelAllMembersModalContentProps) => {
const { channel } = useChannelDetailsContext();
const notificationHostId = channel?.cid ? `channel-member-list:${channel.cid}` : undefined;

if (!notificationHostId) {
return null;
}

return (
<NotificationTargetProvider hostId={notificationHostId} panel='channel-details'>
<ChannelAllMembersModalBody onAddMembersPress={onAddMembersPress} onClose={onClose} />
</NotificationTargetProvider>
);
};

/**
* @experimental This component is experimental and is subject to change.
*/
Expand Down
Loading
Loading