Revert "Make main menu full width on mobile again."
This reverts commit 70d48d547207d0cd611ea2683731fe7676a1a0fc.
This commit is contained in:
parent
70d48d5472
commit
b63d17045e
@ -3,11 +3,6 @@
|
|||||||
.excalidraw {
|
.excalidraw {
|
||||||
[data-radix-popper-content-wrapper] {
|
[data-radix-popper-content-wrapper] {
|
||||||
z-index: 1 !important;
|
z-index: 1 !important;
|
||||||
|
|
||||||
@include isMobile {
|
|
||||||
width: 100%;
|
|
||||||
max-width: var(--radix-popper-available-width);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-menu {
|
.dropdown-menu {
|
||||||
@ -35,6 +30,15 @@
|
|||||||
|
|
||||||
&--mobile {
|
&--mobile {
|
||||||
max-width: none;
|
max-width: none;
|
||||||
|
// bottom: 55px;
|
||||||
|
// top: auto;
|
||||||
|
// left: 0;
|
||||||
|
// // TODO barnabasmolnar/mainmenu-radix
|
||||||
|
// // double check rendering/styling on mobile
|
||||||
|
// // width: 100%;
|
||||||
|
// display: flex;
|
||||||
|
// flex-direction: column;
|
||||||
|
// row-gap: 0.75rem;
|
||||||
|
|
||||||
.dropdown-menu-container {
|
.dropdown-menu-container {
|
||||||
padding: 8px 8px;
|
padding: 8px 8px;
|
||||||
|
@ -16,7 +16,6 @@ const MenuContent = ({
|
|||||||
onSelect,
|
onSelect,
|
||||||
style,
|
style,
|
||||||
sideOffset,
|
sideOffset,
|
||||||
collisionBoundary,
|
|
||||||
}: {
|
}: {
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
onClickOutside?: () => void;
|
onClickOutside?: () => void;
|
||||||
@ -27,7 +26,6 @@ const MenuContent = ({
|
|||||||
onSelect?: (event: Event) => void;
|
onSelect?: (event: Event) => void;
|
||||||
style?: React.CSSProperties;
|
style?: React.CSSProperties;
|
||||||
sideOffset?: number;
|
sideOffset?: number;
|
||||||
collisionBoundary?: Element | Element[] | null | undefined;
|
|
||||||
}) => {
|
}) => {
|
||||||
const device = useDevice();
|
const device = useDevice();
|
||||||
const menuRef = useOutsideClickHook(() => {
|
const menuRef = useOutsideClickHook(() => {
|
||||||
@ -41,7 +39,6 @@ const MenuContent = ({
|
|||||||
return (
|
return (
|
||||||
<DropdownMenuContentPropsContext.Provider value={{ onSelect }}>
|
<DropdownMenuContentPropsContext.Provider value={{ onSelect }}>
|
||||||
<DropdownMenuPrimitive.Content
|
<DropdownMenuPrimitive.Content
|
||||||
collisionBoundary={collisionBoundary}
|
|
||||||
ref={menuRef}
|
ref={menuRef}
|
||||||
className={classNames}
|
className={classNames}
|
||||||
style={style}
|
style={style}
|
||||||
|
@ -7,11 +7,9 @@ import clsx from "clsx";
|
|||||||
const DropdownMenuSubContent = ({
|
const DropdownMenuSubContent = ({
|
||||||
children,
|
children,
|
||||||
className,
|
className,
|
||||||
sideOffset,
|
|
||||||
}: {
|
}: {
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
className?: string;
|
className?: string;
|
||||||
sideOffset?: number;
|
|
||||||
}) => {
|
}) => {
|
||||||
const device = useDevice();
|
const device = useDevice();
|
||||||
|
|
||||||
@ -20,10 +18,7 @@ const DropdownMenuSubContent = ({
|
|||||||
}).trim();
|
}).trim();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DropdownMenuPrimitive.SubContent
|
<DropdownMenuPrimitive.SubContent className={classNames}>
|
||||||
className={classNames}
|
|
||||||
sideOffset={sideOffset}
|
|
||||||
>
|
|
||||||
{device.isMobile ? (
|
{device.isMobile ? (
|
||||||
<Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
|
<Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
|
||||||
) : (
|
) : (
|
||||||
|
@ -33,7 +33,9 @@ const MainMenu = Object.assign(
|
|||||||
const device = useDevice();
|
const device = useDevice();
|
||||||
const appState = useExcalidrawAppState();
|
const appState = useExcalidrawAppState();
|
||||||
const setAppState = useExcalidrawSetAppState();
|
const setAppState = useExcalidrawSetAppState();
|
||||||
const onClickOutside = () => setAppState({ openMenu: null });
|
const onClickOutside = device.isMobile
|
||||||
|
? undefined
|
||||||
|
: () => setAppState({ openMenu: null });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<mainMenuTunnel.In>
|
<mainMenuTunnel.In>
|
||||||
@ -48,11 +50,6 @@ const MainMenu = Object.assign(
|
|||||||
{HamburgerMenuIcon}
|
{HamburgerMenuIcon}
|
||||||
</DropdownMenu.Trigger>
|
</DropdownMenu.Trigger>
|
||||||
<DropdownMenu.Content
|
<DropdownMenu.Content
|
||||||
collisionBoundary={
|
|
||||||
device.isMobile
|
|
||||||
? document.querySelector(".App-bottom-bar")
|
|
||||||
: undefined
|
|
||||||
}
|
|
||||||
sideOffset={device.isMobile ? 20 : undefined}
|
sideOffset={device.isMobile ? 20 : undefined}
|
||||||
className="mainmenu-content"
|
className="mainmenu-content"
|
||||||
onClickOutside={onClickOutside}
|
onClickOutside={onClickOutside}
|
||||||
|
@ -587,8 +587,8 @@ export default function App({ appTitle, useCustom, customArgs }: AppProps) {
|
|||||||
</MainMenu.Sub.Content>
|
</MainMenu.Sub.Content>
|
||||||
</MainMenu.Sub>
|
</MainMenu.Sub>
|
||||||
<MainMenu.Sub>
|
<MainMenu.Sub>
|
||||||
<MainMenu.Sub.Trigger>Trigger me with offset</MainMenu.Sub.Trigger>
|
<MainMenu.Sub.Trigger>Trigger me</MainMenu.Sub.Trigger>
|
||||||
<MainMenu.Sub.Content sideOffset={-80}>
|
<MainMenu.Sub.Content>
|
||||||
<MainMenu.Sub>
|
<MainMenu.Sub>
|
||||||
<MainMenu.Sub.Trigger>Trigger me inside</MainMenu.Sub.Trigger>
|
<MainMenu.Sub.Trigger>Trigger me inside</MainMenu.Sub.Trigger>
|
||||||
<MainMenu.Sub.Content>
|
<MainMenu.Sub.Content>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user