mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-11 20:08:37 +00:00
feat(component): dropdown menu auto avoid collisions (#8013)
<div class='graphite__hidden'>
<div>🎥 Video uploaded on Graphite:</div>
<a href="https://app.graphite.dev/media/video/g3jz87HxbjOJpXV3FPT7/7f9d21cc-7b2f-4dc1-801c-e69d5e6d0750.mp4">
<img src="https://app.graphite.dev/api/v1/graphite/video/thumbnail/g3jz87HxbjOJpXV3FPT7/7f9d21cc-7b2f-4dc1-801c-e69d5e6d0750.mp4">
</a>
</div>
<video src="https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/g3jz87HxbjOJpXV3FPT7/7f9d21cc-7b2f-4dc1-801c-e69d5e6d0750.mp4">CleanShot 2024-08-29 at 14.49.58.mp4</video>
This commit is contained in:
@@ -105,7 +105,7 @@
|
||||
"@vanilla-extract/css": "^1.14.2",
|
||||
"fake-indexeddb": "^6.0.0",
|
||||
"storybook": "^8.2.9",
|
||||
"storybook-dark-mode": "4.0.2",
|
||||
"storybook-dark-mode": "4.0.1",
|
||||
"typescript": "^5.4.5",
|
||||
"unplugin-swc": "^1.5.1",
|
||||
"vite": "^5.2.8",
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
|
||||
export const useMenuContentController = ({
|
||||
onOpenChange,
|
||||
side,
|
||||
defaultOpen,
|
||||
sideOffset,
|
||||
}: {
|
||||
defaultOpen?: boolean;
|
||||
side?: 'top' | 'bottom' | 'left' | 'right';
|
||||
onOpenChange?: (open: boolean) => void;
|
||||
sideOffset?: number;
|
||||
} = {}) => {
|
||||
const [open, setOpen] = useState(defaultOpen ?? false);
|
||||
const contentSide = side ?? 'bottom';
|
||||
const [contentOffset, setContentOffset] = useState<number>(0);
|
||||
const contentRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const handleOpenChange = useCallback(
|
||||
(open: boolean) => {
|
||||
setOpen(open);
|
||||
onOpenChange?.(open);
|
||||
},
|
||||
[onOpenChange]
|
||||
);
|
||||
useEffect(() => {
|
||||
if (!open || !contentRef.current) return;
|
||||
|
||||
const wrapperElement = contentRef.current.parentNode as HTMLDivElement;
|
||||
|
||||
const updateContentOffset = () => {
|
||||
if (!contentRef.current) return;
|
||||
const contentRect = wrapperElement.getBoundingClientRect();
|
||||
if (contentSide === 'bottom') {
|
||||
setContentOffset(prev => {
|
||||
const viewportHeight = window.innerHeight;
|
||||
const newOffset = Math.min(
|
||||
viewportHeight - (contentRect.bottom - prev),
|
||||
0
|
||||
);
|
||||
return newOffset;
|
||||
});
|
||||
} else if (contentSide === 'top') {
|
||||
setContentOffset(prev => {
|
||||
const newOffset = Math.max(contentRect.top - prev, 0);
|
||||
return newOffset;
|
||||
});
|
||||
} else if (contentSide === 'left') {
|
||||
setContentOffset(prev => {
|
||||
const newOffset = Math.max(contentRect.left - prev, 0);
|
||||
return newOffset;
|
||||
});
|
||||
} else if (contentSide === 'right') {
|
||||
setContentOffset(prev => {
|
||||
const viewportWidth = window.innerWidth;
|
||||
const newOffset = Math.min(
|
||||
viewportWidth - (contentRect.right - prev),
|
||||
0
|
||||
);
|
||||
return newOffset;
|
||||
});
|
||||
}
|
||||
};
|
||||
let animationFrame: number = 0;
|
||||
const requestUpdateContentOffset = () => {
|
||||
cancelAnimationFrame(animationFrame);
|
||||
animationFrame = requestAnimationFrame(updateContentOffset);
|
||||
};
|
||||
|
||||
const observer = new ResizeObserver(requestUpdateContentOffset);
|
||||
observer.observe(wrapperElement);
|
||||
window.addEventListener('resize', requestUpdateContentOffset);
|
||||
requestUpdateContentOffset();
|
||||
return () => {
|
||||
observer.disconnect();
|
||||
window.removeEventListener('resize', requestUpdateContentOffset);
|
||||
cancelAnimationFrame(animationFrame);
|
||||
};
|
||||
}, [contentSide, open]);
|
||||
|
||||
return {
|
||||
handleOpenChange,
|
||||
contentSide,
|
||||
contentOffset: (sideOffset ?? 0) + contentOffset,
|
||||
contentRef,
|
||||
};
|
||||
};
|
||||
@@ -3,21 +3,35 @@ import clsx from 'clsx';
|
||||
|
||||
import type { MenuProps } from '../menu.types';
|
||||
import * as styles from '../styles.css';
|
||||
import { useMenuContentController } from './controller';
|
||||
import * as desktopStyles from './styles.css';
|
||||
|
||||
export const DesktopMenu = ({
|
||||
children,
|
||||
items,
|
||||
portalOptions,
|
||||
rootOptions,
|
||||
rootOptions: { onOpenChange, defaultOpen, ...rootOptions } = {},
|
||||
contentOptions: {
|
||||
className = '',
|
||||
style: contentStyle = {},
|
||||
side,
|
||||
sideOffset,
|
||||
...otherContentOptions
|
||||
} = {},
|
||||
}: MenuProps) => {
|
||||
const { handleOpenChange, contentSide, contentOffset, contentRef } =
|
||||
useMenuContentController({
|
||||
defaultOpen,
|
||||
onOpenChange,
|
||||
side,
|
||||
sideOffset: (sideOffset ?? 0) + 5,
|
||||
});
|
||||
return (
|
||||
<DropdownMenu.Root {...rootOptions}>
|
||||
<DropdownMenu.Root
|
||||
onOpenChange={handleOpenChange}
|
||||
defaultOpen={defaultOpen}
|
||||
{...rootOptions}
|
||||
>
|
||||
<DropdownMenu.Trigger asChild>{children}</DropdownMenu.Trigger>
|
||||
|
||||
<DropdownMenu.Portal {...portalOptions}>
|
||||
@@ -27,11 +41,13 @@ export const DesktopMenu = ({
|
||||
desktopStyles.contentAnimation,
|
||||
className
|
||||
)}
|
||||
sideOffset={5}
|
||||
align="start"
|
||||
ref={contentRef}
|
||||
side={contentSide}
|
||||
style={{ zIndex: 'var(--affine-z-index-popover)', ...contentStyle }}
|
||||
avoidCollisions={false}
|
||||
sideOffset={contentOffset}
|
||||
{...otherContentOptions}
|
||||
side="bottom"
|
||||
>
|
||||
{items}
|
||||
</DropdownMenu.Content>
|
||||
|
||||
@@ -4,10 +4,12 @@ const slideDown = keyframes({
|
||||
from: {
|
||||
opacity: 0,
|
||||
transform: 'translateY(-10px)',
|
||||
pointerEvents: 'none',
|
||||
},
|
||||
to: {
|
||||
opacity: 1,
|
||||
transform: 'translateY(0)',
|
||||
pointerEvents: 'none',
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -6,15 +6,18 @@ import { useMemo } from 'react';
|
||||
import type { MenuSubProps } from '../menu.types';
|
||||
import * as styles from '../styles.css';
|
||||
import { useMenuItem } from '../use-menu-item';
|
||||
import { useMenuContentController } from './controller';
|
||||
|
||||
export const DesktopMenuSub = ({
|
||||
children: propsChildren,
|
||||
items,
|
||||
portalOptions,
|
||||
subOptions,
|
||||
subOptions: { defaultOpen, onOpenChange, ...otherSubOptions } = {},
|
||||
triggerOptions,
|
||||
subContentOptions: {
|
||||
className: subContentClassName = '',
|
||||
sideOffset,
|
||||
style: contentStyle,
|
||||
...otherSubContentOptions
|
||||
} = {},
|
||||
}: MenuSubProps) => {
|
||||
@@ -24,18 +27,33 @@ export const DesktopMenuSub = ({
|
||||
suffixIcon: <ArrowRightSmallIcon />,
|
||||
});
|
||||
|
||||
const { handleOpenChange, contentOffset, contentRef } =
|
||||
useMenuContentController({
|
||||
defaultOpen,
|
||||
onOpenChange,
|
||||
side: 'right',
|
||||
sideOffset: (sideOffset ?? 0) + 12,
|
||||
});
|
||||
|
||||
return (
|
||||
<DropdownMenu.Sub {...subOptions}>
|
||||
<DropdownMenu.Sub
|
||||
defaultOpen={defaultOpen}
|
||||
onOpenChange={handleOpenChange}
|
||||
{...otherSubOptions}
|
||||
>
|
||||
<DropdownMenu.SubTrigger className={className} {...otherProps}>
|
||||
{children}
|
||||
</DropdownMenu.SubTrigger>
|
||||
<DropdownMenu.Portal {...portalOptions}>
|
||||
<DropdownMenu.SubContent
|
||||
sideOffset={12}
|
||||
sideOffset={contentOffset}
|
||||
ref={contentRef}
|
||||
className={useMemo(
|
||||
() => clsx(styles.menuContent, subContentClassName),
|
||||
[subContentClassName]
|
||||
)}
|
||||
style={{ zIndex: 'var(--affine-z-index-popover)', ...contentStyle }}
|
||||
avoidCollisions={false}
|
||||
{...otherSubContentOptions}
|
||||
>
|
||||
{items}
|
||||
|
||||
Reference in New Issue
Block a user