From b6283b3469707321430ba2d9820c9aaa07bf8049 Mon Sep 17 00:00:00 2001 From: Ajay Bura <32841439+ajbura@users.noreply.github.com> Date: Sun, 25 Jun 2023 08:40:48 +0530 Subject: [PATCH] Update member drawer icons (#1312) * update folds * update member drawer icons --- package-lock.json | 8 ++++---- package.json | 2 +- src/app/organisms/room/MembersDrawer.css.ts | 2 +- src/app/organisms/room/MembersDrawer.tsx | 18 +++++++++++------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61eebbf..d5867ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "file-saver": "2.0.5", "flux": "4.0.3", "focus-trap-react": "10.0.2", - "folds": "1.2.1", + "folds": "1.3.0", "formik": "2.2.9", "html-react-parser": "3.0.4", "immer": "9.0.16", @@ -3271,9 +3271,9 @@ } }, "node_modules/folds": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/folds/-/folds-1.2.1.tgz", - "integrity": "sha512-BCV5oFCndiGFp1HyeSnbDKmTSbu1yfAtAIF6znPvLthuI/QG4516bBUr6+MyNUQWx/IAkj1bdQL/cdD+jEZWCw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/folds/-/folds-1.3.0.tgz", + "integrity": "sha512-Jcv6xN9woJWaTaATDGCD9xFqUhjuSw+afvChYoUt4UsAyY351hfpkGNYzglN+gA5fvJw6N9oa6Ogjj2p84kFfA==", "peerDependencies": { "@vanilla-extract/css": "^1.9.2", "@vanilla-extract/recipes": "^0.3.0", diff --git a/package.json b/package.json index beaae09..5eb3fa9 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "file-saver": "2.0.5", "flux": "4.0.3", "focus-trap-react": "10.0.2", - "folds": "1.2.1", + "folds": "1.3.0", "formik": "2.2.9", "html-react-parser": "3.0.4", "immer": "9.0.16", diff --git a/src/app/organisms/room/MembersDrawer.css.ts b/src/app/organisms/room/MembersDrawer.css.ts index 6d347bf..a1f4153 100644 --- a/src/app/organisms/room/MembersDrawer.css.ts +++ b/src/app/organisms/room/MembersDrawer.css.ts @@ -19,7 +19,7 @@ export const MemberDrawerContentBase = style({ }); export const MemberDrawerContent = style({ - padding: `${config.space.S300} 0`, + padding: `${config.space.S200} 0`, }); const ScrollBtnAnime = keyframes({ diff --git a/src/app/organisms/room/MembersDrawer.tsx b/src/app/organisms/room/MembersDrawer.tsx index 680a4e9..5712c66 100644 --- a/src/app/organisms/room/MembersDrawer.tsx +++ b/src/app/organisms/room/MembersDrawer.tsx @@ -131,11 +131,11 @@ const useSortFilterMenu = (): SortFilter[] => filterFn: SortFilters.filterDescending, }, { - name: 'New First', + name: 'Newest', filterFn: SortFilters.filterNewestFirst, }, { - name: 'Old First', + name: 'Oldest', filterFn: SortFilters.filterOldest, }, ], @@ -254,6 +254,7 @@ export function MembersDrawer({ room }: MembersDrawerProps) { Invite Member @@ -275,8 +276,8 @@ export function MembersDrawer({ room }: MembersDrawerProps) { - - + + {(open, setOpen) => ( @@ -284,6 +285,7 @@ export function MembersDrawer({ room }: MembersDrawerProps) { open={open} position="Bottom" align="Start" + offset={4} content={ } + before={} > {filter.membershipFilter.name} @@ -338,6 +340,7 @@ export function MembersDrawer({ room }: MembersDrawerProps) { open={open} position="Bottom" align="End" + offset={4} content={ } + after={} > {filter.sortFilter.name} @@ -383,7 +386,6 @@ export function MembersDrawer({ room }: MembersDrawerProps) { )} - } after={ result && (