Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion scss/_menu.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
:root{
--contexify-zIndex: 666;
--contexify-menu-minWidth: 220px;
--contexify-menu-maxHeight: 400px;
--contexify-menu-padding: 6px;
--contexify-menu-radius: 6px;
--contexify-menu-bgColor: #fff;
Expand Down Expand Up @@ -72,6 +73,12 @@
opacity: 1;
}

& &_wrapper {
overflow-x: hidden;
overflow-y: auto;
max-height: var(--contexify-menu-maxHeight);
}

& &_submenu {
position: absolute;
pointer-events: none;
Expand Down Expand Up @@ -111,7 +118,7 @@

&_item {
cursor: pointer;
position: relative;
position: static;

&:focus{
outline: 0;
Expand Down
11 changes: 7 additions & 4 deletions src/components/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ export const Menu: React.FC<MenuProps> = ({
visible: state.visible ? false : state.visible,
}));

// @ts-ignore
visibilityId.current = setTimeout(() => {
isFn(onVisibilityChange) && onVisibilityChange(false);
wasVisible.current = false;
Expand Down Expand Up @@ -292,10 +293,12 @@ export const Menu: React.FC<MenuProps> = ({
ref={nodeRef}
role="menu"
>
{cloneItems(children, {
propsFromTrigger,
triggerEvent,
})}
<div className={cx(CssClass.menuWrapper)}>
{cloneItems(children, {
propsFromTrigger,
triggerEvent,
})}
</div>
</div>
)}
</ItemTrackerProvider>
Expand Down
27 changes: 23 additions & 4 deletions src/components/Submenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const Submenu: React.FC<SubMenuProps> = ({
const isDisabled = getPredicateValue(disabled, handlerParams);
const isHidden = getPredicateValue(hidden, handlerParams);

function setPosition() {
function setPosition(event: any) {
const node = submenuNode.current;
if (node) {
const bottom = `${CssClass.submenu}-bottom`;
Expand All @@ -74,9 +74,28 @@ export const Submenu: React.FC<SubMenuProps> = ({

const rect = node.getBoundingClientRect();

if (rect.right > window.innerWidth) node.classList.add(right);

if (rect.bottom > window.innerHeight) node.classList.add(bottom);
// get the menu item element
const menuItemElement = event.currentTarget;
// get the parent wrapper element
const menuWrapperElement = menuItemElement.parentNode;

const menuItemRect = menuItemElement.getBoundingClientRect();
const menuWrapperRect = menuWrapperElement.getBoundingClientRect();

// if the menu item right position + submenu width is too close to the right edge of the window, then
if ((menuItemRect.right + rect.width) > window.innerWidth) {
// node.classList.add(right);
node.style.left = `-${rect.width}px`;
} else {
node.style.left = `${menuItemRect.width}px`;
}

if (rect.bottom > window.innerHeight) {
node.classList.add(bottom);
} else {
node.style.top = `${menuItemRect.top - menuWrapperRect.top}px`;
node.style.bottom = 'unset';
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* */
export const enum CssClass {
menu = 'contexify',
menuWrapper = 'contexify_wrapper',
submenu = 'contexify_submenu',
submenuOpen = 'contexify_submenu-isOpen',
rightSlot = 'contexify_rightSlot',
Expand All @@ -29,5 +30,5 @@ export const hideOnEvents: (keyof GlobalEventHandlersEventMap)[] = [
'scroll',

// comment blur in dev so you can toggle console without closing the menu
'blur',
// 'blur',
];
2 changes: 1 addition & 1 deletion src/hooks/useItemTracker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export interface ItemTrackerRecord {
node: HTMLElement;
isSubmenu: boolean;
submenuRefTracker?: ItemTracker;
setSubmenuPosition?: () => void;
setSubmenuPosition?: (event: any) => void;
keyMatcher?: false | ((e: KeyboardEvent) => void);
}

Expand Down