mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-05-03 10:00:07 -04:00
* 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>
331 lines
10 KiB
TypeScript
331 lines
10 KiB
TypeScript
import React from "react";
|
|
import { DEFAULT_SIDEBAR } from "../../constants";
|
|
import { Excalidraw, Sidebar } from "../../packages/excalidraw/index";
|
|
import {
|
|
fireEvent,
|
|
GlobalTestState,
|
|
queryAllByTestId,
|
|
queryByTestId,
|
|
render,
|
|
waitFor,
|
|
withExcalidrawDimensions,
|
|
} from "../../tests/test-utils";
|
|
|
|
export const assertSidebarDockButton = async <T extends boolean>(
|
|
hasDockButton: T,
|
|
): Promise<
|
|
T extends false
|
|
? { dockButton: null; sidebar: HTMLElement }
|
|
: { dockButton: HTMLElement; sidebar: HTMLElement }
|
|
> => {
|
|
const sidebar =
|
|
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
|
|
".sidebar",
|
|
);
|
|
expect(sidebar).not.toBe(null);
|
|
const dockButton = queryByTestId(sidebar!, "sidebar-dock");
|
|
if (hasDockButton) {
|
|
expect(dockButton).not.toBe(null);
|
|
return { dockButton: dockButton!, sidebar: sidebar! } as any;
|
|
}
|
|
expect(dockButton).toBe(null);
|
|
return { dockButton: null, sidebar: sidebar! } as any;
|
|
};
|
|
|
|
export const assertExcalidrawWithSidebar = async (
|
|
sidebar: React.ReactNode,
|
|
name: string,
|
|
test: () => void,
|
|
) => {
|
|
await render(
|
|
<Excalidraw initialData={{ appState: { openSidebar: { name } } }}>
|
|
{sidebar}
|
|
</Excalidraw>,
|
|
);
|
|
await withExcalidrawDimensions({ width: 1920, height: 1080 }, test);
|
|
};
|
|
|
|
describe("Sidebar", () => {
|
|
describe("General behavior", () => {
|
|
it("should render custom sidebar", async () => {
|
|
const { container } = await render(
|
|
<Excalidraw
|
|
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
|
|
>
|
|
<Sidebar name="customSidebar">
|
|
<div id="test-sidebar-content">42</div>
|
|
</Sidebar>
|
|
</Excalidraw>,
|
|
);
|
|
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).not.toBe(null);
|
|
});
|
|
|
|
it("should render only one sidebar and prefer the custom one", async () => {
|
|
const { container } = await render(
|
|
<Excalidraw
|
|
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
|
|
>
|
|
<Sidebar name="customSidebar">
|
|
<div id="test-sidebar-content">42</div>
|
|
</Sidebar>
|
|
</Excalidraw>,
|
|
);
|
|
|
|
await waitFor(() => {
|
|
// make sure the custom sidebar is rendered
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).not.toBe(null);
|
|
|
|
// make sure only one sidebar is rendered
|
|
const sidebars = container.querySelectorAll(".sidebar");
|
|
expect(sidebars.length).toBe(1);
|
|
});
|
|
});
|
|
|
|
it("should toggle sidebar using props.toggleMenu()", async () => {
|
|
const { container } = await render(
|
|
<Excalidraw>
|
|
<Sidebar name="customSidebar">
|
|
<div id="test-sidebar-content">42</div>
|
|
</Sidebar>
|
|
</Excalidraw>,
|
|
);
|
|
|
|
// sidebar isn't rendered initially
|
|
// -------------------------------------------------------------------------
|
|
await waitFor(() => {
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).toBe(null);
|
|
});
|
|
|
|
// toggle sidebar on
|
|
// -------------------------------------------------------------------------
|
|
expect(window.h.app.toggleSidebar({ name: "customSidebar" })).toBe(true);
|
|
|
|
await waitFor(() => {
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).not.toBe(null);
|
|
});
|
|
|
|
// toggle sidebar off
|
|
// -------------------------------------------------------------------------
|
|
expect(window.h.app.toggleSidebar({ name: "customSidebar" })).toBe(false);
|
|
|
|
await waitFor(() => {
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).toBe(null);
|
|
});
|
|
|
|
// force-toggle sidebar off (=> still hidden)
|
|
// -------------------------------------------------------------------------
|
|
expect(
|
|
window.h.app.toggleSidebar({ name: "customSidebar", force: false }),
|
|
).toBe(false);
|
|
|
|
await waitFor(() => {
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).toBe(null);
|
|
});
|
|
|
|
// force-toggle sidebar on
|
|
// -------------------------------------------------------------------------
|
|
expect(
|
|
window.h.app.toggleSidebar({ name: "customSidebar", force: true }),
|
|
).toBe(true);
|
|
expect(
|
|
window.h.app.toggleSidebar({ name: "customSidebar", force: true }),
|
|
).toBe(true);
|
|
|
|
await waitFor(() => {
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).not.toBe(null);
|
|
});
|
|
|
|
// toggle library (= hide custom sidebar)
|
|
// -------------------------------------------------------------------------
|
|
expect(window.h.app.toggleSidebar({ name: DEFAULT_SIDEBAR.name })).toBe(
|
|
true,
|
|
);
|
|
|
|
await waitFor(() => {
|
|
const node = container.querySelector("#test-sidebar-content");
|
|
expect(node).toBe(null);
|
|
|
|
// make sure only one sidebar is rendered
|
|
const sidebars = container.querySelectorAll(".sidebar");
|
|
expect(sidebars.length).toBe(1);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("<Sidebar.Header/>", () => {
|
|
it("should render custom sidebar header", async () => {
|
|
const { container } = await render(
|
|
<Excalidraw
|
|
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
|
|
>
|
|
<Sidebar name="customSidebar">
|
|
<Sidebar.Header>
|
|
<div id="test-sidebar-header-content">42</div>
|
|
</Sidebar.Header>
|
|
</Sidebar>
|
|
</Excalidraw>,
|
|
);
|
|
|
|
const node = container.querySelector("#test-sidebar-header-content");
|
|
expect(node).not.toBe(null);
|
|
// make sure we don't render the default fallback header,
|
|
// just the custom one
|
|
expect(queryAllByTestId(container, "sidebar-header").length).toBe(1);
|
|
});
|
|
|
|
it("should not render <Sidebar.Header> for custom sidebars by default", async () => {
|
|
const CustomExcalidraw = () => {
|
|
return (
|
|
<Excalidraw
|
|
initialData={{
|
|
appState: { openSidebar: { name: "customSidebar" } },
|
|
}}
|
|
>
|
|
<Sidebar name="customSidebar" className="test-sidebar">
|
|
hello
|
|
</Sidebar>
|
|
</Excalidraw>
|
|
);
|
|
};
|
|
|
|
const { container } = await render(<CustomExcalidraw />);
|
|
|
|
const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
|
|
expect(sidebar).not.toBe(null);
|
|
const closeButton = queryByTestId(sidebar!, "sidebar-close");
|
|
expect(closeButton).toBe(null);
|
|
});
|
|
|
|
it("<Sidebar.Header> should render close button", async () => {
|
|
const onStateChange = jest.fn();
|
|
const CustomExcalidraw = () => {
|
|
return (
|
|
<Excalidraw
|
|
initialData={{
|
|
appState: { openSidebar: { name: "customSidebar" } },
|
|
}}
|
|
>
|
|
<Sidebar
|
|
name="customSidebar"
|
|
className="test-sidebar"
|
|
onStateChange={onStateChange}
|
|
>
|
|
<Sidebar.Header />
|
|
</Sidebar>
|
|
</Excalidraw>
|
|
);
|
|
};
|
|
|
|
const { container } = await render(<CustomExcalidraw />);
|
|
|
|
// initial open
|
|
expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" });
|
|
|
|
const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
|
|
expect(sidebar).not.toBe(null);
|
|
const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
|
|
expect(closeButton).not.toBe(null);
|
|
|
|
fireEvent.click(closeButton);
|
|
await waitFor(() => {
|
|
expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
|
|
null,
|
|
);
|
|
expect(onStateChange).toHaveBeenCalledWith(null);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Docking behavior", () => {
|
|
it("shouldn't be user-dockable if `onDock` not supplied", async () => {
|
|
await assertExcalidrawWithSidebar(
|
|
<Sidebar name="customSidebar">
|
|
<Sidebar.Header />
|
|
</Sidebar>,
|
|
"customSidebar",
|
|
async () => {
|
|
await assertSidebarDockButton(false);
|
|
},
|
|
);
|
|
});
|
|
|
|
it("shouldn't be user-dockable if `onDock` not supplied & `docked={true}`", async () => {
|
|
await assertExcalidrawWithSidebar(
|
|
<Sidebar name="customSidebar" docked={true}>
|
|
<Sidebar.Header />
|
|
</Sidebar>,
|
|
"customSidebar",
|
|
async () => {
|
|
await assertSidebarDockButton(false);
|
|
},
|
|
);
|
|
});
|
|
|
|
it("shouldn't be user-dockable if `onDock` not supplied & docked={false}`", async () => {
|
|
await assertExcalidrawWithSidebar(
|
|
<Sidebar name="customSidebar" docked={false}>
|
|
<Sidebar.Header />
|
|
</Sidebar>,
|
|
"customSidebar",
|
|
async () => {
|
|
await assertSidebarDockButton(false);
|
|
},
|
|
);
|
|
});
|
|
|
|
it("should be user-dockable when both `onDock` and `docked` supplied", async () => {
|
|
await render(
|
|
<Excalidraw
|
|
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
|
|
>
|
|
<Sidebar
|
|
name="customSidebar"
|
|
className="test-sidebar"
|
|
onDock={() => {}}
|
|
docked
|
|
>
|
|
<Sidebar.Header />
|
|
</Sidebar>
|
|
</Excalidraw>,
|
|
);
|
|
|
|
await withExcalidrawDimensions(
|
|
{ width: 1920, height: 1080 },
|
|
async () => {
|
|
await assertSidebarDockButton(true);
|
|
},
|
|
);
|
|
});
|
|
|
|
it("shouldn't be user-dockable when only `onDock` supplied w/o `docked`", async () => {
|
|
await render(
|
|
<Excalidraw
|
|
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
|
|
>
|
|
<Sidebar
|
|
name="customSidebar"
|
|
className="test-sidebar"
|
|
onDock={() => {}}
|
|
>
|
|
<Sidebar.Header />
|
|
</Sidebar>
|
|
</Excalidraw>,
|
|
);
|
|
|
|
await withExcalidrawDimensions(
|
|
{ width: 1920, height: 1080 },
|
|
async () => {
|
|
await assertSidebarDockButton(false);
|
|
},
|
|
);
|
|
});
|
|
});
|
|
});
|