foss/excalidraw
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give preference to name prop when initialData.appState.name is present and update specs

Browse Source
This commit is contained in:
Aakansha Doshi 2021-03-20 14:25:02 +05:30
parent 78024873e5
commit 16c287c848
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/App.tsx
View File

@ -525,7 +525,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
let zenModeEnabled = actionResult?.appState?.zenModeEnabled || false; let zenModeEnabled = actionResult?.appState?.zenModeEnabled || false;
let gridSize = actionResult?.appState?.gridSize || null; let gridSize = actionResult?.appState?.gridSize || null;
let theme = actionResult?.appState?.theme || "light"; let theme = actionResult?.appState?.theme || "light";
const name = actionResult?.appState?.name || this.state.name; let name = actionResult?.appState?.name || this.state.name;
if (typeof this.props.viewModeEnabled !== "undefined") { if (typeof this.props.viewModeEnabled !== "undefined") {
viewModeEnabled = this.props.viewModeEnabled; viewModeEnabled = this.props.viewModeEnabled;
@ -543,6 +543,10 @@ class App extends React.Component<ExcalidrawProps, AppState> {
theme = this.props.theme; theme = this.props.theme;
} }
if (typeof this.props.name !== "undefined") {
name = this.props.name;
}
this.setState( this.setState(
(state) => { (state) => {
// using Object.assign instead of spread to fool TS 4.2.2+ into // using Object.assign instead of spread to fool TS 4.2.2+ into

25
src/tests/excalidrawPackage.test.tsx
View File

@ -107,21 +107,28 @@ describe("<Excalidraw/>", () => {
}); });
describe("Test name prop", () => { describe("Test name prop", () => {
it('should allow editing the export name when the name prop is "undefined"', async () => { it('should allow editing name when the name prop is "undefined"', async () => {
const { container } = await render(<Excalidraw />); const { container } = await render(<Excalidraw />);
expect(h.state.name).toContain(`${t("labels.untitled")}`);
fireEvent.click(queryByTestId(container, "export-button")!); fireEvent.click(queryByTestId(container, "export-button")!);
const name = document.querySelector(".ExportDialog__name span"); const textInput = document.querySelector(
expect(name?.hasAttribute("data-type")).toBe(true); ".ExportDialog__name .TextInput",
);
expect(textInput?.textContent).toContain(`${t("labels.untitled")}`);
expect(textInput?.hasAttribute("data-type")).toBe(true);
}); });
it('should not allow editing the export name when the name prop is present"', async () => { it('should set the name and not allow editing when the name prop is present"', async () => {
const { container } = await render(<Excalidraw name="test" />); const name = "test";
const { container } = await render(<Excalidraw name={name} />);
fireEvent.click(queryByTestId(container, "export-button")!); await fireEvent.click(queryByTestId(container, "export-button")!);
const name = document.querySelector(".ExportDialog__name span"); const textInput = document.querySelector(
expect(name?.hasAttribute("data-type")).toBe(false); ".ExportDialog__name .TextInput",
);
expect(textInput?.textContent).toEqual(name);
expect(textInput?.hasAttribute("data-type")).toBe(false);
}); });
}); });
}); });