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 popover and dropdown on mobile sidebar #501

Merged
merged 2 commits into from
Nov 7, 2024
Merged

🐛 Fix popover and dropdown on mobile sidebar #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29456bb
🐛 Fix popover and dropdown on mobile
xendke Nov 6, 2024
882ee7e
🐛 Fix misc UI issues only at 768px
xendke Nov 7, 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
2 changes: 1 addition & 1 deletion packages/browser/src/components/UserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function UserMenu({ variant = 'sidebar' }: Props) {
return (
<AutoSizer style={{ height: '2.35rem', width: isSidebar ? '100%' : '2.35rem' }}>
{({ width }) => (
<Popover onOpenChange={setIsOpen} open={isOpen}>
<Popover onOpenChange={setIsOpen} open={isOpen} modal>
<Popover.Trigger asChild>
<Card
className={cn(
Expand Down
7 changes: 4 additions & 3 deletions packages/browser/src/components/navigation/sidebar/SideBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ export default function SideBar({ asChild, hidden }: Props) {
const { shouldUseGradient } = useTheme()

const isBrowser = platform === 'browser'
const isAtLeastMedium = useMediaMatch('(min-width: 768px)')
const isMobile = useMediaMatch('(max-width: 768px)')

const renderHeader = () => {
if (!isBrowser && !isMobile) {
if (!isBrowser && isAtLeastMedium) {
return (
<header className="flex w-full justify-between gap-1">
<UserMenu />
Expand Down Expand Up @@ -131,12 +132,12 @@ export default function SideBar({ asChild, hidden }: Props) {
{renderHeader()}

<div className="flex max-h-full grow flex-col gap-2 overflow-y-auto p-1 scrollbar-hide">
{!isMobile && isBrowser && <UserMenu />}
{isAtLeastMedium && isBrowser && <UserMenu />}
{sections}
</div>
<Spacer />

{!isMobile && <SideBarFooter />}
{isAtLeastMedium && <SideBarFooter />}
</>
)
}
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/components/navigation/sidebar/sections/library/LibraryOptionsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export default function LibraryOptionsMenu({ library }: Props) {
libraryId={library.id}
/>
<DropdownMenu
modal={isMobile}
trigger={
<button className="p-1 text-foreground-muted text-opacity-50 outline-none hover:text-opacity-100 focus:ring-0 focus:ring-offset-0 data-[state=open]:text-opacity-100">
<MoreHorizontal className="h-4 w-4 shrink-0" />
Expand Down
6 changes: 4 additions & 2 deletions packages/browser/src/scenes/library/tabs/settings/LibrarySettingsHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ import { routeGroups } from './routes'
export default function LibrarySettingsHeader() {
const location = useLocation()
const {
preferences: { primary_navigation_mode, layout_max_width_px },
preferences: { primary_navigation_mode, layout_max_width_px, enable_double_sidebar },
} = usePreferences()
const { t } = useLocaleContext()

const isMobile = useMediaMatch('(max-width: 768px)')
const preferTopBar = primary_navigation_mode === 'TOPBAR'
const displayingSideBar = !!enable_double_sidebar && !isMobile

/**
* The active route based on the current location
Expand Down Expand Up @@ -52,9 +53,10 @@ export default function LibrarySettingsHeader() {

return (
<header
className={cn('flex w-full flex-col space-y-4 border-b border-b-edge p-4 md:pl-52', {
className={cn('flex w-full flex-col space-y-4 border-b border-b-edge p-4', {
// Note: We make the border transparent because the width constraint when using a top bar
'mx-auto border-b-transparent': preferTopBar && !!layout_max_width_px,
'pl-52': displayingSideBar,
})}
style={{
maxWidth: preferTopBar ? layout_max_width_px || undefined : undefined,
Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/dropdown/DropdownMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type BaseProps = LabelOrTrigger &
ContentProps & {
contentWrapperClassName?: string
subContentWrapperClassName?: string
modal?: boolean
}
export type DropdownMenuProps = GenericMenu<DropdownItem, DropdownItemGroup> & BaseProps

Expand All @@ -61,6 +62,7 @@ export function DropdownMenu({
contentWrapperClassName,
subContentWrapperClassName,
align,
modal = false,
...props
}: DropdownMenuProps) {
const renderItems = (items: DropdownItem[]) => {
Expand Down Expand Up @@ -114,7 +116,7 @@ export function DropdownMenu({
}

return (
<Dropdown modal={false}>
<Dropdown modal={modal}>
<DropdownTrigger asChild>{renderTrigger()}</DropdownTrigger>

<DropdownContent className={cn('w-56', contentWrapperClassName)} align={align}>
Expand Down
Loading