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> canvasOffsetY: number;
<mask> }
<mask>
<mask> function generateElementCanvas(
<mask> element: ExcalidrawElement,
<mask> zoom: number,
<mask> ): ExcalidrawElementWithCanvas {
<mask> const canvas = document.createElement("canvas");
<mask> const context = canvas.getContext("2d")!;
<mask>
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove const elements = allElements.filter((element) => !element.isDeleted);
</s> add </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return { element, canvas, canvasZoom: zoom, canvasOffsetX, canvasOffsetY };
<mask> }
<mask>
<mask> function drawElementOnCanvas(
<mask> element: ExcalidrawElement,
<mask> rc: RoughCanvas,
<mask> context: CanvasRenderingContext2D,
<mask> ) {
<mask> context.globalAlpha = element.opacity / 100;
<mask> switch (element.type) {
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove }, null as { element: ExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
</s> add }, null as { element: NonDeletedExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null); </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> shapeCache.delete(element);
<mask> }
<mask>
<mask> function generateElement(
<mask> element: ExcalidrawElement,
<mask> generator: RoughGenerator,
<mask> sceneState?: SceneState,
<mask> ) {
<mask> let shape = shapeCache.get(element) || null;
<mask> if (!shape) {
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove isSomeElementSelected(globalSceneState.getAllElements(), this.state)
</s> add isSomeElementSelected(globalSceneState.getElements(), this.state) </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> context.scale(window.devicePixelRatio, window.devicePixelRatio);
<mask> }
<mask>
<mask> export function renderElement(
<mask> element: ExcalidrawElement,
<mask> rc: RoughCanvas,
<mask> context: CanvasRenderingContext2D,
<mask> renderOptimizations: boolean,
<mask> sceneState: SceneState,
<mask> ) {
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove selectionElement: ExcalidrawElement | null,
</s> add selectionElement: NonDeletedExcalidrawElement | null, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove allElements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> export function renderElementToSvg(
<mask> element: ExcalidrawElement,
<mask> rsvg: RoughSVG,
<mask> svgRoot: SVGElement,
<mask> offsetX?: number,
<mask> offsetY?: number,
<mask> ) {
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawLinearElement,
pointIndex: number,
deltaX: number,
deltaY: number,
pointerX: number,
pointerY: number,
perfect: boolean,
</s> add element,
pointIndex,
deltaX,
deltaY,
pointerX,
pointerY,
perfect, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { RoughCanvas } from "roughjs/bin/canvas";
<mask> import { RoughSVG } from "roughjs/bin/svg";
<mask>
<mask> import { FlooredNumber, AppState } from "../types";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import {
<mask> getElementAbsoluteCoords,
<mask> OMIT_SIDES_FOR_MULTIPLE_ELEMENTS,
<mask> handlerRectanglesFromCoords,
<mask> handlerRectangles,
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement, PointerType } from "./types";
</s> add import {
ExcalidrawElement,
PointerType,
NonDeletedExcalidrawElement,
} from "./types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderScene.ts
|
keep keep keep keep replace keep replace keep
|
<mask> context.stroke();
<mask> }
<mask>
<mask> export function renderScene(
<mask> allElements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> selectionElement: ExcalidrawElement | null,
<mask> scale: number,
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderScene.ts
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> if (!canvas) {
<mask> return { atLeastOneVisibleElement: false };
<mask> }
<mask>
<mask> const elements = allElements.filter((element) => !element.isDeleted);
<mask>
<mask> const context = canvas.getContext("2d")!;
<mask> context.scale(scale, scale);
<mask>
<mask> // When doing calculations based on canvas width we should used normalized one
<mask> const normalizedCanvasWidth = canvas.width / scale;
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> add const elements = globalSceneState.getElements(); </s> remove globalSceneState.getAllElements().forEach((element) => {
</s> add globalSceneState.getElementsIncludingDeleted().forEach((element) => { </s> remove for (const element of globalSceneState.getAllElements()) {
</s> add for (const element of globalSceneState.getElementsIncludingDeleted()) { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElementsIncludingDeleted(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderScene.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> // This should be only called for exporting purposes
<mask> export function renderSceneToSvg(
<mask> elements: readonly ExcalidrawElement[],
<mask> rsvg: RoughSVG,
<mask> svgRoot: SVGElement,
<mask> {
<mask> offsetX = 0,
<mask> offsetY = 0,
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove isDeleted: rest.isDeleted ?? false,
</s> add isDeleted: false as false, </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderScene.ts
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "../element/types";
<mask>
<mask> import { getElementAbsoluteCoords, hitTest } from "../element";
<mask> import { AppState } from "../types";
<mask>
<mask> export const hasBackground = (type: string) =>
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/comparisons.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> export const hasText = (type: string) => type === "text";
<mask>
<mask> export function getElementAtPosition(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> x: number,
<mask> y: number,
<mask> zoom: number,
<mask> ) {
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove allElements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove element: ExcalidrawLinearElement,
</s> add element: NonDeleted<ExcalidrawLinearElement>,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/comparisons.ts
|
keep replace keep keep keep keep keep
|
<mask> import rough from "roughjs/bin/rough";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { getCommonBounds } from "../element/bounds";
<mask> import { renderScene, renderSceneToSvg } from "../renderer/renderScene";
<mask> import { distance, SVG_NS } from "../utils";
<mask> import { normalizeScroll } from "./scroll";
<mask> import { AppState } from "../types";
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/export.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> export const SVG_EXPORT_TAG = `<!-- svg-source:excalidraw -->`;
<mask>
<mask> export function exportToCanvas(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> {
<mask> exportBackground,
<mask> exportPadding = 10,
<mask> viewBackgroundColor,
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/export.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return tempCanvas;
<mask> }
<mask>
<mask> export function exportToSvg(
<mask> elements: readonly ExcalidrawElement[],
<mask> {
<mask> exportBackground,
<mask> exportPadding = 10,
<mask> viewBackgroundColor,
<mask> }: {
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/export.ts
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "../element/types";
<mask>
<mask> export interface SceneStateCallback {
<mask> (): void;
<mask> }
<mask>
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove class SceneState {
</s> add class GlobalScene { </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/globalScene.ts
|
keep keep keep replace keep keep keep keep replace keep keep keep keep
|
<mask> (): void;
<mask> }
<mask>
<mask> class SceneState {
<mask> private callbacks: Set<SceneStateCallback> = new Set();
<mask>
<mask> constructor(private _elements: readonly ExcalidrawElement[] = []) {}
<mask>
<mask> getAllElements() {
<mask> return this._elements;
<mask> }
<mask>
<mask> replaceAllElements(nextElements: readonly ExcalidrawElement[]) {
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> add getElements(): readonly NonDeletedExcalidrawElement[] {
return getNonDeletedElements(this._elements);
}
</s> remove export function hasNonDeletedElements(elements: readonly ExcalidrawElement[]) {
return elements.some((element) => !element.isDeleted);
</s> add export function getNonDeletedElements(elements: readonly ExcalidrawElement[]) {
return (
elements.filter((element) => !element.isDeleted) as
readonly NonDeletedExcalidrawElement[]
); </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
import { getNonDeletedElements } from "../element"; </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> add import { globalSceneState } from "../scene";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/globalScene.ts
|
keep keep keep add keep keep keep keep keep
|
<mask> getElementsIncludingDeleted() {
<mask> return this._elements;
<mask> }
<mask>
<mask> replaceAllElements(nextElements: readonly ExcalidrawElement[]) {
<mask> this._elements = nextElements;
<mask> this.informMutation();
<mask> }
<mask>
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove getAllElements() {
</s> add getElementsIncludingDeleted() { </s> remove export function hasNonDeletedElements(elements: readonly ExcalidrawElement[]) {
return elements.some((element) => !element.isDeleted);
</s> add export function getNonDeletedElements(elements: readonly ExcalidrawElement[]) {
return (
elements.filter((element) => !element.isDeleted) as
readonly NonDeletedExcalidrawElement[]
); </s> remove return globalSceneState.getAllElements();
</s> add return globalSceneState.getElementsIncludingDeleted(); </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/globalScene.ts
|
keep keep keep keep replace
|
<mask> };
<mask> }
<mask> }
<mask>
<mask> export const globalSceneState = new SceneState();
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> add import { globalSceneState } from "../scene"; </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove class SceneState {
</s> add class GlobalScene { </s> remove import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./types"; </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted() </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted()
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/globalScene.ts
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { getElementAbsoluteCoords, getElementBounds } from "../element";
<mask> import { AppState } from "../types";
<mask> import { newElementWith } from "../element/mutateElement";
<mask>
<mask> export function getElementsWithinSelection(
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove elements: readonly ExcalidrawElement[],
selection: ExcalidrawElement,
</s> add elements: readonly NonDeletedExcalidrawElement[],
selection: NonDeletedExcalidrawElement, </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/selection.ts
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> import { AppState } from "../types";
<mask> import { newElementWith } from "../element/mutateElement";
<mask>
<mask> export function getElementsWithinSelection(
<mask> elements: readonly ExcalidrawElement[],
<mask> selection: ExcalidrawElement,
<mask> ) {
<mask> const [
<mask> selectionX1,
<mask> selectionY1,
<mask> selectionX2,
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/selection.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask> }
<mask>
<mask> export function isSomeElementSelected(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> ): boolean {
<mask> return elements.some((element) => appState.selectedElementIds[element.id]);
<mask> }
<mask>
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/selection.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> * Returns common attribute (picked by `getAttribute` callback) of selected
<mask> * elements. If elements don't share the same value, returns `null`.
<mask> */
<mask> export function getCommonAttributeOfSelectedElements<T>(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> getAttribute: (element: ExcalidrawElement) => T,
<mask> ): T | null {
<mask> const attributes = Array.from(
<mask> new Set(
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> add const nonDeletedElements = getNonDeletedElements(elements); </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove for (const element of globalSceneState.getAllElements()) {
</s> add for (const element of globalSceneState.getElementsIncludingDeleted()) { </s> remove selectionElement: ExcalidrawElement | null,
</s> add selectionElement: NonDeletedExcalidrawElement | null, </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/selection.ts
|
keep keep replace keep keep keep keep keep keep keep keep replace keep keep keep
|
<mask>
<mask> export function getSelectedElements(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> ): readonly ExcalidrawElement[] {
<mask> return elements.filter((element) => appState.selectedElementIds[element.id]);
<mask> }
<mask>
<mask> export function getSelectedElements(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> ): readonly ExcalidrawElement[] {
<mask> return elements.filter((element) => appState.selectedElementIds[element.id]);
<mask> }
<mask>
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/selection.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return elements.filter((element) => appState.selectedElementIds[element.id]);
<mask> }
<mask>
<mask> export function getTargetElement(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> ) {
<mask> return appState.editingElement
<mask> ? [appState.editingElement]
<mask> : getSelectedElements(elements, appState);
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/scene/selection.ts
|
keep add keep keep keep keep keep keep
|
<mask> actionSendToBack,
<mask> } from "../actions";
<mask>
<mask> // Unmount ReactDOM from root
<mask> ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
<mask>
<mask> beforeEach(() => {
<mask> localStorage.clear();
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove import { duplicateElement } from "../element";
</s> add import { duplicateElement, getNonDeletedElements } from "../element"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { isTextElement, redrawTextBoundingBox } from "../element";
</s> add import {
isTextElement,
redrawTextBoundingBox,
getNonDeletedElements,
} from "../element"; </s> remove import { showSelectedShapeActions } from "../element";
</s> add import { showSelectedShapeActions, getNonDeletedElements } from "../element"; </s> remove import { hasNonDeletedElements } from "../element";
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/tests/zindex.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ) {
<mask> const selectedElementIds: any = {};
<mask>
<mask> h.elements = elements.map(({ id, isDeleted = false, isSelected = false }) => {
<mask> const element: Mutable<ReturnType<typeof newElement>> = newElement({
<mask> type: "rectangle",
<mask> x: 100,
<mask> y: 100,
<mask> strokeColor: h.state.currentItemStrokeColor,
<mask> backgroundColor: h.state.currentItemBackgroundColor,
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove isDeleted: false,
</s> add </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove isDeleted: rest.isDeleted ?? false,
</s> add isDeleted: false as false,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/tests/zindex.test.tsx
|
keep replace keep keep keep keep keep
|
<mask> import {
<mask> ExcalidrawElement,
<mask> PointerType,
<mask> ExcalidrawLinearElement,
<mask> } from "./element/types";
<mask> import { SHAPES } from "./shapes";
<mask> import { Point as RoughPoint } from "roughjs/bin/geometry";
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> add NonDeletedExcalidrawElement,
NonDeleted, </s> remove import { ExcalidrawElement } from "./element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "./element/types"; </s> remove import { ExcalidrawElement, PointerType } from "./types";
</s> add import {
ExcalidrawElement,
PointerType,
NonDeletedExcalidrawElement,
} from "./types"; </s> remove import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/types.ts
|
keep add keep keep keep keep
|
<mask> PointerType,
<mask> ExcalidrawLinearElement,
<mask> } from "./element/types";
<mask> import { SHAPES } from "./shapes";
<mask> import { Point as RoughPoint } from "roughjs/bin/geometry";
<mask>
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove ExcalidrawElement,
</s> add </s> remove import { ExcalidrawElement } from "./element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "./element/types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./types"; </s> add NonDeleted, </s> remove import { ExcalidrawElement, PointerType } from "./types";
</s> add import {
ExcalidrawElement,
PointerType,
NonDeletedExcalidrawElement,
} from "./types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/types.ts
|
keep keep keep keep replace replace replace replace keep keep replace keep keep
|
<mask>
<mask> export type AppState = {
<mask> isLoading: boolean;
<mask> errorMessage: string | null;
<mask> draggingElement: ExcalidrawElement | null;
<mask> resizingElement: ExcalidrawElement | null;
<mask> multiElement: ExcalidrawLinearElement | null;
<mask> selectionElement: ExcalidrawElement | null;
<mask> // element being edited, but not necessarily added to elements array yet
<mask> // (e.g. text element when typing into the input)
<mask> editingElement: ExcalidrawElement | null;
<mask> elementType: typeof SHAPES[number]["value"];
<mask> elementLocked: boolean;
</s> Add NonDeleted<ExcalidrawElement> (#1068)
* add NonDeleted
* make test:all script run tests without prompt
* rename helper
* replace with helper
* make element contructors return nonDeleted elements
* cache filtered elements where appliacable for better perf
* rename manager element getter
* remove unnecessary assertion
* fix test
* make element types in resizeElement into nonDeleted
Co-authored-by: dwelle <[email protected]> </s> remove selectionElement: ExcalidrawElement | null,
</s> add selectionElement: NonDeletedExcalidrawElement | null, </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove elements: readonly ExcalidrawElement[];
setElements: (elements: readonly ExcalidrawElement[]) => void;
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove allElements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove }, null as { element: ExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
</s> add }, null as { element: NonDeletedExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/types.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> }
<mask>
<mask> public render() {
<mask> const { zenModeEnabled, viewModeEnabled } = this.state;
<mask> const selectedElement = getSelectedElements(
<mask> this.scene.getNonDeletedElements(),
<mask> this.state,
<mask> );
<mask> const {
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> add import { actionToggleZenMode } from "../actions"; </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> return (
<mask> <div
<mask> className={clsx("excalidraw excalidraw-container", {
<mask> "excalidraw--view-mode": viewModeEnabled,
<mask> "excalidraw--mobile": this.device.isMobile,
<mask> })}
<mask> ref={this.excalidrawContainerRef}
<mask> onDrop={this.handleAppOnDrop}
<mask> tabIndex={0}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove viewModeEnabled,
</s> add </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove {!viewModeEnabled && renderToolbar()}
</s> add {!appState.viewModeEnabled && renderToolbar()} </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> position: "center",
<mask> files: null,
<mask> })
<mask> }
<mask> zenModeEnabled={zenModeEnabled}
<mask> toggleZenMode={this.toggleZenMode}
<mask> langCode={getLanguage().code}
<mask> isCollaborating={this.props.isCollaborating}
<mask> renderTopRightUI={renderTopRightUI}
<mask> renderCustomFooter={renderFooter}
<mask> renderCustomStats={renderCustomStats}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove viewModeEnabled={viewModeEnabled}
</s> add </s> remove zenModeEnabled
</s> add this.state.zenModeEnabled </s> remove viewModeEnabled={viewModeEnabled}
</s> add </s> add import { actionToggleZenMode } from "../actions"; </s> remove const { zenModeEnabled, viewModeEnabled } = this.state;
</s> add </s> remove zenModeEnabled={zenModeEnabled}
</s> add zenModeEnabled={appState.zenModeEnabled}
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/App.tsx
|
keep keep replace keep keep replace keep keep
|
<mask> renderCustomFooter={renderFooter}
<mask> renderCustomStats={renderCustomStats}
<mask> viewModeEnabled={viewModeEnabled}
<mask> showExitZenModeBtn={
<mask> typeof this.props?.zenModeEnabled === "undefined" &&
<mask> zenModeEnabled
<mask> }
<mask> showThemeBtn={
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove zenModeEnabled={zenModeEnabled}
toggleZenMode={this.toggleZenMode}
</s> add </s> remove !viewModeEnabled &&
</s> add !appState.viewModeEnabled && </s> remove {viewModeEnabled
</s> add {appState.viewModeEnabled </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove viewModeEnabled={viewModeEnabled}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/App.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> };
<mask> });
<mask> };
<mask>
<mask> toggleZenMode = () => {
<mask> this.actionManager.executeAction(actionToggleZenMode);
<mask> };
<mask>
<mask> scrollToContent = (
<mask> target:
<mask> | ExcalidrawElement
<mask> | readonly ExcalidrawElement[] = this.scene.getNonDeletedElements(),
<mask> ) => {
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove const { zenModeEnabled, viewModeEnabled } = this.state;
</s> add </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove viewModeEnabled: boolean;
</s> add </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove {!viewModeEnabled && renderToolbar()}
</s> add {!appState.viewModeEnabled && renderToolbar()}
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/App.tsx
|
keep add keep keep keep keep
|
<mask> import { Stats } from "./Stats";
<mask> import { actionToggleStats } from "../actions/actionToggleStats";
<mask>
<mask> interface LayerUIProps {
<mask> actionManager: ActionManager;
<mask> appState: AppState;
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove const { zenModeEnabled, viewModeEnabled } = this.state;
</s> add </s> remove zenModeEnabled
</s> add this.state.zenModeEnabled </s> remove viewModeEnabled: boolean;
</s> add </s> remove zenModeEnabled={zenModeEnabled}
toggleZenMode={this.toggleZenMode}
</s> add </s> remove viewModeEnabled={viewModeEnabled}
</s> add </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep replace keep keep replace keep keep keep
|
<mask> onPenModeToggle: () => void;
<mask> onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
<mask> zenModeEnabled: boolean;
<mask> showExitZenModeBtn: boolean;
<mask> showThemeBtn: boolean;
<mask> toggleZenMode: () => void;
<mask> langCode: Language["code"];
<mask> isCollaborating: boolean;
<mask> renderTopRightUI?: ExcalidrawProps["renderTopRightUI"];
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove viewModeEnabled: boolean;
</s> add </s> remove viewModeEnabled: boolean;
</s> add </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> isCollaborating: boolean;
<mask> renderTopRightUI?: ExcalidrawProps["renderTopRightUI"];
<mask> renderCustomFooter?: ExcalidrawProps["renderFooter"];
<mask> renderCustomStats?: ExcalidrawProps["renderCustomStats"];
<mask> viewModeEnabled: boolean;
<mask> libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
<mask> UIOptions: AppProps["UIOptions"];
<mask> focusContainer: () => void;
<mask> library: Library;
<mask> id: string;
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove toggleZenMode: () => void;
</s> add </s> remove zenModeEnabled: boolean;
</s> add </s> remove viewModeEnabled: boolean;
</s> add </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep replace keep keep replace
|
<mask> onInsertElements,
<mask> zenModeEnabled,
<mask> showExitZenModeBtn,
<mask> showThemeBtn,
<mask> toggleZenMode,
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove viewModeEnabled,
</s> add </s> remove onClick={toggleZenMode}
</s> add onClick={() => actionManager.executeAction(actionToggleZenMode)} </s> remove zenModeEnabled={zenModeEnabled}
</s> add zenModeEnabled={appState.zenModeEnabled} </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> isCollaborating,
<mask> renderTopRightUI,
<mask> renderCustomFooter,
<mask> renderCustomStats,
<mask> viewModeEnabled,
<mask> libraryReturnUrl,
<mask> UIOptions,
<mask> focusContainer,
<mask> library,
<mask> id,
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove toggleZenMode,
</s> add </s> remove viewModeEnabled,
</s> add </s> remove zenModeEnabled,
</s> add </s> remove "excalidraw--view-mode": viewModeEnabled,
</s> add "excalidraw--view-mode": this.state.viewModeEnabled, </s> remove !viewModeEnabled &&
</s> add !appState.viewModeEnabled && </s> remove viewModeEnabled: boolean;
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return (
<mask> <Section
<mask> heading="canvasActions"
<mask> className={clsx("zen-mode-transition", {
<mask> "transition-left": zenModeEnabled,
<mask> })}
<mask> >
<mask> {/* the zIndex ensures this menu has higher stacking order,
<mask> see https://github.com/excalidraw/excalidraw/pull/1445 */}
<mask> <Island padding={2} style={{ zIndex: 1 }}>
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove {!viewModeEnabled && renderToolbar()}
</s> add {!appState.viewModeEnabled && renderToolbar()} </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled, </s> remove "excalidraw--view-mode": viewModeEnabled,
</s> add "excalidraw--view-mode": this.state.viewModeEnabled, </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const renderCanvasActions = () => (
<mask> <Section
<mask> heading="canvasActions"
<mask> className={clsx("zen-mode-transition", {
<mask> "transition-left": zenModeEnabled,
<mask> })}
<mask> >
<mask> {/* the zIndex ensures this menu has higher stacking order,
<mask> see https://github.com/excalidraw/excalidraw/pull/1445 */}
<mask> <Island padding={2} style={{ zIndex: 1 }}>
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove const { zenModeEnabled, viewModeEnabled } = this.state;
</s> add </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const renderSelectedShapeActions = () => (
<mask> <Section
<mask> heading="selectedShapeActions"
<mask> className={clsx("zen-mode-transition", {
<mask> "transition-left": zenModeEnabled,
<mask> })}
<mask> >
<mask> <Island
<mask> className={CLASSES.SHAPE_ACTIONS_MENU}
<mask> padding={2}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove const { zenModeEnabled, viewModeEnabled } = this.state;
</s> add </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep replace keep replace keep
|
<mask> <div className="App-menu App-menu_top">
<mask> <Stack.Col
<mask> gap={4}
<mask> className={clsx({ "disable-pointerEvents": zenModeEnabled })}
<mask> >
<mask> {viewModeEnabled
<mask> ? renderViewModeCanvasActions()
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && ( </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled, </s> remove "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
</s> add "layer-ui__wrapper__footer-left--transition-left":
appState.zenModeEnabled, </s> remove viewModeEnabled={viewModeEnabled}
</s> add </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ? renderViewModeCanvasActions()
<mask> : renderCanvasActions()}
<mask> {shouldRenderSelectedShapeActions && renderSelectedShapeActions()}
<mask> </Stack.Col>
<mask> {!viewModeEnabled && (
<mask> <Section heading="shapes">
<mask> {(heading) => (
<mask> <Stack.Col gap={4} align="start">
<mask> <Stack.Row
<mask> gap={1}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove {viewModeEnabled
</s> add {appState.viewModeEnabled </s> remove className={clsx({ "disable-pointerEvents": zenModeEnabled })}
</s> add className={clsx({
"disable-pointerEvents": appState.zenModeEnabled,
})} </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled, </s> remove !viewModeEnabled &&
</s> add !appState.viewModeEnabled && </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && ( </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled &&
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep replace keep keep keep replace keep
|
<mask> gap={1}
<mask> className={clsx("App-toolbar-container", {
<mask> "zen-mode": zenModeEnabled,
<mask> })}
<mask> >
<mask> <PenModeButton
<mask> zenModeEnabled={zenModeEnabled}
<mask> checked={appState.penMode}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && (
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> title={t("toolBar.penMode")}
<mask> penDetected={appState.penDetected}
<mask> />
<mask> <LockButton
<mask> zenModeEnabled={zenModeEnabled}
<mask> checked={appState.activeTool.locked}
<mask> onChange={() => onLockToggle()}
<mask> title={t("toolBar.lock")}
<mask> />
<mask> <Island
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove zenModeEnabled={zenModeEnabled}
</s> add zenModeEnabled={appState.zenModeEnabled} </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled, </s> remove viewModeEnabled={viewModeEnabled}
</s> add </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && ( </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove zenModeEnabled={zenModeEnabled}
toggleZenMode={this.toggleZenMode}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> />
<mask> <Island
<mask> padding={1}
<mask> className={clsx("App-toolbar", {
<mask> "zen-mode": zenModeEnabled,
<mask> })}
<mask> >
<mask> <HintViewer
<mask> appState={appState}
<mask> elements={elements}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove zenModeEnabled={zenModeEnabled}
</s> add zenModeEnabled={appState.zenModeEnabled} </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled, </s> remove zenModeEnabled={zenModeEnabled}
</s> add zenModeEnabled={appState.zenModeEnabled} </s> remove !viewModeEnabled &&
</s> add !appState.viewModeEnabled && </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && (
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <div
<mask> className={clsx(
<mask> "layer-ui__wrapper__top-right zen-mode-transition",
<mask> {
<mask> "transition-right": zenModeEnabled,
<mask> },
<mask> )}
<mask> >
<mask> <UserList
<mask> collaborators={appState.collaborators}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
</s> add "layer-ui__wrapper__footer-left--transition-left":
appState.zenModeEnabled, </s> remove "transition-right disable-pointerEvents": zenModeEnabled,
</s> add "transition-right disable-pointerEvents": appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <div
<mask> className={clsx(
<mask> "layer-ui__wrapper__footer-left zen-mode-transition",
<mask> {
<mask> "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
<mask> },
<mask> )}
<mask> >
<mask> <Stack.Col gap={2}>
<mask> <Section heading="canvasActions">
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove "transition-right": zenModeEnabled,
</s> add "transition-right": appState.zenModeEnabled, </s> remove "transition-right disable-pointerEvents": zenModeEnabled,
</s> add "transition-right disable-pointerEvents": appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep replace keep keep keep keep replace keep keep
|
<mask> </Island>
<mask> {!viewModeEnabled && (
<mask> <>
<mask> <div
<mask> className={clsx("undo-redo-buttons zen-mode-transition", {
<mask> "layer-ui__wrapper__footer-left--transition-bottom":
<mask> zenModeEnabled,
<mask> })}
<mask> >
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove {!viewModeEnabled && renderToolbar()}
</s> add {!appState.viewModeEnabled && renderToolbar()} </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> <div
<mask> className={clsx("eraser-buttons zen-mode-transition", {
<mask> "layer-ui__wrapper__footer-left--transition-left":
<mask> zenModeEnabled,
<mask> })}
<mask> >
<mask> {actionManager.renderAction("eraser", { size: "small" })}
<mask> </div>
<mask> </>
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
</s> add "layer-ui__wrapper__footer-left--transition-left":
appState.zenModeEnabled, </s> remove "transition-right disable-pointerEvents": zenModeEnabled,
</s> add "transition-right disable-pointerEvents": appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> {actionManager.renderAction("eraser", { size: "small" })}
<mask> </div>
<mask> </>
<mask> )}
<mask> {!viewModeEnabled &&
<mask> appState.multiElement &&
<mask> device.isTouchScreen && (
<mask> <div
<mask> className={clsx("finalize-button zen-mode-transition", {
<mask> "layer-ui__wrapper__footer-left--transition-left":
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && ( </s> remove "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
</s> add "layer-ui__wrapper__footer-left--transition-left":
appState.zenModeEnabled, </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> device.isTouchScreen && (
<mask> <div
<mask> className={clsx("finalize-button zen-mode-transition", {
<mask> "layer-ui__wrapper__footer-left--transition-left":
<mask> zenModeEnabled,
<mask> })}
<mask> >
<mask> {actionManager.renderAction("finalize", { size: "small" })}
<mask> </div>
<mask> )}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
</s> add "layer-ui__wrapper__footer-left--transition-left":
appState.zenModeEnabled, </s> remove "transition-right disable-pointerEvents": zenModeEnabled,
</s> add "transition-right disable-pointerEvents": appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> className={clsx(
<mask> "layer-ui__wrapper__footer-center zen-mode-transition",
<mask> {
<mask> "layer-ui__wrapper__footer-left--transition-bottom":
<mask> zenModeEnabled,
<mask> },
<mask> )}
<mask> >
<mask> {renderCustomFooter?.(false, appState)}
<mask> </div>
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove "transition-right disable-pointerEvents": zenModeEnabled,
</s> add "transition-right disable-pointerEvents": appState.zenModeEnabled, </s> remove "transition-right": zenModeEnabled,
</s> add "transition-right": appState.zenModeEnabled, </s> remove "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
</s> add "layer-ui__wrapper__footer-left--transition-left":
appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled &&
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <div
<mask> className={clsx(
<mask> "layer-ui__wrapper__footer-right zen-mode-transition",
<mask> {
<mask> "transition-right disable-pointerEvents": zenModeEnabled,
<mask> },
<mask> )}
<mask> >
<mask> {actionManager.renderAction("toggleShortcuts")}
<mask> </div>
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove "transition-right": zenModeEnabled,
</s> add "transition-right": appState.zenModeEnabled, </s> remove "layer-ui__wrapper__footer-left--transition-left": zenModeEnabled,
</s> add "layer-ui__wrapper__footer-left--transition-left":
appState.zenModeEnabled, </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled, </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <button
<mask> className={clsx("disable-zen-mode", {
<mask> "disable-zen-mode--visible": showExitZenModeBtn,
<mask> })}
<mask> onClick={toggleZenMode}
<mask> >
<mask> {t("buttons.exitZenMode")}
<mask> </button>
<mask> </footer>
<mask> );
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove const { zenModeEnabled, viewModeEnabled } = this.state;
</s> add </s> remove zenModeEnabled,
</s> add </s> remove toggleZenMode,
</s> add </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> onPenModeToggle={onPenModeToggle}
<mask> canvas={canvas}
<mask> isCollaborating={isCollaborating}
<mask> renderCustomFooter={renderCustomFooter}
<mask> viewModeEnabled={viewModeEnabled}
<mask> showThemeBtn={showThemeBtn}
<mask> onImageAction={onImageAction}
<mask> renderTopRightUI={renderTopRightUI}
<mask> renderStats={renderStats}
<mask> />
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove viewModeEnabled={viewModeEnabled}
</s> add </s> remove zenModeEnabled={zenModeEnabled}
</s> add zenModeEnabled={appState.zenModeEnabled} </s> remove zenModeEnabled={zenModeEnabled}
toggleZenMode={this.toggleZenMode}
</s> add </s> remove zenModeEnabled
</s> add this.state.zenModeEnabled </s> remove zenModeEnabled={zenModeEnabled}
</s> add zenModeEnabled={appState.zenModeEnabled} </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> renderCustomFooter?: (
<mask> isMobile: boolean,
<mask> appState: AppState,
<mask> ) => JSX.Element | null;
<mask> viewModeEnabled: boolean;
<mask> showThemeBtn: boolean;
<mask> onImageAction: (data: { insertOnCanvasDirectly: boolean }) => void;
<mask> renderTopRightUI?: (
<mask> isMobile: boolean,
<mask> appState: AppState,
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove toggleZenMode: () => void;
</s> add </s> remove viewModeEnabled: boolean;
</s> add </s> remove zenModeEnabled: boolean;
</s> add </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> add import { actionToggleZenMode } from "../actions"; </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> onPenModeToggle,
<mask> canvas,
<mask> isCollaborating,
<mask> renderCustomFooter,
<mask> viewModeEnabled,
<mask> showThemeBtn,
<mask> onImageAction,
<mask> renderTopRightUI,
<mask> renderStats,
<mask> }: MobileMenuProps) => {
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove toggleZenMode,
</s> add </s> remove zenModeEnabled,
</s> add </s> remove viewModeEnabled,
</s> add </s> remove "excalidraw--view-mode": viewModeEnabled,
</s> add "excalidraw--view-mode": this.state.viewModeEnabled, </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) {
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> !appState.viewModeEnabled &&
<mask> !appState.editingElement &&
<mask> getSelectedElements(elements, appState).length === 0;
<mask>
<mask> if (viewModeEnabled) {
<mask> return (
<mask> <div className="App-toolbar-content">
<mask> {actionManager.renderAction("toggleCanvasMenu")}
<mask> </div>
<mask> );
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove !viewModeEnabled &&
</s> add !appState.viewModeEnabled && </s> remove {!viewModeEnabled && renderToolbar()}
</s> add {!appState.viewModeEnabled && renderToolbar()} </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove zenModeEnabled
</s> add this.state.zenModeEnabled </s> remove zenModeEnabled,
</s> add appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> };
<mask>
<mask> const renderCanvasActions = () => {
<mask> if (viewModeEnabled) {
<mask> return (
<mask> <>
<mask> {renderJSONExportDialog()}
<mask> {renderImageExportDialog()}
<mask> </>
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> remove const { zenModeEnabled, viewModeEnabled } = this.state;
</s> add </s> remove {!viewModeEnabled && renderToolbar()}
</s> add {!appState.viewModeEnabled && renderToolbar()} </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled, </s> remove "transition-left": zenModeEnabled,
</s> add "transition-left": appState.zenModeEnabled,
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> };
<mask> return (
<mask> <>
<mask> {!viewModeEnabled && renderToolbar()}
<mask> {renderStats()}
<mask> <div
<mask> className="App-bottom-bar"
<mask> style={{
<mask> marginBottom: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && ( </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove {!viewModeEnabled &&
</s> add {!appState.viewModeEnabled && </s> remove toggleZenMode = () => {
this.actionManager.executeAction(actionToggleZenMode);
};
</s> add </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && (
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> </Stack.Col>
<mask> </div>
<mask> </Section>
<mask> ) : appState.openMenu === "shape" &&
<mask> !viewModeEnabled &&
<mask> showSelectedShapeActions(appState, elements) ? (
<mask> <Section className="App-mobile-menu" heading="selectedShapeActions">
<mask> <SelectedShapeActions
<mask> appState={appState}
<mask> elements={elements}
</s> refactor: don't pass zenModeEnable, viewModeEnabled and toggleZenMode props to LayerUI (#5444)
refactor: don't pass zenModeEnabled and viewModeEnabled props to LayerUI </s> remove {!viewModeEnabled && (
</s> add {!appState.viewModeEnabled && ( </s> remove {viewModeEnabled
</s> add {appState.viewModeEnabled </s> remove if (viewModeEnabled) {
</s> add if (appState.viewModeEnabled) { </s> remove "zen-mode": zenModeEnabled,
</s> add "zen-mode": appState.zenModeEnabled, </s> remove zenModeEnabled
</s> add this.state.zenModeEnabled </s> remove className={clsx({ "disable-pointerEvents": zenModeEnabled })}
</s> add className={clsx({
"disable-pointerEvents": appState.zenModeEnabled,
})}
|
https://github.com/excalidraw/excalidraw/commit/df14c69977c56e3c85324a61af6235bcd35b7fd8
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> DEFAULT_FONT_FAMILY,
<mask> DEFAULT_TEXT_ALIGN,
<mask> } from "../constants";
<mask>
<mask> let copiedStyles: string = "{}";
<mask>
<mask> export const actionCopyStyles = register({
<mask> name: "copyStyles",
<mask> perform: (elements, appState) => {
<mask> const element = elements.find((el) => appState.selectedElementIds[el.id]);
</s> Add regression tests for context-menu actions (#1959) </s> add import { queryByText } from "@testing-library/react";
import { copiedStyles } from "../actions/actionStyles"; </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df4e903bd6f1b173cf085a73ee4d529c7c6e82a9
|
src/actions/actionStyles.ts
|
keep keep keep add keep keep keep keep keep
|
<mask> import { KEYS, Key } from "../keys";
<mask> import { setDateTimeForTests } from "../utils";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { handlerRectangles } from "../element";
<mask>
<mask> const { h } = window;
<mask>
<mask> const renderScene = jest.spyOn(Renderer, "renderScene");
<mask> let getByToolName: (name: string) => HTMLElement = null!;
</s> Add regression tests for context-menu actions (#1959) </s> remove let copiedStyles: string = "{}";
</s> add // `copiedStyles` is exported only for tests.
export let copiedStyles: string = "{}"; </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df4e903bd6f1b173cf085a73ee4d529c7c6e82a9
|
src/tests/regressionTests.test.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> expect(h.state.currentItemFontFamily).toEqual(3); // Cascadia
<mask> });
<mask>
<mask> it("shows context menu for canvas", () => {
<mask> fireEvent.change(document.querySelector(".dropdown-select__language")!, {
<mask> target: { value: "en" },
<mask> });
<mask> fireEvent.contextMenu(canvas, { button: 2, clientX: 1, clientY: 1 });
<mask> const contextMenu = document.querySelector(".context-menu");
<mask> const options = contextMenu?.querySelectorAll(".context-menu-option");
<mask> const expectedOptions = ["Select all", "Toggle grid mode"];
<mask>
</s> Add regression tests for context-menu actions (#1959) </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove let copiedStyles: string = "{}";
</s> add // `copiedStyles` is exported only for tests.
export let copiedStyles: string = "{}"; </s> add import { queryByText } from "@testing-library/react";
import { copiedStyles } from "../actions/actionStyles";
|
https://github.com/excalidraw/excalidraw/commit/df4e903bd6f1b173cf085a73ee4d529c7c6e82a9
|
src/tests/regressionTests.test.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> expect(options?.item(0).textContent).toBe(expectedOptions[0]);
<mask> });
<mask>
<mask> it("shows context menu for element", () => {
<mask> fireEvent.change(document.querySelector(".dropdown-select__language")!, {
<mask> target: { value: "en" },
<mask> });
<mask> clickTool("rectangle");
<mask> mouse.down(10, 10);
<mask> mouse.up(20, 20);
<mask> fireEvent.contextMenu(canvas, { button: 2, clientX: 1, clientY: 1 });
<mask> const contextMenu = document.querySelector(".context-menu");
</s> Add regression tests for context-menu actions (#1959) </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> add import { queryByText } from "@testing-library/react";
import { copiedStyles } from "../actions/actionStyles"; </s> remove let copiedStyles: string = "{}";
</s> add // `copiedStyles` is exported only for tests.
export let copiedStyles: string = "{}";
|
https://github.com/excalidraw/excalidraw/commit/df4e903bd6f1b173cf085a73ee4d529c7c6e82a9
|
src/tests/regressionTests.test.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask>
<mask> it("shows 'Group selection' in context menu for multiple selected elements", () => {
<mask> fireEvent.change(document.querySelector(".dropdown-select__language")!, {
<mask> target: { value: "en" },
<mask> });
<mask>
<mask> clickTool("rectangle");
<mask> mouse.down(10, 10);
<mask> mouse.up(10, 10);
<mask>
<mask> clickTool("rectangle");
</s> Add regression tests for context-menu actions (#1959) </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> add import { queryByText } from "@testing-library/react";
import { copiedStyles } from "../actions/actionStyles"; </s> remove let copiedStyles: string = "{}";
</s> add // `copiedStyles` is exported only for tests.
export let copiedStyles: string = "{}";
|
https://github.com/excalidraw/excalidraw/commit/df4e903bd6f1b173cf085a73ee4d529c7c6e82a9
|
src/tests/regressionTests.test.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask>
<mask> it("shows 'Ungroup selection' in context menu for group inside selected elements", () => {
<mask> fireEvent.change(document.querySelector(".dropdown-select__language")!, {
<mask> target: { value: "en" },
<mask> });
<mask>
<mask> clickTool("rectangle");
<mask> mouse.down(10, 10);
<mask> mouse.up(10, 10);
<mask>
<mask> clickTool("rectangle");
</s> Add regression tests for context-menu actions (#1959) </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> remove fireEvent.change(document.querySelector(".dropdown-select__language")!, {
target: { value: "en" },
});
</s> add </s> add import { queryByText } from "@testing-library/react";
import { copiedStyles } from "../actions/actionStyles"; </s> remove let copiedStyles: string = "{}";
</s> add // `copiedStyles` is exported only for tests.
export let copiedStyles: string = "{}";
|
https://github.com/excalidraw/excalidraw/commit/df4e903bd6f1b173cf085a73ee4d529c7c6e82a9
|
src/tests/regressionTests.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask> },
<mask> contextItemLabel: "labels.copyStyles",
<mask> keyTest: (event) =>
<mask> event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "C",
<mask> contextMenuOrder: 0,
<mask> });
<mask>
<mask> export const actionPasteStyles = register({
<mask> name: "pasteStyles",
</s> change copy/paste styles shortcuts (#1881)
* change copy/paste styles shortcuts
* use keyCode </s> remove event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "V",
</s> add event[KEYS.CTRL_OR_CMD] &&
event.altKey &&
event.keyCode === KEYS.V_KEY_CODE, </s> add C_KEY_CODE: 67,
V_KEY_CODE: 86, </s> remove shortcuts={[getShortcutKey("CtrlOrCmd+Shift+V")]}
</s> add shortcuts={[getShortcutKey("CtrlOrCmd+Alt+V")]} </s> remove shortcuts={[getShortcutKey("CtrlOrCmd+Shift+C")]}
</s> add shortcuts={[getShortcutKey("CtrlOrCmd+Alt+C")]}
|
https://github.com/excalidraw/excalidraw/commit/df5eb3f0d971e6172ced6ae7d8835179be131ca7
|
src/actions/actionStyles.ts
|
keep keep keep keep replace keep keep
|
<mask> };
<mask> },
<mask> contextItemLabel: "labels.pasteStyles",
<mask> keyTest: (event) =>
<mask> event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "V",
<mask> contextMenuOrder: 1,
<mask> });
</s> change copy/paste styles shortcuts (#1881)
* change copy/paste styles shortcuts
* use keyCode </s> remove event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "C",
</s> add event[KEYS.CTRL_OR_CMD] &&
event.altKey &&
event.keyCode === KEYS.C_KEY_CODE, </s> add C_KEY_CODE: 67,
V_KEY_CODE: 86, </s> remove shortcuts={[getShortcutKey("CtrlOrCmd+Shift+V")]}
</s> add shortcuts={[getShortcutKey("CtrlOrCmd+Alt+V")]} </s> remove shortcuts={[getShortcutKey("CtrlOrCmd+Shift+C")]}
</s> add shortcuts={[getShortcutKey("CtrlOrCmd+Alt+C")]}
|
https://github.com/excalidraw/excalidraw/commit/df5eb3f0d971e6172ced6ae7d8835179be131ca7
|
src/actions/actionStyles.ts
|
keep keep replace keep keep keep replace keep keep keep keep
|
<mask> <Shortcut
<mask> label={t("labels.copyStyles")}
<mask> shortcuts={[getShortcutKey("CtrlOrCmd+Shift+C")]}
<mask> />
<mask> <Shortcut
<mask> label={t("labels.pasteStyles")}
<mask> shortcuts={[getShortcutKey("CtrlOrCmd+Shift+V")]}
<mask> />
<mask> <Shortcut
<mask> label={t("labels.delete")}
<mask> shortcuts={[getShortcutKey("Del")]}
</s> change copy/paste styles shortcuts (#1881)
* change copy/paste styles shortcuts
* use keyCode </s> add C_KEY_CODE: 67,
V_KEY_CODE: 86, </s> remove event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "V",
</s> add event[KEYS.CTRL_OR_CMD] &&
event.altKey &&
event.keyCode === KEYS.V_KEY_CODE, </s> remove event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "C",
</s> add event[KEYS.CTRL_OR_CMD] &&
event.altKey &&
event.keyCode === KEYS.C_KEY_CODE,
|
https://github.com/excalidraw/excalidraw/commit/df5eb3f0d971e6172ced6ae7d8835179be131ca7
|
src/components/ShortcutsDialog.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> ALT_KEY_CODE: 18,
<mask> Z_KEY_CODE: 90,
<mask> GRID_KEY_CODE: 222,
<mask> G_KEY_CODE: 71,
<mask> } as const;
<mask>
<mask> export type Key = keyof typeof KEYS;
<mask>
<mask> export const isArrowKey = (keyCode: string) =>
<mask> keyCode === KEYS.ARROW_LEFT ||
</s> change copy/paste styles shortcuts (#1881)
* change copy/paste styles shortcuts
* use keyCode </s> remove event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "C",
</s> add event[KEYS.CTRL_OR_CMD] &&
event.altKey &&
event.keyCode === KEYS.C_KEY_CODE, </s> remove event[KEYS.CTRL_OR_CMD] && event.shiftKey && event.key === "V",
</s> add event[KEYS.CTRL_OR_CMD] &&
event.altKey &&
event.keyCode === KEYS.V_KEY_CODE, </s> remove shortcuts={[getShortcutKey("CtrlOrCmd+Shift+V")]}
</s> add shortcuts={[getShortcutKey("CtrlOrCmd+Alt+V")]} </s> remove shortcuts={[getShortcutKey("CtrlOrCmd+Shift+C")]}
</s> add shortcuts={[getShortcutKey("CtrlOrCmd+Alt+C")]}
|
https://github.com/excalidraw/excalidraw/commit/df5eb3f0d971e6172ced6ae7d8835179be131ca7
|
src/keys.ts
|
keep replace replace replace keep keep keep replace keep keep keep keep
|
<mask>
<mask> generateCurrentEntry(elements: readonly ExcalidrawElement[]) {
<mask> return JSON.stringify(
<mask> elements.map(({ shape, ...element }) => ({
<mask> ...element,
<mask> isSelected: false
<mask> }))
<mask> );
<mask> }
<mask>
<mask> pushEntry(newEntry: string) {
<mask> if (
</s> Add app state to history (#309)
* Add app state to history.
* Pick missing state keys.
* Fix bug.
* Remove force update. </s> add function pickAppStatePropertiesForHistory(
appState: AppState
): Partial<AppState> {
return {
exportBackground: appState.exportBackground,
currentItemStrokeColor: appState.currentItemStrokeColor,
currentItemBackgroundColor: appState.currentItemBackgroundColor,
currentItemFont: appState.currentItemFont,
viewBackgroundColor: appState.viewBackgroundColor,
name: appState.name
};
}
</s> add event.preventDefault();
|
https://github.com/excalidraw/excalidraw/commit/dfb7c2b7441e0caf83ca70863728ed834290f58b
|
src/history.ts
|
keep keep keep add keep keep keep keep
|
<mask> const y = clientY - CANVAS_WINDOW_OFFSET_TOP - scrollY;
<mask> return { x, y };
<mask> }
<mask>
<mask> export class App extends React.Component<any, AppState> {
<mask> canvas: HTMLCanvasElement | null = null;
<mask> rc: RoughCanvas | null = null;
<mask>
</s> Add app state to history (#309)
* Add app state to history.
* Pick missing state keys.
* Fix bug.
* Remove force update. </s> add event.preventDefault();
</s> remove generateCurrentEntry(elements: readonly ExcalidrawElement[]) {
return JSON.stringify(
elements.map(({ shape, ...element }) => ({
</s> add generateCurrentEntry(
appState: Partial<AppState>,
elements: readonly ExcalidrawElement[]
) {
return JSON.stringify({
appState,
elements: elements.map(({ shape, ...element }) => ({ </s> remove );
</s> add });
|
https://github.com/excalidraw/excalidraw/commit/dfb7c2b7441e0caf83ca70863728ed834290f58b
|
src/index.tsx
|
keep add keep keep keep keep keep
|
<mask> this.setState({ elementType: shape });
<mask> } else if (event[KEYS.META] && event.code === "KeyZ") {
<mask> if (event.shiftKey) {
<mask> // Redo action
<mask> const data = history.redoOnce();
<mask> if (data !== null) {
<mask> elements = data.elements;
</s> Add app state to history (#309)
* Add app state to history.
* Pick missing state keys.
* Fix bug.
* Remove force update. </s> add function pickAppStatePropertiesForHistory(
appState: AppState
): Partial<AppState> {
return {
exportBackground: appState.exportBackground,
currentItemStrokeColor: appState.currentItemStrokeColor,
currentItemBackgroundColor: appState.currentItemBackgroundColor,
currentItemFont: appState.currentItemFont,
viewBackgroundColor: appState.viewBackgroundColor,
name: appState.name
};
}
</s> remove generateCurrentEntry(elements: readonly ExcalidrawElement[]) {
return JSON.stringify(
elements.map(({ shape, ...element }) => ({
</s> add generateCurrentEntry(
appState: Partial<AppState>,
elements: readonly ExcalidrawElement[]
) {
return JSON.stringify({
appState,
elements: elements.map(({ shape, ...element }) => ({ </s> remove );
</s> add });
|
https://github.com/excalidraw/excalidraw/commit/dfb7c2b7441e0caf83ca70863728ed834290f58b
|
src/index.tsx
|
keep keep keep keep replace keep keep replace keep keep keep keep
|
<mask> const margin = 4;
<mask> const minimumSize = 40;
<mask> const handlers: { [handler: string]: number[] } = {};
<mask>
<mask> if (elementX2 - elementX1 > minimumSize) {
<mask> handlers["n"] = [
<mask> elementX1 + (elementX2 - elementX1) / 2 + sceneState.scrollX - 4,
<mask> elementY1 - margin + sceneState.scrollY - 8,
<mask> 8,
<mask> 8
<mask> ];
<mask>
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove elementY2 - margin + sceneState.scrollY + 8,
</s> add elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX1 - margin + sceneState.scrollX - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX, </s> remove if (elementY2 - elementY1 > minimumSize) {
</s> add if (Math.abs(elementY2 - elementY1) > minimumSize) { </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY1 - margin + sceneState.scrollY + marginY,
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ];
<mask>
<mask> handlers["s"] = [
<mask> elementX1 + (elementX2 - elementX1) / 2 + sceneState.scrollX - 4,
<mask> elementY2 - margin + sceneState.scrollY + 8,
<mask> 8,
<mask> 8
<mask> ];
<mask> }
<mask>
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove elementY1 - margin + sceneState.scrollY - 8,
</s> add elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY2 - margin + sceneState.scrollY + 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY2 - margin + sceneState.scrollY + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep keep keep replace keep replace keep
|
<mask> 8
<mask> ];
<mask> }
<mask>
<mask> if (elementY2 - elementY1 > minimumSize) {
<mask> handlers["w"] = [
<mask> elementX1 - margin + sceneState.scrollX - 8,
<mask> elementY1 + (elementY2 - elementY1) / 2 + sceneState.scrollY - 4,
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove elementX2 - margin + sceneState.scrollX + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX, </s> remove elementY1 - margin + sceneState.scrollY - 8,
</s> add elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove if (elementX2 - elementX1 > minimumSize) {
</s> add const marginX = element.width < 0 ? 8 : -8;
const marginY = element.height < 0 ? 8 : -8;
if (Math.abs(elementX2 - elementX1) > minimumSize) {
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> 8
<mask> ];
<mask>
<mask> handlers["e"] = [
<mask> elementX2 - margin + sceneState.scrollX + 8,
<mask> elementY1 + (elementY2 - elementY1) / 2 + sceneState.scrollY - 4,
<mask> 8,
<mask> 8
<mask> ];
<mask> }
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove if (elementY2 - elementY1 > minimumSize) {
</s> add if (Math.abs(elementY2 - elementY1) > minimumSize) { </s> remove elementX1 - margin + sceneState.scrollX - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX, </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY2 - margin + sceneState.scrollY + 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY2 - margin + sceneState.scrollY + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY2 - margin + sceneState.scrollY - marginY,
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep keep replace replace keep keep keep keep replace replace keep keep keep
|
<mask> }
<mask>
<mask> handlers["nw"] = [
<mask> elementX1 - margin + sceneState.scrollX - 8,
<mask> elementY1 - margin + sceneState.scrollY - 8,
<mask> 8,
<mask> 8
<mask> ]; // nw
<mask> handlers["ne"] = [
<mask> elementX2 - margin + sceneState.scrollX + 8,
<mask> elementY1 - margin + sceneState.scrollY - 8,
<mask> 8,
<mask> 8
<mask> ]; // ne
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY2 - margin + sceneState.scrollY + 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY2 - margin + sceneState.scrollY + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX, </s> remove elementX1 - margin + sceneState.scrollX - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX, </s> remove elementY1 - margin + sceneState.scrollY - 8,
</s> add elementY1 - margin + sceneState.scrollY + marginY,
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep replace replace keep keep keep keep replace replace keep keep
|
<mask> ]; // ne
<mask> handlers["sw"] = [
<mask> elementX1 - margin + sceneState.scrollX - 8,
<mask> elementY2 - margin + sceneState.scrollY + 8,
<mask> 8,
<mask> 8
<mask> ]; // sw
<mask> handlers["se"] = [
<mask> elementX2 - margin + sceneState.scrollX + 8,
<mask> elementY2 - margin + sceneState.scrollY + 8,
<mask> 8,
<mask> 8
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementY2 - margin + sceneState.scrollY + 8,
</s> add elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX, </s> remove elementY1 - margin + sceneState.scrollY - 8,
</s> add elementY1 - margin + sceneState.scrollY + marginY,
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> element.type !== "text" &&
<mask> element.type !== "arrow" &&
<mask> selectedIndices.length === 1
<mask> ) {
<mask> const handlers = handlerRectangles(
<mask> elementX1,
<mask> elementX2,
<mask> elementY1,
<mask> elementY2,
<mask> sceneState
<mask> );
<mask> Object.values(handlers).forEach(handler => {
<mask> context.strokeRect(handler[0], handler[1], handler[2], handler[3]);
<mask> });
<mask> }
<mask> }
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove const x = e.clientX - target.offsetLeft - this.state.scrollX;
const y = e.clientY - target.offsetTop - this.state.scrollY;
</s> add const x =
e.clientX - CANVAS_WINDOW_OFFSET_LEFT - this.state.scrollX;
const y =
e.clientY - CANVAS_WINDOW_OFFSET_TOP - this.state.scrollY; </s> remove if (elementX2 - elementX1 > minimumSize) {
</s> add const marginX = element.width < 0 ? 8 : -8;
const marginY = element.height < 0 ? 8 : -8;
if (Math.abs(elementX2 - elementX1) > minimumSize) { </s> remove elementY2 - margin + sceneState.scrollY + 8,
</s> add elementY2 - margin + sceneState.scrollY - marginY, </s> remove elementX2 - margin + sceneState.scrollX + 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX, </s> remove elementX1 - margin + sceneState.scrollX - 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
elementY1 - margin + sceneState.scrollY + marginY, </s> remove elementX1 - margin + sceneState.scrollX - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX,
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> if (isResizingElements && this.state.resizingElement) {
<mask> const el = this.state.resizingElement;
<mask> const selectedElements = elements.filter(el => el.isSelected);
<mask> if (selectedElements.length === 1) {
<mask> const x = e.clientX - target.offsetLeft - this.state.scrollX;
<mask> const y = e.clientY - target.offsetTop - this.state.scrollY;
<mask> selectedElements.forEach(element => {
<mask> switch (resizeHandle) {
<mask> case "nw":
<mask> element.width += element.x - lastX;
<mask> element.height += element.y - lastY;
</s> Resize with negative width or height (#136)
* Disable resize for text, arrow and multiple selection
* Resize with negative width and height
* Fix resizing when leaves windows </s> remove if (elementX2 - elementX1 > minimumSize) {
</s> add const marginX = element.width < 0 ? 8 : -8;
const marginY = element.height < 0 ? 8 : -8;
if (Math.abs(elementX2 - elementX1) > minimumSize) { </s> remove const handlers = handlerRectangles(
elementX1,
elementX2,
elementY1,
elementY2,
sceneState
);
</s> add const handlers = handlerRectangles(element, sceneState); </s> remove elementY1 - margin + sceneState.scrollY - 8,
</s> add elementY1 - margin + sceneState.scrollY + marginY, </s> remove if (elementY2 - elementY1 > minimumSize) {
</s> add if (Math.abs(elementY2 - elementY1) > minimumSize) { </s> remove elementX1 - margin + sceneState.scrollX - 8,
</s> add elementX1 - margin + sceneState.scrollX + marginX, </s> remove elementX2 - margin + sceneState.scrollX + 8,
elementY1 - margin + sceneState.scrollY - 8,
</s> add elementX2 - margin + sceneState.scrollX - marginX,
elementY1 - margin + sceneState.scrollY + marginY,
|
https://github.com/excalidraw/excalidraw/commit/dfb7faec3071dc7ea5abbf590a174f4cb8931c9b
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "bugs": "https://github.com/excalidraw/excalidraw/issues",
<mask> "homepage": "https://github.com/excalidraw/excalidraw/tree/master/src/packages/excalidraw",
<mask> "scripts": {
<mask> "gen:types": "tsc --project ../../../tsconfig-types.json",
<mask> "build:umd": "cross-env NODE_ENV=production webpack --config webpack.prod.config.js && cross-env NODE_ENV=development webpack --config webpack.dev.config.js && yarn gen:types",
<mask> "build:umd:withAnalyzer": "cross-env NODE_ENV=production ANALYZER=true webpack --config webpack.prod.config.js",
<mask> "pack": "yarn build:umd && yarn pack"
<mask> },
<mask> "dependencies": {
<mask> "dotenv": "10.0.0"
</s> feat: set package build target to `es2017` (#4341) </s> remove "@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-transform-arrow-functions",
</s> add </s> remove "target": "es5",
</s> add "target": "es2017", </s> remove "@babel/plugin-transform-async-to-generator",
</s> add
|
https://github.com/excalidraw/excalidraw/commit/dfbfbc3f11673e0de70dadb3ab4001a9b9721632
|
src/packages/excalidraw/package.json
|
keep keep replace replace keep replace keep keep keep keep
|
<mask> ],
<mask> plugins: [
<mask> "@babel/plugin-proposal-object-rest-spread",
<mask> "@babel/plugin-transform-arrow-functions",
<mask> "transform-class-properties",
<mask> "@babel/plugin-transform-async-to-generator",
<mask> "@babel/plugin-transform-runtime",
<mask> ],
<mask> },
<mask> },
</s> feat: set package build target to `es2017` (#4341) </s> remove "build:umd": "cross-env NODE_ENV=production webpack --config webpack.prod.config.js && cross-env NODE_ENV=development webpack --config webpack.dev.config.js && yarn gen:types",
</s> add "build:umd": "rm -rf dist && cross-env NODE_ENV=production webpack --config webpack.prod.config.js && cross-env NODE_ENV=development webpack --config webpack.dev.config.js && yarn gen:types", </s> remove "target": "es5",
</s> add "target": "es2017",
|
https://github.com/excalidraw/excalidraw/commit/dfbfbc3f11673e0de70dadb3ab4001a9b9721632
|
src/packages/excalidraw/webpack.prod.config.js
|
keep keep replace keep keep keep keep keep
|
<mask> {
<mask> "compilerOptions": {
<mask> "target": "es5",
<mask> "module": "es2015",
<mask> "moduleResolution": "node",
<mask> "resolveJsonModule": true,
<mask> "jsx": "react"
<mask> }
</s> feat: set package build target to `es2017` (#4341) </s> remove "@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-transform-arrow-functions",
</s> add </s> remove "build:umd": "cross-env NODE_ENV=production webpack --config webpack.prod.config.js && cross-env NODE_ENV=development webpack --config webpack.dev.config.js && yarn gen:types",
</s> add "build:umd": "rm -rf dist && cross-env NODE_ENV=production webpack --config webpack.prod.config.js && cross-env NODE_ENV=development webpack --config webpack.dev.config.js && yarn gen:types", </s> remove "@babel/plugin-transform-async-to-generator",
</s> add
|
https://github.com/excalidraw/excalidraw/commit/dfbfbc3f11673e0de70dadb3ab4001a9b9721632
|
src/packages/tsconfig.prod.json
|
keep add keep keep keep keep keep
|
<mask> viewModeEnabled={viewModeEnabled}
<mask> />
<mask> {this.state.showStats && (
<mask> <Stats
<mask> appState={this.state}
<mask> setAppState={this.setAppState}
<mask> elements={this.scene.getElements()}
</s> fix: incorrect z-index of text editor (#2914) </s> remove document.body.appendChild(editable);
</s> add document
.querySelector(".excalidraw-textEditorContainer")!
.appendChild(editable); </s> remove document.body.removeChild(editable);
</s> add editable.remove();
|
https://github.com/excalidraw/excalidraw/commit/e18e945cd31bb017233ed75a2bf5cb60d9db4e2a
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> window.removeEventListener("blur", handleSubmit);
<mask>
<mask> unbindUpdate();
<mask>
<mask> document.body.removeChild(editable);
<mask> };
<mask>
<mask> const rebindBlur = () => {
<mask> window.removeEventListener("pointerup", rebindBlur);
<mask> // deferred to guard against focus traps on various UIs that steal focus
</s> fix: incorrect z-index of text editor (#2914) </s> remove document.body.appendChild(editable);
</s> add document
.querySelector(".excalidraw-textEditorContainer")!
.appendChild(editable); </s> add <div className="excalidraw-textEditorContainer" />
|
https://github.com/excalidraw/excalidraw/commit/e18e945cd31bb017233ed75a2bf5cb60d9db4e2a
|
src/element/textWysiwyg.tsx
|
keep keep keep keep replace keep keep keep
|
<mask> window.addEventListener("wheel", stopEvent, {
<mask> passive: false,
<mask> capture: true,
<mask> });
<mask> document.body.appendChild(editable);
<mask> editable.focus();
<mask> editable.select();
<mask> };
</s> fix: incorrect z-index of text editor (#2914) </s> remove document.body.removeChild(editable);
</s> add editable.remove(); </s> add <div className="excalidraw-textEditorContainer" />
|
https://github.com/excalidraw/excalidraw/commit/e18e945cd31bb017233ed75a2bf5cb60d9db4e2a
|
src/element/textWysiwyg.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ) {
<mask> elements = clearSelection(elements);
<mask>
<mask> let subCanvasX1 = Infinity;
<mask> let subCanvasX2 = 0;
<mask> let subCanvasY1 = Infinity;
<mask> let subCanvasY2 = 0;
<mask>
<mask> const minX = Math.min(...parsedElements.map(element => element.x));
<mask> const minY = Math.min(...parsedElements.map(element => element.y));
</s> Fix exported size when drawing to the left (#575)
If you scroll and draw to the left of the origin, when you export the scene, there's a weird whitespace on the right. This is because we do the min() computation starting at 0 and not -Infinity
This also fixes pasted elements and scrollbars. </s> remove let subCanvasY2 = 0;
</s> add let subCanvasY2 = -Infinity; </s> remove let maxX = 0;
</s> add let maxX = -Infinity; </s> remove let subCanvasY2 = 0;
</s> add let subCanvasY2 = -Infinity; </s> remove let maxY = 0;
</s> add let maxY = -Infinity; </s> remove let subCanvasX2 = 0;
</s> add let subCanvasX2 = -Infinity;
|
https://github.com/excalidraw/excalidraw/commit/e1ed40be65d67b5de1cf4e82c8ba919cde33c26d
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> let subCanvasX1 = Infinity;
<mask> let subCanvasX2 = 0;
<mask> let subCanvasY1 = Infinity;
<mask> let subCanvasY2 = 0;
<mask>
<mask> const minX = Math.min(...parsedElements.map(element => element.x));
<mask> const minY = Math.min(...parsedElements.map(element => element.y));
<mask>
<mask> parsedElements.forEach(parsedElement => {
</s> Fix exported size when drawing to the left (#575)
If you scroll and draw to the left of the origin, when you export the scene, there's a weird whitespace on the right. This is because we do the min() computation starting at 0 and not -Infinity
This also fixes pasted elements and scrollbars. </s> remove let subCanvasX2 = 0;
</s> add let subCanvasX2 = -Infinity; </s> remove let maxX = 0;
</s> add let maxX = -Infinity; </s> remove let maxY = 0;
</s> add let maxY = -Infinity; </s> remove let subCanvasX2 = 0;
</s> add let subCanvasX2 = -Infinity; </s> remove let subCanvasY2 = 0;
</s> add let subCanvasY2 = -Infinity;
|
https://github.com/excalidraw/excalidraw/commit/e1ed40be65d67b5de1cf4e82c8ba919cde33c26d
|
src/index.tsx
|
keep replace keep replace keep keep
|
<mask> let subCanvasX1 = Infinity;
<mask> let subCanvasX2 = 0;
<mask> let subCanvasY1 = Infinity;
<mask> let subCanvasY2 = 0;
<mask>
<mask> elements.forEach(element => {
</s> Fix exported size when drawing to the left (#575)
If you scroll and draw to the left of the origin, when you export the scene, there's a weird whitespace on the right. This is because we do the min() computation starting at 0 and not -Infinity
This also fixes pasted elements and scrollbars. </s> remove let maxY = 0;
</s> add let maxY = -Infinity; </s> remove let maxX = 0;
</s> add let maxX = -Infinity; </s> remove let subCanvasX2 = 0;
</s> add let subCanvasX2 = -Infinity; </s> remove let subCanvasY2 = 0;
</s> add let subCanvasY2 = -Infinity;
|
https://github.com/excalidraw/excalidraw/commit/e1ed40be65d67b5de1cf4e82c8ba919cde33c26d
|
src/scene/getExportCanvasPreview.ts
|
keep keep replace keep replace keep keep keep
|
<mask> ) {
<mask> let minX = Infinity;
<mask> let maxX = 0;
<mask> let minY = Infinity;
<mask> let maxY = 0;
<mask>
<mask> elements.forEach(element => {
<mask> const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
</s> Fix exported size when drawing to the left (#575)
If you scroll and draw to the left of the origin, when you export the scene, there's a weird whitespace on the right. This is because we do the min() computation starting at 0 and not -Infinity
This also fixes pasted elements and scrollbars. </s> remove let subCanvasY2 = 0;
</s> add let subCanvasY2 = -Infinity; </s> remove let subCanvasX2 = 0;
</s> add let subCanvasX2 = -Infinity; </s> remove let subCanvasY2 = 0;
</s> add let subCanvasY2 = -Infinity; </s> remove let subCanvasX2 = 0;
</s> add let subCanvasX2 = -Infinity;
|
https://github.com/excalidraw/excalidraw/commit/e1ed40be65d67b5de1cf4e82c8ba919cde33c26d
|
src/scene/scrollbars.ts
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> if (
<mask> transformElements(
<mask> pointerDownState,
<mask> transformHandleType,
<mask> (newTransformHandle) => {
<mask> pointerDownState.resize.handleType = newTransformHandle;
<mask> },
<mask> selectedElements,
<mask> pointerDownState.resize.arrowDirection,
<mask> getRotateWithDiscreteAngleKey(event),
<mask> getResizeCenterPointKey(event),
<mask> getResizeWithSidesSameLengthKey(event),
</s> improvement: Enhance resize for non generic elements (#2720) </s> remove let scaleX = 1;
let scaleY = 1;
if (
transformHandleType === "e" ||
transformHandleType === "ne" ||
transformHandleType === "se"
) {
scaleX = (rotatedX - x1) / (x2 - x1);
}
if (
transformHandleType === "s" ||
transformHandleType === "sw" ||
transformHandleType === "se"
) {
scaleY = (rotatedY - y1) / (y2 - y1);
}
if (
transformHandleType === "w" ||
transformHandleType === "nw" ||
transformHandleType === "sw"
) {
scaleX = (x2 - rotatedX) / (x2 - x1);
}
if (
transformHandleType === "n" ||
transformHandleType === "nw" ||
transformHandleType === "ne"
) {
scaleY = (y2 - rotatedY) / (y2 - y1);
}
let nextWidth = element.width * scaleX;
let nextHeight = element.height * scaleY;
if (keepSquareAspectRatio) {
nextWidth = nextHeight = Math.max(nextWidth, nextHeight);
}
const [nextX1, nextY1, nextX2, nextY2] = getResizedElementAbsoluteCoords(
element,
nextWidth,
nextHeight,
);
const deltaX1 = (x1 - nextX1) / 2;
const deltaY1 = (y1 - nextY1) / 2;
const deltaX2 = (x2 - nextX2) / 2;
const deltaY2 = (y2 - nextY2) / 2;
const rescaledPoints = rescalePointsInElement(element, nextWidth, nextHeight);
updateBoundElements(element, {
newSize: { width: nextWidth, height: nextHeight },
});
const [finalX1, finalY1, finalX2, finalY2] = getResizedElementAbsoluteCoords(
{
...element,
...rescaledPoints,
},
Math.abs(nextWidth),
Math.abs(nextHeight),
);
const [flipDiffX, flipDiffY] = getFlipAdjustment(
transformHandleType,
nextWidth,
nextHeight,
nextX1,
nextY1,
nextX2,
nextY2,
finalX1,
finalY1,
finalX2,
finalY2,
isLinearElement(element),
element.angle,
);
const [nextElementX, nextElementY] = adjustXYWithRotation(
getSidesForTransformHandle(transformHandleType, isResizeFromCenter),
element.x - flipDiffX,
element.y - flipDiffY,
element.angle,
deltaX1,
deltaY1,
deltaX2,
deltaY2,
);
</s> add const resizedElement = {
width: Math.abs(eleNewWidth),
height: Math.abs(eleNewHeight),
x: newOrigin[0],
y: newOrigin[1],
...rescaledPoints,
}; </s> remove if (isGenericElement(element)) {
resizeSingleGenericElement(
pointerDownState.originalElements.get(element.id) as typeof element,
shouldKeepSidesRatio,
element,
transformHandleType,
isResizeCenterPoint,
pointerX,
pointerY,
);
} else {
const keepSquareAspectRatio = shouldKeepSidesRatio;
resizeSingleNonGenericElement(
element,
transformHandleType,
isResizeCenterPoint,
keepSquareAspectRatio,
pointerX,
pointerY,
);
setTransformHandle(
normalizeTransformHandleType(element, transformHandleType),
);
if (element.width < 0) {
mutateElement(element, { width: -element.width });
}
if (element.height < 0) {
mutateElement(element, { height: -element.height });
}
}
</s> add resizeSingleElement(
pointerDownState.originalElements.get(element.id) as typeof element,
shouldKeepSidesRatio,
element,
transformHandleType,
isResizeCenterPoint,
pointerX,
pointerY,
); </s> remove const resizedElement = {
width: Math.abs(newWidth),
height: Math.abs(newHeight),
x: newTopLeft[0],
y: newTopLeft[1],
};
updateBoundElements(element, {
newSize: { width: resizedElement.width, height: resizedElement.height },
});
mutateElement(element, resizedElement);
};
const resizeSingleNonGenericElement = (
element: NonDeleted<Exclude<ExcalidrawElement, ExcalidrawGenericElement>>,
transformHandleType: "n" | "s" | "w" | "e" | "nw" | "ne" | "sw" | "se",
isResizeFromCenter: boolean,
keepSquareAspectRatio: boolean,
pointerX: number,
pointerY: number,
) => {
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
const cx = (x1 + x2) / 2;
const cy = (y1 + y2) / 2;
// rotation pointer with reverse angle
const [rotatedX, rotatedY] = rotate(
pointerX,
pointerY,
cx,
cy,
-element.angle,
</s> add // Readjust points for linear elements
const rescaledPoints = rescalePointsInElement(
stateAtResizeStart,
eleNewWidth,
eleNewHeight, </s> add mutateElement(element, resizedElement); </s> remove mutateElement(element, {
width: nextWidth,
height: nextHeight,
x: nextElementX,
y: nextElementY,
...rescaledPoints,
</s> add updateBoundElements(element, {
newSize: { width: resizedElement.width, height: resizedElement.height }, </s> remove export const getFlipAdjustment = (
side: "n" | "s" | "w" | "e" | "nw" | "ne" | "sw" | "se",
nextWidth: number,
nextHeight: number,
nextX1: number,
nextY1: number,
nextX2: number,
nextY2: number,
finalX1: number,
finalY1: number,
finalX2: number,
finalY2: number,
needsRotation: boolean,
angle: number,
): [number, number] => {
const cos = Math.cos(angle);
const sin = Math.sin(angle);
let flipDiffX = 0;
let flipDiffY = 0;
if (nextWidth < 0) {
if (side === "e" || side === "ne" || side === "se") {
if (needsRotation) {
flipDiffX += (finalX2 - nextX1) * cos;
flipDiffY += (finalX2 - nextX1) * sin;
} else {
flipDiffX += finalX2 - nextX1;
}
}
if (side === "w" || side === "nw" || side === "sw") {
if (needsRotation) {
flipDiffX += (finalX1 - nextX2) * cos;
flipDiffY += (finalX1 - nextX2) * sin;
} else {
flipDiffX += finalX1 - nextX2;
}
}
}
if (nextHeight < 0) {
if (side === "s" || side === "se" || side === "sw") {
if (needsRotation) {
flipDiffY += (finalY2 - nextY1) * cos;
flipDiffX += (finalY2 - nextY1) * -sin;
} else {
flipDiffY += finalY2 - nextY1;
}
}
if (side === "n" || side === "ne" || side === "nw") {
if (needsRotation) {
flipDiffY += (finalY1 - nextY2) * cos;
flipDiffX += (finalY1 - nextY2) * -sin;
} else {
flipDiffY += finalY1 - nextY2;
}
}
}
return [flipDiffX, flipDiffY];
};
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e26f374ca6175d70d182e9353dae209b71f28e12
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> } from "./collision";
<mask> export {
<mask> resizeTest,
<mask> getCursorForResizingElement,
<mask> normalizeTransformHandleType,
<mask> getElementWithTransformHandleType,
<mask> getTransformHandleTypeFromCoords,
<mask> } from "./resizeTest";
<mask> export {
<mask> transformElements,
</s> improvement: Enhance resize for non generic elements (#2720) </s> remove import {
getCursorForResizingElement,
normalizeTransformHandleType,
} from "./resizeTest";
</s> add import { getCursorForResizingElement } from "./resizeTest"; </s> remove import { isGenericElement, isLinearElement, isTextElement } from "./typeChecks";
</s> add import { isLinearElement, isTextElement } from "./typeChecks"; </s> remove getFlipAdjustment,
</s> add </s> remove ExcalidrawGenericElement,
ExcalidrawElement,
</s> add </s> remove newHeight = startBottomRight[1] - rotatedPointer[1];
</s> add scaleY = (startBottomRight[1] - rotatedPointer[1]) / boundsCurrentHeight; </s> remove export const getFlipAdjustment = (
side: "n" | "s" | "w" | "e" | "nw" | "ne" | "sw" | "se",
nextWidth: number,
nextHeight: number,
nextX1: number,
nextY1: number,
nextX2: number,
nextY2: number,
finalX1: number,
finalY1: number,
finalX2: number,
finalY2: number,
needsRotation: boolean,
angle: number,
): [number, number] => {
const cos = Math.cos(angle);
const sin = Math.sin(angle);
let flipDiffX = 0;
let flipDiffY = 0;
if (nextWidth < 0) {
if (side === "e" || side === "ne" || side === "se") {
if (needsRotation) {
flipDiffX += (finalX2 - nextX1) * cos;
flipDiffY += (finalX2 - nextX1) * sin;
} else {
flipDiffX += finalX2 - nextX1;
}
}
if (side === "w" || side === "nw" || side === "sw") {
if (needsRotation) {
flipDiffX += (finalX1 - nextX2) * cos;
flipDiffY += (finalX1 - nextX2) * sin;
} else {
flipDiffX += finalX1 - nextX2;
}
}
}
if (nextHeight < 0) {
if (side === "s" || side === "se" || side === "sw") {
if (needsRotation) {
flipDiffY += (finalY2 - nextY1) * cos;
flipDiffX += (finalY2 - nextY1) * -sin;
} else {
flipDiffY += finalY2 - nextY1;
}
}
if (side === "n" || side === "ne" || side === "nw") {
if (needsRotation) {
flipDiffY += (finalY1 - nextY2) * cos;
flipDiffX += (finalY1 - nextY2) * -sin;
} else {
flipDiffY += finalY1 - nextY2;
}
}
}
return [flipDiffX, flipDiffY];
};
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e26f374ca6175d70d182e9353dae209b71f28e12
|
src/element/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> import {
<mask> rotate,
<mask> adjustXYWithRotation,
<mask> getFlipAdjustment,
<mask> centerPoint,
<mask> rotatePoint,
<mask> } from "../math";
<mask> import {
<mask> ExcalidrawLinearElement,
</s> improvement: Enhance resize for non generic elements (#2720) </s> remove import {
getCursorForResizingElement,
normalizeTransformHandleType,
} from "./resizeTest";
</s> add import { getCursorForResizingElement } from "./resizeTest"; </s> remove import { isGenericElement, isLinearElement, isTextElement } from "./typeChecks";
</s> add import { isLinearElement, isTextElement } from "./typeChecks"; </s> remove ExcalidrawGenericElement,
ExcalidrawElement,
</s> add </s> remove normalizeTransformHandleType,
</s> add </s> remove newHeight = startBottomRight[1] - rotatedPointer[1];
</s> add scaleY = (startBottomRight[1] - rotatedPointer[1]) / boundsCurrentHeight; </s> remove newWidth = 2 * newWidth - stateAtResizeStart.width;
newHeight = 2 * newHeight - stateAtResizeStart.height;
</s> add eleNewWidth = 2 * eleNewWidth - eleInitialWidth;
eleNewHeight = 2 * eleNewHeight - eleInitialHeight;
|
https://github.com/excalidraw/excalidraw/commit/e26f374ca6175d70d182e9353dae209b71f28e12
|
src/element/resizeElements.ts
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> ExcalidrawLinearElement,
<mask> ExcalidrawTextElement,
<mask> NonDeletedExcalidrawElement,
<mask> NonDeleted,
<mask> ExcalidrawGenericElement,
<mask> ExcalidrawElement,
<mask> } from "./types";
<mask> import {
<mask> getElementAbsoluteCoords,
<mask> getCommonBounds,
<mask> getResizedElementAbsoluteCoords,
</s> improvement: Enhance resize for non generic elements (#2720) </s> remove import { isGenericElement, isLinearElement, isTextElement } from "./typeChecks";
</s> add import { isLinearElement, isTextElement } from "./typeChecks"; </s> remove getFlipAdjustment,
</s> add </s> remove import {
getCursorForResizingElement,
normalizeTransformHandleType,
} from "./resizeTest";
</s> add import { getCursorForResizingElement } from "./resizeTest"; </s> remove const resizeSingleGenericElement = (
stateAtResizeStart: NonDeleted<ExcalidrawGenericElement>,
</s> add const resizeSingleElement = (
stateAtResizeStart: NonDeletedExcalidrawElement, </s> remove normalizeTransformHandleType,
</s> add </s> remove
export const normalizeTransformHandleType = (
element: ExcalidrawElement,
transformHandleType: TransformHandleType,
): TransformHandleType => {
if (element.width >= 0 && element.height >= 0) {
return transformHandleType;
}
if (element.width < 0 && element.height < 0) {
switch (transformHandleType) {
case "nw":
return "se";
case "ne":
return "sw";
case "se":
return "nw";
case "sw":
return "ne";
}
} else if (element.width < 0) {
switch (transformHandleType) {
case "nw":
return "ne";
case "ne":
return "nw";
case "se":
return "sw";
case "sw":
return "se";
case "e":
return "w";
case "w":
return "e";
}
} else {
switch (transformHandleType) {
case "nw":
return "sw";
case "ne":
return "se";
case "se":
return "ne";
case "sw":
return "nw";
case "n":
return "s";
case "s":
return "n";
}
}
return transformHandleType;
};
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e26f374ca6175d70d182e9353dae209b71f28e12
|
src/element/resizeElements.ts
|
keep keep keep keep replace keep keep replace replace replace replace keep keep keep
|
<mask> getElementAbsoluteCoords,
<mask> getCommonBounds,
<mask> getResizedElementAbsoluteCoords,
<mask> } from "./bounds";
<mask> import { isGenericElement, isLinearElement, isTextElement } from "./typeChecks";
<mask> import { mutateElement } from "./mutateElement";
<mask> import { getPerfectElementSize } from "./sizeHelpers";
<mask> import {
<mask> getCursorForResizingElement,
<mask> normalizeTransformHandleType,
<mask> } from "./resizeTest";
<mask> import { measureText, getFontString } from "../utils";
<mask> import { updateBoundElements } from "./binding";
<mask> import {
</s> improvement: Enhance resize for non generic elements (#2720) </s> remove ExcalidrawGenericElement,
ExcalidrawElement,
</s> add </s> remove getFlipAdjustment,
</s> add </s> remove normalizeTransformHandleType,
</s> add </s> remove newHeight = startBottomRight[1] - rotatedPointer[1];
</s> add scaleY = (startBottomRight[1] - rotatedPointer[1]) / boundsCurrentHeight; </s> remove newWidth = 2 * newWidth - stateAtResizeStart.width;
newHeight = 2 * newHeight - stateAtResizeStart.height;
</s> add eleNewWidth = 2 * eleNewWidth - eleInitialWidth;
eleNewHeight = 2 * eleNewHeight - eleInitialHeight;
|
https://github.com/excalidraw/excalidraw/commit/e26f374ca6175d70d182e9353dae209b71f28e12
|
src/element/resizeElements.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Returns true when transform (resizing/rotation) happened
<mask> export const transformElements = (
<mask> pointerDownState: PointerDownState,
<mask> transformHandleType: MaybeTransformHandleType,
<mask> setTransformHandle: (nextTransformHandle: MaybeTransformHandleType) => void,
<mask> selectedElements: readonly NonDeletedExcalidrawElement[],
<mask> resizeArrowDirection: "origin" | "end",
<mask> isRotateWithDiscreteAngle: boolean,
<mask> isResizeCenterPoint: boolean,
<mask> shouldKeepSidesRatio: boolean,
</s> improvement: Enhance resize for non generic elements (#2720) </s> remove const resizeSingleGenericElement = (
stateAtResizeStart: NonDeleted<ExcalidrawGenericElement>,
</s> add const resizeSingleElement = (
stateAtResizeStart: NonDeletedExcalidrawElement, </s> add mutateElement(element, resizedElement); </s> remove const resizedElement = {
width: Math.abs(newWidth),
height: Math.abs(newHeight),
x: newTopLeft[0],
y: newTopLeft[1],
};
updateBoundElements(element, {
newSize: { width: resizedElement.width, height: resizedElement.height },
});
mutateElement(element, resizedElement);
};
const resizeSingleNonGenericElement = (
element: NonDeleted<Exclude<ExcalidrawElement, ExcalidrawGenericElement>>,
transformHandleType: "n" | "s" | "w" | "e" | "nw" | "ne" | "sw" | "se",
isResizeFromCenter: boolean,
keepSquareAspectRatio: boolean,
pointerX: number,
pointerY: number,
) => {
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
const cx = (x1 + x2) / 2;
const cy = (y1 + y2) / 2;
// rotation pointer with reverse angle
const [rotatedX, rotatedY] = rotate(
pointerX,
pointerY,
cx,
cy,
-element.angle,
</s> add // Readjust points for linear elements
const rescaledPoints = rescalePointsInElement(
stateAtResizeStart,
eleNewWidth,
eleNewHeight, </s> remove const [x1, y1, x2, y2] = getElementAbsoluteCoords(stateAtResizeStart);
</s> add // Gets bounds corners
const [x1, y1, x2, y2] = getResizedElementAbsoluteCoords(
stateAtResizeStart,
stateAtResizeStart.width,
stateAtResizeStart.height,
); </s> remove export const getFlipAdjustment = (
side: "n" | "s" | "w" | "e" | "nw" | "ne" | "sw" | "se",
nextWidth: number,
nextHeight: number,
nextX1: number,
nextY1: number,
nextX2: number,
nextY2: number,
finalX1: number,
finalY1: number,
finalX2: number,
finalY2: number,
needsRotation: boolean,
angle: number,
): [number, number] => {
const cos = Math.cos(angle);
const sin = Math.sin(angle);
let flipDiffX = 0;
let flipDiffY = 0;
if (nextWidth < 0) {
if (side === "e" || side === "ne" || side === "se") {
if (needsRotation) {
flipDiffX += (finalX2 - nextX1) * cos;
flipDiffY += (finalX2 - nextX1) * sin;
} else {
flipDiffX += finalX2 - nextX1;
}
}
if (side === "w" || side === "nw" || side === "sw") {
if (needsRotation) {
flipDiffX += (finalX1 - nextX2) * cos;
flipDiffY += (finalX1 - nextX2) * sin;
} else {
flipDiffX += finalX1 - nextX2;
}
}
}
if (nextHeight < 0) {
if (side === "s" || side === "se" || side === "sw") {
if (needsRotation) {
flipDiffY += (finalY2 - nextY1) * cos;
flipDiffX += (finalY2 - nextY1) * -sin;
} else {
flipDiffY += finalY2 - nextY1;
}
}
if (side === "n" || side === "ne" || side === "nw") {
if (needsRotation) {
flipDiffY += (finalY1 - nextY2) * cos;
flipDiffX += (finalY1 - nextY2) * -sin;
} else {
flipDiffY += finalY1 - nextY2;
}
}
}
return [flipDiffX, flipDiffY];
};
</s> add </s> remove ${"ne"} | ${[10, 55]} | ${[110, 45]} | ${[elemData.x, 55]}
</s> add ${"ne"} | ${[5, 55]} | ${[105, 45]} | ${[elemData.x, 55]}
|
https://github.com/excalidraw/excalidraw/commit/e26f374ca6175d70d182e9353dae209b71f28e12
|
src/element/resizeElements.ts
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.