marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-08-30 13:47:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove customName from state

Browse Source
This commit is contained in:
Arun Kumar
2021-03-19 01:30:27 +05:30
parent db4ed1ecb1
commit f774452124
8 changed files with 9 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/actions/actionExport.tsx
View File

@@ -18,12 +18,12 @@ export const actionChangeProjectName = register({
trackEvent("change", "title");
return { appState: { ...appState, name: value }, commitToHistory: false };
},
PanelComponent: ({ appState, updateData }) => (
PanelComponent: ({ appState, updateData, appProps }) => (
<ProjectName
label={t("labels.fileTitle")}
value={appState.name || "Unnamed"}
onChange={(name: string) => updateData(name)}
customName={appState.customName}
isNameEditable={typeof appProps.name !== "undefined"}
/>
),
});

1
src/actions/manager.tsx
View File

@@ -122,6 +122,7 @@ export class ActionManager implements ActionsManagerInterface {
appState={this.getAppState()}
updateData={updateData}
id={id}
appProps={this.app.props}
/>
);
}

3
src/actions/types.ts
View File

@@ -1,6 +1,6 @@
import React from "react";
import { ExcalidrawElement } from "../element/types";
import { AppState } from "../types";
import { AppState, ExcalidrawProps } from "../types";
/** if false, the action should be prevented */
export type ActionResult =
@@ -94,6 +94,7 @@ export interface Action {
elements: readonly ExcalidrawElement[];
appState: AppState;
updateData: (formData?: any) => void;
appProps: ExcalidrawProps;
id?: string;
}>;
perform: ActionFn;

2
src/appState.ts
View File

@@ -74,7 +74,6 @@ export const getDefaultAppState = (): Omit<
zenModeEnabled: false,
zoom: { value: 1 as NormalizedZoomValue, translation: { x: 0, y: 0 } },
viewModeEnabled: false,
customName: false,
};
};
@@ -156,7 +155,6 @@ const APP_STATE_STORAGE_CONF = (<
zenModeEnabled: { browser: true, export: false },
zoom: { browser: true, export: false },
viewModeEnabled: { browser: false, export: false },
customName: { browser: false, export: false },
});
const _clearAppStateForStorage = <ExportType extends "export" | "browser">(

6
src/components/App.tsx
View File

@@ -304,7 +304,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
zenModeEnabled = false,
gridModeEnabled = false,
theme = defaultAppState.theme,
name,
name = defaultAppState.name,
} = props;
this.state = {
...defaultAppState,
@@ -316,8 +316,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
viewModeEnabled,
zenModeEnabled,
gridSize: gridModeEnabled ? GRID_SIZE : null,
name: name ? name : defaultAppState.name,
customName: typeof name === "string",
name,
};
if (excalidrawRef) {
const readyPromise =
@@ -565,7 +564,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
gridSize,
theme,
name,
customName: typeof this.props.name === "string",
});
},
() => {

4
src/components/ProjectName.tsx
View File

@@ -7,7 +7,7 @@ type Props = {
value: string;
onChange: (value: string) => void;
label: string;
customName: boolean;
isNameEditable: boolean;
};
export class ProjectName extends Component<Props> {
@@ -44,7 +44,7 @@ export class ProjectName extends Component<Props> {
};
public render() {
return this.props.customName ? (
return this.props.isNameEditable ? (
<span className="TextInput" aria-label={this.props.label}>
{this.props.value}
</span>

67
src/tests/__snapshots__/regressionTests.test.tsx.snap
View File

@@ -19,7 +19,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -481,7 +480,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -949,7 +947,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": "id10",
@@ -1726,7 +1723,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -1931,7 +1927,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -2390,7 +2385,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -2644,7 +2638,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -2809,7 +2802,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -3287,7 +3279,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -3596,7 +3587,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -3801,7 +3791,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -4046,7 +4035,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -4299,7 +4287,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -4661,7 +4648,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": Object {
"angle": 0,
"backgroundColor": "transparent",
@@ -4957,7 +4943,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": Object {
"angle": 0,
"backgroundColor": "transparent",
@@ -5265,7 +5250,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": Object {
"angle": 0,
"backgroundColor": "transparent",
@@ -5474,7 +5458,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": Object {
"angle": 0,
"backgroundColor": "transparent",
@@ -5661,7 +5644,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": "id3",
@@ -6115,7 +6097,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -6434,7 +6415,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -8469,7 +8449,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -8832,7 +8811,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -9088,7 +9066,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -9342,7 +9319,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -9658,7 +9634,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -9823,7 +9798,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -9988,7 +9962,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -10153,7 +10126,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -10348,7 +10320,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -10543,7 +10514,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -10738,7 +10708,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -10933,7 +10902,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -11098,7 +11066,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -11263,7 +11230,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -11458,7 +11424,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -11623,7 +11588,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -11818,7 +11782,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -12535,7 +12498,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -12789,7 +12751,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -12892,7 +12853,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -12993,7 +12953,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -13158,7 +13117,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -13467,7 +13425,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -13776,7 +13733,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -13941,7 +13897,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -14138,7 +14093,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -14388,7 +14342,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -14713,7 +14666,6 @@ Object {
"currentItemStrokeWidth": 2,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -15553,7 +15505,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -15862,7 +15813,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -16171,7 +16121,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -16551,7 +16500,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -16719,7 +16667,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -17041,7 +16988,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -17281,7 +17227,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -17537,7 +17482,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -17865,7 +17809,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -17966,7 +17909,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -18131,7 +18073,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -18953,7 +18894,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -19054,7 +18994,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": "id3",
@@ -19787,7 +19726,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": Object {
"angle": 0,
"backgroundColor": "transparent",
@@ -20193,7 +20131,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": Object {
"angle": 0,
"backgroundColor": "transparent",
@@ -20489,7 +20426,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "down",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -20592,7 +20528,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -21091,7 +21026,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,
@@ -21192,7 +21126,6 @@ Object {
"currentItemStrokeWidth": 1,
"currentItemTextAlign": "left",
"cursorButton": "up",
"customName": false,
"draggingElement": null,
"editingElement": null,
"editingGroupId": null,

1
src/types.ts
View File

@@ -93,7 +93,6 @@ export type AppState = {
theme: "light" | "dark";
gridSize: number | null;
viewModeEnabled: boolean;
customName: boolean;
/** top-most selected groups (i.e. does not include nested groups) */
selectedGroupIds: { [groupId: string]: boolean };