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> getElements: () => readonly ExcalidrawElement[],
<mask> ) {
<mask> this.updater = updater;
<mask> this.getAppState = getAppState;
<mask> this.getElements = getElements;
<mask> }
<mask>
<mask> registerAction(action: Action) {
<mask> this.actions[action.name] = action;
<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 getElements: () => readonly ExcalidrawElement[],
</s> add getElementsIncludingDeleted: () => ReturnType<
typeof globalSceneState["getElementsIncludingDeleted"]
>, </s> remove getElements: () => readonly ExcalidrawElement[];
</s> add getElementsIncludingDeleted: () => readonly ExcalidrawElement[]; </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[],
selection: ExcalidrawElement,
</s> add elements: readonly NonDeletedExcalidrawElement[],
selection: NonDeletedExcalidrawElement, </s> remove this.updater(action.perform(this.getElements(), this.getAppState(), null));
</s> add this.updater(
action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
),
);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/actions/manager.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> .sort((a, b) => (b.keyPriority || 0) - (a.keyPriority || 0))
<mask> .filter(
<mask> (action) =>
<mask> action.keyTest &&
<mask> action.keyTest(event, this.getAppState(), this.getElements()),
<mask> );
<mask>
<mask> if (data.length === 0) {
<mask> return false;
<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 if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) { </s> remove this.updater(action.perform(this.getElements(), this.getAppState(), null));
</s> add this.updater(
action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
),
); </s> remove this.updater(data[0].perform(this.getElements(), this.getAppState(), null));
</s> add this.updater(
data[0].perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
),
); </s> remove globalSceneState.getAllElements() == null ||
globalSceneState.getAllElements().length === 0
</s> add globalSceneState.getElementsIncludingDeleted() == null ||
globalSceneState.getElementsIncludingDeleted().length === 0 </s> remove globalSceneState.getAllElements().map((el) => {
</s> add globalSceneState.getElementsIncludingDeleted().map((el) => { </s> remove globalSceneState.getAllElements().filter((element) => {
</s> add elements.filter((element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/actions/manager.tsx
|
keep keep keep replace keep keep keep keep replace keep keep keep keep
|
<mask> }
<mask>
<mask> event.preventDefault();
<mask> this.updater(data[0].perform(this.getElements(), this.getAppState(), null));
<mask> return true;
<mask> }
<mask>
<mask> executeAction(action: Action) {
<mask> this.updater(action.perform(this.getElements(), this.getAppState(), null));
<mask> }
<mask>
<mask> getContextMenuItems(actionFilter: ActionFilterFn = (action) => action) {
<mask> return Object.values(this.actions)
</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 action.keyTest(event, this.getAppState(), this.getElements()),
</s> add action.keyTest(
event,
this.getAppState(),
this.getElementsIncludingDeleted(),
), </s> remove action.perform(this.getElements(), this.getAppState(), null),
</s> add action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
), </s> remove action.perform(this.getElements(), this.getAppState(), formState),
</s> add action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
formState,
), </s> add getElements(): readonly NonDeletedExcalidrawElement[] {
return getNonDeletedElements(this._elements);
}
</s> remove this.getElements = getElements;
</s> add this.getElementsIncludingDeleted = getElementsIncludingDeleted;
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/actions/manager.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> .map((action) => ({
<mask> label: action.contextItemLabel ? t(action.contextItemLabel) : "",
<mask> action: () => {
<mask> this.updater(
<mask> action.perform(this.getElements(), this.getAppState(), null),
<mask> );
<mask> },
<mask> }));
<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 hasNonDeletedElements(globalSceneState.getAllElements()) && {
</s> add elements.length > 0 && { </s> remove hasNonDeletedElements(globalSceneState.getAllElements()) && {
</s> add elements.length > 0 && { </s> remove action.perform(this.getElements(), this.getAppState(), formState),
</s> add action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
formState,
), </s> remove this.updater(action.perform(this.getElements(), this.getAppState(), null));
</s> add this.updater(
action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
),
); </s> remove this.updater(data[0].perform(this.getElements(), this.getAppState(), null));
</s> add this.updater(
data[0].perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
),
); </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/actions/manager.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const action = this.actions[name];
<mask> const PanelComponent = action.PanelComponent!;
<mask> const updateData = (formState?: any) => {
<mask> this.updater(
<mask> action.perform(this.getElements(), this.getAppState(), formState),
<mask> );
<mask> };
<mask>
<mask> return (
<mask> <PanelComponent
</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 action.perform(this.getElements(), this.getAppState(), null),
</s> add action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
), </s> remove this.updater(data[0].perform(this.getElements(), this.getAppState(), null));
</s> add this.updater(
data[0].perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
),
); </s> remove elements={this.getElements()}
</s> add elements={this.getElementsIncludingDeleted()} </s> remove this.updater(action.perform(this.getElements(), this.getAppState(), null));
</s> add this.updater(
action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
),
); </s> remove action.keyTest(event, this.getAppState(), this.getElements()),
</s> add action.keyTest(
event,
this.getAppState(),
this.getElementsIncludingDeleted(),
), </s> remove const targetElements = getTargetElement(elements, appState);
</s> add const targetElements = getTargetElement(
getNonDeletedElements(elements),
appState,
);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/actions/manager.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask>
<mask> return (
<mask> <PanelComponent
<mask> elements={this.getElements()}
<mask> appState={this.getAppState()}
<mask> updateData={updateData}
<mask> />
<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 action.perform(this.getElements(), this.getAppState(), formState),
</s> add action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
formState,
), </s> remove getDrawingVersion(globalSceneState.getAllElements()),
</s> add getDrawingVersion(globalSceneState.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 elements={globalSceneState.getAllElements().filter((element) => {
return !element.isDeleted;
})}
setElements={this.setElements}
</s> add elements={globalSceneState.getElements()} </s> remove (isSomeElementSelected(elements, appState)
? getCommonAttributeOfSelectedElements(elements, appState, getAttribute)
</s> add (isSomeElementSelected(nonDeletedElements, appState)
? getCommonAttributeOfSelectedElements(
nonDeletedElements,
appState,
getAttribute,
) </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/actions/manager.tsx
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "./element/types";
<mask> import { getSelectedElements } from "./scene";
<mask> import { AppState } from "./types";
<mask> import { SVG_EXPORT_TAG } from "./scene/export";
<mask>
<mask> let CLIPBOARD = "";
</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 "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { ExcalidrawElement, NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/clipboard.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "ClipboardItem" in window &&
<mask> "toBlob" in HTMLCanvasElement.prototype;
<mask>
<mask> export async function copyToAppClipboard(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> ) {
<mask> CLIPBOARD = JSON.stringify(getSelectedElements(elements, appState));
<mask> try {
<mask> // when copying to in-app clipboard, clear system clipboard so that if
</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 globalSceneState.getAllElements() == null ||
globalSceneState.getAllElements().length === 0
</s> add globalSceneState.getElementsIncludingDeleted() == null ||
globalSceneState.getElementsIncludingDeleted().length === 0 </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/clipboard.ts
|
keep keep add keep keep keep keep keep
|
<mask> import { capitalizeString, setCursorForShape } from "../utils";
<mask> import Stack from "./Stack";
<mask> import useIsMobile from "../is-mobile";
<mask>
<mask> export function SelectedShapeActions({
<mask> appState,
<mask> elements,
<mask> renderAction,
</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 { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { duplicateElement } from "../element";
</s> add import { duplicateElement, getNonDeletedElements } from "../element"; </s> remove import { showSelectedShapeActions } from "../element";
</s> add import { showSelectedShapeActions, getNonDeletedElements } from "../element";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/Actions.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> elements: readonly ExcalidrawElement[];
<mask> renderAction: ActionManager["renderAction"];
<mask> elementType: ExcalidrawElement["type"];
<mask> }) {
<mask> const targetElements = getTargetElement(elements, appState);
<mask> const isEditing = Boolean(appState.editingElement);
<mask> const isMobile = useIsMobile();
<mask>
<mask> return (
<mask> <div className="panelColumn">
</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 setElements: any;
elements: readonly ExcalidrawElement[];
</s> add </s> remove setElements,
elements,
</s> add </s> remove setElements,
</s> add </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove elements: readonly ExcalidrawElement[];
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove setElements={setElements}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/Actions.tsx
|
keep replace replace keep keep keep replace replace keep
|
<mask> setAppState,
<mask> setElements,
<mask> elements,
<mask> }: {
<mask> elementType: ExcalidrawElement["type"];
<mask> setAppState: any;
<mask> setElements: any;
<mask> elements: readonly ExcalidrawElement[];
<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[];
setElements: any;
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove elements: readonly ExcalidrawElement[];
setElements: (elements: readonly ExcalidrawElement[]) => void;
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove setElements,
</s> add </s> remove const targetElements = getTargetElement(elements, appState);
</s> add const targetElements = getTargetElement(
getNonDeletedElements(elements),
appState,
); </s> remove setElements,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/Actions.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> normalizeDimensions,
<mask> getElementMap,
<mask> getDrawingVersion,
<mask> getSyncableElements,
<mask> hasNonDeletedElements,
<mask> newLinearElement,
<mask> ResizeArrowFnType,
<mask> resizeElements,
<mask> getElementWithResizeHandler,
<mask> canResizeMutlipleElements,
</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 editingElement: ExcalidrawElement | null;
</s> add editingElement: NonDeletedExcalidrawElement | null; </s> remove getDrawingVersion(globalSceneState.getAllElements()),
</s> add getDrawingVersion(globalSceneState.getElementsIncludingDeleted()), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> super(props);
<mask> this.actionManager = new ActionManager(
<mask> this.syncActionResult,
<mask> () => this.state,
<mask> () => globalSceneState.getAllElements(),
<mask> );
<mask> this.actionManager.registerAll(actions);
<mask>
<mask> this.actionManager.registerAction(createUndoAction(history));
<mask> this.actionManager.registerAction(createRedoAction(history));
</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 getElements: () => readonly ExcalidrawElement[];
</s> add getElementsIncludingDeleted: () => readonly ExcalidrawElement[]; </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove copyToAppClipboard(globalSceneState.getAllElements(), this.state);
</s> add copyToAppClipboard(globalSceneState.getElements(), this.state); </s> remove elements: readonly ExcalidrawElement[];
setElements: any;
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove getElements: () => readonly ExcalidrawElement[],
</s> add getElementsIncludingDeleted: () => ReturnType<
typeof globalSceneState["getElementsIncludingDeleted"]
>,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> canvas={this.canvas}
<mask> appState={this.state}
<mask> setAppState={this.setAppState}
<mask> actionManager={this.actionManager}
<mask> elements={globalSceneState.getAllElements().filter((element) => {
<mask> return !element.isDeleted;
<mask> })}
<mask> setElements={this.setElements}
<mask> onRoomCreate={this.openPortal}
<mask> onRoomDestroy={this.closePortal}
<mask> onLockToggle={this.toggleLock}
<mask> />
<mask> <main>
</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={this.getElements()}
</s> add elements={this.getElementsIncludingDeleted()} </s> remove visible={isSomeElementSelected(elements, appState)}
</s> add visible={isSomeElementSelected(getNonDeletedElements(elements), appState)} </s> remove visible={isSomeElementSelected(elements, appState)}
</s> add visible={isSomeElementSelected(getNonDeletedElements(elements), appState)} </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove return globalSceneState.getAllElements();
</s> add return globalSceneState.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[]
);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // rerender text elements on font load to fix #637
<mask> try {
<mask> await Promise.race([
<mask> document.fonts?.ready?.then(() => {
<mask> globalSceneState.getAllElements().forEach((element) => {
<mask> if (isTextElement(element)) {
<mask> invalidateShapeForElement(element);
<mask> }
<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> add const elements = globalSceneState.getElements(); </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove globalSceneState.getAllElements().filter((element) => {
</s> add elements.filter((element) => { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove const elements = allElements.filter((element) => !element.isDeleted);
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> window.removeEventListener("beforeunload", this.beforeUnload);
<mask> }
<mask> private onResize = withBatchedUpdates(() => {
<mask> globalSceneState
<mask> .getAllElements()
<mask> .forEach((element) => invalidateShapeForElement(element));
<mask> this.setState({});
<mask> });
<mask>
<mask> private beforeUnload = withBatchedUpdates((event: BeforeUnloadEvent) => {
</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 hasNonDeletedElements(globalSceneState.getAllElements())
</s> add globalSceneState.getElements().length > 0 </s> remove history.record(this.state, globalSceneState.getAllElements());
</s> add history.record(this.state, globalSceneState.getElementsIncludingDeleted()); </s> remove copyToAppClipboard(globalSceneState.getAllElements(), this.state);
</s> add copyToAppClipboard(globalSceneState.getElements(), this.state); </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted() </s> remove saveToLocalStorage(globalSceneState.getAllElements(), this.state);
</s> add saveToLocalStorage(
globalSceneState.getElementsIncludingDeleted(),
this.state,
); </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> private beforeUnload = withBatchedUpdates((event: BeforeUnloadEvent) => {
<mask> if (
<mask> this.state.isCollaborating &&
<mask> hasNonDeletedElements(globalSceneState.getAllElements())
<mask> ) {
<mask> event.preventDefault();
<mask> // NOTE: modern browsers no longer allow showing a custom message here
<mask> event.returnValue = "";
<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 history.record(this.state, globalSceneState.getAllElements());
</s> add history.record(this.state, globalSceneState.getElementsIncludingDeleted()); </s> remove hasNonDeletedElements(globalSceneState.getAllElements()) && {
</s> add elements.length > 0 && { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove hasNonDeletedElements(globalSceneState.getAllElements()) && {
</s> add elements.length > 0 && {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> window.devicePixelRatio,
<mask> );
<mask> cursorButton[socketID] = user.button;
<mask> });
<mask> const { atLeastOneVisibleElement, scrollBars } = renderScene(
<mask> elements.filter((element) => {
<mask> // don't render text element that's being currently edited (it's
<mask> // rendered on remote only)
<mask> return (
<mask> !this.state.editingElement ||
</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().filter((element) => {
</s> add elements.filter((element) => { </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 .getAllElements()
</s> add .getElementsIncludingDeleted() </s> remove globalSceneState.getAllElements() == null ||
globalSceneState.getAllElements().length === 0
</s> add globalSceneState.getElementsIncludingDeleted() == null ||
globalSceneState.getElementsIncludingDeleted().length === 0 </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElementsIncludingDeleted(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> cursorButton[socketID] = user.button;
<mask> });
<mask> const { atLeastOneVisibleElement, scrollBars } = renderScene(
<mask> globalSceneState.getAllElements().filter((element) => {
<mask> // don't render text element that's being currently edited (it's
<mask> // rendered on remote only)
<mask> return (
<mask> !this.state.editingElement ||
<mask> this.state.editingElement.type !== "text" ||
</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 const elements = globalSceneState.getElements(); </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted() </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() == null ||
globalSceneState.getAllElements().length === 0
</s> add globalSceneState.getElementsIncludingDeleted() == null ||
globalSceneState.getElementsIncludingDeleted().length === 0 </s> remove isSomeElementSelected(globalSceneState.getAllElements(), this.state)
</s> add isSomeElementSelected(globalSceneState.getElements(), this.state)
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> );
<mask> if (scrollBars) {
<mask> currentScrollBars = scrollBars;
<mask> }
<mask> const scrolledOutside =
<mask> !atLeastOneVisibleElement &&
<mask> hasNonDeletedElements(globalSceneState.getAllElements());
<mask> if (this.state.scrolledOutside !== scrolledOutside) {
<mask> this.setState({ scrolledOutside: scrolledOutside });
<mask> }
<mask> this.saveDebounced();
<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 if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove getDrawingVersion(globalSceneState.getAllElements()) >
</s> add getDrawingVersion(globalSceneState.getElementsIncludingDeleted()) > </s> remove isSomeElementSelected(globalSceneState.getAllElements(), this.state)
</s> add isSomeElementSelected(globalSceneState.getElements(), this.state) </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted() </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> this.saveDebounced();
<mask>
<mask> if (
<mask> getDrawingVersion(globalSceneState.getAllElements()) >
<mask> this.lastBroadcastedOrReceivedSceneVersion
<mask> ) {
<mask> this.broadcastScene("SCENE_UPDATE");
<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 const scrolledOutside =
!atLeastOneVisibleElement &&
hasNonDeletedElements(globalSceneState.getAllElements());
</s> add const scrolledOutside = !atLeastOneVisibleElement && elements.length > 0; </s> remove history.record(this.state, globalSceneState.getAllElements());
</s> add history.record(this.state, globalSceneState.getElementsIncludingDeleted()); </s> remove isSomeElementSelected(globalSceneState.getAllElements(), this.state)
</s> add isSomeElementSelected(globalSceneState.getElements(), this.state) </s> remove hasNonDeletedElements(globalSceneState.getAllElements())
</s> add globalSceneState.getElements().length > 0 </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ) {
<mask> this.broadcastScene("SCENE_UPDATE");
<mask> }
<mask>
<mask> history.record(this.state, globalSceneState.getAllElements());
<mask> }
<mask>
<mask> // Copy/paste
<mask>
<mask> private onCut = withBatchedUpdates((event: ClipboardEvent) => {
</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 hasNonDeletedElements(globalSceneState.getAllElements())
</s> add globalSceneState.getElements().length > 0 </s> remove getDrawingVersion(globalSceneState.getAllElements()) >
</s> add getDrawingVersion(globalSceneState.getElementsIncludingDeleted()) > </s> remove saveToLocalStorage(globalSceneState.getAllElements(), this.state);
</s> add saveToLocalStorage(
globalSceneState.getElementsIncludingDeleted(),
this.state,
); </s> add import { ExcalidrawElement } from "../element/types"; </s> remove globalSceneState.getAllElements().forEach((element) => {
</s> add globalSceneState.getElementsIncludingDeleted().forEach((element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return;
<mask> }
<mask> this.copyAll();
<mask> const { elements: nextElements, appState } = deleteSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> );
<mask> globalSceneState.replaceAllElements(nextElements);
<mask> history.resumeRecording();
<mask> this.setState({ ...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 ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove globalSceneState.getAllElements().slice(0, -1),
</s> add globalSceneState.getElementsIncludingDeleted().slice(0, -1), </s> remove saveToLocalStorage(globalSceneState.getAllElements(), this.state);
</s> add saveToLocalStorage(
globalSceneState.getElementsIncludingDeleted(),
this.state,
);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep replace keep keep keep replace replace replace replace keep keep keep keep
|
<mask> });
<mask>
<mask> private copyAll = () => {
<mask> copyToAppClipboard(globalSceneState.getAllElements(), this.state);
<mask> };
<mask>
<mask> private copyToClipboardAsPng = () => {
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> );
<mask> exportCanvas(
<mask> "clipboard",
<mask> selectedElements.length
<mask> ? selectedElements
</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 selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
</s> add selectedElements.length ? selectedElements : elements, </s> remove : globalSceneState.getAllElements(),
</s> add : globalSceneState.getElements(), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> this.state,
<mask> );
<mask> exportCanvas(
<mask> "clipboard",
<mask> selectedElements.length
<mask> ? selectedElements
<mask> : globalSceneState.getAllElements(),
<mask> this.state,
<mask> this.canvas!,
<mask> this.state,
<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 : globalSceneState.getAllElements(),
</s> add : globalSceneState.getElements(), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask>
<mask> private copyToClipboardAsSvg = () => {
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> );
<mask> exportCanvas(
<mask> "clipboard-svg",
<mask> selectedElements.length
</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 const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove : globalSceneState.getAllElements(),
</s> add : globalSceneState.getElements(), </s> remove selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
</s> add selectedElements.length ? selectedElements : elements, </s> remove copyToAppClipboard(globalSceneState.getAllElements(), this.state);
</s> add copyToAppClipboard(globalSceneState.getElements(), this.state); </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </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/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> exportCanvas(
<mask> "clipboard-svg",
<mask> selectedElements.length
<mask> ? selectedElements
<mask> : globalSceneState.getAllElements(),
<mask> this.state,
<mask> this.canvas!,
<mask> this.state,
<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 selectedElements.length
? selectedElements
: globalSceneState.getAllElements(),
</s> add selectedElements.length ? selectedElements : elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, 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/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }),
<mask> );
<mask>
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements(),
<mask> ...newElements,
<mask> ]);
<mask> history.resumeRecording();
<mask> this.setState({
<mask> selectedElementIds: newElements.reduce((map, element) => {
</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.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> font: this.state.currentItemFont,
<mask> });
<mask>
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements(),
<mask> element,
<mask> ]);
<mask> this.setState({ selectedElementIds: { [element.id]: true } });
<mask> history.resumeRecording();
<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 ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> // Perform reconciliation - in collaboration, if we encounter
<mask> // elements with more staler versions than ours, ignore them
<mask> // and keep ours.
<mask> if (
<mask> globalSceneState.getAllElements() == null ||
<mask> globalSceneState.getAllElements().length === 0
<mask> ) {
<mask> globalSceneState.replaceAllElements(remoteElements);
<mask> } else {
<mask> // create a map of ids so we don't have to iterate
<mask> // over the array more than once.
</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.getElementsIncludingDeleted(), </s> remove for (const element of globalSceneState.getAllElements()) {
</s> add for (const element of globalSceneState.getElementsIncludingDeleted()) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove hasNonDeletedElements(globalSceneState.getAllElements())
</s> add globalSceneState.getElements().length > 0 </s> add const elements = globalSceneState.getElements(); </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> } else {
<mask> // create a map of ids so we don't have to iterate
<mask> // over the array more than once.
<mask> const localElementMap = getElementMap(
<mask> globalSceneState.getAllElements(),
<mask> );
<mask>
<mask> // Reconcile
<mask> const newElements = remoteElements
<mask> .reduce((elements, element) => {
</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() == null ||
globalSceneState.getAllElements().length === 0
</s> add globalSceneState.getElementsIncludingDeleted() == null ||
globalSceneState.getElementsIncludingDeleted().length === 0 </s> remove for (const element of globalSceneState.getAllElements()) {
</s> add for (const element of globalSceneState.getElementsIncludingDeleted()) { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> add const elements = globalSceneState.getElements(); </s> remove globalSceneState.getAllElements().filter((element) => {
</s> add elements.filter((element) => { </s> remove globalSceneState.getAllElements().forEach((element) => {
</s> add globalSceneState.getElementsIncludingDeleted().forEach((element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep replace keep keep keep keep replace keep keep keep keep
|
<mask> type: sceneType,
<mask> payload: {
<mask> elements: getSyncableElements(globalSceneState.getAllElements()),
<mask> },
<mask> };
<mask> this.lastBroadcastedOrReceivedSceneVersion = Math.max(
<mask> this.lastBroadcastedOrReceivedSceneVersion,
<mask> getDrawingVersion(globalSceneState.getAllElements()),
<mask> );
<mask> return this._broadcastSocketData(
<mask> data as typeof data & { _brand: "socketUpdateData" },
<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 return globalSceneState.getAllElements();
</s> add return globalSceneState.getElementsIncludingDeleted(); </s> remove ): ExcalidrawLinearElement {
</s> add ): NonDeleted<ExcalidrawLinearElement> { </s> remove }, null as { element: ExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
</s> add }, null as { element: NonDeletedExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null); </s> remove ): ExcalidrawGenericElement {
</s> add ): NonDeleted<ExcalidrawGenericElement> { </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const step = event.shiftKey
<mask> ? ELEMENT_SHIFT_TRANSLATE_AMOUNT
<mask> : ELEMENT_TRANSLATE_AMOUNT;
<mask> globalSceneState.replaceAllElements(
<mask> globalSceneState.getAllElements().map((el) => {
<mask> if (this.state.selectedElementIds[el.id]) {
<mask> const update: { x?: number; y?: number } = {};
<mask> if (event.key === KEYS.ARROW_LEFT) {
<mask> update.x = el.x - step;
<mask> } else if (event.key === KEYS.ARROW_RIGHT) {
</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 if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) { </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> event.preventDefault();
<mask> } else if (event.key === KEYS.ENTER) {
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> );
<mask>
<mask> if (
<mask> selectedElements.length === 1 &&
</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 const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements().map((el) => {
</s> add globalSceneState.getElementsIncludingDeleted().map((el) => { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> this.setState({ selectedElementIds: {} });
<mask>
<mask> const deleteElement = () => {
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements().map((_element) => {
<mask> if (_element.id === element.id) {
<mask> return newElementWith(_element, { isDeleted: true });
<mask> }
<mask> return _element;
<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 ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove globalSceneState.getAllElements().forEach((element) => {
</s> add globalSceneState.getElementsIncludingDeleted().forEach((element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask>
<mask> const updateElement = (text: string) => {
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements().map((_element) => {
<mask> if (_element.id === element.id) {
<mask> return newTextElement({
<mask> ...(_element as ExcalidrawTextElement),
<mask> x: element.x,
<mask> y: element.y,
</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().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) { </s> remove }, null as { element: ExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
</s> add }, null as { element: NonDeletedExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null); </s> remove globalSceneState.getAllElements().map((el) => {
</s> add globalSceneState.getElementsIncludingDeleted().map((el) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> clientY?: number;
<mask> centerIfPossible?: boolean;
<mask> }) => {
<mask> const elementAtPosition = getElementAtPosition(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> x,
<mask> y,
<mask> this.state.zoom,
<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 globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> add const elements = globalSceneState.getElements(); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> y: centerElementY,
<mask> });
<mask> } else {
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements(),
<mask> element,
<mask> ]);
<mask>
<mask> if (centerIfPossible) {
<mask> const snappedToCenterPosition = this.getTextWysiwygSnappedToCenterPosition(
</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.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace replace replace replace keep keep replace keep keep keep
|
<mask> ) {
<mask> return;
<mask> }
<mask>
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> );
<mask> if (selectedElements.length === 1 && !isOverScrollBar) {
<mask> const elementWithResizeHandler = getElementWithResizeHandler(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> { x, y },
<mask> this.state.zoom,
</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 elements, </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask> }
<mask> const hitElement = getElementAtPosition(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> x,
<mask> y,
<mask> this.state.zoom,
<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 globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> add const elements = globalSceneState.getElements(); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep replace replace replace replace keep keep replace keep
|
<mask> if (this.state.elementType === "selection") {
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> );
<mask> if (selectedElements.length === 1) {
<mask> const elementWithResizeHandler = getElementWithResizeHandler(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
</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 const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask> if (!isResizingElements) {
<mask> hitElement = getElementAtPosition(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> x,
<mask> y,
<mask> this.state.zoom,
<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 globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> add const elements = globalSceneState.getElements(); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> [hitElement!.id]: true,
<mask> },
<mask> }));
<mask> globalSceneState.replaceAllElements(
<mask> globalSceneState.getAllElements(),
<mask> );
<mask> hitElementWasAddedToSelection = true;
<mask> }
<mask>
<mask> // We duplicate the selected element if alt is pressed on pointer down
</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 for (const element of globalSceneState.getAllElements()) {
</s> add for (const element of globalSceneState.getElementsIncludingDeleted()) { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements().slice(0, -1),
</s> add globalSceneState.getElementsIncludingDeleted().slice(0, -1), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> add const elements = globalSceneState.getElements();
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Move the currently selected elements to the top of the z index stack, and
<mask> // put the duplicates where the selected elements used to be.
<mask> const nextElements = [];
<mask> const elementsToAppend = [];
<mask> for (const element of globalSceneState.getAllElements()) {
<mask> if (
<mask> this.state.selectedElementIds[element.id] ||
<mask> (element.id === hitElement.id && hitElementWasAddedToSelection)
<mask> ) {
<mask> nextElements.push(duplicateElement(element));
</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() == null ||
globalSceneState.getAllElements().length === 0
</s> add globalSceneState.getElementsIncludingDeleted() == null ||
globalSceneState.getElementsIncludingDeleted().length === 0 </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElementsIncludingDeleted(), </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElementsIncludingDeleted(), </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove editingElement: ExcalidrawElement | null;
</s> add editingElement: NonDeletedExcalidrawElement | null; </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> mutateElement(element, {
<mask> points: [...element.points, [0, 0]],
<mask> });
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements(),
<mask> element,
<mask> ]);
<mask> this.setState({
<mask> draggingElement: element,
<mask> editingElement: element,
</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.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove globalSceneState.getAllElements().slice(0, -1),
</s> add globalSceneState.getElementsIncludingDeleted().slice(0, -1),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> draggingElement: element,
<mask> });
<mask> } else {
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements(),
<mask> element,
<mask> ]);
<mask> this.setState({
<mask> multiElement: null,
<mask> draggingElement: element,
</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.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove globalSceneState.getAllElements().slice(0, -1),
</s> add globalSceneState.getElementsIncludingDeleted().slice(0, -1), </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Marking that click was used for dragging to check
<mask> // if elements should be deselected on pointerup
<mask> draggingOccurred = true;
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> );
<mask> if (selectedElements.length > 0) {
<mask> const { x, y } = viewportCoordsToSceneCoords(
<mask> event,
</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 const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove for (const element of globalSceneState.getAllElements()) {
</s> add for (const element of globalSceneState.getElementsIncludingDeleted()) { </s> remove const elements = allElements.filter((element) => !element.isDeleted);
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep replace replace replace replace keep keep keep replace
|
<mask> }
<mask>
<mask> if (this.state.elementType === "selection") {
<mask> if (
<mask> !event.shiftKey &&
<mask> isSomeElementSelected(globalSceneState.getAllElements(), this.state)
<mask> ) {
<mask> this.setState({ selectedElementIds: {} });
<mask> }
<mask> const elementsWithinSelection = getElementsWithinSelection(
<mask> globalSceneState.getAllElements(),
</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 isSomeElementSelected(globalSceneState.getAllElements(), this.state)
</s> add isSomeElementSelected(globalSceneState.getElements(), this.state) </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove const scrolledOutside =
!atLeastOneVisibleElement &&
hasNonDeletedElements(globalSceneState.getAllElements());
</s> add const scrolledOutside = !atLeastOneVisibleElement && elements.length > 0; </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/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> isInvisiblySmallElement(draggingElement)
<mask> ) {
<mask> // remove invisible element which was added in onPointerDown
<mask> globalSceneState.replaceAllElements(
<mask> globalSceneState.getAllElements().slice(0, -1),
<mask> );
<mask> this.setState({
<mask> draggingElement: null,
<mask> });
<mask> return;
</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.getElementsIncludingDeleted(), </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElementsIncludingDeleted(), </s> remove ...globalSceneState.getAllElements(),
</s> add ...globalSceneState.getElementsIncludingDeleted(), </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted() </s> remove draggingElement: ExcalidrawElement | null;
resizingElement: ExcalidrawElement | null;
multiElement: ExcalidrawLinearElement | null;
selectionElement: ExcalidrawElement | null;
</s> add draggingElement: NonDeletedExcalidrawElement | null;
resizingElement: NonDeletedExcalidrawElement | null;
multiElement: NonDeleted<ExcalidrawLinearElement> | null;
selectionElement: NonDeletedExcalidrawElement | null; </s> remove saveToLocalStorage(globalSceneState.getAllElements(), this.state);
</s> add saveToLocalStorage(
globalSceneState.getElementsIncludingDeleted(),
this.state,
);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> if (resizingElement && isInvisiblySmallElement(resizingElement)) {
<mask> globalSceneState.replaceAllElements(
<mask> globalSceneState
<mask> .getAllElements()
<mask> .filter((el) => el.id !== resizingElement.id),
<mask> );
<mask> }
<mask>
<mask> // If click occurred on already selected element
</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.getElementsIncludingDeleted(), </s> remove globalSceneState.getAllElements().filter((element) => {
</s> add elements.filter((element) => { </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove for (const element of globalSceneState.getAllElements()) {
</s> add for (const element of globalSceneState.getElementsIncludingDeleted()) { </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted() </s> remove const scrolledOutside =
!atLeastOneVisibleElement &&
hasNonDeletedElements(globalSceneState.getAllElements());
</s> add const scrolledOutside = !atLeastOneVisibleElement && elements.length > 0;
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> if (
<mask> elementType !== "selection" ||
<mask> isSomeElementSelected(globalSceneState.getAllElements(), this.state)
<mask> ) {
<mask> history.resumeRecording();
<mask> }
<mask>
<mask> if (!elementLocked) {
</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 if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove getDrawingVersion(globalSceneState.getAllElements()) >
</s> add getDrawingVersion(globalSceneState.getElementsIncludingDeleted()) > </s> remove if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) { </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,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> window.devicePixelRatio,
<mask> );
<mask>
<mask> const element = getElementAtPosition(
<mask> elements,
<mask> this.state,
<mask> x,
<mask> y,
<mask> this.state.zoom,
</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 elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> window.devicePixelRatio,
<mask> );
<mask>
<mask> const element = getElementAtPosition(
<mask> globalSceneState.getAllElements(),
<mask> this.state,
<mask> x,
<mask> y,
<mask> this.state.zoom,
<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> add const elements = globalSceneState.getElements(); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep replace keep keep keep keep replace keep keep
|
<mask> action: () => this.pasteFromClipboard(null),
<mask> },
<mask> probablySupportsClipboardBlob &&
<mask> hasNonDeletedElements(globalSceneState.getAllElements()) && {
<mask> label: t("labels.copyAsPng"),
<mask> action: this.copyToClipboardAsPng,
<mask> },
<mask> probablySupportsClipboardWriteText &&
<mask> hasNonDeletedElements(globalSceneState.getAllElements()) && {
<mask> label: t("labels.copyAsSvg"),
<mask> action: this.copyToClipboardAsSvg,
</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 action.perform(this.getElements(), this.getAppState(), null),
</s> add action.perform(
this.getElementsIncludingDeleted(),
this.getAppState(),
null,
), </s> remove hasNonDeletedElements(globalSceneState.getAllElements())
</s> add globalSceneState.getElements().length > 0 </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove const scrolledOutside =
!atLeastOneVisibleElement &&
hasNonDeletedElements(globalSceneState.getAllElements());
</s> add const scrolledOutside = !atLeastOneVisibleElement && elements.length > 0;
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> canvas: HTMLCanvasElement | null,
<mask> scale: number,
<mask> ) {
<mask> const elementClickedInside = getElementContainingPosition(
<mask> globalSceneState.getAllElements(),
<mask> x,
<mask> y,
<mask> );
<mask> if (elementClickedInside) {
<mask> const elementCenterX =
</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 allElements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </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/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> this.setState({ shouldCacheIgnoreZoom: false });
<mask> }, 300);
<mask>
<mask> private saveDebounced = debounce(() => {
<mask> saveToLocalStorage(globalSceneState.getAllElements(), this.state);
<mask> }, 300);
<mask> }
<mask>
<mask> // -----------------------------------------------------------------------------
<mask> // TEST HOOKS
</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 copyToAppClipboard(globalSceneState.getAllElements(), this.state);
</s> add copyToAppClipboard(globalSceneState.getElements(), this.state); </s> remove history.record(this.state, globalSceneState.getAllElements());
</s> add history.record(this.state, globalSceneState.getElementsIncludingDeleted()); </s> remove globalSceneState.getAllElements().slice(0, -1),
</s> add globalSceneState.getElementsIncludingDeleted().slice(0, -1), </s> remove .getAllElements()
</s> add .getElementsIncludingDeleted() </s> remove return globalSceneState.getAllElements();
</s> add return globalSceneState.getElementsIncludingDeleted(); </s> remove globalSceneState.getAllElements().forEach((element) => {
</s> add globalSceneState.getElementsIncludingDeleted().forEach((element) => {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> Object.defineProperties(window.h, {
<mask> elements: {
<mask> get() {
<mask> return globalSceneState.getAllElements();
<mask> },
<mask> set(elements: ExcalidrawElement[]) {
<mask> return globalSceneState.replaceAllElements(elements);
<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 setElements: any;
elements: readonly ExcalidrawElement[];
</s> add </s> remove getDrawingVersion(globalSceneState.getAllElements()),
</s> add getDrawingVersion(globalSceneState.getElementsIncludingDeleted()), </s> remove }, null as { element: ExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
</s> add }, null as { element: NonDeletedExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null); </s> remove hasNonDeletedElements(globalSceneState.getAllElements()) && {
</s> add elements.length > 0 && { </s> remove if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import React, { useState, useEffect, useRef } from "react";
<mask>
<mask> import { ToolButton } from "./ToolButton";
<mask> import { clipboard, exportFile, link } from "./icons";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { AppState } from "../types";
<mask> import { exportToCanvas } from "../scene/export";
<mask> import { ActionsManagerInterface } from "../actions/types";
<mask> import Stack from "./Stack";
<mask> import { t } from "../i18n";
</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 { duplicateElement } from "../element";
</s> add import { duplicateElement, getNonDeletedElements } from "../element"; </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> add import { globalSceneState } from "../scene";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/ExportDialog.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const scales = [1, 2, 3];
<mask> const defaultScale = scales.includes(devicePixelRatio) ? devicePixelRatio : 1;
<mask>
<mask> export type ExportCB = (
<mask> elements: readonly ExcalidrawElement[],
<mask> scale?: number,
<mask> ) => void;
<mask>
<mask> function ExportModal({
<mask> elements,
</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 element: ExcalidrawLinearElement,
</s> add element: NonDeleted<ExcalidrawLinearElement>, </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/ExportDialog.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> onExportToClipboard,
<mask> onExportToBackend,
<mask> }: {
<mask> appState: AppState;
<mask> elements: readonly ExcalidrawElement[];
<mask> exportPadding?: number;
<mask> actionManager: ActionsManagerInterface;
<mask> onExportToPng: ExportCB;
<mask> onExportToSvg: ExportCB;
<mask> onExportToClipboard: ExportCB;
</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[];
setElements: any;
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove elements: readonly ExcalidrawElement[];
setElements: (elements: readonly ExcalidrawElement[]) => void;
</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 setElements,
elements,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/ExportDialog.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> onExportToClipboard,
<mask> onExportToBackend,
<mask> }: {
<mask> appState: AppState;
<mask> elements: readonly ExcalidrawElement[];
<mask> exportPadding?: number;
<mask> actionManager: ActionsManagerInterface;
<mask> onExportToPng: ExportCB;
<mask> onExportToSvg: ExportCB;
<mask> onExportToClipboard: ExportCB;
</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]>
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/ExportDialog.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import { t } from "../i18n";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { getSelectedElements } from "../scene";
<mask>
<mask> import "./HintViewer.scss";
<mask> import { AppState } from "../types";
<mask> import { isLinearElement } from "../element/typeChecks";
</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> add import { globalSceneState } from "../scene"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { showSelectedShapeActions } from "../element";
</s> add import { showSelectedShapeActions, getNonDeletedElements } from "../element"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/HintViewer.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { isLinearElement } from "../element/typeChecks";
<mask>
<mask> interface Hint {
<mask> appState: AppState;
<mask> elements: readonly ExcalidrawElement[];
<mask> }
<mask>
<mask> const getHints = ({ appState, elements }: Hint) => {
<mask> const { elementType, isResizing, isRotating, lastPointerDownWith } = appState;
<mask> const multiMode = appState.multiElement !== null;
</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 "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
import { getNonDeletedElements } from "../element"; </s> remove import { ExcalidrawElement, ExcalidrawTextElement } from "../element/types";
</s> add import {
ExcalidrawElement,
ExcalidrawTextElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/HintViewer.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { calculateScrollCenter } from "../scene";
<mask> import { exportCanvas } from "../data";
<mask>
<mask> import { AppState } from "../types";
<mask> import { ExcalidrawElement } from "../element/types";
<mask>
<mask> import { ActionManager } from "../actions/manager";
<mask> import { Island } from "./Island";
<mask> import Stack from "./Stack";
<mask> import { FixedSideContainer } from "./FixedSideContainer";
</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 { NonDeletedExcalidrawElement } from "../element/types"; </s> add import { globalSceneState } from "../scene"; </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";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/LayerUI.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> actionManager: ActionManager;
<mask> appState: AppState;
<mask> canvas: HTMLCanvasElement | null;
<mask> setAppState: any;
<mask> elements: readonly ExcalidrawElement[];
<mask> setElements: (elements: readonly ExcalidrawElement[]) => void;
<mask> onRoomCreate: () => void;
<mask> onRoomDestroy: () => void;
<mask> onLockToggle: () => 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 elements: readonly ExcalidrawElement[];
setElements: any;
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove getElements: () => readonly ExcalidrawElement[];
</s> add getElementsIncludingDeleted: () => readonly ExcalidrawElement[]; </s> remove setElements,
elements,
</s> add </s> remove setElements: any;
elements: readonly ExcalidrawElement[];
</s> add </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove getElements: () => readonly ExcalidrawElement[],
</s> add getElementsIncludingDeleted: () => ReturnType<
typeof globalSceneState["getElementsIncludingDeleted"]
>,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> appState,
<mask> setAppState,
<mask> canvas,
<mask> elements,
<mask> setElements,
<mask> onRoomCreate,
<mask> onRoomDestroy,
<mask> onLockToggle,
<mask> }: LayerUIProps) => {
<mask> const isMobile = useIsMobile();
</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 setElements,
</s> add </s> remove setElements,
elements,
</s> add </s> remove const targetElements = getTargetElement(elements, appState);
</s> add const targetElements = getTargetElement(
getNonDeletedElements(elements),
appState,
); </s> remove setElements: any;
elements: readonly ExcalidrawElement[];
</s> add </s> remove elements: readonly ExcalidrawElement[];
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove visible={showSelectedShapeActions(appState, elements)}
</s> add visible={showSelectedShapeActions(
appState,
getNonDeletedElements(elements),
)}
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return isMobile ? (
<mask> <MobileMenu
<mask> appState={appState}
<mask> elements={elements}
<mask> setElements={setElements}
<mask> actionManager={actionManager}
<mask> exportButton={renderExportDialog()}
<mask> setAppState={setAppState}
<mask> onRoomCreate={onRoomCreate}
<mask> onRoomDestroy={onRoomDestroy}
</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 setElements={setElements}
elements={elements}
</s> add </s> remove setElements={setElements}
elements={elements}
</s> add </s> remove const targetElements = getTargetElement(elements, appState);
</s> add const targetElements = getTargetElement(
getNonDeletedElements(elements),
appState,
); </s> remove (isSomeElementSelected(elements, appState)
? getCommonAttributeOfSelectedElements(elements, appState, getAttribute)
</s> add (isSomeElementSelected(nonDeletedElements, appState)
? getCommonAttributeOfSelectedElements(
nonDeletedElements,
appState,
getAttribute,
) </s> add const nonDeletedElements = getNonDeletedElements(elements); </s> remove setElements,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/LayerUI.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> <Stack.Row gap={1}>
<mask> <ShapesSwitcher
<mask> elementType={appState.elementType}
<mask> setAppState={setAppState}
<mask> setElements={setElements}
<mask> elements={elements}
<mask> />
<mask> </Stack.Row>
<mask> </Island>
<mask> <LockIcon
<mask> checked={appState.elementLocked}
</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 setElements={setElements}
elements={elements}
</s> add </s> remove setElements={setElements}
</s> add </s> remove elements={this.getElements()}
</s> add elements={this.getElementsIncludingDeleted()} </s> remove visible={isSomeElementSelected(elements, appState)}
</s> add visible={isSomeElementSelected(getNonDeletedElements(elements), appState)} </s> remove visible={isSomeElementSelected(elements, appState)}
</s> add visible={isSomeElementSelected(getNonDeletedElements(elements), appState)} </s> remove elements={globalSceneState.getAllElements().filter((element) => {
return !element.isDeleted;
})}
setElements={this.setElements}
</s> add elements={globalSceneState.getElements()}
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { t, setLanguage } from "../i18n";
<mask> import Stack from "./Stack";
<mask> import { LanguageList } from "./LanguageList";
<mask> import { showSelectedShapeActions } from "../element";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { FixedSideContainer } from "./FixedSideContainer";
<mask> import { Island } from "./Island";
<mask> import { HintViewer } from "./HintViewer";
<mask> import { calculateScrollCenter } from "../scene";
<mask> import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
</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 { 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 { showSelectedShapeActions } from "../element";
</s> add import { showSelectedShapeActions, getNonDeletedElements } from "../element"; </s> remove import { isTextElement, redrawTextBoundingBox } from "../element";
</s> add import {
isTextElement,
redrawTextBoundingBox,
getNonDeletedElements,
} from "../element";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> appState: AppState;
<mask> actionManager: ActionManager;
<mask> exportButton: React.ReactNode;
<mask> setAppState: any;
<mask> elements: readonly ExcalidrawElement[];
<mask> setElements: any;
<mask> onRoomCreate: () => void;
<mask> onRoomDestroy: () => void;
<mask> onLockToggle: () => 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 elements: readonly ExcalidrawElement[];
setElements: (elements: readonly ExcalidrawElement[]) => void;
</s> add elements: readonly NonDeletedExcalidrawElement[]; </s> remove getElements: () => readonly ExcalidrawElement[];
</s> add getElementsIncludingDeleted: () => readonly ExcalidrawElement[]; </s> remove setElements,
elements,
</s> add </s> remove setElements: any;
elements: 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/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> export function MobileMenu({
<mask> appState,
<mask> elements,
<mask> setElements,
<mask> actionManager,
<mask> exportButton,
<mask> setAppState,
<mask> onRoomCreate,
<mask> onRoomDestroy,
</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 setElements,
</s> add </s> remove setElements,
elements,
</s> add </s> add import { getNonDeletedElements } from "../element"; </s> remove visible={showSelectedShapeActions(appState, elements)}
</s> add visible={showSelectedShapeActions(
appState,
getNonDeletedElements(elements),
)} </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </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[]
);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> <Stack.Row gap={1}>
<mask> <ShapesSwitcher
<mask> elementType={appState.elementType}
<mask> setAppState={setAppState}
<mask> setElements={setElements}
<mask> elements={elements}
<mask> />
<mask> </Stack.Row>
<mask> </Island>
<mask> <LockIcon
<mask> checked={appState.elementLocked}
</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]>
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/components/MobileMenu.tsx
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "../element/types";
<mask>
<mask> import { getDefaultAppState } from "../appState";
<mask>
<mask> import { AppState } from "../types";
<mask> import { exportToCanvas, exportToSvg } from "../scene/export";
</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 { 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";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> import { ExportType } from "../scene/types";
<mask> import { restore } from "./restore";
<mask> import { restoreFromLocalStorage } from "./localStorage";
<mask> import { hasNonDeletedElements } from "../element";
<mask>
<mask> export { loadFromBlob } from "./blob";
<mask> export { saveAsJSON, loadFromJSON } from "./json";
<mask> export { saveToLocalStorage } from "./localStorage";
<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 { duplicateElement } from "../element";
</s> add import { duplicateElement, getNonDeletedElements } from "../element"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { showSelectedShapeActions } from "../element";
</s> add import { showSelectedShapeActions, getNonDeletedElements } from "../element"; </s> remove import { isTextElement, redrawTextBoundingBox } from "../element";
</s> add import {
isTextElement,
redrawTextBoundingBox,
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 {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
import { getNonDeletedElements } from "../element";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> export async function exportCanvas(
<mask> type: ExportType,
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> canvas: HTMLCanvasElement,
<mask> {
<mask> exportBackground,
<mask> exportPadding = 10,
</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 allElements: 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 selectionElement: ExcalidrawElement | null,
</s> add selectionElement: NonDeletedExcalidrawElement | null,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> name: string;
<mask> scale?: number;
<mask> },
<mask> ) {
<mask> if (!hasNonDeletedElements(elements)) {
<mask> return window.alert(t("alerts.cannotExportEmptyCanvas"));
<mask> }
<mask> if (type === "svg" || type === "clipboard-svg") {
<mask> const tempSvg = exportToSvg(elements, {
<mask> exportBackground,
</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().map((el) => {
</s> add globalSceneState.getElementsIncludingDeleted().map((el) => { </s> remove if (
!event.shiftKey &&
isSomeElementSelected(globalSceneState.getAllElements(), this.state)
) {
</s> add const elements = globalSceneState.getElements();
if (!event.shiftKey && isSomeElementSelected(elements, this.state)) { </s> remove ...globalSceneState.getAllElements().map((_element) => {
</s> add ...globalSceneState.getElementsIncludingDeleted().map((_element) => { </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove isSomeElementSelected(globalSceneState.getAllElements(), this.state)
</s> add isSomeElementSelected(globalSceneState.getElements(), this.state) </s> remove globalSceneState.getAllElements(),
</s> add elements,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/data/index.ts
|
keep keep replace keep keep keep keep keep
|
<mask> import { distanceBetweenPointAndSegment } from "../math";
<mask>
<mask> import { ExcalidrawElement } from "./types";
<mask>
<mask> import { getDiamondPoints, getElementAbsoluteCoords } from "./bounds";
<mask> import { Point } from "../types";
<mask> import { Drawable, OpSet } from "roughjs/bin/core";
<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, 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 { 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/element/collision.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { isLinearElement } from "./typeChecks";
<mask> import { rotate } from "../math";
<mask>
<mask> function isElementDraggableFromInside(
<mask> element: ExcalidrawElement,
<mask> appState: AppState,
<mask> ): boolean {
<mask> return (
<mask> element.backgroundColor !== "transparent" ||
<mask> appState.selectedElementIds[element.id]
</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, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./types"; </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./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/element/collision.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> }
<mask>
<mask> export function hitTest(
<mask> element: ExcalidrawElement,
<mask> appState: AppState,
<mask> x: number,
<mask> y: number,
<mask> zoom: number,
<mask> ): 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 element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </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 element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/collision.ts
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "./types";
<mask> import { isInvisiblySmallElement } from "./sizeHelpers";
<mask>
<mask> export {
<mask> newElement,
<mask> newTextElement,
</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, 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 "./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, 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";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/index.ts
|
keep keep keep keep replace replace keep
|
<mask> export function getDrawingVersion(elements: readonly ExcalidrawElement[]) {
<mask> return elements.reduce((acc, el) => acc + el.version, 0);
<mask> }
<mask>
<mask> export function hasNonDeletedElements(elements: readonly ExcalidrawElement[]) {
<mask> return elements.some((element) => !element.isDeleted);
<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> add getElements(): readonly NonDeletedExcalidrawElement[] {
return getNonDeletedElements(this._elements);
}
</s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove getAllElements() {
</s> add getElementsIncludingDeleted() { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/index.ts
|
keep keep add keep keep keep keep keep
|
<mask> ExcalidrawTextElement,
<mask> ExcalidrawLinearElement,
<mask> ExcalidrawGenericElement,
<mask> } from "../element/types";
<mask> import { measureText } from "../utils";
<mask> import { randomInteger, randomId } from "../random";
<mask> import { newElementWith } from "./mutateElement";
<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 import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement, ExcalidrawTextElement } from "../element/types";
</s> add import {
ExcalidrawElement,
ExcalidrawTextElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./types"; </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";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> opacity,
<mask> seed: rest.seed ?? randomInteger(),
<mask> version: rest.version || 1,
<mask> versionNonce: rest.versionNonce ?? 0,
<mask> isDeleted: rest.isDeleted ?? false,
<mask> };
<mask> }
<mask>
<mask> export function newElement(
<mask> opts: {
</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 (isSomeElementSelected(elements, appState)
? getCommonAttributeOfSelectedElements(elements, appState, getAttribute)
</s> add (isSomeElementSelected(nonDeletedElements, appState)
? getCommonAttributeOfSelectedElements(
nonDeletedElements,
appState,
getAttribute,
) </s> remove ): ExcalidrawGenericElement {
</s> add ): NonDeleted<ExcalidrawGenericElement> { </s> add const nonDeletedElements = getNonDeletedElements(elements); </s> remove ): ExcalidrawLinearElement {
</s> add ): NonDeleted<ExcalidrawLinearElement> { </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/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> export function newElement(
<mask> opts: {
<mask> type: ExcalidrawGenericElement["type"];
<mask> } & ElementConstructorOpts,
<mask> ): ExcalidrawGenericElement {
<mask> return _newElementBase<ExcalidrawGenericElement>(opts.type, opts);
<mask> }
<mask>
<mask> export function newTextElement(
<mask> opts: {
</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 ): ExcalidrawLinearElement {
</s> add ): NonDeleted<ExcalidrawLinearElement> { </s> remove ): ExcalidrawTextElement {
</s> add ): NonDeleted<ExcalidrawTextElement> { </s> remove isDeleted: rest.isDeleted ?? false,
</s> add isDeleted: false as false, </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </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[]
);
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> opts: {
<mask> text: string;
<mask> font: string;
<mask> } & ElementConstructorOpts,
<mask> ): ExcalidrawTextElement {
<mask> const { text, font } = opts;
<mask> const metrics = measureText(text, font);
<mask> const textElement = newElementWith(
<mask> {
<mask> ..._newElementBase<ExcalidrawTextElement>("text", opts),
</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 isDeleted: false,
</s> add </s> add export type NonDeleted<TElement extends ExcalidrawElement> = TElement & {
isDeleted: false;
};
export type NonDeletedExcalidrawElement = NonDeleted<ExcalidrawElement>;
</s> remove ): ExcalidrawLinearElement {
</s> add ): NonDeleted<ExcalidrawLinearElement> { </s> remove ): ExcalidrawGenericElement {
</s> add ): NonDeleted<ExcalidrawGenericElement> { </s> remove if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) { </s> remove import { ExcalidrawElement, ExcalidrawTextElement } from "../element/types";
</s> add import {
ExcalidrawElement,
ExcalidrawTextElement,
NonDeletedExcalidrawElement,
} from "../element/types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const metrics = measureText(text, font);
<mask> const textElement = newElementWith(
<mask> {
<mask> ..._newElementBase<ExcalidrawTextElement>("text", opts),
<mask> isDeleted: false,
<mask> text: text,
<mask> font: font,
<mask> // Center the text
<mask> x: opts.x - metrics.width / 2,
<mask> y: opts.y - metrics.height / 2,
</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 ): ExcalidrawTextElement {
</s> add ): NonDeleted<ExcalidrawTextElement> { </s> remove const elements = allElements.filter((element) => !element.isDeleted);
</s> add </s> remove isDeleted: rest.isDeleted ?? false,
</s> add isDeleted: false as false, </s> add export type NonDeleted<TElement extends ExcalidrawElement> = TElement & {
isDeleted: false;
};
export type NonDeletedExcalidrawElement = NonDeleted<ExcalidrawElement>;
</s> remove const element: Mutable<ReturnType<typeof newElement>> = newElement({
</s> add const element: Mutable<ExcalidrawElement> = newElement({ </s> remove globalSceneState.getAllElements() == null ||
globalSceneState.getAllElements().length === 0
</s> add globalSceneState.getElementsIncludingDeleted() == null ||
globalSceneState.getElementsIncludingDeleted().length === 0
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> opts: {
<mask> type: ExcalidrawLinearElement["type"];
<mask> lastCommittedPoint?: ExcalidrawLinearElement["lastCommittedPoint"];
<mask> } & ElementConstructorOpts,
<mask> ): ExcalidrawLinearElement {
<mask> return {
<mask> ..._newElementBase<ExcalidrawLinearElement>(opts.type, opts),
<mask> points: [],
<mask> lastCommittedPoint: opts.lastCommittedPoint || null,
<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 ): ExcalidrawGenericElement {
</s> add ): NonDeleted<ExcalidrawGenericElement> { </s> remove ): ExcalidrawTextElement {
</s> add ): NonDeleted<ExcalidrawTextElement> { </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove isDeleted: rest.isDeleted ?? false,
</s> add isDeleted: false as false, </s> add export type NonDeleted<TElement extends ExcalidrawElement> = TElement & {
isDeleted: false;
};
export type NonDeletedExcalidrawElement = NonDeleted<ExcalidrawElement>;
</s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { SHIFT_LOCKING_ANGLE } from "../constants";
<mask> import { getSelectedElements, globalSceneState } from "../scene";
<mask> import { rescalePoints } from "../points";
<mask> import { rotate, adjustXYWithRotation } from "../math";
<mask> import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
<mask> import { getElementAbsoluteCoords, getCommonBounds } from "./bounds";
<mask> import { isLinearElement } from "./typeChecks";
<mask> import { mutateElement } from "./mutateElement";
<mask> import { getPerfectElementSize, normalizeDimensions } from "./sizeHelpers";
<mask> import {
</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 "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import { NonDeletedExcalidrawElement } from "../element/types"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { ExcalidrawElement, NonDeletedExcalidrawElement } from "./types"; </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";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeElements.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> type ResizeTestType = ReturnType<typeof resizeTest>;
<mask>
<mask> export type ResizeArrowFnType = (
<mask> element: ExcalidrawLinearElement,
<mask> pointIndex: number,
<mask> deltaX: number,
<mask> deltaY: number,
<mask> pointerX: number,
<mask> pointerY: 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 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: ExcalidrawLinearElement,
pointIndex: number,
deltaX: number,
deltaY: number,
pointerX: number,
pointerY: number,
perfect: boolean,
</s> add element,
pointIndex,
deltaX,
deltaY,
pointerX,
pointerY,
perfect, </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,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeElements.ts
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> perfect: boolean,
<mask> ) => void;
<mask>
<mask> const arrowResizeOrigin: ResizeArrowFnType = (
<mask> element: ExcalidrawLinearElement,
<mask> pointIndex: number,
<mask> deltaX: number,
<mask> deltaY: number,
<mask> pointerX: number,
<mask> pointerY: number,
<mask> perfect: boolean,
<mask> ) => {
<mask> const [px, py] = element.points[pointIndex];
<mask> let x = element.x + deltaX;
<mask> let y = element.y + deltaY;
<mask> let pointX = px - deltaX;
</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: 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: ExcalidrawLinearElement,
</s> add element: NonDeleted<ExcalidrawLinearElement>, </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 element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeElements.ts
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> });
<mask> };
<mask>
<mask> const arrowResizeEnd: ResizeArrowFnType = (
<mask> element: ExcalidrawLinearElement,
<mask> pointIndex: number,
<mask> deltaX: number,
<mask> deltaY: number,
<mask> pointerX: number,
<mask> pointerY: number,
<mask> perfect: boolean,
<mask> ) => {
<mask> const [px, py] = element.points[pointIndex];
<mask> if (perfect) {
<mask> const { width, height } = getPerfectElementSize(
<mask> 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: 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: ExcalidrawLinearElement,
</s> add element: NonDeleted<ExcalidrawLinearElement>, </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 element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeElements.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> isResizing: resizeHandle !== "rotation",
<mask> isRotating: resizeHandle === "rotation",
<mask> });
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
<mask> appState,
<mask> );
<mask> if (selectedElements.length === 1) {
<mask> const element = selectedElements[0];
<mask> const angle = element.angle;
</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 const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove const selectedElements = getSelectedElements(
globalSceneState.getAllElements(),
this.state,
);
</s> add const elements = globalSceneState.getElements();
const selectedElements = getSelectedElements(elements, this.state); </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(), </s> remove globalSceneState.getAllElements(),
</s> add elements, </s> remove globalSceneState.getAllElements(),
</s> add globalSceneState.getElements(),
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeElements.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return false;
<mask> }
<mask>
<mask> export function canResizeMutlipleElements(
<mask> elements: readonly ExcalidrawElement[],
<mask> ) {
<mask> return elements.every((element) =>
<mask> ["rectangle", "diamond", "ellipse"].includes(element.type),
<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 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/element/resizeElements.ts
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement, PointerType } from "./types";
<mask>
<mask> import {
<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 } from "./types";
</s> add import { ExcalidrawElement, NonDeletedExcalidrawElement } from "./types"; </s> remove import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
</s> add import {
ExcalidrawLinearElement,
NonDeletedExcalidrawElement,
NonDeleted,
} from "./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"; </s> remove import { ExcalidrawElement } from "./types";
</s> add import { NonDeletedExcalidrawElement } from "./types";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeTest.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> }
<mask>
<mask> export function resizeTest(
<mask> element: ExcalidrawElement,
<mask> appState: AppState,
<mask> x: number,
<mask> y: number,
<mask> zoom: number,
<mask> pointerType: PointerType,
</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 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 element: ExcalidrawLinearElement,
</s> add element: NonDeleted<ExcalidrawLinearElement>,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeTest.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return false;
<mask> }
<mask>
<mask> export function getElementWithResizeHandler(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> { x, y }: { x: number; y: number },
<mask> zoom: number,
<mask> pointerType: PointerType,
<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 elements: 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); </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove ): readonly ExcalidrawElement[] {
</s> add ) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[],
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeTest.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return result;
<mask> }
<mask> const resizeHandle = resizeTest(element, appState, x, y, zoom, pointerType);
<mask> return resizeHandle ? { element, resizeHandle } : null;
<mask> }, null as { element: ExcalidrawElement; resizeHandle: ReturnType<typeof resizeTest> } | null);
<mask> }
<mask>
<mask> export function getResizeHandlerFromCoords(
<mask> [x1, y1, x2, y2]: readonly [number, number, number, number],
<mask> { x, y }: { x: number; y: 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 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 element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement, </s> remove element: ExcalidrawElement,
</s> add element: NonDeletedExcalidrawElement,
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/resizeTest.ts
|
keep replace keep keep keep keep replace keep keep keep
|
<mask> import { AppState } from "../types";
<mask> import { ExcalidrawElement } from "./types";
<mask> import { getSelectedElements } from "../scene";
<mask>
<mask> export const showSelectedShapeActions = (
<mask> appState: AppState,
<mask> elements: readonly ExcalidrawElement[],
<mask> ) =>
<mask> Boolean(
<mask> appState.editingElement ||
</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 "./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 { NonDeletedExcalidrawElement } from "../element/types"; </s> add import { globalSceneState } from "../scene";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/showSelectedShapeActions.ts
|
keep keep add keep keep keep keep keep
|
<mask> | ExcalidrawTextElement
<mask> | ExcalidrawLinearElement;
<mask>
<mask> export type ExcalidrawTextElement = _ExcalidrawElementBase &
<mask> Readonly<{
<mask> type: "text";
<mask> font: string;
<mask> text: 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 ): ExcalidrawTextElement {
</s> add ): NonDeleted<ExcalidrawTextElement> { </s> remove editingElement: ExcalidrawElement | null;
</s> add editingElement: NonDeletedExcalidrawElement | null; </s> remove draggingElement: ExcalidrawElement | null;
resizingElement: ExcalidrawElement | null;
multiElement: ExcalidrawLinearElement | null;
selectionElement: ExcalidrawElement | null;
</s> add draggingElement: NonDeletedExcalidrawElement | null;
resizingElement: NonDeletedExcalidrawElement | null;
multiElement: NonDeleted<ExcalidrawLinearElement> | null;
selectionElement: NonDeletedExcalidrawElement | null; </s> remove if (!hasNonDeletedElements(elements)) {
</s> add if (elements.length === 0) { </s> remove elements: readonly ExcalidrawElement[],
</s> add elements: readonly NonDeletedExcalidrawElement[], </s> remove ): ExcalidrawGenericElement {
</s> add ): NonDeleted<ExcalidrawGenericElement> {
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/element/types.ts
|
replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement, ExcalidrawTextElement } from "../element/types";
<mask> import { isTextElement } from "../element/typeChecks";
<mask> import {
<mask> getDiamondPoints,
<mask> getArrowPoints,
<mask> getElementAbsoluteCoords,
</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 {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types"; </s> remove import { ExcalidrawElement } from "../element/types";
</s> add import {
ExcalidrawElement,
NonDeletedExcalidrawElement,
} from "../element/types";
import { getNonDeletedElements } from "../element";
|
https://github.com/excalidraw/excalidraw/commit/df0613d8acf732d539b1862547cbfaffbdf8103f
|
src/renderer/renderElement.ts
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.