fix: make context menu scrollable when there's not enough space

This commit is contained in:
Antonella Sgarlatta
2021-05-20 13:29:59 -03:00
parent eea4f98928
commit f9f2959ad5
3 changed files with 51 additions and 9 deletions

View File

@@ -31,8 +31,8 @@ const NotesContextMenu = observer(({ appState }: Props) => {
return appState.notes.contextMenuOpen ? ( return appState.notes.contextMenuOpen ? (
<div <div
ref={contextMenuRef} ref={contextMenuRef}
className="sn-dropdown max-w-80 flex flex-col py-2" className="sn-dropdown max-w-80 flex flex-col py-2 overflow-y-scroll absolute"
style={{ position: 'absolute', ...appState.notes.contextMenuPosition }} style={{ ...appState.notes.contextMenuPosition, maxHeight: appState.notes.contextMenuMaxHeight }}
> >
<NotesOptions <NotesOptions
appState={appState} appState={appState}

View File

@@ -27,6 +27,7 @@ export class NotesState {
top: 0, top: 0,
left: 0, left: 0,
}; };
contextMenuMaxHeight: number | 'auto' = 'auto';
showProtectedWarning = false; showProtectedWarning = false;
constructor( constructor(
@@ -45,6 +46,7 @@ export class NotesState {
setContextMenuOpen: action, setContextMenuOpen: action,
setContextMenuPosition: action, setContextMenuPosition: action,
setContextMenuMaxHeight: action,
setShowProtectedWarning: action, setShowProtectedWarning: action,
unselectNotes: action, unselectNotes: action,
}); });
@@ -181,6 +183,10 @@ export class NotesState {
this.contextMenuPosition = position; this.contextMenuPosition = position;
} }
setContextMenuMaxHeight(height: number | 'auto'): void {
this.contextMenuMaxHeight = height;
}
async changeSelectedNotes( async changeSelectedNotes(
mutate: (mutator: NoteMutator) => void mutate: (mutator: NoteMutator) => void
): Promise<void> { ): Promise<void> {

View File

@@ -313,18 +313,54 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesCtrlState> {
document.documentElement document.documentElement
).fontSize; ).fontSize;
const maxContextMenuHeight = parseFloat(defaultFontSize) * 20; const maxContextMenuHeight = parseFloat(defaultFontSize) * 20;
if (e.clientY > clientHeight - maxContextMenuHeight) { const footerHeight = 32;
this.application.getAppState().notes.setContextMenuPosition({
bottom: clientHeight - e.clientY, // Open up-bottom is default behavior
left: e.clientX, let openUpBottom = true;
});
const bottomSpace = clientHeight - footerHeight - e.clientY;
const upSpace = e.clientY;
// If not enough space to open up-bottom
if (maxContextMenuHeight > bottomSpace) {
// If there's enough space, open bottom-up
if (upSpace > maxContextMenuHeight) {
openUpBottom = false;
this.appState.notes.setContextMenuMaxHeight(
'auto'
);
// Else, reduce max height (menu will be scrollable) and open in whichever direction there's more space
} else {
if (upSpace > bottomSpace) {
this.appState.notes.setContextMenuMaxHeight(
upSpace - 2
);
openUpBottom = false;
} else {
this.appState.notes.setContextMenuMaxHeight(
bottomSpace - 2
);
}
}
} else { } else {
this.application.getAppState().notes.setContextMenuPosition({ this.appState.notes.setContextMenuMaxHeight(
'auto'
);
}
if (openUpBottom) {
this.appState.notes.setContextMenuPosition({
top: e.clientY, top: e.clientY,
left: e.clientX, left: e.clientX,
}); });
} else {
this.appState.notes.setContextMenuPosition({
bottom: clientHeight - e.clientY,
left: e.clientX,
});
} }
this.application.getAppState().notes.setContextMenuOpen(true);
this.appState.notes.setContextMenuOpen(true);
} }
} }