hippoz/cinny
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix member panel filter layout (#1307)

Browse source 
* fix member panel filter layout

* make member role text lowercase
This commit is contained in:
Ajay Bura 2023-06-23 09:46:04 +10:00 committed by GitHub
parent c07905c360
commit b19e248383
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/organisms/room/MembersDrawer.css.ts
View file

@ -41,7 +41,7 @@ export const DrawerScrollTop = style({
});
export const DrawerGroup = style({
padding: `0 ${config.space.S100} 0 ${config.space.S300}`,
paddingLeft: config.space.S200,
});
export const MembersGroup = style({

48
src/app/organisms/room/MembersDrawer.tsx
View file

@ -75,7 +75,7 @@ const useMembershipFilterMenu = (): MembershipFilter[] =>
{
name: 'Joined',
filterFn: MembershipFilters.filterJoined,
color: 'Surface',
color: 'Background',
},
{
name: 'Invited',
@ -131,11 +131,11 @@ const useSortFilterMenu = (): SortFilter[] =>
filterFn: SortFilters.filterDescending,
},
{
name: 'Newest First',
name: 'New First',
filterFn: SortFilters.filterNewestFirst,
},
{
name: 'Oldest First',
name: 'Old First',
filterFn: SortFilters.filterOldest,
},
],
@ -275,10 +275,9 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
</Header>
<Box className={css.MemberDrawerContentBase} grow="Yes">
<Scroll ref={scrollRef} variant="Background" size="300" visibility="Hover">
<Box className={css.MemberDrawerContent} direction="Column" gap="400">
<Box className={css.DrawerGroup} direction="Column" gap="100">
<Text size="L400">Filter</Text>
<Box alignItems="Center" gap="100" wrap="Wrap">
<Box className={css.MemberDrawerContent} direction="Column" gap="300">
<Box ref={scrollTopAnchorRef} className={css.DrawerGroup} direction="Column" gap="100">
<Box alignItems="Center" justifyContent="SpaceBetween" gap="200">
<UseStateProvider initial={false}>
{(open, setOpen) => (
<PopOut
@ -304,6 +303,7 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
? menuItem.color
: 'Surface'
}
aria-pressed={menuItem.name === filter.membershipFilter.name}
radii="300"
onClick={() => {
setFilter((f) => ({ ...f, membershipFilter: menuItem }));
@ -322,9 +322,9 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
ref={anchorRef}
onClick={() => setOpen(!open)}
variant={filter.membershipFilter.color}
radii="400"
outlined
after={<Icon src={Icons.ChevronBottom} size="50" />}
size="400"
radii="300"
before={<Icon src={Icons.Funnel} size="50" />}
>
<Text size="T200">{filter.membershipFilter.name}</Text>
</Chip>
@ -337,7 +337,7 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
<PopOut
open={open}
position="Bottom"
align="Start"
align="End"
content={
<FocusTrap
focusTrapOptions={{
@ -371,31 +371,26 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
<Chip
ref={anchorRef}
onClick={() => setOpen(!open)}
variant="Surface"
radii="400"
outlined
after={<Icon src={Icons.ChevronBottom} size="50" />}
variant="Background"
size="400"
radii="300"
after={<Icon src={Icons.Category} size="50" />}
>
<Text size="T200">{`Order: ${filter.sortFilter.name}`}</Text>
<Text size="T200">{filter.sortFilter.name}</Text>
</Chip>
)}
</PopOut>
)}
</UseStateProvider>
</Box>
</Box>
<Box ref={scrollTopAnchorRef} className={css.DrawerGroup} direction="Column" gap="100">
<Text size="L400">Search</Text>
<Box direction="Column" gap="100">
<Input
ref={searchInputRef}
onChange={handleSearchChange}
style={{ paddingRight: config.space.S200 }}
placeholder="Type name..."
variant="Surface"
size="400"
outlined
radii="400"
before={<Icon size="50" src={Icons.Search} />}
after={
result && (
@ -403,8 +398,12 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
variant={result.items.length > 0 ? 'Success' : 'Critical'}
size="400"
radii="Pill"
aria-pressed
onClick={() => {
if (searchInputRef.current) searchInputRef.current.value = '';
if (searchInputRef.current) {
searchInputRef.current.value = '';
searchInputRef.current.focus();
}
resetSearch();
}}
after={<Icon size="50" src={Icons.Cross} />}
@ -417,6 +416,7 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
}
/>
</Box>
</Box>
{!onTop && (
<Box className={css.DrawerScrollTop}>
@ -458,7 +458,7 @@ export function MembersDrawer({ room }: MembersDrawerProps) {
ref={virtualizer.measureElement}
key={`${room.roomId}-${vItem.index}`}
className={classNames(css.MembersGroupLabel, css.DrawerVirtualItem)}
size="O400"
size="L400"
>
{tagOrMember.name}
</Text>