docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests single-clicking on a subgroup of a selected group should not alter selection: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests spacebar + drag scrolls the canvas: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests supports nested groups: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests switches from group of selected elements to another element on pointer down: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests switches selected element on pointer down: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests two-finger scroll works: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests undo/redo drawing an element: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests updates fontSize & fontFamily appState: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "text",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`regression tests zoom hotkeys: [end of test] appState 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exports[`exportToSvg with default arguments 1`] = `
<mask> Object {
<mask> "activeTool": Object {
<mask> "customType": null,
<mask> "lastActiveToolBeforeEraser": null,
<mask> "locked": false,
<mask> "type": "selection",
<mask> },
<mask> "collaborators": Map {},
<mask> "contextMenu": null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null, </s> remove "lastActiveToolBeforeEraser": null,
</s> add "lastActiveTool": null,
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/tests/packages/__snapshots__/utils.test.ts.snap
|
keep keep replace keep replace
|
<mask> export type BinaryFiles = Record<ExcalidrawElement["id"], BinaryFileData>;
<mask>
<mask> export type LastActiveToolBeforeEraser =
<mask> | {
<mask> type: typeof SHAPES[number]["value"] | "eraser";
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove | { type: typeof SHAPES[number]["value"] | "eraser" }
</s> add | { type: typeof SHAPES[number]["value"] | "eraser" | "hand" } </s> remove | "eraser"
</s> add </s> remove type: typeof SHAPES[number]["value"] | "eraser";
lastActiveToolBeforeEraser: LastActiveToolBeforeEraser;
locked: boolean;
</s> add type: typeof SHAPES[number]["value"] | "eraser" | "hand"; </s> remove | "toggleLinearEditor";
</s> add | "toggleLinearEditor"
| "toggleEraserTool"
| "toggleHandTool"; </s> remove | { type: typeof SHAPES[number]["value"] | "eraser" }
</s> add | { type: typeof SHAPES[number]["value"] | "eraser" | "hand" }
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/types.ts
|
keep keep replace keep replace replace replace keep
|
<mask> editingElement: NonDeletedExcalidrawElement | null;
<mask> editingLinearElement: LinearElementEditor | null;
<mask> activeTool:
<mask> | {
<mask> type: typeof SHAPES[number]["value"] | "eraser";
<mask> lastActiveToolBeforeEraser: LastActiveToolBeforeEraser;
<mask> locked: boolean;
<mask> customType: null;
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove type: typeof SHAPES[number]["value"] | "eraser";
</s> add type: typeof SHAPES[number]["value"] | "eraser" | "hand"; </s> remove export type LastActiveToolBeforeEraser =
</s> add export type LastActiveTool = </s> remove lastActiveToolBeforeEraser: LastActiveToolBeforeEraser;
locked: boolean;
};
</s> add }
); </s> remove | { type: typeof SHAPES[number]["value"] | "eraser" }
</s> add | { type: typeof SHAPES[number]["value"] | "eraser" | "hand" } </s> remove | { type: typeof SHAPES[number]["value"] | "eraser" }
</s> add | { type: typeof SHAPES[number]["value"] | "eraser" | "hand" }
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/types.ts
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> }
<mask> | {
<mask> type: "custom";
<mask> customType: string;
<mask> lastActiveToolBeforeEraser: LastActiveToolBeforeEraser;
<mask> locked: boolean;
<mask> };
<mask> penMode: boolean;
<mask> penDetected: boolean;
<mask> exportBackground: boolean;
<mask> exportEmbedScene: boolean;
<mask> exportWithDarkMode: boolean;
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove type: typeof SHAPES[number]["value"] | "eraser";
lastActiveToolBeforeEraser: LastActiveToolBeforeEraser;
locked: boolean;
</s> add type: typeof SHAPES[number]["value"] | "eraser" | "hand"; </s> remove keyBindingLabel?: string;
</s> add keyBindingLabel?: string | null; </s> remove zenModeEnabled?: boolean;
</s> add </s> remove activeTool:
</s> add activeTool: {
/**
* indicates a previous tool we should revert back to if we deselect the
* currently active tool. At the moment applies to `eraser` and `hand` tool.
*/
lastActiveTool: LastActiveTool;
locked: boolean;
} & ( </s> remove lastActiveToolBeforeEraser: null,
</s> add lastActiveTool: null, </s> add onHandToolToggle: () => void;
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/types.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> THEME,
<mask> WINDOWS_EMOJI_FALLBACK_FONT,
<mask> } from "./constants";
<mask> import { FontFamilyValues, FontString } from "./element/types";
<mask> import { AppState, DataURL, LastActiveToolBeforeEraser, Zoom } from "./types";
<mask> import { unstable_batchedUpdates } from "react-dom";
<mask> import { SHAPES } from "./shapes";
<mask> import React from "react";
<mask>
<mask> let mockDateTime: string | null = null;
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> add import { isEraserActive, isHandToolActive } from "./appState"; </s> remove import { MIN_ZOOM, THEME, ZOOM_STEP } from "../constants";
</s> add import { CURSOR_TYPE, MIN_ZOOM, THEME, ZOOM_STEP } from "../constants"; </s> remove import { getShortcutKey, updateActiveTool } from "../utils";
</s> add import { getShortcutKey, setCursor, updateActiveTool } from "../utils"; </s> remove import { eraser, ZoomInIcon, ZoomOutIcon } from "../components/icons";
</s> add import { ZoomInIcon, ZoomOutIcon } from "../components/icons"; </s> remove import { getDefaultAppState, isEraserActive } from "../appState";
</s> add import {
getDefaultAppState,
isEraserActive,
isHandToolActive,
} from "../appState"; </s> add import { HandButton } from "./HandButton";
import { isHandToolActive } from "../appState";
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/utils.ts
|
keep add keep keep keep keep keep keep
|
<mask> import { SHAPES } from "./shapes";
<mask> import React from "react";
<mask>
<mask> let mockDateTime: string | null = null;
<mask>
<mask> export const setDateTimeForTests = (dateTime: string) => {
<mask> mockDateTime = dateTime;
<mask> };
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove import { AppState, DataURL, LastActiveToolBeforeEraser, Zoom } from "./types";
</s> add import { AppState, DataURL, LastActiveTool, Zoom } from "./types"; </s> remove import { getDefaultAppState, isEraserActive } from "../appState";
import clsx from "clsx";
</s> add import {
getDefaultAppState,
isEraserActive,
isHandToolActive,
} from "../appState"; </s> add import { actionToggleHandTool } from "../actions/actionCanvas"; </s> add import { HandButton } from "./HandButton";
import { isHandToolActive } from "../appState"; </s> remove import { getShortcutKey, updateActiveTool } from "../utils";
</s> add import { getShortcutKey, setCursor, updateActiveTool } from "../utils"; </s> remove import { MIN_ZOOM, THEME, ZOOM_STEP } from "../constants";
</s> add import { CURSOR_TYPE, MIN_ZOOM, THEME, ZOOM_STEP } from "../constants";
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/utils.ts
|
keep keep keep keep replace keep replace
|
<mask>
<mask> export const updateActiveTool = (
<mask> appState: Pick<AppState, "activeTool">,
<mask> data: (
<mask> | { type: typeof SHAPES[number]["value"] | "eraser" }
<mask> | { type: "custom"; customType: string }
<mask> ) & { lastActiveToolBeforeEraser?: LastActiveToolBeforeEraser },
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove | { type: typeof SHAPES[number]["value"] | "eraser" }
</s> add | { type: typeof SHAPES[number]["value"] | "eraser" | "hand" } </s> remove type: typeof SHAPES[number]["value"] | "eraser";
</s> add type: typeof SHAPES[number]["value"] | "eraser" | "hand"; </s> remove if (!isHoldingSpace) {
</s> add if (nextActiveTool.type === "hand") {
setCursor(this.canvas, CURSOR_TYPE.GRAB);
} else if (!isHoldingSpace) { </s> remove type: typeof SHAPES[number]["value"] | "eraser";
lastActiveToolBeforeEraser: LastActiveToolBeforeEraser;
locked: boolean;
</s> add type: typeof SHAPES[number]["value"] | "eraser" | "hand"; </s> remove export type LastActiveToolBeforeEraser =
</s> add export type LastActiveTool =
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/utils.ts
|
keep keep keep keep replace keep replace keep keep keep
|
<mask> }
<mask>
<mask> return {
<mask> ...appState.activeTool,
<mask> lastActiveToolBeforeEraser:
<mask> data.lastActiveToolBeforeEraser === undefined
<mask> ? appState.activeTool.lastActiveToolBeforeEraser
<mask> : data.lastActiveToolBeforeEraser,
<mask> type: data.type,
<mask> customType: null,
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove ) & { lastActiveToolBeforeEraser?: LastActiveToolBeforeEraser },
</s> add ) & { lastActiveToolBeforeEraser?: LastActiveTool }, </s> remove lastActiveToolBeforeEraser: null,
</s> add lastActiveTool: null, </s> remove const letter = key && (typeof key === "string" ? key : key[0]);
</s> add const letter =
key && capitalizeString(typeof key === "string" ? key : key[0]); </s> remove ? `${capitalizeString(letter)} ${t("helpDialog.or")} ${numericKey}`
</s> add ? `${letter} ${t("helpDialog.or")} ${numericKey}` </s> remove | { type: typeof SHAPES[number]["value"] | "eraser" }
</s> add | { type: typeof SHAPES[number]["value"] | "eraser" | "hand" }
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/utils.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return;
<mask> }
<mask> if (appState.activeTool.type === "selection") {
<mask> resetCursor(canvas);
<mask> } else if (appState.activeTool.type === "eraser") {
<mask> setEraserCursor(canvas, appState.theme);
<mask> // do nothing if image tool is selected which suggests there's
<mask> // a image-preview set as the cursor
<mask> // Ignore custom type as well and let host decide
<mask> } else if (!["image", "custom"].includes(appState.activeTool.type)) {
</s> feat: add hand/panning tool (#6141)
* feat: add hand/panning tool
* move hand tool right of tool lock separator
* tweak i18n
* rename `panning` -> `hand`
* toggle between last tool and hand on `H` shortcut
* hide properties sidebar when `hand` active
* revert to rendering HandButton manually due to mobile toolbar </s> remove ...(appState.activeTool.lastActiveToolBeforeEraser || {
</s> add ...(appState.activeTool.lastActiveTool || { </s> remove } else if (this.state.activeTool.type !== "eraser") {
</s> add } else if (
this.state.activeTool.type !== "eraser" &&
this.state.activeTool.type !== "hand"
) { </s> remove if (!isHoldingSpace) {
</s> add if (nextActiveTool.type === "hand") {
setCursor(this.canvas, CURSOR_TYPE.GRAB);
} else if (!isHoldingSpace) { </s> remove ...(appState.activeTool.lastActiveToolBeforeEraser || {
</s> add ...(appState.activeTool.lastActiveTool || { </s> remove activeTool:
</s> add activeTool: {
/**
* indicates a previous tool we should revert back to if we deselect the
* currently active tool. At the moment applies to `eraser` and `hand` tool.
*/
lastActiveTool: LastActiveTool;
locked: boolean;
} & ( </s> remove if (isHoldingSpace || isPanning || isDraggingScrollBar) {
</s> add if (
isHoldingSpace ||
isPanning ||
isDraggingScrollBar ||
isHandToolActive(this.state)
) {
|
https://github.com/excalidraw/excalidraw/commit/d4afd6626850befdb000d86c203e7a604f8a871c
|
src/utils.ts
|
keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> export async function copyTextToSystemClipboard(text: string | null) {
<mask> let copied = false;
<mask> if (probablySupportsClipboardWriteText) {
<mask> try {
<mask> // NOTE: doesn't work on FF on non-HTTPS domains, or when document
</s> Adding ability to copy to clipboard as SVG (#1250) </s> remove export type ExportType = "png" | "clipboard" | "backend" | "svg";
</s> add export type ExportType =
| "png"
| "clipboard"
| "clipboard-svg"
| "backend"
| "svg"; </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard"; </s> add probablySupportsClipboardWriteText, </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/clipboard.ts
|
keep add keep keep keep keep
|
<mask> getClipboardContent,
<mask> probablySupportsClipboardBlob,
<mask> } from "../clipboard";
<mask> import { normalizeScroll } from "../scene";
<mask> import { getCenter, getDistance } from "../gesture";
<mask> import { createUndoAction, createRedoAction } from "../actions/actionHistory";
</s> Adding ability to copy to clipboard as SVG (#1250) </s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard"; </s> add export async function copyCanvasToClipboardAsSvg(svgroot: SVGSVGElement) {
try {
await navigator.clipboard.writeText(svgroot.outerHTML);
} catch (error) {
console.error(error);
}
}
</s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> remove export type ExportType = "png" | "clipboard" | "backend" | "svg";
</s> add export type ExportType =
| "png"
| "clipboard"
| "clipboard-svg"
| "backend"
| "svg"; </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/components/App.tsx
|
keep keep add keep keep keep keep
|
<mask> );
<mask> };
<mask>
<mask> private onTapStart = (event: TouchEvent) => {
<mask> if (!didTapTwice) {
<mask> didTapTwice = true;
<mask> clearTimeout(tappedTwiceTimer);
</s> Adding ability to copy to clipboard as SVG (#1250) </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> add probablySupportsClipboardWriteText &&
hasNonDeletedElements(globalSceneState.getAllElements()) && {
label: t("labels.copyAsSvg"),
action: this.copyToClipboardAsSvg,
}, </s> add probablySupportsClipboardWriteText && {
label: t("labels.copyAsSvg"),
action: this.copyToClipboardAsSvg,
}, </s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> add export async function copyCanvasToClipboardAsSvg(svgroot: SVGSVGElement) {
try {
await navigator.clipboard.writeText(svgroot.outerHTML);
} catch (error) {
console.error(error);
}
}
</s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard";
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/components/App.tsx
|
keep keep keep add keep keep keep keep keep
|
<mask> hasNonDeletedElements(globalSceneState.getAllElements()) && {
<mask> label: t("labels.copyAsPng"),
<mask> action: this.copyToClipboardAsPng,
<mask> },
<mask> ...this.actionManager.getContextMenuItems((action) =>
<mask> this.canvasOnlyActions.includes(action.name),
<mask> ),
<mask> ],
<mask> top: event.clientY,
</s> Adding ability to copy to clipboard as SVG (#1250) </s> add probablySupportsClipboardWriteText && {
label: t("labels.copyAsSvg"),
action: this.copyToClipboardAsSvg,
}, </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
</s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard"; </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> add export async function copyCanvasToClipboardAsSvg(svgroot: SVGSVGElement) {
try {
await navigator.clipboard.writeText(svgroot.outerHTML);
} catch (error) {
console.error(error);
}
}
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/components/App.tsx
|
keep add keep keep keep keep
|
<mask> action: this.copyToClipboardAsPng,
<mask> },
<mask> ...this.actionManager.getContextMenuItems(
<mask> (action) => !this.canvasOnlyActions.includes(action.name),
<mask> ),
<mask> ],
</s> Adding ability to copy to clipboard as SVG (#1250) </s> add probablySupportsClipboardWriteText &&
hasNonDeletedElements(globalSceneState.getAllElements()) && {
label: t("labels.copyAsSvg"),
action: this.copyToClipboardAsSvg,
}, </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
</s> remove export type ExportType = "png" | "clipboard" | "backend" | "svg";
</s> add export type ExportType =
| "png"
| "clipboard"
| "clipboard-svg"
| "backend"
| "svg"; </s> add "copyAsSvg": "Copy to clipboard as SVG", </s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") {
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { exportToCanvas, exportToSvg } from "../scene/export";
<mask> import { fileSave } from "browser-nativefs";
<mask>
<mask> import { t } from "../i18n";
<mask> import { copyCanvasToClipboardAsPng } from "../clipboard";
<mask> import { serializeAsJSON } from "./json";
<mask>
<mask> import { ExportType } from "../scene/types";
<mask> import { restore } from "./restore";
<mask> import { restoreFromLocalStorage } from "./localStorage";
</s> Adding ability to copy to clipboard as SVG (#1250) </s> add probablySupportsClipboardWriteText, </s> add export async function copyCanvasToClipboardAsSvg(svgroot: SVGSVGElement) {
try {
await navigator.clipboard.writeText(svgroot.outerHTML);
} catch (error) {
console.error(error);
}
}
</s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> remove export type ExportType = "png" | "clipboard" | "backend" | "svg";
</s> add export type ExportType =
| "png"
| "clipboard"
| "clipboard-svg"
| "backend"
| "svg"; </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ) {
<mask> if (!hasNonDeletedElements(elements)) {
<mask> return window.alert(t("alerts.cannotExportEmptyCanvas"));
<mask> }
<mask> if (type === "svg") {
<mask> const tempSvg = exportToSvg(elements, {
<mask> exportBackground,
<mask> viewBackgroundColor,
<mask> exportPadding,
<mask> });
</s> Adding ability to copy to clipboard as SVG (#1250) </s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> add export async function copyCanvasToClipboardAsSvg(svgroot: SVGSVGElement) {
try {
await navigator.clipboard.writeText(svgroot.outerHTML);
} catch (error) {
console.error(error);
}
}
</s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard"; </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
</s> add probablySupportsClipboardWriteText, </s> remove export type ExportType = "png" | "clipboard" | "backend" | "svg";
</s> add export type ExportType =
| "png"
| "clipboard"
| "clipboard-svg"
| "backend"
| "svg";
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/data/index.ts
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> exportBackground,
<mask> viewBackgroundColor,
<mask> exportPadding,
<mask> });
<mask> await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
<mask> fileName: `${name}.svg`,
<mask> });
<mask> return;
<mask> }
<mask>
<mask> const tempCanvas = exportToCanvas(elements, appState, {
<mask> exportBackground,
<mask> viewBackgroundColor,
</s> Adding ability to copy to clipboard as SVG (#1250) </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> add export async function copyCanvasToClipboardAsSvg(svgroot: SVGSVGElement) {
try {
await navigator.clipboard.writeText(svgroot.outerHTML);
} catch (error) {
console.error(error);
}
}
</s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard"; </s> add probablySupportsClipboardWriteText, </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
</s> remove export type ExportType = "png" | "clipboard" | "backend" | "svg";
</s> add export type ExportType =
| "png"
| "clipboard"
| "clipboard-svg"
| "backend"
| "svg";
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/data/index.ts
|
keep keep add keep keep keep keep keep keep
|
<mask> "selectAll": "Select All",
<mask> "copy": "Copy",
<mask> "copyAsPng": "Copy to clipboard as PNG",
<mask> "bringForward": "Bring Forward",
<mask> "sendToBack": "Send To Back",
<mask> "bringToFront": "Bring To Front",
<mask> "sendBackward": "Send Backward",
<mask> "delete": "Delete",
<mask> "copyStyles": "Copy Styles",
</s> Adding ability to copy to clipboard as SVG (#1250) </s> remove export type ExportType = "png" | "clipboard" | "backend" | "svg";
</s> add export type ExportType =
| "png"
| "clipboard"
| "clipboard-svg"
| "backend"
| "svg"; </s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard"; </s> add probablySupportsClipboardWriteText && {
label: t("labels.copyAsSvg"),
action: this.copyToClipboardAsSvg,
}, </s> add probablySupportsClipboardWriteText &&
hasNonDeletedElements(globalSceneState.getAllElements()) && {
label: t("labels.copyAsSvg"),
action: this.copyToClipboardAsSvg,
},
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/locales/en.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> export interface Scene {
<mask> elements: ExcalidrawTextElement[];
<mask> }
<mask>
<mask> export type ExportType = "png" | "clipboard" | "backend" | "svg";
<mask>
<mask> export type ScrollBars = {
<mask> horizontal: {
<mask> x: number;
<mask> y: number;
</s> Adding ability to copy to clipboard as SVG (#1250) </s> add export async function copyCanvasToClipboardAsSvg(svgroot: SVGSVGElement) {
try {
await navigator.clipboard.writeText(svgroot.outerHTML);
} catch (error) {
console.error(error);
}
}
</s> remove if (type === "svg") {
</s> add if (type === "svg" || type === "clipboard-svg") { </s> remove import { copyCanvasToClipboardAsPng } from "../clipboard";
</s> add import {
copyCanvasToClipboardAsPng,
copyCanvasToClipboardAsSvg,
} from "../clipboard"; </s> remove await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
</s> add if (type === "svg") {
await fileSave(new Blob([tempSvg.outerHTML], { type: "image/svg+xml" }), {
fileName: `${name}.svg`,
});
return;
} else if (type === "clipboard-svg") {
copyCanvasToClipboardAsSvg(tempSvg);
return;
} </s> add probablySupportsClipboardWriteText, </s> add private copyToClipboardAsSvg = () => {
const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
exportCanvas(
"clipboard-svg",
selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
this.state,
this.canvas!,
this.state,
);
};
|
https://github.com/excalidraw/excalidraw/commit/d5366db341bca242ba6f383148d05af3e5b9e3c7
|
src/scene/types.ts
|
keep keep keep add keep keep keep keep keep
|
<mask> return;
<mask> }
<mask> const scene = await loadScene(null);
<mask> this.syncActionResult(scene);
<mask> }
<mask>
<mask> public componentWillUnmount() {
<mask> this.unmounted = true;
<mask> document.removeEventListener("copy", this.onCopy);
</s> [RFC] show confirmation dialog before the user closes the page (#957) </s> add window.removeEventListener("beforeunload", this.beforeUnload); </s> add private beforeUnload = (event: BeforeUnloadEvent) => {
if (
this.state.isCollaborating &&
hasNonDeletedElements(globalSceneState.getAllElements())
) {
event.preventDefault();
// NOTE: modern browsers no longer allow showing a custom message here
event.returnValue = "";
}
};
|
https://github.com/excalidraw/excalidraw/commit/d58216f5ec3aef8392b0e5efd2edfa577f0a8cdc
|
src/components/App.tsx
|
keep keep keep add keep keep keep keep keep
|
<mask> this.onGestureChange as any,
<mask> false,
<mask> );
<mask> document.removeEventListener("gestureend", this.onGestureEnd as any, false);
<mask> }
<mask>
<mask> public state: AppState = getDefaultAppState();
<mask>
<mask> private onResize = () => {
</s> [RFC] show confirmation dialog before the user closes the page (#957) </s> add private beforeUnload = (event: BeforeUnloadEvent) => {
if (
this.state.isCollaborating &&
hasNonDeletedElements(globalSceneState.getAllElements())
) {
event.preventDefault();
// NOTE: modern browsers no longer allow showing a custom message here
event.returnValue = "";
}
};
</s> add window.addEventListener("beforeunload", this.beforeUnload);
|
https://github.com/excalidraw/excalidraw/commit/d58216f5ec3aef8392b0e5efd2edfa577f0a8cdc
|
src/components/App.tsx
|
keep keep keep add keep keep keep keep
|
<mask> scrollY: normalizeScroll(scrollY - deltaY / zoom),
<mask> }));
<mask> };
<mask>
<mask> private addElementsFromPaste = (
<mask> clipboardElements: readonly ExcalidrawElement[],
<mask> ) => {
<mask> const [minX, minY, maxX, maxY] = getCommonBounds(clipboardElements);
</s> [RFC] show confirmation dialog before the user closes the page (#957) </s> add window.removeEventListener("beforeunload", this.beforeUnload); </s> add window.addEventListener("beforeunload", this.beforeUnload);
|
https://github.com/excalidraw/excalidraw/commit/d58216f5ec3aef8392b0e5efd2edfa577f0a8cdc
|
src/components/App.tsx
|
keep keep keep add keep keep keep keep keep
|
<mask> ENV,
<mask> CANVAS_ONLY_ACTIONS,
<mask> DEFAULT_VERTICAL_ALIGN,
<mask> GRID_SIZE,
<mask> } from "../constants";
<mask> import {
<mask> INITAL_SCENE_UPDATE_TIMEOUT,
<mask> TAP_TWICE_TIMEOUT,
<mask> SYNC_FULL_SCENE_INTERVAL_MS,
</s> prompt when loading external scene before overriding local one (#1862) </s> remove window.history.replaceState({}, "Excalidraw", window.location.origin);
</s> add </s> remove scene = await loadScene(null);
}
if (scene) {
this.syncActionResult(scene);
</s> add isCollaborationScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin); </s> remove if (!isCollaborationScene) {
let scene: ResolutionType<typeof loadScene> | undefined;
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> add if (isExternalScene) {
if (
this.shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
}
if (!isCollaborationScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
} </s> add } else if (scene) {
this.syncActionResult(scene); </s> remove // run this last else the `isLoading` state
</s> add </s> add if (this.state.isCollaborating && this.portal.roomID) {
localStorage.setItem(
LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
JSON.stringify({
timestamp: Date.now(),
room: this.portal.roomID,
}),
);
}
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/components/App.tsx
|
keep keep replace keep replace replace replace replace replace replace replace
|
<mask> );
<mask>
<mask> const isCollaborationScene = getCollaborationLinkData(window.location.href);
<mask>
<mask> if (!isCollaborationScene) {
<mask> let scene: ResolutionType<typeof loadScene> | undefined;
<mask> // Backwards compatibility with legacy url format
<mask> if (id) {
<mask> scene = await loadScene(id);
<mask> } else if (jsonMatch) {
<mask> scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> prompt when loading external scene before overriding local one (#1862) </s> remove scene = await loadScene(null);
}
if (scene) {
this.syncActionResult(scene);
</s> add isCollaborationScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin); </s> remove window.history.replaceState({}, "Excalidraw", window.location.origin);
</s> add </s> add if (this.state.isCollaborating && this.portal.roomID) {
localStorage.setItem(
LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
JSON.stringify({
timestamp: Date.now(),
room: this.portal.roomID,
}),
);
} </s> add } else if (scene) {
this.syncActionResult(scene); </s> remove // run this last else the `isLoading` state
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/components/App.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> scene = await loadScene(id);
<mask> } else if (jsonMatch) {
<mask> scene = await loadScene(jsonMatch[1], jsonMatch[2]);
<mask> } else {
<mask> scene = await loadScene(null);
<mask> }
<mask> if (scene) {
<mask> this.syncActionResult(scene);
<mask> }
<mask> }
<mask>
<mask> if (this.state.isLoading) {
<mask> this.setState({ isLoading: false });
</s> prompt when loading external scene before overriding local one (#1862) </s> remove if (!isCollaborationScene) {
let scene: ResolutionType<typeof loadScene> | undefined;
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> add if (isExternalScene) {
if (
this.shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
}
if (!isCollaborationScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
} </s> remove // run this last else the `isLoading` state
</s> add </s> add } else if (scene) {
this.syncActionResult(scene); </s> remove window.history.replaceState({}, "Excalidraw", window.location.origin);
</s> add </s> remove const isCollaborationScene = getCollaborationLinkData(window.location.href);
</s> add let scene = await loadScene(null);
let isCollaborationScene = !!getCollaborationLinkData(window.location.href);
const isExternalScene = !!(id || jsonMatch || isCollaborationScene); </s> add if (this.state.isCollaborating && this.portal.roomID) {
localStorage.setItem(
LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
JSON.stringify({
timestamp: Date.now(),
room: this.portal.roomID,
}),
);
}
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (this.state.isLoading) {
<mask> this.setState({ isLoading: false });
<mask> }
<mask>
<mask> // run this last else the `isLoading` state
<mask> if (isCollaborationScene) {
<mask> this.initializeSocketClient({ showLoadingState: true });
<mask> }
<mask> };
<mask>
</s> prompt when loading external scene before overriding local one (#1862) </s> add } else if (scene) {
this.syncActionResult(scene); </s> remove scene = await loadScene(null);
}
if (scene) {
this.syncActionResult(scene);
</s> add isCollaborationScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin); </s> remove window.history.replaceState({}, "Excalidraw", window.location.origin);
</s> add </s> remove if (!isCollaborationScene) {
let scene: ResolutionType<typeof loadScene> | undefined;
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> add if (isExternalScene) {
if (
this.shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
}
if (!isCollaborationScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
} </s> add if (this.state.isCollaborating && this.portal.roomID) {
localStorage.setItem(
LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
JSON.stringify({
timestamp: Date.now(),
room: this.portal.roomID,
}),
);
} </s> remove const isCollaborationScene = getCollaborationLinkData(window.location.href);
</s> add let scene = await loadScene(null);
let isCollaborationScene = !!getCollaborationLinkData(window.location.href);
const isExternalScene = !!(id || jsonMatch || isCollaborationScene);
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/components/App.tsx
|
keep keep add keep keep keep keep keep
|
<mask>
<mask> if (isCollaborationScene) {
<mask> this.initializeSocketClient({ showLoadingState: true });
<mask> }
<mask> };
<mask>
<mask> public async componentDidMount() {
<mask> if (
</s> prompt when loading external scene before overriding local one (#1862) </s> remove // run this last else the `isLoading` state
</s> add </s> remove scene = await loadScene(null);
}
if (scene) {
this.syncActionResult(scene);
</s> add isCollaborationScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin); </s> remove if (!isCollaborationScene) {
let scene: ResolutionType<typeof loadScene> | undefined;
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> add if (isExternalScene) {
if (
this.shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
}
if (!isCollaborationScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
} </s> add if (this.state.isCollaborating && this.portal.roomID) {
localStorage.setItem(
LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
JSON.stringify({
timestamp: Date.now(),
room: this.portal.roomID,
}),
);
} </s> remove window.history.replaceState({}, "Excalidraw", window.location.origin);
</s> add </s> remove const isCollaborationScene = getCollaborationLinkData(window.location.href);
</s> add let scene = await loadScene(null);
let isCollaborationScene = !!getCollaborationLinkData(window.location.href);
const isExternalScene = !!(id || jsonMatch || isCollaborationScene);
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/components/App.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> }
<mask>
<mask> private beforeUnload = withBatchedUpdates((event: BeforeUnloadEvent) => {
<mask> if (
<mask> this.state.isCollaborating &&
<mask> globalSceneState.getElements().length > 0
<mask> ) {
<mask> event.preventDefault();
<mask> // NOTE: modern browsers no longer allow showing a custom message here
</s> prompt when loading external scene before overriding local one (#1862) </s> remove if (!isCollaborationScene) {
let scene: ResolutionType<typeof loadScene> | undefined;
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> add if (isExternalScene) {
if (
this.shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
}
if (!isCollaborationScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
} </s> remove window.history.replaceState({}, "Excalidraw", window.location.origin);
</s> add </s> add } else if (scene) {
this.syncActionResult(scene); </s> remove scene = await loadScene(null);
}
if (scene) {
this.syncActionResult(scene);
</s> add isCollaborationScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin); </s> remove // run this last else the `isLoading` state
</s> add </s> remove const isCollaborationScene = getCollaborationLinkData(window.location.href);
</s> add let scene = await loadScene(null);
let isCollaborationScene = !!getCollaborationLinkData(window.location.href);
const isExternalScene = !!(id || jsonMatch || isCollaborationScene);
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (id != null) {
<mask> // the private key is used to decrypt the content from the server, take
<mask> // extra care not to leak it
<mask> data = await importFromBackend(id, privateKey);
<mask> window.history.replaceState({}, "Excalidraw", window.location.origin);
<mask> } else {
<mask> data = restoreFromLocalStorage();
<mask> }
<mask>
<mask> return {
</s> prompt when loading external scene before overriding local one (#1862) </s> remove if (!isCollaborationScene) {
let scene: ResolutionType<typeof loadScene> | undefined;
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> add if (isExternalScene) {
if (
this.shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
}
if (!isCollaborationScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
} </s> remove scene = await loadScene(null);
}
if (scene) {
this.syncActionResult(scene);
</s> add isCollaborationScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin); </s> remove // run this last else the `isLoading` state
</s> add </s> remove "uploadedSecurly": "The upload has been secured with end-to-end encryption, which means that Excalidraw server and third parties can't read the content."
</s> add "uploadedSecurly": "The upload has been secured with end-to-end encryption, which means that Excalidraw server and third parties can't read the content.",
"loadSceneOverridePrompt": "Loading external drawing will replace your existing content. Do you wish to continue?" </s> add if (this.state.isCollaborating && this.portal.roomID) {
localStorage.setItem(
LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
JSON.stringify({
timestamp: Date.now(),
room: this.portal.roomID,
}),
);
} </s> add } else if (scene) {
this.syncActionResult(scene);
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "importBackendFailed": "Importing from backend failed.",
<mask> "cannotExportEmptyCanvas": "Cannot export empty canvas.",
<mask> "couldNotCopyToClipboard": "Couldn't copy to clipboard. Try using Chrome browser.",
<mask> "decryptFailed": "Couldn't decrypt data.",
<mask> "uploadedSecurly": "The upload has been secured with end-to-end encryption, which means that Excalidraw server and third parties can't read the content."
<mask> },
<mask> "toolBar": {
<mask> "selection": "Selection",
<mask> "draw": "Free draw",
<mask> "rectangle": "Rectangle",
</s> prompt when loading external scene before overriding local one (#1862) </s> remove window.history.replaceState({}, "Excalidraw", window.location.origin);
</s> add </s> add LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG, </s> remove if (!isCollaborationScene) {
let scene: ResolutionType<typeof loadScene> | undefined;
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
</s> add if (isExternalScene) {
if (
this.shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2]);
}
if (!isCollaborationScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
} </s> remove // run this last else the `isLoading` state
</s> add </s> remove const isCollaborationScene = getCollaborationLinkData(window.location.href);
</s> add let scene = await loadScene(null);
let isCollaborationScene = !!getCollaborationLinkData(window.location.href);
const isExternalScene = !!(id || jsonMatch || isCollaborationScene); </s> add } else if (scene) {
this.syncActionResult(scene);
|
https://github.com/excalidraw/excalidraw/commit/d5e7d08586c0ee79a3ec717ea92be1c58ff5fc2d
|
src/locales/en.json
|
keep keep replace replace replace keep replace replace keep keep keep
|
<mask> },
<mask> "@sentry/integrations": {
<mask> "version": "5.30.0",
<mask> "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.30.0.tgz",
<mask> "integrity": "sha512-Fqh4ALLoQWdd+1ih0iBduANWFyNmFWMxwvBu3V/wLDRi8OcquI0lEzWai1InzTJTiNhRHPnhuU++l/vkO0OCww==",
<mask> "requires": {
<mask> "@sentry/types": "5.30.0",
<mask> "@sentry/utils": "5.30.0",
<mask> "localforage": "1.8.1",
<mask> "tslib": "^1.9.3"
<mask> }
</s> chore(deps): bump @sentry/integrations from 5.30.0 to 6.0.1 (#2854)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> </s> remove "@sentry/integrations": "5.30.0",
</s> add "@sentry/integrations": "6.0.1", </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
"integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.0.1.tgz",
"integrity": "sha512-bjGuBYnG6fulZ8mLhPGBxttNu96DCN6d7Glw2sfLf4aurn1kjJ/58hP2c8dH0OqWO5e+rGYTsZ5Dr5kqVKNGTg==", </s> remove "@sentry/types": "5.30.0",
</s> add "@sentry/types": "6.0.1", </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
"integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw=="
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.0.1.tgz",
"integrity": "sha512-cEoe19vtam75Tf6eWmaobfbeV8XwBdr5FJoSVTomzcSsEiP2FHGOEhlE7kVBigzeH5Lri0aibiW6BDi1hIqHdg=="
|
https://github.com/excalidraw/excalidraw/commit/d63ec678db2401c646aa6ca61b8b42fc66275882
|
package-lock.json
|
keep keep keep replace replace replace keep keep replace replace replace keep keep
|
<mask> }
<mask> },
<mask> "@sentry/types": {
<mask> "version": "5.30.0",
<mask> "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
<mask> "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw=="
<mask> },
<mask> "@sentry/utils": {
<mask> "version": "5.30.0",
<mask> "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
<mask> "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
<mask> "requires": {
<mask> "@sentry/types": "5.30.0",
</s> chore(deps): bump @sentry/integrations from 5.30.0 to 6.0.1 (#2854)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.30.0.tgz",
"integrity": "sha512-Fqh4ALLoQWdd+1ih0iBduANWFyNmFWMxwvBu3V/wLDRi8OcquI0lEzWai1InzTJTiNhRHPnhuU++l/vkO0OCww==",
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-6.0.1.tgz",
"integrity": "sha512-5HGwKW0otSVXSLAJ9ezqlux4AYdeX6ElzQgpm6roWEBXEWf/5OyD0n+M3+yHq4NdQXk2kkfL/0DCyNdy8zZX2Q==", </s> remove "@sentry/types": "5.30.0",
</s> add "@sentry/types": "6.0.1", </s> remove "@sentry/types": "5.30.0",
"@sentry/utils": "5.30.0",
</s> add "@sentry/types": "6.0.1",
"@sentry/utils": "6.0.1", </s> remove "@sentry/integrations": "5.30.0",
</s> add "@sentry/integrations": "6.0.1",
|
https://github.com/excalidraw/excalidraw/commit/d63ec678db2401c646aa6ca61b8b42fc66275882
|
package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "version": "5.30.0",
<mask> "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
<mask> "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
<mask> "requires": {
<mask> "@sentry/types": "5.30.0",
<mask> "tslib": "^1.9.3"
<mask> }
<mask> },
<mask> "@sindresorhus/is": {
<mask> "version": "0.14.0",
</s> chore(deps): bump @sentry/integrations from 5.30.0 to 6.0.1 (#2854)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
"integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.0.1.tgz",
"integrity": "sha512-bjGuBYnG6fulZ8mLhPGBxttNu96DCN6d7Glw2sfLf4aurn1kjJ/58hP2c8dH0OqWO5e+rGYTsZ5Dr5kqVKNGTg==", </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.30.0.tgz",
"integrity": "sha512-Fqh4ALLoQWdd+1ih0iBduANWFyNmFWMxwvBu3V/wLDRi8OcquI0lEzWai1InzTJTiNhRHPnhuU++l/vkO0OCww==",
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-6.0.1.tgz",
"integrity": "sha512-5HGwKW0otSVXSLAJ9ezqlux4AYdeX6ElzQgpm6roWEBXEWf/5OyD0n+M3+yHq4NdQXk2kkfL/0DCyNdy8zZX2Q==", </s> remove "@sentry/types": "5.30.0",
"@sentry/utils": "5.30.0",
</s> add "@sentry/types": "6.0.1",
"@sentry/utils": "6.0.1", </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
"integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw=="
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.0.1.tgz",
"integrity": "sha512-cEoe19vtam75Tf6eWmaobfbeV8XwBdr5FJoSVTomzcSsEiP2FHGOEhlE7kVBigzeH5Lri0aibiW6BDi1hIqHdg==" </s> remove "@sentry/integrations": "5.30.0",
</s> add "@sentry/integrations": "6.0.1",
|
https://github.com/excalidraw/excalidraw/commit/d63ec678db2401c646aa6ca61b8b42fc66275882
|
package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ]
<mask> },
<mask> "dependencies": {
<mask> "@sentry/browser": "5.30.0",
<mask> "@sentry/integrations": "5.30.0",
<mask> "@testing-library/jest-dom": "5.11.9",
<mask> "@testing-library/react": "11.2.3",
<mask> "@types/jest": "26.0.20",
<mask> "@types/react": "17.0.0",
<mask> "@types/react-dom": "17.0.0",
</s> chore(deps): bump @sentry/integrations from 5.30.0 to 6.0.1 (#2854)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.30.0.tgz",
"integrity": "sha512-Fqh4ALLoQWdd+1ih0iBduANWFyNmFWMxwvBu3V/wLDRi8OcquI0lEzWai1InzTJTiNhRHPnhuU++l/vkO0OCww==",
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-6.0.1.tgz",
"integrity": "sha512-5HGwKW0otSVXSLAJ9ezqlux4AYdeX6ElzQgpm6roWEBXEWf/5OyD0n+M3+yHq4NdQXk2kkfL/0DCyNdy8zZX2Q==", </s> remove "@sentry/types": "5.30.0",
"@sentry/utils": "5.30.0",
</s> add "@sentry/types": "6.0.1",
"@sentry/utils": "6.0.1", </s> remove "@sentry/types": "5.30.0",
</s> add "@sentry/types": "6.0.1", </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
"integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw=="
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.0.1.tgz",
"integrity": "sha512-cEoe19vtam75Tf6eWmaobfbeV8XwBdr5FJoSVTomzcSsEiP2FHGOEhlE7kVBigzeH5Lri0aibiW6BDi1hIqHdg==" </s> remove "version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
"integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
</s> add "version": "6.0.1",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.0.1.tgz",
"integrity": "sha512-bjGuBYnG6fulZ8mLhPGBxttNu96DCN6d7Glw2sfLf4aurn1kjJ/58hP2c8dH0OqWO5e+rGYTsZ5Dr5kqVKNGTg==",
|
https://github.com/excalidraw/excalidraw/commit/d63ec678db2401c646aa6ca61b8b42fc66275882
|
package.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "loader-utils": "^1.2.3"
<mask> }
<mask> },
<mask> "@testing-library/dom": {
<mask> "version": "7.24.1",
<mask> "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.24.1.tgz",
<mask> "integrity": "sha512-TemHWY59gvzcScGiE5eooZpzYk9GaED0TuuK4WefbIc/DQg0L5wOpnj7MIEeAGF3B7Ekf1kvmVnQ97vwz4Lmhg==",
<mask> "requires": {
<mask> "@babel/code-frame": "^7.10.4",
<mask> "@babel/runtime": "^7.10.3",
<mask> "@types/aria-query": "^4.2.0",
<mask> "aria-query": "^4.2.2",
</s> Bump @testing-library/react from 11.0.2 to 11.0.4 (#2160)
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.0.2 to 11.0.4.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.0.2...v11.0.4)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "@testing-library/dom": "^7.23.0"
</s> add "@testing-library/dom": "^7.24.2" </s> remove "version": "11.0.2",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.0.2.tgz",
"integrity": "sha512-iOuNNHt4ZgMH5trSKC4kaWDcKzUOf7e7KQIcu7xvGCd68/w1EegbW89F9T5sZ4IjS0gAXdvOfZbG9ESZ7YjOug==",
</s> add "version": "11.0.4",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.0.4.tgz",
"integrity": "sha512-U0fZO2zxm7M0CB5h1+lh31lbAwMSmDMEMGpMT3BUPJwIjDEKYWOV4dx7lb3x2Ue0Pyt77gmz/VropuJnSz/Iew==", </s> remove "@testing-library/react": "11.0.2",
</s> add "@testing-library/react": "11.0.4",
|
https://github.com/excalidraw/excalidraw/commit/d6adfe88bd57acd61485a176e5eec1d939409c34
|
package-lock.json
|
keep keep replace replace replace keep keep replace keep keep keep
|
<mask> },
<mask> "@testing-library/react": {
<mask> "version": "11.0.2",
<mask> "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.0.2.tgz",
<mask> "integrity": "sha512-iOuNNHt4ZgMH5trSKC4kaWDcKzUOf7e7KQIcu7xvGCd68/w1EegbW89F9T5sZ4IjS0gAXdvOfZbG9ESZ7YjOug==",
<mask> "requires": {
<mask> "@babel/runtime": "^7.11.2",
<mask> "@testing-library/dom": "^7.23.0"
<mask> },
<mask> "dependencies": {
<mask> "@babel/runtime": {
</s> Bump @testing-library/react from 11.0.2 to 11.0.4 (#2160)
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.0.2 to 11.0.4.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.0.2...v11.0.4)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "version": "7.24.1",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.24.1.tgz",
"integrity": "sha512-TemHWY59gvzcScGiE5eooZpzYk9GaED0TuuK4WefbIc/DQg0L5wOpnj7MIEeAGF3B7Ekf1kvmVnQ97vwz4Lmhg==",
</s> add "version": "7.24.2",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.24.2.tgz",
"integrity": "sha512-ERxcZSoHx0EcN4HfshySEWmEf5Kkmgi+J7O79yCJ3xggzVlBJ2w/QjJUC+EBkJJ2OeSw48i3IoePN4w8JlVUIA==", </s> remove "@testing-library/react": "11.0.2",
</s> add "@testing-library/react": "11.0.4",
|
https://github.com/excalidraw/excalidraw/commit/d6adfe88bd57acd61485a176e5eec1d939409c34
|
package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "dependencies": {
<mask> "@sentry/browser": "5.23.0",
<mask> "@sentry/integrations": "5.22.3",
<mask> "@testing-library/jest-dom": "5.11.4",
<mask> "@testing-library/react": "11.0.2",
<mask> "@types/jest": "26.0.13",
<mask> "@types/nanoid": "2.1.0",
<mask> "@types/react": "16.9.49",
<mask> "@types/react-dom": "16.9.8",
<mask> "@types/socket.io-client": "1.4.33",
</s> Bump @testing-library/react from 11.0.2 to 11.0.4 (#2160)
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.0.2 to 11.0.4.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.0.2...v11.0.4)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "@testing-library/dom": "^7.23.0"
</s> add "@testing-library/dom": "^7.24.2" </s> remove "version": "11.0.2",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.0.2.tgz",
"integrity": "sha512-iOuNNHt4ZgMH5trSKC4kaWDcKzUOf7e7KQIcu7xvGCd68/w1EegbW89F9T5sZ4IjS0gAXdvOfZbG9ESZ7YjOug==",
</s> add "version": "11.0.4",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.0.4.tgz",
"integrity": "sha512-U0fZO2zxm7M0CB5h1+lh31lbAwMSmDMEMGpMT3BUPJwIjDEKYWOV4dx7lb3x2Ue0Pyt77gmz/VropuJnSz/Iew==", </s> remove "version": "7.24.1",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.24.1.tgz",
"integrity": "sha512-TemHWY59gvzcScGiE5eooZpzYk9GaED0TuuK4WefbIc/DQg0L5wOpnj7MIEeAGF3B7Ekf1kvmVnQ97vwz4Lmhg==",
</s> add "version": "7.24.2",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.24.2.tgz",
"integrity": "sha512-ERxcZSoHx0EcN4HfshySEWmEf5Kkmgi+J7O79yCJ3xggzVlBJ2w/QjJUC+EBkJJ2OeSw48i3IoePN4w8JlVUIA==",
|
https://github.com/excalidraw/excalidraw/commit/d6adfe88bd57acd61485a176e5eec1d939409c34
|
package.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> actions: { [keyProp: string]: Action } = {};
<mask>
<mask> updater: UpdaterFn;
<mask>
<mask> resumeHistoryRecording: () => void;
<mask>
<mask> getAppState: () => AppState;
<mask>
<mask> getElements: () => readonly ExcalidrawElement[];
<mask>
<mask> constructor(
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove resumeHistoryRecording: () => void,
</s> add </s> remove this.resumeHistoryRecording = resumeHistoryRecording;
</s> add </s> remove handleKeyDown: (event: KeyboardEvent) => ActionResult | null;
</s> add handleKeyDown: (event: KeyboardEvent) => boolean; </s> add language: string; </s> remove () => {
history.resumeRecording();
},
</s> add </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep keep keep keep replace keep keep keep keep replace
|
<mask> getElements: () => readonly ExcalidrawElement[];
<mask>
<mask> constructor(
<mask> updater: UpdaterFn,
<mask> resumeHistoryRecording: () => void,
<mask> getAppState: () => AppState,
<mask> getElements: () => readonly ExcalidrawElement[],
<mask> ) {
<mask> this.updater = updater;
<mask> this.resumeHistoryRecording = resumeHistoryRecording;
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove resumeHistoryRecording: () => void;
</s> add </s> remove () => {
history.resumeRecording();
},
</s> add </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove if (
</s> add const commitToHistory =
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep keep keep replace keep keep keep replace
|
<mask> );
<mask>
<mask> if (data.length === 0) {
<mask> return null;
<mask> }
<mask>
<mask> event.preventDefault();
<mask> if (
</s> move footer into layerUI & refactor ActionManager (#729) </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
</s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove data[0].commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
return data[0].perform(this.getElements(), this.getAppState(), null);
</s> add data[0].commitToHistory(this.getAppState(), this.getElements());
this.updater(
data[0].perform(this.getElements(), this.getAppState(), null),
commitToHistory,
);
return true; </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null;
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask>
<mask> event.preventDefault();
<mask> if (
<mask> data[0].commitToHistory &&
<mask> data[0].commitToHistory(this.getAppState(), this.getElements())
<mask> ) {
<mask> this.resumeHistoryRecording();
<mask> }
<mask> return data[0].perform(this.getElements(), this.getAppState(), null);
<mask> }
<mask>
<mask> getContextMenuItems(actionFilter: ActionFilterFn = action => action) {
<mask> return Object.values(this.actions)
<mask> .filter(actionFilter)
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove if (
</s> add const commitToHistory = </s> remove return null;
</s> add return false; </s> remove if (
</s> add const commitToHistory = </s> remove action.commitToHistory(this.getAppState(), this.getElements()) ===
true
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove action.commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove if (
</s> add const commitToHistory =
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep keep keep replace keep replace replace replace replace keep keep keep
|
<mask> .map(action => ({
<mask> label: action.contextItemLabel ? t(action.contextItemLabel) : "",
<mask> action: () => {
<mask> if (
<mask> action.commitToHistory &&
<mask> action.commitToHistory(this.getAppState(), this.getElements())
<mask> ) {
<mask> this.resumeHistoryRecording();
<mask> }
<mask> this.updater(
<mask> action.perform(this.getElements(), this.getAppState(), null),
<mask> );
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove action.commitToHistory(this.getAppState(), this.getElements()) ===
true
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove data[0].commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
return data[0].perform(this.getElements(), this.getAppState(), null);
</s> add data[0].commitToHistory(this.getAppState(), this.getElements());
this.updater(
data[0].perform(this.getElements(), this.getAppState(), null),
commitToHistory,
);
return true; </s> add commitToHistory, </s> remove if (
</s> add const commitToHistory = </s> remove handleKeyDown: (event: KeyboardEvent) => ActionResult | null;
</s> add handleKeyDown: (event: KeyboardEvent) => boolean;
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep keep add keep keep keep keep
|
<mask> action.commitToHistory(this.getAppState(), this.getElements());
<mask> this.updater(
<mask> action.perform(this.getElements(), this.getAppState(), null),
<mask> );
<mask> },
<mask> }));
<mask> }
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove action.commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove action.commitToHistory(this.getAppState(), this.getElements()) ===
true
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove data[0].commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
return data[0].perform(this.getElements(), this.getAppState(), null);
</s> add data[0].commitToHistory(this.getAppState(), this.getElements());
this.updater(
data[0].perform(this.getElements(), this.getAppState(), null),
commitToHistory,
);
return true; </s> add commitToHistory, </s> remove return null;
</s> add return false; </s> add prev.language === next.language &&
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep keep replace keep replace replace replace replace replace keep keep keep keep
|
<mask> const PanelComponent = action.PanelComponent!;
<mask> const updateData = (formState: any) => {
<mask> if (
<mask> action.commitToHistory &&
<mask> action.commitToHistory(this.getAppState(), this.getElements()) ===
<mask> true
<mask> ) {
<mask> this.resumeHistoryRecording();
<mask> }
<mask> this.updater(
<mask> action.perform(this.getElements(), this.getAppState(), formState),
<mask> );
<mask> };
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove action.commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove if (
</s> add const commitToHistory = </s> add commitToHistory, </s> remove data[0].commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
return data[0].perform(this.getElements(), this.getAppState(), null);
</s> add data[0].commitToHistory(this.getAppState(), this.getElements());
this.updater(
data[0].perform(this.getElements(), this.getAppState(), null),
commitToHistory,
);
return true; </s> remove if (
</s> add const commitToHistory =
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep add keep keep keep keep
|
<mask> this.updater(
<mask> action.perform(this.getElements(), this.getAppState(), formState),
<mask> );
<mask> };
<mask>
<mask> return (
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove action.commitToHistory(this.getAppState(), this.getElements()) ===
true
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> add commitToHistory, </s> remove action.commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove data[0].commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
return data[0].perform(this.getElements(), this.getAppState(), null);
</s> add data[0].commitToHistory(this.getAppState(), this.getElements());
this.updater(
data[0].perform(this.getElements(), this.getAppState(), null),
commitToHistory,
);
return true; </s> remove return null;
</s> add return false; </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/manager.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { AppState } from "../types";
<mask>
<mask> export type ActionResult = {
<mask> elements?: readonly ExcalidrawElement[];
<mask> appState?: AppState;
<mask> };
<mask>
<mask> type ActionFn = (
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove import { getLanguage } from "./i18n";
</s> add </s> add loadScene, </s> remove export type UpdaterFn = (res: ActionResult) => void;
</s> add export type UpdaterFn = (res: ActionResult, commitToHistory?: boolean) => void; </s> add language: string; </s> remove resumeHistoryRecording: () => void,
</s> add </s> remove this.resumeHistoryRecording = resumeHistoryRecording;
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/types.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> appState: AppState,
<mask> formData: any,
<mask> ) => ActionResult;
<mask>
<mask> export type UpdaterFn = (res: ActionResult) => void;
<mask> export type ActionFilterFn = (action: Action) => void;
<mask>
<mask> export interface Action {
<mask> name: string;
<mask> PanelComponent?: React.FC<{
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove handleKeyDown: (event: KeyboardEvent) => ActionResult | null;
</s> add handleKeyDown: (event: KeyboardEvent) => boolean; </s> remove resumeHistoryRecording: () => void;
</s> add </s> add language: string; </s> remove this.resumeHistoryRecording = resumeHistoryRecording;
</s> add </s> remove private syncActionResult = (res: ActionResult) => {
if (res.elements !== undefined) {
</s> add private syncActionResult = (
res: ActionResult,
commitToHistory: boolean = true,
) => {
if (res.elements) {
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/types.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> actions: {
<mask> [keyProp: string]: Action;
<mask> };
<mask> registerAction: (action: Action) => void;
<mask> handleKeyDown: (event: KeyboardEvent) => ActionResult | null;
<mask> getContextMenuItems: (
<mask> actionFilter: ActionFilterFn,
<mask> ) => { label: string; action: () => void }[];
<mask> renderAction: (name: string) => React.ReactElement | null;
<mask> }
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove resumeHistoryRecording: () => void;
</s> add </s> add language: string; </s> remove export type UpdaterFn = (res: ActionResult) => void;
</s> add export type UpdaterFn = (res: ActionResult, commitToHistory?: boolean) => void; </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove if (
</s> add const commitToHistory = </s> remove action.commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements());
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/actions/types.ts
|
keep keep replace keep keep keep keep keep
|
<mask> import { AppState } from "./types";
<mask> import { getDateTime } from "./utils";
<mask> import { getLanguage } from "./i18n";
<mask>
<mask> const DEFAULT_PROJECT_NAME = `excalidraw-${getDateTime()}`;
<mask>
<mask> export function getDefaultAppState(): AppState {
<mask> return {
</s> move footer into layerUI & refactor ActionManager (#729) </s> add loadScene, </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> add loadScene, </s> remove lng: getLanguage(),
</s> add </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/appState.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> scrolledOutside: false,
<mask> name: DEFAULT_PROJECT_NAME,
<mask> isResizing: false,
<mask> selectionElement: null,
<mask> lng: getLanguage(),
<mask> };
<mask> }
<mask>
<mask> export function clearAppStateForLocalStorage(appState: AppState) {
<mask> const {
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove lng: string;
</s> add </s> remove import { getLanguage } from "./i18n";
</s> add </s> remove export type UpdaterFn = (res: ActionResult) => void;
</s> add export type UpdaterFn = (res: ActionResult, commitToHistory?: boolean) => void; </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> add loadScene,
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/appState.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> clearSelection,
<mask> deleteSelectedElements,
<mask> getElementsWithinSelection,
<mask> isOverScrollBars,
<mask> restoreFromLocalStorage,
<mask> saveToLocalStorage,
<mask> getElementAtPosition,
<mask> createScene,
<mask> getElementContainingPosition,
<mask> hasBackground,
</s> move footer into layerUI & refactor ActionManager (#729) </s> add loadScene, </s> remove importFromBackend,
addToLoadedScenes,
</s> add </s> add language: string; </s> add loadScene, </s> remove lng: getLanguage(),
</s> add </s> remove import { getLanguage } from "./i18n";
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> hasBackground,
<mask> hasStroke,
<mask> hasText,
<mask> exportCanvas,
<mask> importFromBackend,
<mask> addToLoadedScenes,
<mask> loadedScenes,
<mask> calculateScrollCenter,
<mask> loadFromBlob,
<mask> } from "./scene";
<mask>
</s> move footer into layerUI & refactor ActionManager (#729) </s> add loadScene, </s> add loadScene, </s> remove import { getLanguage } from "./i18n";
</s> add </s> remove restoreFromLocalStorage,
</s> add </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> hasStroke,
<mask> hasText,
<mask> exportCanvas,
<mask> loadedScenes,
<mask> calculateScrollCenter,
<mask> loadFromBlob,
<mask> } from "./scene";
<mask>
<mask> import { renderScene } from "./renderer";
<mask> import { AppState } from "./types";
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove importFromBackend,
addToLoadedScenes,
</s> add </s> remove import { getLanguage } from "./i18n";
</s> add </s> add loadScene, </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove this.loadScene(null, undefined);
</s> add this.syncActionResult(await loadScene(null));
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> appState: AppState;
<mask> canvas: HTMLCanvasElement | null;
<mask> setAppState: any;
<mask> elements: readonly ExcalidrawElement[];
<mask> setElements: (elements: readonly ExcalidrawElement[]) => void;
<mask> }
<mask>
<mask> const LayerUI = React.memo(
<mask> ({
<mask> actionManager,
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove resumeHistoryRecording: () => void;
</s> add </s> remove resumeHistoryRecording: () => void,
</s> add </s> remove handleKeyDown: (event: KeyboardEvent) => ActionResult | null;
</s> add handleKeyDown: (event: KeyboardEvent) => boolean; </s> remove export type UpdaterFn = (res: ActionResult) => void;
</s> add export type UpdaterFn = (res: ActionResult, commitToHistory?: boolean) => void; </s> remove this.resumeHistoryRecording = resumeHistoryRecording;
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep add keep keep keep keep
|
<mask> appState,
<mask> setAppState,
<mask> canvas,
<mask> elements,
<mask> setElements,
<mask> }: LayerUIProps) => {
<mask> function renderCanvasActions() {
<mask> return (
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove this.syncActionResult({
elements,
appState,
} as ActionResult),
</s> add this.syncActionResult({ elements, appState }), </s> remove import { getLanguage } from "./i18n";
</s> add </s> remove () => {
history.resumeRecording();
},
</s> add </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
</s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove lng: getLanguage(),
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> </>
<mask> );
<mask> }
<mask>
<mask> return (
<mask> <>
<mask> <FixedSideContainer side="top">
<mask> <div className="App-menu App-menu_top">
<mask> <Stack.Col gap={4} align="end">
<mask> <section
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove <FixedSideContainer side="top">
<div className="App-menu App-menu_top">
<Stack.Col gap={4} align="end">
<section
className="App-right-menu"
aria-labelledby="canvas-actions-title"
>
<h2 className="visually-hidden" id="canvas-actions-title">
{t("headings.canvasActions")}
</h2>
<Island padding={4}>{renderCanvasActions()}</Island>
</s> add <>
<FixedSideContainer side="top">
<div className="App-menu App-menu_top">
<Stack.Col gap={4} align="end">
<section
className="App-right-menu"
aria-labelledby="canvas-actions-title"
>
<h2 className="visually-hidden" id="canvas-actions-title">
{t("headings.canvasActions")}
</h2>
<Island padding={4}>{renderCanvasActions()}</Island>
</section>
<section
className="App-right-menu"
aria-labelledby="selected-shape-title"
>
<h2 className="visually-hidden" id="selected-shape-title">
{t("headings.selectedShapeActions")}
</h2>
{renderSelectedShapeActions(elements)}
</section>
</Stack.Col>
<section aria-labelledby="shapes-title">
<Stack.Col gap={4} align="start">
<Stack.Row gap={1}>
<Island padding={1}>
<h2 className="visually-hidden" id="shapes-title">
{t("headings.shapes")}
</h2>
<Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
</Island>
<LockIcon
checked={appState.elementLocked}
onChange={() => {
setAppState({
elementLocked: !appState.elementLocked,
elementType: appState.elementLocked
? "selection"
: appState.elementType,
});
}}
title={t("toolBar.lock")}
/>
</Stack.Row>
</Stack.Col> </s> remove <h2 className="visually-hidden" id="selected-shape-title">
{t("headings.selectedShapeActions")}
</h2>
{renderSelectedShapeActions(elements)}
</section>
</Stack.Col>
<section aria-labelledby="shapes-title">
<Stack.Col gap={4} align="start">
<Stack.Row gap={1}>
<Island padding={1}>
<h2 className="visually-hidden" id="shapes-title">
{t("headings.shapes")}
</h2>
<Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
</Island>
<LockIcon
checked={appState.elementLocked}
onChange={() => {
setAppState({
elementLocked: !appState.elementLocked,
elementType: appState.elementLocked
? "selection"
: appState.elementType,
});
}}
title={t("toolBar.lock")}
/>
</Stack.Row>
</Stack.Col>
</section>
<div />
</div>
</FixedSideContainer>
</s> add {t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</> </s> remove <section
className="App-right-menu"
aria-labelledby="selected-shape-title"
</s> add <div />
</div>
</FixedSideContainer>
<footer role="contentinfo">
<HintViewer
elementType={appState.elementType}
multiMode={appState.multiElement !== null}
isResizing={appState.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
setAppState({});
}}
languages={languages}
currentLanguage={language}
/>
{renderIdsDropdown()}
{appState.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
setAppState({ ...calculateScrollCenter(elements) });
}} </s> remove return null;
</s> add return false; </s> remove data[0].commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
return data[0].perform(this.getElements(), this.getAppState(), null);
</s> add data[0].commitToHistory(this.getAppState(), this.getElements());
this.updater(
data[0].perform(this.getElements(), this.getAppState(), null),
commitToHistory,
);
return true; </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep replace replace replace
|
<mask> }
<mask>
<mask> return (
<mask> <FixedSideContainer side="top">
<mask> <div className="App-menu App-menu_top">
<mask> <Stack.Col gap={4} align="end">
<mask> <section
<mask> className="App-right-menu"
<mask> aria-labelledby="canvas-actions-title"
<mask> >
<mask> <h2 className="visually-hidden" id="canvas-actions-title">
<mask> {t("headings.canvasActions")}
<mask> </h2>
<mask> <Island padding={4}>{renderCanvasActions()}</Island>
<mask> </section>
<mask> <section
<mask> className="App-right-menu"
<mask> aria-labelledby="selected-shape-title"
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove <h2 className="visually-hidden" id="selected-shape-title">
{t("headings.selectedShapeActions")}
</h2>
{renderSelectedShapeActions(elements)}
</section>
</Stack.Col>
<section aria-labelledby="shapes-title">
<Stack.Col gap={4} align="start">
<Stack.Row gap={1}>
<Island padding={1}>
<h2 className="visually-hidden" id="shapes-title">
{t("headings.shapes")}
</h2>
<Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
</Island>
<LockIcon
checked={appState.elementLocked}
onChange={() => {
setAppState({
elementLocked: !appState.elementLocked,
elementType: appState.elementLocked
? "selection"
: appState.elementType,
});
}}
title={t("toolBar.lock")}
/>
</Stack.Row>
</Stack.Col>
</section>
<div />
</div>
</FixedSideContainer>
</s> add {t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</> </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
</s> remove <footer role="contentinfo">
<HintViewer
elementType={this.state.elementType}
multiMode={this.state.multiElement !== null}
isResizing={this.state.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
this.setState({ lng });
}}
languages={languages}
currentLanguage={getLanguage()}
/>
{this.renderIdsDropdown()}
{this.state.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
this.setState({ ...calculateScrollCenter(elements) });
}}
>
{t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</s> add </s> remove this.syncActionResult({
elements,
appState,
} as ActionResult),
</s> add this.syncActionResult({ elements, appState }), </s> remove return null;
</s> add return false;
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> <section
<mask> className="App-right-menu"
<mask> aria-labelledby="selected-shape-title"
<mask> >
<mask> <h2 className="visually-hidden" id="selected-shape-title">
<mask> {t("headings.selectedShapeActions")}
<mask> </h2>
<mask> {renderSelectedShapeActions(elements)}
<mask> </section>
<mask> </Stack.Col>
<mask> <section aria-labelledby="shapes-title">
<mask> <Stack.Col gap={4} align="start">
<mask> <Stack.Row gap={1}>
<mask> <Island padding={1}>
<mask> <h2 className="visually-hidden" id="shapes-title">
<mask> {t("headings.shapes")}
<mask> </h2>
<mask> <Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
<mask> </Island>
<mask> <LockIcon
<mask> checked={appState.elementLocked}
<mask> onChange={() => {
<mask> setAppState({
<mask> elementLocked: !appState.elementLocked,
<mask> elementType: appState.elementLocked
<mask> ? "selection"
<mask> : appState.elementType,
<mask> });
<mask> }}
<mask> title={t("toolBar.lock")}
<mask> />
<mask> </Stack.Row>
<mask> </Stack.Col>
<mask> </section>
<mask> <div />
<mask> </div>
<mask> </FixedSideContainer>
<mask> );
<mask> },
<mask> (prev, next) => {
<mask> const getNecessaryObj = (appState: AppState): Partial<AppState> => {
<mask> const {
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove <FixedSideContainer side="top">
<div className="App-menu App-menu_top">
<Stack.Col gap={4} align="end">
<section
className="App-right-menu"
aria-labelledby="canvas-actions-title"
>
<h2 className="visually-hidden" id="canvas-actions-title">
{t("headings.canvasActions")}
</h2>
<Island padding={4}>{renderCanvasActions()}</Island>
</s> add <>
<FixedSideContainer side="top">
<div className="App-menu App-menu_top">
<Stack.Col gap={4} align="end">
<section
className="App-right-menu"
aria-labelledby="canvas-actions-title"
>
<h2 className="visually-hidden" id="canvas-actions-title">
{t("headings.canvasActions")}
</h2>
<Island padding={4}>{renderCanvasActions()}</Island>
</section>
<section
className="App-right-menu"
aria-labelledby="selected-shape-title"
>
<h2 className="visually-hidden" id="selected-shape-title">
{t("headings.selectedShapeActions")}
</h2>
{renderSelectedShapeActions(elements)}
</section>
</Stack.Col>
<section aria-labelledby="shapes-title">
<Stack.Col gap={4} align="start">
<Stack.Row gap={1}>
<Island padding={1}>
<h2 className="visually-hidden" id="shapes-title">
{t("headings.shapes")}
</h2>
<Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
</Island>
<LockIcon
checked={appState.elementLocked}
onChange={() => {
setAppState({
elementLocked: !appState.elementLocked,
elementType: appState.elementLocked
? "selection"
: appState.elementType,
});
}}
title={t("toolBar.lock")}
/>
</Stack.Row>
</Stack.Col> </s> remove <section
className="App-right-menu"
aria-labelledby="selected-shape-title"
</s> add <div />
</div>
</FixedSideContainer>
<footer role="contentinfo">
<HintViewer
elementType={appState.elementType}
multiMode={appState.multiElement !== null}
isResizing={appState.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
setAppState({});
}}
languages={languages}
currentLanguage={language}
/>
{renderIdsDropdown()}
{appState.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
setAppState({ ...calculateScrollCenter(elements) });
}} </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
</s> remove <footer role="contentinfo">
<HintViewer
elementType={this.state.elementType}
multiMode={this.state.multiElement !== null}
isResizing={this.state.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
this.setState({ lng });
}}
languages={languages}
currentLanguage={getLanguage()}
/>
{this.renderIdsDropdown()}
{this.state.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
this.setState({ ...calculateScrollCenter(elements) });
}}
>
{t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</s> add </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove if (
</s> add const commitToHistory =
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> const keys = Object.keys(prevAppState) as (keyof Partial<AppState>)[];
<mask>
<mask> return (
<mask> prev.elements === next.elements &&
<mask> keys.every(k => prevAppState[k] === nextAppState[k])
<mask> );
<mask> },
<mask> );
<mask>
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove return null;
</s> add return false; </s> remove action.commitToHistory(this.getAppState(), this.getElements()) ===
true
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove this.syncActionResult({
elements,
appState,
} as ActionResult),
</s> add this.syncActionResult({ elements, appState }), </s> remove if (
</s> add const commitToHistory = </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> constructor(props: any) {
<mask> super(props);
<mask> this.actionManager = new ActionManager(
<mask> this.syncActionResult,
<mask> () => {
<mask> history.resumeRecording();
<mask> },
<mask> () => this.state,
<mask> () => elements,
<mask> );
<mask> this.actionManager.registerAction(actionFinalize);
<mask> this.actionManager.registerAction(actionDeleteSelected);
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove resumeHistoryRecording: () => void,
</s> add </s> remove resumeHistoryRecording: () => void;
</s> add </s> remove this.resumeHistoryRecording = resumeHistoryRecording;
</s> add </s> remove action.commitToHistory(this.getAppState(), this.getElements())
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements()); </s> remove if (
</s> add const commitToHistory =
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> this.canvasOnlyActions = [actionSelectAll];
<mask> }
<mask>
<mask> private syncActionResult = (res: ActionResult) => {
<mask> if (res.elements !== undefined) {
<mask> elements = res.elements;
<mask> this.setState({});
<mask> }
<mask>
<mask> if (res.appState !== undefined) {
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove if (res.appState !== undefined) {
</s> add if (res.appState) {
if (commitToHistory) {
history.resumeRecording();
} </s> add if (commitToHistory) {
history.resumeRecording();
} </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove export type UpdaterFn = (res: ActionResult) => void;
</s> add export type UpdaterFn = (res: ActionResult, commitToHistory?: boolean) => void; </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> ) => {
<mask> if (res.elements) {
<mask> elements = res.elements;
<mask> this.setState({});
<mask> }
<mask>
<mask> if (res.appState) {
<mask> if (commitToHistory) {
<mask> history.resumeRecording();
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove if (res.appState !== undefined) {
</s> add if (res.appState) {
if (commitToHistory) {
history.resumeRecording();
} </s> remove private syncActionResult = (res: ActionResult) => {
if (res.elements !== undefined) {
</s> add private syncActionResult = (
res: ActionResult,
commitToHistory: boolean = true,
) => {
if (res.elements) { </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove const actionResult = this.actionManager.handleKeyDown(event);
if (actionResult) {
this.syncActionResult(actionResult);
if (actionResult) {
return;
}
</s> add if (this.actionManager.handleKeyDown(event)) {
return; </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove () => {
history.resumeRecording();
},
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> elements = res.elements;
<mask> this.setState({});
<mask> }
<mask>
<mask> if (res.appState !== undefined) {
<mask> this.setState({ ...res.appState });
<mask> }
<mask> };
<mask>
<mask> private onCut = (e: ClipboardEvent) => {
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove private syncActionResult = (res: ActionResult) => {
if (res.elements !== undefined) {
</s> add private syncActionResult = (
res: ActionResult,
commitToHistory: boolean = true,
) => {
if (res.elements) { </s> add if (commitToHistory) {
history.resumeRecording();
} </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove <footer role="contentinfo">
<HintViewer
elementType={this.state.elementType}
multiMode={this.state.multiElement !== null}
isResizing={this.state.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
this.setState({ lng });
}}
languages={languages}
currentLanguage={getLanguage()}
/>
{this.renderIdsDropdown()}
{this.state.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
this.setState({ ...calculateScrollCenter(elements) });
}}
>
{t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</s> add </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> this.saveDebounced();
<mask> this.saveDebounced.flush();
<mask> };
<mask>
<mask> private async loadScene(id: string | null, k: string | undefined) {
<mask> let data;
<mask> let selectedId;
<mask> if (id != null) {
<mask> // k is the private key used to decrypt the content from the server, take
<mask> // extra care not to leak it
<mask> data = await importFromBackend(id, k);
<mask> addToLoadedScenes(id, k);
<mask> selectedId = id;
<mask> window.history.replaceState({}, "Excalidraw", window.location.origin);
<mask> } else {
<mask> data = restoreFromLocalStorage();
<mask> }
<mask>
<mask> if (data.elements) {
<mask> elements = data.elements;
<mask> }
<mask>
<mask> if (data.appState) {
<mask> history.resumeRecording();
<mask> this.setState({ ...data.appState, selectedId });
<mask> } else {
<mask> this.setState({});
<mask> }
<mask> }
<mask>
<mask> public async componentDidMount() {
<mask> document.addEventListener("copy", this.onCopy);
<mask> document.addEventListener("paste", this.pasteFromClipboard);
<mask> document.addEventListener("cut", this.onCut);
<mask>
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove if (res.appState !== undefined) {
</s> add if (res.appState) {
if (commitToHistory) {
history.resumeRecording();
} </s> remove private syncActionResult = (res: ActionResult) => {
if (res.elements !== undefined) {
</s> add private syncActionResult = (
res: ActionResult,
commitToHistory: boolean = true,
) => {
if (res.elements) { </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> add if (commitToHistory) {
history.resumeRecording();
} </s> remove this.loadScene(id, undefined);
</s> add this.syncActionResult(await loadScene(id)); </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const id = searchParams.get("id");
<mask>
<mask> if (id) {
<mask> // Backwards compatibility with legacy url format
<mask> this.loadScene(id, undefined);
<mask> } else {
<mask> const match = window.location.hash.match(
<mask> /^#json=([0-9]+),([a-zA-Z0-9_-]+)$/,
<mask> );
<mask> if (match) {
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove this.loadScene(match[1], match[2]);
</s> add this.syncActionResult(await loadScene(match[1], match[2])); </s> remove this.loadScene(null, undefined);
</s> add this.syncActionResult(await loadScene(null)); </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove const actionResult = this.actionManager.handleKeyDown(event);
if (actionResult) {
this.syncActionResult(actionResult);
if (actionResult) {
return;
}
</s> add if (this.actionManager.handleKeyDown(event)) {
return;
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace keep replace
|
<mask> const match = window.location.hash.match(
<mask> /^#json=([0-9]+),([a-zA-Z0-9_-]+)$/,
<mask> );
<mask> if (match) {
<mask> this.loadScene(match[1], match[2]);
<mask> } else {
<mask> this.loadScene(null, undefined);
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove this.loadScene(id, undefined);
</s> add this.syncActionResult(await loadScene(id)); </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove const actionResult = this.actionManager.handleKeyDown(event);
if (actionResult) {
this.syncActionResult(actionResult);
if (actionResult) {
return;
}
</s> add if (this.actionManager.handleKeyDown(event)) {
return; </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> ) {
<mask> return;
<mask> }
<mask>
<mask> const actionResult = this.actionManager.handleKeyDown(event);
<mask>
<mask> if (actionResult) {
<mask> this.syncActionResult(actionResult);
<mask> if (actionResult) {
<mask> return;
<mask> }
<mask> }
<mask>
<mask> const shape = findShapeByKey(event.key);
<mask>
<mask> if (isArrowKey(event.key)) {
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
</s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> add if (commitToHistory) {
history.resumeRecording();
} </s> remove this.loadScene(match[1], match[2]);
</s> add this.syncActionResult(await loadScene(match[1], match[2])); </s> remove private syncActionResult = (res: ActionResult) => {
if (res.elements !== undefined) {
</s> add private syncActionResult = (
res: ActionResult,
commitToHistory: boolean = true,
) => {
if (res.elements) {
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep add keep keep keep keep keep
|
<mask> actionManager={this.actionManager}
<mask> elements={elements}
<mask> setElements={this.setElements}
<mask> />
<mask> <main>
<mask> <canvas
<mask> id="canvas"
<mask> style={{
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove <section
className="App-right-menu"
aria-labelledby="selected-shape-title"
</s> add <div />
</div>
</FixedSideContainer>
<footer role="contentinfo">
<HintViewer
elementType={appState.elementType}
multiMode={appState.multiElement !== null}
isResizing={appState.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
setAppState({});
}}
languages={languages}
currentLanguage={language}
/>
{renderIdsDropdown()}
{appState.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
setAppState({ ...calculateScrollCenter(elements) });
}} </s> remove <footer role="contentinfo">
<HintViewer
elementType={this.state.elementType}
multiMode={this.state.multiElement !== null}
isResizing={this.state.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
this.setState({ lng });
}}
languages={languages}
currentLanguage={getLanguage()}
/>
{this.renderIdsDropdown()}
{this.state.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
this.setState({ ...calculateScrollCenter(elements) });
}}
>
{t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</s> add </s> remove <h2 className="visually-hidden" id="selected-shape-title">
{t("headings.selectedShapeActions")}
</h2>
{renderSelectedShapeActions(elements)}
</section>
</Stack.Col>
<section aria-labelledby="shapes-title">
<Stack.Col gap={4} align="start">
<Stack.Row gap={1}>
<Island padding={1}>
<h2 className="visually-hidden" id="shapes-title">
{t("headings.shapes")}
</h2>
<Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
</Island>
<LockIcon
checked={appState.elementLocked}
onChange={() => {
setAppState({
elementLocked: !appState.elementLocked,
elementType: appState.elementLocked
? "selection"
: appState.elementType,
});
}}
title={t("toolBar.lock")}
/>
</Stack.Row>
</Stack.Col>
</section>
<div />
</div>
</FixedSideContainer>
</s> add {t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</> </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
</s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove <FixedSideContainer side="top">
<div className="App-menu App-menu_top">
<Stack.Col gap={4} align="end">
<section
className="App-right-menu"
aria-labelledby="canvas-actions-title"
>
<h2 className="visually-hidden" id="canvas-actions-title">
{t("headings.canvasActions")}
</h2>
<Island padding={4}>{renderCanvasActions()}</Island>
</s> add <>
<FixedSideContainer side="top">
<div className="App-menu App-menu_top">
<Stack.Col gap={4} align="end">
<section
className="App-right-menu"
aria-labelledby="canvas-actions-title"
>
<h2 className="visually-hidden" id="canvas-actions-title">
{t("headings.canvasActions")}
</h2>
<Island padding={4}>{renderCanvasActions()}</Island>
</section>
<section
className="App-right-menu"
aria-labelledby="selected-shape-title"
>
<h2 className="visually-hidden" id="selected-shape-title">
{t("headings.selectedShapeActions")}
</h2>
{renderSelectedShapeActions(elements)}
</section>
</Stack.Col>
<section aria-labelledby="shapes-title">
<Stack.Col gap={4} align="start">
<Stack.Row gap={1}>
<Island padding={1}>
<h2 className="visually-hidden" id="shapes-title">
{t("headings.shapes")}
</h2>
<Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
</Island>
<LockIcon
checked={appState.elementLocked}
onChange={() => {
setAppState({
elementLocked: !appState.elementLocked,
elementType: appState.elementLocked
? "selection"
: appState.elementType,
});
}}
title={t("toolBar.lock")}
/>
</Stack.Row>
</Stack.Col>
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> const file = e.dataTransfer.files[0];
<mask> if (file?.type === "application/json") {
<mask> loadFromBlob(file)
<mask> .then(({ elements, appState }) =>
<mask> this.syncActionResult({
<mask> elements,
<mask> appState,
<mask> } as ActionResult),
<mask> )
<mask> .catch(err => console.error(err));
<mask> }
<mask> }}
<mask> >
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove contents = await (async () => {
return new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
});
})();
</s> add contents = await new Promise(resolve => {
const reader = new FileReader();
reader.readAsText(blob, "utf8");
reader.onloadend = () => {
if (reader.readyState === FileReader.DONE) {
resolve(reader.result as string);
}
};
}); </s> add language, </s> remove () => {
history.resumeRecording();
},
</s> add </s> remove <footer role="contentinfo">
<HintViewer
elementType={this.state.elementType}
multiMode={this.state.multiElement !== null}
isResizing={this.state.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
this.setState({ lng });
}}
languages={languages}
currentLanguage={getLanguage()}
/>
{this.renderIdsDropdown()}
{this.state.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
this.setState({ ...calculateScrollCenter(elements) });
}}
>
{t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</s> add </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove action.commitToHistory(this.getAppState(), this.getElements()) ===
true
) {
this.resumeHistoryRecording();
}
</s> add action.commitToHistory(this.getAppState(), this.getElements());
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep
|
<mask> {t("labels.drawingCanvas")}
<mask> </canvas>
<mask> </main>
<mask> <footer role="contentinfo">
<mask> <HintViewer
<mask> elementType={this.state.elementType}
<mask> multiMode={this.state.multiElement !== null}
<mask> isResizing={this.state.isResizing}
<mask> elements={elements}
<mask> />
<mask>
<mask> <LanguageList
<mask> onChange={lng => {
<mask> setLanguage(lng);
<mask> this.setState({ lng });
<mask> }}
<mask> languages={languages}
<mask> currentLanguage={getLanguage()}
<mask> />
<mask> {this.renderIdsDropdown()}
<mask> {this.state.scrolledOutside && (
<mask> <button
<mask> className="scroll-back-to-content"
<mask> onClick={() => {
<mask> this.setState({ ...calculateScrollCenter(elements) });
<mask> }}
<mask> >
<mask> {t("buttons.scrollBackToContent")}
<mask> </button>
<mask> )}
<mask> </footer>
<mask> </div>
<mask> );
<mask> }
<mask>
<mask> private renderIdsDropdown() {
<mask> const scenes = loadedScenes();
<mask> if (scenes.length === 0) {
<mask> return;
<mask> }
<mask> return (
<mask> <StoredScenesList
<mask> scenes={scenes}
<mask> currentId={this.state.selectedId}
<mask> onChange={(id, k) => this.loadScene(id, k)}
<mask> />
<mask> );
<mask> }
<mask>
<mask> private handleWheel = (e: WheelEvent) => {
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove <section
className="App-right-menu"
aria-labelledby="selected-shape-title"
</s> add <div />
</div>
</FixedSideContainer>
<footer role="contentinfo">
<HintViewer
elementType={appState.elementType}
multiMode={appState.multiElement !== null}
isResizing={appState.isResizing}
elements={elements}
/>
<LanguageList
onChange={lng => {
setLanguage(lng);
setAppState({});
}}
languages={languages}
currentLanguage={language}
/>
{renderIdsDropdown()}
{appState.scrolledOutside && (
<button
className="scroll-back-to-content"
onClick={() => {
setAppState({ ...calculateScrollCenter(elements) });
}} </s> add function renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={appState.selectedId}
onChange={async (id, k) =>
actionManager.updater(await loadScene(id, k))
}
/>
);
}
</s> remove if (res.appState !== undefined) {
</s> add if (res.appState) {
if (commitToHistory) {
history.resumeRecording();
} </s> remove <h2 className="visually-hidden" id="selected-shape-title">
{t("headings.selectedShapeActions")}
</h2>
{renderSelectedShapeActions(elements)}
</section>
</Stack.Col>
<section aria-labelledby="shapes-title">
<Stack.Col gap={4} align="start">
<Stack.Row gap={1}>
<Island padding={1}>
<h2 className="visually-hidden" id="shapes-title">
{t("headings.shapes")}
</h2>
<Stack.Row gap={1}>{renderShapesSwitcher()}</Stack.Row>
</Island>
<LockIcon
checked={appState.elementLocked}
onChange={() => {
setAppState({
elementLocked: !appState.elementLocked,
elementType: appState.elementLocked
? "selection"
: appState.elementType,
});
}}
title={t("toolBar.lock")}
/>
</Stack.Row>
</Stack.Col>
</section>
<div />
</div>
</FixedSideContainer>
</s> add {t("buttons.scrollBackToContent")}
</button>
)}
</footer>
</> </s> remove private syncActionResult = (res: ActionResult) => {
if (res.elements !== undefined) {
</s> add private syncActionResult = (
res: ActionResult,
commitToHistory: boolean = true,
) => {
if (res.elements) {
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/index.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> let contents;
<mask> if ("text" in Blob) {
<mask> contents = await blob.text();
<mask> } else {
<mask> contents = await (async () => {
<mask> return new Promise(resolve => {
<mask> const reader = new FileReader();
<mask> reader.readAsText(blob, "utf8");
<mask> reader.onloadend = () => {
<mask> if (reader.readyState === FileReader.DONE) {
<mask> resolve(reader.result as string);
<mask> }
<mask> };
<mask> });
<mask> })();
<mask> }
<mask> const { elements, appState } = updateAppState(contents);
<mask> if (!elements.length) {
<mask> return Promise.reject("Cannot load invalid json");
<mask> }
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove () => {
history.resumeRecording();
},
</s> add </s> remove this.syncActionResult({
elements,
appState,
} as ActionResult),
</s> add this.syncActionResult({ elements, appState }), </s> remove private async loadScene(id: string | null, k: string | undefined) {
let data;
let selectedId;
if (id != null) {
// k is the private key used to decrypt the content from the server, take
// extra care not to leak it
data = await importFromBackend(id, k);
addToLoadedScenes(id, k);
selectedId = id;
window.history.replaceState({}, "Excalidraw", window.location.origin);
} else {
data = restoreFromLocalStorage();
}
if (data.elements) {
elements = data.elements;
}
if (data.appState) {
history.resumeRecording();
this.setState({ ...data.appState, selectedId });
} else {
this.setState({});
}
}
</s> add </s> remove private renderIdsDropdown() {
const scenes = loadedScenes();
if (scenes.length === 0) {
return;
}
return (
<StoredScenesList
scenes={scenes}
currentId={this.state.selectedId}
onChange={(id, k) => this.loadScene(id, k)}
/>
);
}
</s> add </s> remove if (res.appState !== undefined) {
</s> add if (res.appState) {
if (commitToHistory) {
history.resumeRecording();
} </s> remove this.resumeHistoryRecording = resumeHistoryRecording;
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/scene/data.ts
|
keep keep add keep keep keep keep keep keep
|
<mask> importFromBackend,
<mask> addToLoadedScenes,
<mask> loadedScenes,
<mask> calculateScrollCenter,
<mask> } from "./data";
<mask> export {
<mask> hasBackground,
<mask> hasStroke,
<mask> getElementAtPosition,
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove importFromBackend,
addToLoadedScenes,
</s> add </s> add loadScene, </s> remove import { getLanguage } from "./i18n";
</s> add </s> remove restoreFromLocalStorage,
</s> add </s> remove elements?: readonly ExcalidrawElement[];
appState?: AppState;
</s> add elements?: readonly ExcalidrawElement[] | null;
appState?: AppState | null; </s> remove lng: getLanguage(),
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/scene/index.ts
|
keep keep keep keep replace keep
|
<mask> scrolledOutside: boolean;
<mask> name: string;
<mask> selectedId?: string;
<mask> isResizing: boolean;
<mask> lng: string;
<mask> };
</s> move footer into layerUI & refactor ActionManager (#729) </s> remove lng: getLanguage(),
</s> add </s> remove handleKeyDown: (event: KeyboardEvent) => ActionResult | null;
</s> add handleKeyDown: (event: KeyboardEvent) => boolean; </s> remove export type UpdaterFn = (res: ActionResult) => void;
</s> add export type UpdaterFn = (res: ActionResult, commitToHistory?: boolean) => void; </s> add language: string; </s> add commitToHistory, </s> remove if (res.appState !== undefined) {
</s> add if (res.appState) {
if (commitToHistory) {
history.resumeRecording();
}
|
https://github.com/excalidraw/excalidraw/commit/d79293de06d6f29643e25df3ed8261e7e37431d2
|
src/types.ts
|
keep add keep keep keep keep
|
<mask> "@excalidraw/eslint-config": "1.0.0",
<mask> "@excalidraw/prettier-config": "1.0.2",
<mask> "@types/lodash.throttle": "4.1.6",
<mask> "@types/pako": "1.0.1",
<mask> "@types/resize-observer-browser": "0.1.5",
<mask> "chai": "4.3.4",
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> add "chai": "4.3.4", </s> remove elements.filter((el) => el.isDeleted || !isInvisiblySmallElement(el));
</s> add elements.filter((element) => this.isSyncableElement(element)); </s> remove this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
</s> add this.setLastBroadcastedOrReceivedSceneVersion(
getSceneVersion(reconciledElements),
); </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
); </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
package.json
|
keep keep keep add keep keep keep keep keep
|
<mask> "@types/chai": "4.2.22",
<mask> "@types/lodash.throttle": "4.1.6",
<mask> "@types/pako": "1.0.1",
<mask> "@types/resize-observer-browser": "0.1.5",
<mask> "eslint-config-prettier": "8.3.0",
<mask> "eslint-plugin-prettier": "3.3.1",
<mask> "firebase-tools": "9.9.0",
<mask> "husky": "4.3.8",
<mask> "jest-canvas-mock": "2.3.1",
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> add "@types/chai": "4.2.22", </s> remove elements.filter((el) => el.isDeleted || !isInvisiblySmallElement(el));
</s> add elements.filter((element) => this.isSyncableElement(element)); </s> remove this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
</s> add this.setLastBroadcastedOrReceivedSceneVersion(
getSceneVersion(reconciledElements),
); </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
); </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
package.json
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> import {
<mask> ExcalidrawElement,
<mask> InitializedExcalidrawImageElement,
<mask> } from "../../element/types";
<mask> import {
<mask> getElementMap,
<mask> getSceneVersion,
<mask> } from "../../packages/excalidraw/index";
<mask> import { Collaborator, Gesture } from "../../types";
<mask> import {
<mask> preventUnload,
<mask> resolvablePromise,
<mask> withBatchedUpdates,
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> add import {
ReconciledElements,
reconcileElements as _reconcileElements,
} from "./reconciliation"; </s> remove type ReconciledElements = readonly ExcalidrawElement[] & {
_brand: "reconciledElements";
};
</s> add </s> remove syncableElements: ExcalidrawElement[] = this.getSyncableElements(
</s> add syncableElements: readonly ExcalidrawElement[] = this.getSyncableElements( </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
); </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> isImageElement,
<mask> isInitializedImageElement,
<mask> } from "../../element/typeChecks";
<mask> import { mutateElement } from "../../element/mutateElement";
<mask>
<mask> interface CollabState {
<mask> modalIsShown: boolean;
<mask> errorMessage: string;
<mask> username: string;
<mask> userState: UserIdleState;
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> remove import {
getElementMap,
getSceneVersion,
} from "../../packages/excalidraw/index";
</s> add import { getSceneVersion } from "../../packages/excalidraw/index"; </s> remove type ReconciledElements = readonly ExcalidrawElement[] & {
_brand: "reconciledElements";
};
</s> add </s> remove syncableElements: ExcalidrawElement[] = this.getSyncableElements(
</s> add syncableElements: readonly ExcalidrawElement[] = this.getSyncableElements( </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
); </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> broadcastElements: CollabInstance["broadcastElements"];
<mask> fetchImageFilesFromFirebase: CollabInstance["fetchImageFilesFromFirebase"];
<mask> }
<mask>
<mask> type ReconciledElements = readonly ExcalidrawElement[] & {
<mask> _brand: "reconciledElements";
<mask> };
<mask>
<mask> interface Props {
<mask> excalidrawAPI: ExcalidrawImperativeAPI;
<mask> onRoomClose?: () => void;
<mask> }
<mask>
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> remove syncableElements: ExcalidrawElement[] = this.getSyncableElements(
</s> add syncableElements: readonly ExcalidrawElement[] = this.getSyncableElements( </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[], </s> add import {
ReconciledElements,
reconcileElements as _reconcileElements,
} from "./reconciliation"; </s> remove this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
</s> add this.setLastBroadcastedOrReceivedSceneVersion(
getSceneVersion(reconciledElements),
); </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
);
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> });
<mask>
<mask> saveCollabRoomToFirebase = async (
<mask> syncableElements: ExcalidrawElement[] = this.getSyncableElements(
<mask> this.excalidrawAPI.getSceneElementsIncludingDeleted(),
<mask> ),
<mask> ) => {
<mask> try {
<mask> await saveToFirebase(this.portal, syncableElements);
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
); </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove type ReconciledElements = readonly ExcalidrawElement[] & {
_brand: "reconciledElements";
};
</s> add </s> remove elements.filter((el) => el.isDeleted || !isInvisiblySmallElement(el));
</s> add elements.filter((element) => this.isSyncableElement(element)); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[], </s> remove this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
</s> add this.setLastBroadcastedOrReceivedSceneVersion(
getSceneVersion(reconciledElements),
);
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep replace keep replace replace replace replace replace keep
|
<mask>
<mask> private reconcileElements = (
<mask> elements: readonly ExcalidrawElement[],
<mask> ): ReconciledElements => {
<mask> const currentElements = this.getSceneElementsIncludingDeleted();
<mask> // create a map of ids so we don't have to iterate
<mask> // over the array more than once.
<mask> const localElementMap = getElementMap(currentElements);
<mask>
<mask> const appState = this.excalidrawAPI.getAppState();
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
); </s> remove this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
</s> add this.setLastBroadcastedOrReceivedSceneVersion(
getSceneVersion(reconciledElements),
); </s> remove syncableElements: ExcalidrawElement[] = this.getSyncableElements(
</s> add syncableElements: readonly ExcalidrawElement[] = this.getSyncableElements( </s> remove type ReconciledElements = readonly ExcalidrawElement[] & {
_brand: "reconciledElements";
};
</s> add </s> remove elements.filter((el) => el.isDeleted || !isInvisiblySmallElement(el));
</s> add elements.filter((element) => this.isSyncableElement(element));
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> const localElementMap = getElementMap(currentElements);
<mask>
<mask> const appState = this.excalidrawAPI.getAppState();
<mask>
<mask> // Reconcile
<mask> const newElements: readonly ExcalidrawElement[] = elements
<mask> .reduce((elements, element) => {
<mask> // if the remote element references one that's currently
<mask> // edited on local, skip it (it'll be added in the next step)
<mask> if (
<mask> element.id === appState.editingElement?.id ||
<mask> element.id === appState.resizingElement?.id ||
<mask> element.id === appState.draggingElement?.id
<mask> ) {
<mask> return elements;
<mask> }
<mask>
<mask> if (
<mask> localElementMap.hasOwnProperty(element.id) &&
<mask> localElementMap[element.id].version > element.version
<mask> ) {
<mask> elements.push(localElementMap[element.id]);
<mask> delete localElementMap[element.id];
<mask> } else if (
<mask> localElementMap.hasOwnProperty(element.id) &&
<mask> localElementMap[element.id].version === element.version &&
<mask> localElementMap[element.id].versionNonce !== element.versionNonce
<mask> ) {
<mask> // resolve conflicting edits deterministically by taking the one with the lowest versionNonce
<mask> if (localElementMap[element.id].versionNonce < element.versionNonce) {
<mask> elements.push(localElementMap[element.id]);
<mask> } else {
<mask> // it should be highly unlikely that the two versionNonces are the same. if we are
<mask> // really worried about this, we can replace the versionNonce with the socket id.
<mask> elements.push(element);
<mask> }
<mask> delete localElementMap[element.id];
<mask> } else {
<mask> elements.push(element);
<mask> delete localElementMap[element.id];
<mask> }
<mask>
<mask> return elements;
<mask> }, [] as Mutable<typeof elements>)
<mask> // add local elements that weren't deleted or on remote
<mask> .concat(...Object.values(localElementMap));
<mask>
<mask> // Avoid broadcasting to the rest of the collaborators the scene
<mask> // we just received!
<mask> // Note: this needs to be set before updating the scene as it
<mask> // synchronously calls render.
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> remove this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
</s> add this.setLastBroadcastedOrReceivedSceneVersion(
getSceneVersion(reconciledElements),
); </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[], </s> remove syncableElements: ExcalidrawElement[] = this.getSyncableElements(
</s> add syncableElements: readonly ExcalidrawElement[] = this.getSyncableElements( </s> remove type ReconciledElements = readonly ExcalidrawElement[] & {
_brand: "reconciledElements";
};
</s> add </s> add import {
ReconciledElements,
reconcileElements as _reconcileElements,
} from "./reconciliation";
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Avoid broadcasting to the rest of the collaborators the scene
<mask> // we just received!
<mask> // Note: this needs to be set before updating the scene as it
<mask> // synchronously calls render.
<mask> this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
<mask>
<mask> return newElements as ReconciledElements;
<mask> };
<mask>
<mask> private loadImageFiles = throttle(async () => {
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
); </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[], </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove type ReconciledElements = readonly ExcalidrawElement[] & {
_brand: "reconciledElements";
};
</s> add </s> add import {
ReconciledElements,
reconcileElements as _reconcileElements,
} from "./reconciliation"; </s> remove elements.filter((el) => el.isDeleted || !isInvisiblySmallElement(el));
</s> add elements.filter((element) => this.isSyncableElement(element));
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> });
<mask> };
<mask>
<mask> getSyncableElements = (elements: readonly ExcalidrawElement[]) =>
<mask> elements.filter((el) => el.isDeleted || !isInvisiblySmallElement(el));
<mask>
<mask> /** PRIVATE. Use `this.getContextValue()` instead. */
<mask> private contextValue: CollabAPI | null = null;
<mask>
<mask> /** Getter of context value. Returned object is stable. */
</s> fix: rewrite collab element reconciliation to fix z-index issues (#4076) </s> remove syncableElements: ExcalidrawElement[] = this.getSyncableElements(
</s> add syncableElements: readonly ExcalidrawElement[] = this.getSyncableElements( </s> remove elements: readonly ExcalidrawElement[],
</s> add remoteElements: readonly ExcalidrawElement[], </s> remove const currentElements = this.getSceneElementsIncludingDeleted();
// create a map of ids so we don't have to iterate
// over the array more than once.
const localElementMap = getElementMap(currentElements);
</s> add const localElements = this.getSceneElementsIncludingDeleted(); </s> remove type ReconciledElements = readonly ExcalidrawElement[] & {
_brand: "reconciledElements";
};
</s> add </s> remove this.setLastBroadcastedOrReceivedSceneVersion(getSceneVersion(newElements));
</s> add this.setLastBroadcastedOrReceivedSceneVersion(
getSceneVersion(reconciledElements),
); </s> remove // Reconcile
const newElements: readonly ExcalidrawElement[] = elements
.reduce((elements, element) => {
// if the remote element references one that's currently
// edited on local, skip it (it'll be added in the next step)
if (
element.id === appState.editingElement?.id ||
element.id === appState.resizingElement?.id ||
element.id === appState.draggingElement?.id
) {
return elements;
}
if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version > element.version
) {
elements.push(localElementMap[element.id]);
delete localElementMap[element.id];
} else if (
localElementMap.hasOwnProperty(element.id) &&
localElementMap[element.id].version === element.version &&
localElementMap[element.id].versionNonce !== element.versionNonce
) {
// resolve conflicting edits deterministically by taking the one with the lowest versionNonce
if (localElementMap[element.id].versionNonce < element.versionNonce) {
elements.push(localElementMap[element.id]);
} else {
// it should be highly unlikely that the two versionNonces are the same. if we are
// really worried about this, we can replace the versionNonce with the socket id.
elements.push(element);
}
delete localElementMap[element.id];
} else {
elements.push(element);
delete localElementMap[element.id];
}
return elements;
}, [] as Mutable<typeof elements>)
// add local elements that weren't deleted or on remote
.concat(...Object.values(localElementMap));
</s> add const reconciledElements = _reconcileElements(
localElements,
remoteElements,
appState,
);
|
https://github.com/excalidraw/excalidraw/commit/d89fb3371befbe7e6754756ea70d2dbae356cfea
|
src/excalidraw-app/collab/CollabWrapper.tsx
|
keep keep keep replace replace replace keep keep replace replace keep
|
<mask> "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
<mask> },
<mask> "lint-staged": {
<mask> "version": "10.1.3",
<mask> "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
<mask> "integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
<mask> "dev": true,
<mask> "requires": {
<mask> "chalk": "^3.0.0",
<mask> "commander": "^4.0.1",
<mask> "cosmiconfig": "^6.0.0",
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
"integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", </s> remove "p-finally": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
"dev": true
},
</s> add </s> remove "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
</s> add "version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==", </s> remove "version": "3.4.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
"integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", </s> remove "lint-staged": "10.1.3",
</s> add "lint-staged": "10.1.6",
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "commander": "^4.0.1",
<mask> "cosmiconfig": "^6.0.0",
<mask> "debug": "^4.1.1",
<mask> "dedent": "^0.7.0",
<mask> "execa": "^3.4.0",
<mask> "listr": "^0.14.3",
<mask> "log-symbols": "^3.0.0",
<mask> "micromatch": "^4.0.2",
<mask> "normalize-path": "^3.0.0",
<mask> "please-upgrade-node": "^3.2.0",
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "chalk": "^3.0.0",
"commander": "^4.0.1",
</s> add "chalk": "^4.0.0",
"commander": "^5.0.0", </s> remove "version": "10.1.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
"integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
</s> add "version": "10.1.6",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.6.tgz",
"integrity": "sha512-45zaGxf4XZuwdUk87yRFE/1b4vTZmH2UnYmUPmindsgdAljOFpWWb0yEjxngmqERUS/MGauJexFF6BjLVg9VMA==", </s> remove "version": "3.4.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
"integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", </s> remove "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
</s> add "version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==", </s> remove "lint-staged": "10.1.3",
</s> add "lint-staged": "10.1.6", </s> remove "p-finally": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
"dev": true
},
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package-lock.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "fill-range": "^7.0.1"
<mask> }
<mask> },
<mask> "chalk": {
<mask> "version": "3.0.0",
<mask> "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
<mask> "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "ansi-styles": "^4.1.0",
<mask> "supports-color": "^7.1.0"
<mask> }
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "p-finally": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
"dev": true
},
</s> add </s> remove "version": "10.1.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
"integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
</s> add "version": "10.1.6",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.6.tgz",
"integrity": "sha512-45zaGxf4XZuwdUk87yRFE/1b4vTZmH2UnYmUPmindsgdAljOFpWWb0yEjxngmqERUS/MGauJexFF6BjLVg9VMA==", </s> remove "version": "3.4.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
"integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", </s> remove "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
</s> add "version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==", </s> remove "chalk": "^3.0.0",
"commander": "^4.0.1",
</s> add "chalk": "^4.0.0",
"commander": "^5.0.0", </s> remove "p-finally": "^2.0.0",
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package-lock.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
<mask> "dev": true
<mask> },
<mask> "commander": {
<mask> "version": "4.1.1",
<mask> "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
<mask> "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
<mask> "dev": true
<mask> },
<mask> "cosmiconfig": {
<mask> "version": "6.0.0",
<mask> "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "p-finally": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
"dev": true
},
</s> add </s> remove "version": "10.1.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
"integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
</s> add "version": "10.1.6",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.6.tgz",
"integrity": "sha512-45zaGxf4XZuwdUk87yRFE/1b4vTZmH2UnYmUPmindsgdAljOFpWWb0yEjxngmqERUS/MGauJexFF6BjLVg9VMA==", </s> remove "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
"integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", </s> remove "version": "3.4.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
"integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", </s> remove "chalk": "^3.0.0",
"commander": "^4.0.1",
</s> add "chalk": "^4.0.0",
"commander": "^5.0.0", </s> remove "p-finally": "^2.0.0",
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package-lock.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "which": "^2.0.1"
<mask> }
<mask> },
<mask> "execa": {
<mask> "version": "3.4.0",
<mask> "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
<mask> "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
<mask> "dev": true,
<mask> "requires": {
<mask> "cross-spawn": "^7.0.0",
<mask> "get-stream": "^5.0.0",
<mask> "human-signals": "^1.1.1",
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "p-finally": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
"dev": true
},
</s> add </s> remove "chalk": "^3.0.0",
"commander": "^4.0.1",
</s> add "chalk": "^4.0.0",
"commander": "^5.0.0", </s> remove "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
"integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", </s> remove "version": "10.1.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
"integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
</s> add "version": "10.1.6",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.6.tgz",
"integrity": "sha512-45zaGxf4XZuwdUk87yRFE/1b4vTZmH2UnYmUPmindsgdAljOFpWWb0yEjxngmqERUS/MGauJexFF6BjLVg9VMA==", </s> remove "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
</s> add "version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==", </s> remove "p-finally": "^2.0.0",
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "is-stream": "^2.0.0",
<mask> "merge-stream": "^2.0.0",
<mask> "npm-run-path": "^4.0.0",
<mask> "onetime": "^5.1.0",
<mask> "p-finally": "^2.0.0",
<mask> "signal-exit": "^3.0.2",
<mask> "strip-final-newline": "^2.0.0"
<mask> }
<mask> },
<mask> "fill-range": {
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "p-finally": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
"dev": true
},
</s> add </s> remove "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
"integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", </s> remove "version": "3.4.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
"integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", </s> remove "chalk": "^3.0.0",
"commander": "^4.0.1",
</s> add "chalk": "^4.0.0",
"commander": "^5.0.0", </s> remove "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
</s> add "version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==", </s> remove "version": "10.1.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
"integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
</s> add "version": "10.1.6",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.6.tgz",
"integrity": "sha512-45zaGxf4XZuwdUk87yRFE/1b4vTZmH2UnYmUPmindsgdAljOFpWWb0yEjxngmqERUS/MGauJexFF6BjLVg9VMA==",
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package-lock.json
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> "requires": {
<mask> "path-key": "^3.0.0"
<mask> }
<mask> },
<mask> "p-finally": {
<mask> "version": "2.0.1",
<mask> "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
<mask> "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
<mask> "dev": true
<mask> },
<mask> "parse-json": {
<mask> "version": "5.0.0",
<mask> "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
<mask> "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
<mask> "dev": true,
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
</s> add "version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==", </s> remove "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
"integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", </s> remove "version": "10.1.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
"integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
</s> add "version": "10.1.6",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.6.tgz",
"integrity": "sha512-45zaGxf4XZuwdUk87yRFE/1b4vTZmH2UnYmUPmindsgdAljOFpWWb0yEjxngmqERUS/MGauJexFF6BjLVg9VMA==", </s> remove "version": "3.4.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
"integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", </s> remove "chalk": "^3.0.0",
"commander": "^4.0.1",
</s> add "chalk": "^4.0.0",
"commander": "^5.0.0", </s> remove "p-finally": "^2.0.0",
</s> add
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "eslint-config-prettier": "6.10.1",
<mask> "eslint-plugin-prettier": "3.1.3",
<mask> "husky": "4.2.5",
<mask> "jest-canvas-mock": "2.2.0",
<mask> "lint-staged": "10.1.3",
<mask> "node-sass": "4.13.1",
<mask> "pepjs": "0.5.2",
<mask> "prettier": "2.0.4",
<mask> "rewire": "5.0.0",
<mask> "typescript": "3.8.3"
</s> Bump lint-staged from 10.1.3 to 10.1.6 (#1456)
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.1.3 to 10.1.6.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.1.3...v10.1.6)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> </s> remove "version": "10.1.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.3.tgz",
"integrity": "sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ==",
</s> add "version": "10.1.6",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.1.6.tgz",
"integrity": "sha512-45zaGxf4XZuwdUk87yRFE/1b4vTZmH2UnYmUPmindsgdAljOFpWWb0yEjxngmqERUS/MGauJexFF6BjLVg9VMA==", </s> remove "p-finally": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
"dev": true
},
</s> add </s> remove "version": "4.1.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
</s> add "version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==", </s> remove "p-finally": "^2.0.0",
</s> add </s> remove "version": "3.4.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
"integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", </s> remove "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
</s> add "version": "4.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
"integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
|
https://github.com/excalidraw/excalidraw/commit/d909ea24a2bc765574e3624059f987a7073656de
|
package.json
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.