e9cae918a7
* feat: Sidebar tabs support [wip] * tab trigger styling tweaks * add `:hover` & `:active` states * replace `@dwelle/tunnel-rat` with `tunnel-rat` * make stuff more explicit - remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place) - make `docked` state explicit - stop tunneling `Sidebar.TabTriggers` (render in place) * redesign sidebar / library as per latest spec * support no label on `Sidebar.Trigger` * add Sidebar `props.onStateChange` * style fixes * make `appState.isSidebarDocked` into a soft user preference * px -> rem & refactor * remove `props.renderSidebar` * update tests * remove * refactor * rename constants * tab triggers styling fixes * factor out library-related logic from generic sidebar trigger * change `props.onClose` to `onToggle` * rename `props.value` -> `props.tab` * add displayNames * allow HTMLAttributes on applicable compos * fix example App * more styling tweaks and fixes * fix not setting `dockable` * more style fixes * fix and align sidebar header button styling * make DefaultSidebar dockable on if host apps supplies `onDock` * stop `Sidebar.Trigger` hiding label on mobile this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS * fix `dockable` prop of defaultSidebar * remove extra `typescript` dep * remove `defaultTab` prop in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution). * remove `onToggle` in favor of `onStateChange` reducing API surface area * fix restore * comment no longer applies * reuse `Button` component in sidebar buttons * fix tests * split Sidebar sub-components into files * remove `props.dockable` in favor of `props.onDock` only * split tests * fix sidebar showing dock button if no `props.docked` supplied & add more tests * reorder and group sidebar tests * clarify * rename classes & dedupe css * refactor tests * update changelog * update changelog --------- Co-authored-by: barnabasmolnar <barnabas@excalidraw.com>
85 lines
2.5 KiB
TypeScript
85 lines
2.5 KiB
TypeScript
import React from "react";
|
|
import {
|
|
useDevice,
|
|
useExcalidrawAppState,
|
|
useExcalidrawSetAppState,
|
|
} from "../App";
|
|
import DropdownMenu from "../dropdownMenu/DropdownMenu";
|
|
|
|
import * as DefaultItems from "./DefaultItems";
|
|
|
|
import { UserList } from "../UserList";
|
|
import { t } from "../../i18n";
|
|
import { HamburgerMenuIcon } from "../icons";
|
|
import { withInternalFallback } from "../hoc/withInternalFallback";
|
|
import { composeEventHandlers } from "../../utils";
|
|
import { useTunnels } from "../../context/tunnels";
|
|
|
|
const MainMenu = Object.assign(
|
|
withInternalFallback(
|
|
"MainMenu",
|
|
({
|
|
children,
|
|
onSelect,
|
|
}: {
|
|
children?: React.ReactNode;
|
|
/**
|
|
* Called when any menu item is selected (clicked on).
|
|
*/
|
|
onSelect?: (event: Event) => void;
|
|
}) => {
|
|
const { MainMenuTunnel } = useTunnels();
|
|
const device = useDevice();
|
|
const appState = useExcalidrawAppState();
|
|
const setAppState = useExcalidrawSetAppState();
|
|
const onClickOutside = device.isMobile
|
|
? undefined
|
|
: () => setAppState({ openMenu: null });
|
|
|
|
return (
|
|
<MainMenuTunnel.In>
|
|
<DropdownMenu open={appState.openMenu === "canvas"}>
|
|
<DropdownMenu.Trigger
|
|
onToggle={() => {
|
|
setAppState({
|
|
openMenu: appState.openMenu === "canvas" ? null : "canvas",
|
|
});
|
|
}}
|
|
>
|
|
{HamburgerMenuIcon}
|
|
</DropdownMenu.Trigger>
|
|
<DropdownMenu.Content
|
|
onClickOutside={onClickOutside}
|
|
onSelect={composeEventHandlers(onSelect, () => {
|
|
setAppState({ openMenu: null });
|
|
})}
|
|
>
|
|
{children}
|
|
{device.isMobile && appState.collaborators.size > 0 && (
|
|
<fieldset className="UserList-Wrapper">
|
|
<legend>{t("labels.collaborators")}</legend>
|
|
<UserList
|
|
mobile={true}
|
|
collaborators={appState.collaborators}
|
|
/>
|
|
</fieldset>
|
|
)}
|
|
</DropdownMenu.Content>
|
|
</DropdownMenu>
|
|
</MainMenuTunnel.In>
|
|
);
|
|
},
|
|
),
|
|
{
|
|
Trigger: DropdownMenu.Trigger,
|
|
Item: DropdownMenu.Item,
|
|
ItemLink: DropdownMenu.ItemLink,
|
|
ItemCustom: DropdownMenu.ItemCustom,
|
|
Group: DropdownMenu.Group,
|
|
Separator: DropdownMenu.Separator,
|
|
DefaultItems,
|
|
},
|
|
);
|
|
|
|
export default MainMenu;
|