diff --git a/packages/pl-fe/src/components/sidebar-menu.tsx b/packages/pl-fe/src/components/sidebar-menu.tsx index f997eb5ad..ecfccceea 100644 --- a/packages/pl-fe/src/components/sidebar-menu.tsx +++ b/packages/pl-fe/src/components/sidebar-menu.tsx @@ -63,25 +63,25 @@ interface ISidebarLink { const SidebarLink: React.FC = React.memo(({ href, to, icon, text, onClick }) => { const body = ( - -
- + <> +
+
{text} - + ); if (to) { return ( - + {body} ); } return ( - + {body} ); @@ -184,8 +184,9 @@ const SidebarMenu: React.FC = React.memo((): JSX.Element | null => { aria-expanded={isSidebarOpen} className={ clsx({ - 'z-[1000]': isSidebarOpen || sidebarVisible, - hidden: !(isSidebarOpen || sidebarVisible), + '⁂-dropdown-navigation__container': true, + '⁂-dropdown-navigation__container--partially-visible': isSidebarOpen || sidebarVisible, + '⁂-dropdown-navigation__container--visible': isSidebarOpen && sidebarVisible, }) } ref={containerRef} @@ -195,8 +196,8 @@ const SidebarMenu: React.FC = React.memo((): JSX.Element | null => { onTouchEnd={handleTouchEnd} >
{ />
-
-
- {account ? ( - - - - + {account ? ( +
+ + + - {!settings.demetricator && ( - - )} + {!settings.demetricator && ( + + )} - - + + - - - {(account.locked || followRequestsCount > 0) && ( - - )} - - {(interactionRequestsCount > 0) && ( - - )} - - {features.conversations && ( - - )} - - {features.bookmarks && ( - - )} - - {features.groups && ( - - )} - - {features.lists && ( - - )} - - {features.circles && ( - - )} - - {features.events && ( - - )} - - {features.profileDirectory && ( - - )} - - {scheduledStatusCount > 0 && ( - - )} - - {draftCount > 0 && ( - - )} - - {features.publicTimeline && <> - - - : } - onClick={closeSidebar} - /> - - {features.bubbleTimeline && ( - } - onClick={closeSidebar} - /> - )} - - {features.federating && ( - } - onClick={closeSidebar} - /> - )} - } - - - - - - {features.followedHashtagsList && ( - - )} - - {(account.is_admin || account.is_moderator) && ( - - )} - - - - - - - - - - - - - - - {switcher && ( -
- {otherAccounts.map(account => renderAccount(account))} - - - - {intl.formatMessage(messages.addAccount)} - -
- )} -
-
-
- ) : ( - - {features.publicTimeline && !restrictUnauth.timelines.local && <> - : } - onClick={closeSidebar} - /> - - {features.bubbleTimeline && !restrictUnauth.timelines.bubble && ( - } - onClick={closeSidebar} - /> - )} - - {features.federating && !restrictUnauth.timelines.federated && ( - } - onClick={closeSidebar} - /> - )} - - - } + + {(account.locked || followRequestsCount > 0) && ( + )} - {isOpen && ( - - )} + {(interactionRequestsCount > 0) && ( + + )} + {features.conversations && ( + + )} + + {features.bookmarks && ( + + )} + + {features.groups && ( + + )} + + {features.lists && ( + + )} + + {features.circles && ( + + )} + + {features.events && ( + + )} + + {features.profileDirectory && ( + + )} + + {scheduledStatusCount > 0 && ( + + )} + + {draftCount > 0 && ( + + )} + + {features.publicTimeline && <> : } onClick={closeSidebar} /> + + {features.bubbleTimeline && ( + } + onClick={closeSidebar} + /> + )} + + {features.federating && ( + } + onClick={closeSidebar} + /> + )} + } + + + + + + {features.followedHashtagsList && ( + + )} + + {(account.is_admin || account.is_moderator) && ( + + )} + + + + + + + + + + + + + + + {switcher && ( +
+ {otherAccounts.map(account => renderAccount(account))} + + + + {intl.formatMessage(messages.addAccount)} + +
+ )}
- )} +
-
+ ) : ( +
+ {features.publicTimeline && !restrictUnauth.timelines.local && <> + : } + onClick={closeSidebar} + /> + + {features.bubbleTimeline && !restrictUnauth.timelines.bubble && ( + } + onClick={closeSidebar} + /> + )} + + {features.federating && !restrictUnauth.timelines.federated && ( + } + onClick={closeSidebar} + /> + )} + + + } + + + + {isOpen && ( + + )} + + + + +
+ )}
); diff --git a/packages/pl-fe/src/components/ui/divider.tsx b/packages/pl-fe/src/components/ui/divider.tsx index 03bf34fa1..6234bd94c 100644 --- a/packages/pl-fe/src/components/ui/divider.tsx +++ b/packages/pl-fe/src/components/ui/divider.tsx @@ -11,14 +11,14 @@ interface IDivider { /** Divider */ const Divider = ({ text, textSize = 'md' }: IDivider) => ( -
-