Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix(web): keep preference submenus on screen in narrow viewports

johnnyjoygh200b4d0920af
diff --git a/web/src/components/UserMenu.tsx b/web/src/components/UserMenu.tsx
index 3bb696c6b..3b232502a 100644
--- a/web/src/components/UserMenu.tsx
+++ b/web/src/components/UserMenu.tsx
@@ -55,7 +55,16 @@ const PreferenceSubmenu = ({ icon: Icon, label, value, options, onChange, classN
<span className="max-w-28 truncate text-muted-foreground">{options.find((option) => option.value === value)?.label ?? value}</span>
<ChevronRightIcon className={cn(iconClass, "rtl:rotate-180")} />
</DropdownMenuTrigger>
- <DropdownMenuContent side="inline-end" align="start" sideOffset={8} alignOffset={-4} size="sm" className={className}>
+ {/* Like a nested submenu: when neither side has room (narrow screens), drop below the row instead of overflowing. */}
+ <DropdownMenuContent
+ side="inline-end"
+ align="start"
+ sideOffset={8}
+ alignOffset={-4}
+ collisionAvoidance={{ fallbackAxisSide: "end" }}
+ size="sm"
+ className={className}
+ >
<DropdownMenuRadioGroup value={value} onValueChange={onChange}>
{options.map((option) => (
<DropdownMenuRadioItem key={option.value} value={option.value} closeOnClick>
diff --git a/web/src/components/ui/dropdown-menu.tsx b/web/src/components/ui/dropdown-menu.tsx
index 7676082b7..77073ff1d 100644
--- a/web/src/components/ui/dropdown-menu.tsx
+++ b/web/src/components/ui/dropdown-menu.tsx
@@ -20,18 +20,19 @@ const DropdownMenuTrigger = React.forwardRef<HTMLButtonElement, DropdownMenuPrim
DropdownMenuTrigger.displayName = "DropdownMenuTrigger";
type DropdownMenuContentProps = DropdownMenuPrimitive.Popup.Props &
- Pick<DropdownMenuPrimitive.Positioner.Props, "align" | "alignOffset" | "side" | "sideOffset"> & {
+ Pick<DropdownMenuPrimitive.Positioner.Props, "align" | "alignOffset" | "collisionAvoidance" | "side" | "sideOffset"> & {
size?: DropdownMenuSize;
};
const DropdownMenuContent = React.forwardRef<HTMLDivElement, DropdownMenuContentProps>(
- ({ className, align, alignOffset, side, sideOffset = 4, size = "default", ...props }, ref) => {
+ ({ className, align, alignOffset, collisionAvoidance, side, sideOffset = 4, size = "default", ...props }, ref) => {
return (
<DropdownMenuSizeContext.Provider value={size}>
<DropdownMenuPrimitive.Portal>
<DropdownMenuPrimitive.Positioner
align={align}
alignOffset={alignOffset}
+ collisionAvoidance={collisionAvoidance}
side={side}
sideOffset={sideOffset}
className="isolate z-dropdown outline-none"