Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: render all popups in popup container

Abdullah Atta688dde9890fd
diff --git a/packages/editor/src/components/popup-presenter/index.tsx b/packages/editor/src/components/popup-presenter/index.tsx
index 4cb8ecc92..7bd722f95 100644
--- a/packages/editor/src/components/popup-presenter/index.tsx
+++ b/packages/editor/src/components/popup-presenter/index.tsx
@@ -25,6 +25,7 @@ import {
PopupPresenter
} from "@notesnook/ui";
import {
+ getPopupContainer,
getPopupRoot,
getToolbarElement,
unmountPopupRoot
@@ -62,6 +63,7 @@ export function PopupWrapper(props: PropsWithChildren<PopupWrapperProps>) {
focusOnRender
className={isMobile ? "editor-mobile-toolbar-popup" : undefined}
isMobile={isMobile}
+ container={getPopupContainer()}
{...presenterProps}
isOpen={isPopupOpen}
>
@@ -136,6 +138,7 @@ export function showPopup(options: ShowPopupOptions) {
}}
blocking
focusOnRender
+ container={getPopupContainer()}
{...props}
onClose={() => {
hide();
diff --git a/packages/editor/src/components/responsive/index.tsx b/packages/editor/src/components/responsive/index.tsx
index 7c5f9598d..7ca597179 100644
--- a/packages/editor/src/components/responsive/index.tsx
+++ b/packages/editor/src/components/responsive/index.tsx
@@ -23,7 +23,12 @@ import {
ActionSheetPresenter,
ActionSheetPresenterProps
} from "../action-sheet";
-import { MenuPresenter, MenuPresenterProps } from "@notesnook/ui";
+import {
+ MenuPresenter,
+ MenuPresenterProps,
+ PopupPresenter
+} from "@notesnook/ui";
+import { getPopupContainer } from "../../toolbar/utils/dom";
type ResponsiveContainerProps = {
mobile?: JSX.Element;
@@ -44,7 +49,7 @@ export function MobileOnly(props: PropsWithChildren<unknown>) {
return <ResponsiveContainer mobile={<>{props.children}</>} />;
}
-export type PopupType = "sheet" | "menu" | "none";
+export type PopupType = "sheet" | "menu" | "none" | "popup";
export type ResponsivePresenterProps = MenuPresenterProps &
ActionSheetPresenterProps & {
mobile?: PopupType;
@@ -60,5 +65,7 @@ export function ResponsivePresenter(
return <ActionSheetPresenter {...restProps} />;
else if (mobile === "menu" || desktop === "menu")
return <MenuPresenter {...restProps} />;
- else return props.isOpen ? <>{props.children}</> : null;
+ else if (mobile === "popup" || desktop === "popup") {
+ return <PopupPresenter container={getPopupContainer()} {...restProps} />;
+ } else return props.isOpen ? <>{props.children}</> : null;
}