Compare commits
2 commits
4d3f5c911b
...
4190b8847d
Author | SHA1 | Date | |
---|---|---|---|
|
4190b8847d | ||
|
0a9d833f09 |
3 changed files with 15 additions and 34 deletions
|
@ -14,6 +14,7 @@ import {
|
||||||
animateGrowFromTopRight,
|
animateGrowFromTopRight,
|
||||||
animateShrinkToTopRight,
|
animateShrinkToTopRight,
|
||||||
} from "../platform/anim";
|
} from "../platform/anim";
|
||||||
|
import type { MenuListProps } from "@suid/material/MenuList";
|
||||||
|
|
||||||
export type Anchor = Pick<DOMRect, "top" | "left" | "right"> & { e?: number };
|
export type Anchor = Pick<DOMRect, "top" | "left" | "right"> & { e?: number };
|
||||||
|
|
||||||
|
@ -22,6 +23,7 @@ export type MenuProps = ParentProps<
|
||||||
open?: boolean;
|
open?: boolean;
|
||||||
onClose?: JSX.EventHandlerUnion<HTMLDialogElement, Event>;
|
onClose?: JSX.EventHandlerUnion<HTMLDialogElement, Event>;
|
||||||
anchor: () => Anchor;
|
anchor: () => Anchor;
|
||||||
|
MenuListProps?: MenuListProps;
|
||||||
|
|
||||||
id?: string;
|
id?: string;
|
||||||
} & JSX.AriaAttributes
|
} & JSX.AriaAttributes
|
||||||
|
@ -213,11 +215,8 @@ const Menu: Component<MenuProps> = (props) => {
|
||||||
tabIndex={-1}
|
tabIndex={-1}
|
||||||
{...rest}
|
{...rest}
|
||||||
>
|
>
|
||||||
<div
|
<div class="container" role="presentation">
|
||||||
class="container"
|
<MenuList {...props.MenuListProps}>{props.children}</MenuList>
|
||||||
role="presentation"
|
|
||||||
>
|
|
||||||
<MenuList>{props.children}</MenuList>
|
|
||||||
</div>
|
</div>
|
||||||
</dialog>
|
</dialog>
|
||||||
);
|
);
|
||||||
|
|
|
@ -259,7 +259,10 @@ const StackedRouter: Component<StackedRouterProps> = (oprops) => {
|
||||||
|
|
||||||
createRenderEffect(() => {
|
createRenderEffect(() => {
|
||||||
if (stack.length === 0) {
|
if (stack.length === 0) {
|
||||||
pushFrame(window.location.pathname);
|
mutStack(0, {
|
||||||
|
path: window.location.pathname,
|
||||||
|
rootId: createUniqueId(),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,10 @@ import {
|
||||||
ListItemAvatar,
|
ListItemAvatar,
|
||||||
ListItemIcon,
|
ListItemIcon,
|
||||||
ListItemText,
|
ListItemText,
|
||||||
Menu,
|
|
||||||
MenuItem,
|
MenuItem,
|
||||||
} from "@suid/material";
|
} from "@suid/material";
|
||||||
import {
|
import {
|
||||||
ErrorBoundary,
|
|
||||||
Show,
|
Show,
|
||||||
createSignal,
|
|
||||||
createUniqueId,
|
createUniqueId,
|
||||||
type ParentComponent,
|
type ParentComponent,
|
||||||
} from "solid-js";
|
} from "solid-js";
|
||||||
|
@ -22,6 +19,7 @@ import {
|
||||||
FeaturedPlayList as ListIcon,
|
FeaturedPlayList as ListIcon,
|
||||||
} from "@suid/icons-material";
|
} from "@suid/icons-material";
|
||||||
import A from "../platform/A";
|
import A from "../platform/A";
|
||||||
|
import Menu, { createManagedMenuState } from "../material/Menu";
|
||||||
|
|
||||||
const ProfileMenuButton: ParentComponent<{
|
const ProfileMenuButton: ParentComponent<{
|
||||||
profile?: {
|
profile?: {
|
||||||
|
@ -35,29 +33,20 @@ const ProfileMenuButton: ParentComponent<{
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
onClick?: () => void;
|
|
||||||
onClose?: () => void;
|
|
||||||
}> = (props) => {
|
}> = (props) => {
|
||||||
const menuId = createUniqueId();
|
const menuId = createUniqueId();
|
||||||
const buttonId = createUniqueId();
|
const buttonId = createUniqueId();
|
||||||
|
|
||||||
let [anchor, setAnchor] = createSignal<HTMLButtonElement | null>(null);
|
const [open, state] = createManagedMenuState();
|
||||||
const open = () => !!anchor();
|
|
||||||
|
|
||||||
const onClick = (
|
const onClick = (
|
||||||
event: MouseEvent & { currentTarget: HTMLButtonElement },
|
event: MouseEvent & { currentTarget: HTMLButtonElement },
|
||||||
) => {
|
) => {
|
||||||
setAnchor(event.currentTarget);
|
open(event.currentTarget.getBoundingClientRect());
|
||||||
props.onClick?.();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const inf = () => props.profile?.account.inf;
|
const inf = () => props.profile?.account.inf;
|
||||||
|
|
||||||
const onClose = () => {
|
|
||||||
props.onClick?.();
|
|
||||||
setAnchor(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<ButtonBase
|
<ButtonBase
|
||||||
|
@ -75,23 +64,13 @@ const ProfileMenuButton: ParentComponent<{
|
||||||
</ButtonBase>
|
</ButtonBase>
|
||||||
<Menu
|
<Menu
|
||||||
id={menuId}
|
id={menuId}
|
||||||
anchorEl={anchor()}
|
|
||||||
open={open()}
|
|
||||||
onClose={onClose}
|
|
||||||
MenuListProps={{
|
MenuListProps={{
|
||||||
"aria-labelledby": buttonId,
|
"aria-labelledby": menuId,
|
||||||
sx: {
|
style: {
|
||||||
minWidth: "220px",
|
"min-width": "220px",
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
anchorOrigin={{
|
{...state}
|
||||||
vertical: "top",
|
|
||||||
horizontal: "right",
|
|
||||||
}}
|
|
||||||
transformOrigin={{
|
|
||||||
vertical: "top",
|
|
||||||
horizontal: "right",
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
component={A}
|
component={A}
|
||||||
|
|
Loading…
Reference in a new issue