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 replace replace replace replace replace replace replace replace keep keep replace keep keep keep
|
<mask> UI.clickTool("rectangle");
<mask> mouse.down();
<mask> mouse.up(100, 100);
<mask>
<mask> UI.clickTool("rectangle");
<mask> mouse.down(0, 0);
<mask> mouse.up(100, 100);
<mask>
<mask> // Select the first element.
<mask> // The second rectangle is already selected because it was the last element created
<mask> mouse.reset();
<mask> Keyboard.withModifierKeys({ shift: true }, () => {
<mask> mouse.click();
<mask> });
<mask>
<mask> h.app.actionManager.executeAction(actionGroup);
<mask>
<mask> mouse.reset();
<mask> UI.clickTool("rectangle");
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> });
<mask>
<mask> h.app.actionManager.executeAction(actionGroup);
<mask>
<mask> mouse.reset();
<mask> UI.clickTool("rectangle");
<mask> mouse.down(200, 200);
<mask> mouse.up(100, 100);
<mask>
<mask> UI.clickTool("rectangle");
<mask> mouse.down();
<mask> mouse.up(100, 100);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
</s> add h.app.actionManager.executeAction(actionAlignHorizontallyCentered); </s> remove h.app.actionManager.executeAction(actionGroup);
</s> add h.app.actionManager.executeAction(actionAlignHorizontallyCentered); </s> remove h.app.actionManager.executeAction(actionGroup);
</s> add it("centers a group with another element correctly horizontally", () => {
createAndSelectGroupAndRectangle(); </s> remove mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
</s> add expect(API.getSelectedElements()[0].x).toEqual(60);
expect(API.getSelectedElements()[1].x).toEqual(55); </s> remove UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already selected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(100); </s> remove const createAndSelectTwoGroups = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
</s> add h.app.actionManager.executeAction(actionAlignVerticallyCentered);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace keep replace replace replace
|
<mask>
<mask> UI.clickTool("rectangle");
<mask> mouse.down();
<mask> mouse.up(100, 100);
<mask>
<mask> mouse.restorePosition(200, 200);
<mask> Keyboard.withModifierKeys({ shift: true }, () => {
<mask> mouse.click();
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove h.app.actionManager.executeAction(actionGroup);
</s> add h.app.actionManager.executeAction(actionAlignHorizontallyCentered); </s> remove h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add const createAndSelectTwoGroups = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already selected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
mouse.restorePosition(200, 200);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns two groups correctly to the top", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[3].y).toEqual(100); </s> remove h.app.actionManager.executeAction(actionGroup);
</s> add it("centers a group with another element correctly horizontally", () => {
createAndSelectGroupAndRectangle(); </s> remove mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
</s> add expect(API.getSelectedElements()[0].x).toEqual(60);
expect(API.getSelectedElements()[1].x).toEqual(55); </s> remove // Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
</s> add it("centers two groups correctly horizontally", () => {
createAndSelectTwoGroups();
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask>
<mask> h.app.actionManager.executeAction(actionGroup);
<mask>
<mask> // Select the first group.
<mask> // The second group is already selected because it was the last group created
<mask> mouse.reset();
<mask> Keyboard.withModifierKeys({ shift: true }, () => {
<mask> mouse.click();
<mask> });
<mask> };
<mask>
<mask> it("aligns two groups correctly to the top", () => {
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignTop);
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(0);
<mask> expect(API.getSelectedElements()[3].y).toEqual(100);
<mask> });
<mask>
<mask> it("aligns two groups correctly to the bottom", () => {
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove h.app.actionManager.executeAction(actionAlignTop);
</s> add // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
}); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
});
</s> add const createAndSelectNestedGroupAndRectangle = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create the nested group
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(300, 300);
mouse.up(100, 100);
// Select the nested group, the rectangle is already selected
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
}); </s> remove it("aligns two groups correctly to the bottom", () => {
createAndSelectTwoGroups();
</s> add it("aligns two groups correctly to the bottom", () => {
createAndSelectTwoGroups(); </s> remove // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110); </s> remove // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[3].y).toEqual(200);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect(API.getSelectedElements()[2].y).toEqual(0);
<mask> expect(API.getSelectedElements()[3].y).toEqual(100);
<mask> });
<mask>
<mask> it("aligns two groups correctly to the bottom", () => {
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove };
it("aligns two groups correctly to the top", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[3].y).toEqual(100);
});
</s> add </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(200);
expect(API.getSelectedElements()[1].y).toEqual(300);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
});
it("aligns two groups correctly to the left", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
h.app.actionManager.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[3].x).toEqual(100);
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove h.app.actionManager.executeAction(actionAlignVerticallyCentered);
</s> add it("aligns two groups correctly to the right", () => {
createAndSelectTwoGroups(); </s> remove it("centers two groups correctly vertically", () => {
createAndSelectTwoGroups();
</s> add h.app.actionManager.executeAction(actionAlignLeft); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
});
</s> add h.app.actionManager.executeAction(actionGroup);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep replace replace keep
|
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignBottom);
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(200);
<mask> expect(API.getSelectedElements()[1].y).toEqual(300);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask> });
<mask>
<mask> it("aligns two groups correctly to the left", () => {
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignLeft);
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(0);
<mask> expect(API.getSelectedElements()[3].x).toEqual(100);
<mask> });
<mask>
<mask> it("aligns two groups correctly to the right", () => {
<mask> createAndSelectTwoGroups();
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(200);
expect(API.getSelectedElements()[1].y).toEqual(300);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
}); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[3].x).toEqual(100);
}); </s> remove it("aligns two groups correctly to the bottom", () => {
createAndSelectTwoGroups();
</s> add it("aligns two groups correctly to the bottom", () => {
createAndSelectTwoGroups(); </s> remove it("centers two groups correctly vertically", () => {
createAndSelectTwoGroups();
</s> add h.app.actionManager.executeAction(actionAlignLeft); </s> remove h.app.actionManager.executeAction(actionAlignVerticallyCentered);
</s> add it("aligns two groups correctly to the right", () => {
createAndSelectTwoGroups();
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace keep replace
|
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignRight);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace replace keep replace replace keep keep keep
|
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(200);
<mask> expect(API.getSelectedElements()[1].x).toEqual(300);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask> });
<mask>
<mask> it("centers two groups correctly vertically", () => {
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
}); </s> remove h.app.actionManager.executeAction(actionAlignRight);
</s> add it("aligns two groups correctly to the left", () => {
createAndSelectTwoGroups(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(200);
expect(API.getSelectedElements()[1].y).toEqual(300);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
}); </s> remove h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
</s> add it("centers two groups correctly vertically", () => {
createAndSelectTwoGroups(); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[3].x).toEqual(100);
});
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep replace replace replace replace keep replace keep keep keep keep
|
<mask> it("centers two groups correctly vertically", () => {
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignVerticallyCentered);
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(100);
<mask> expect(API.getSelectedElements()[1].y).toEqual(200);
<mask> expect(API.getSelectedElements()[2].y).toEqual(100);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[3].y).toEqual(200);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove it("centers two groups correctly vertically", () => {
createAndSelectTwoGroups();
</s> add h.app.actionManager.executeAction(actionAlignLeft); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignBottom);
expect(API.getSelectedElements()[0].y).toEqual(200);
expect(API.getSelectedElements()[1].y).toEqual(300);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
});
it("aligns two groups correctly to the left", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
h.app.actionManager.executeAction(actionAlignLeft);
expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[3].x).toEqual(100);
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove it("aligns two groups correctly to the bottom", () => {
createAndSelectTwoGroups();
</s> add it("aligns two groups correctly to the bottom", () => {
createAndSelectTwoGroups();
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace replace keep replace replace keep keep keep keep
|
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(100);
<mask> expect(API.getSelectedElements()[1].y).toEqual(200);
<mask> expect(API.getSelectedElements()[2].y).toEqual(100);
<mask> expect(API.getSelectedElements()[3].y).toEqual(200);
<mask> });
<mask>
<mask> it("centers two groups correctly horizontally", () => {
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove h.app.actionManager.executeAction(actionAlignVerticallyCentered);
</s> add it("aligns two groups correctly to the right", () => {
createAndSelectTwoGroups(); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(0);
expect(API.getSelectedElements()[3].x).toEqual(100);
}); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
}); </s> remove expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove it("centers a group with another element correctly horizontally", () => {
createAndSelectGroupAndRectangle();
</s> add h.app.actionManager.executeAction(actionAlignRight);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep replace replace replace replace keep replace keep keep keep keep
|
<mask> it("centers two groups correctly horizontally", () => {
<mask> createAndSelectTwoGroups();
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(100);
<mask> expect(API.getSelectedElements()[1].x).toEqual(200);
<mask> expect(API.getSelectedElements()[2].x).toEqual(100);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("centers two groups correctly horizontally", () => {
createAndSelectTwoGroups();
</s> add h.app.actionManager.executeAction(actionAlignRight); </s> remove expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[3].y).toEqual(200);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
</s> add expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(200);
}); </s> remove expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep replace replace replace replace replace keep replace replace replace replace replace replace replace replace keep keep keep keep
|
<mask>
<mask> h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(100);
<mask> expect(API.getSelectedElements()[1].x).toEqual(200);
<mask> expect(API.getSelectedElements()[2].x).toEqual(100);
<mask> expect(API.getSelectedElements()[3].x).toEqual(200);
<mask> });
<mask>
<mask> const createAndSelectNestedGroupAndRectangle = () => {
<mask> UI.clickTool("rectangle");
<mask> mouse.down();
<mask> mouse.up(100, 100);
<mask>
<mask> UI.clickTool("rectangle");
<mask> mouse.down(0, 0);
<mask> mouse.up(100, 100);
<mask>
<mask> // Select the first element.
<mask> // The second rectangle is already reselected because it was the last element created
<mask> mouse.reset();
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep
|
<mask>
<mask> // Select the first element.
<mask> // The second rectangle is already reselected because it was the last element created
<mask> mouse.reset();
<mask> Keyboard.withModifierKeys({ shift: true }, () => {
<mask> mouse.click();
<mask> });
<mask>
<mask> // Create first group of rectangles
<mask> h.app.actionManager.executeAction(actionGroup);
<mask>
<mask> mouse.reset();
<mask> UI.clickTool("rectangle");
<mask> mouse.down(200, 200);
<mask> mouse.up(100, 100);
<mask>
<mask> // Add group to current selection
<mask> mouse.restorePosition(0, 0);
<mask> Keyboard.withModifierKeys({ shift: true }, () => {
<mask> mouse.click();
<mask> });
<mask>
<mask> // Create the nested group
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
});
</s> add const createAndSelectNestedGroupAndRectangle = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create the nested group
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(300, 300);
mouse.up(100, 100);
// Select the nested group, the rectangle is already selected
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
}); </s> remove // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110); </s> remove h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add const createAndSelectTwoGroups = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already selected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
mouse.restorePosition(200, 200);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns two groups correctly to the top", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[3].y).toEqual(100); </s> remove UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already selected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(100); </s> remove UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> Keyboard.withModifierKeys({ shift: true }, () => {
<mask> mouse.click();
<mask> });
<mask>
<mask> // Create the nested group
<mask> h.app.actionManager.executeAction(actionGroup);
<mask>
<mask> mouse.reset();
<mask> UI.clickTool("rectangle");
<mask> mouse.down(300, 300);
<mask> mouse.up(100, 100);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove mouse.reset();
UI.clickTool("rectangle");
mouse.down(300, 300);
mouse.up(100, 100);
</s> add h.app.actionManager.executeAction(actionAlignHorizontallyCentered); </s> remove // Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
</s> add it("centers two groups correctly horizontally", () => {
createAndSelectTwoGroups(); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
});
</s> add const createAndSelectNestedGroupAndRectangle = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create the nested group
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(300, 300);
mouse.up(100, 100);
// Select the nested group, the rectangle is already selected
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
}); </s> remove // Select the nested group, the rectangle is already selected
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(100);
expect(API.getSelectedElements()[3].x).toEqual(200); </s> remove h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add const createAndSelectTwoGroups = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already selected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
mouse.restorePosition(200, 200);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns two groups correctly to the top", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[3].y).toEqual(100); </s> remove h.app.actionManager.executeAction(actionGroup);
</s> add h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace replace replace keep replace replace replace replace keep keep
|
<mask>
<mask> // Create the nested group
<mask> h.app.actionManager.executeAction(actionGroup);
<mask>
<mask> mouse.reset();
<mask> UI.clickTool("rectangle");
<mask> mouse.down(300, 300);
<mask> mouse.up(100, 100);
<mask>
<mask> // Select the nested group, the rectangle is already selected
<mask> mouse.reset();
<mask> Keyboard.withModifierKeys({ shift: true }, () => {
<mask> mouse.click();
<mask> });
<mask> };
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
});
</s> add const createAndSelectNestedGroupAndRectangle = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create the nested group
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(300, 300);
mouse.up(100, 100);
// Select the nested group, the rectangle is already selected
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
}); </s> remove // Create the nested group
h.app.actionManager.executeAction(actionGroup);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add const createAndSelectTwoGroups = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already selected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
mouse.restorePosition(200, 200);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
h.app.actionManager.executeAction(actionGroup);
// Select the first group.
// The second group is already selected because it was the last group created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns two groups correctly to the top", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[3].y).toEqual(100); </s> remove UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already selected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add expect(API.getSelectedElements()[0].y).toEqual(50);
expect(API.getSelectedElements()[1].y).toEqual(150);
expect(API.getSelectedElements()[2].y).toEqual(100); </s> remove // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace keep
|
<mask> });
<mask> };
<mask>
<mask> it("aligns nested group and other element correctly to the top", () => {
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignTop);
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(0);
<mask> });
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove it("centers nested group and other element correctly vertically", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("centers nested group and other element correctly vertically", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove };
it("aligns two groups correctly to the top", () => {
createAndSelectTwoGroups();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(0);
expect(API.getSelectedElements()[3].y).toEqual(100);
});
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(0);
<mask> });
<mask>
<mask> it("aligns nested group and other element correctly to the bottom", () => {
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove };
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
</s> add </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove it("centers nested group and other element correctly vertically", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("centers nested group and other element correctly vertically", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
});
</s> add const createAndSelectNestedGroupAndRectangle = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create the nested group
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(300, 300);
mouse.up(100, 100);
// Select the nested group, the rectangle is already selected
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
}); </s> remove it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle();
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace replace replace keep replace keep keep
|
<mask>
<mask> it("aligns nested group and other element correctly to the bottom", () => {
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignBottom);
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(100);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep replace replace replace replace replace keep replace replace keep keep keep
|
<mask> h.app.actionManager.executeAction(actionAlignBottom);
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(100);
<mask> expect(API.getSelectedElements()[1].y).toEqual(200);
<mask> expect(API.getSelectedElements()[2].y).toEqual(300);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask> });
<mask>
<mask> it("aligns nested group and other element correctly to the left", () => {
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove it("aligns nested group and other element correctly to the right", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the right", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(0);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(0);
});
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace keep keep keep keep keep keep keep keep replace keep
|
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignLeft);
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignLeft);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(0);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(0);
}); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove h.app.actionManager.executeAction(actionAlignLeft);
</s> add it("aligns a group with another element correctly to the bottom", () => {
createAndSelectGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace replace keep replace replace
|
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(0);
<mask> });
<mask>
<mask> it("aligns nested group and other element correctly to the right", () => {
<mask> createAndSelectNestedGroupAndRectangle();
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove it("centers nested group and other element correctly horizontally", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("centers nested group and other element correctly horizontally", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle();
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep replace replace replace replace keep replace keep
|
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignRight);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(0);
});
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(0);
}); </s> remove it("centers two groups correctly horizontally", () => {
createAndSelectTwoGroups();
</s> add h.app.actionManager.executeAction(actionAlignRight);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep replace replace replace replace replace keep replace replace keep
|
<mask> h.app.actionManager.executeAction(actionAlignRight);
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(100);
<mask> expect(API.getSelectedElements()[1].x).toEqual(200);
<mask> expect(API.getSelectedElements()[2].x).toEqual(300);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask> });
<mask>
<mask> it("centers nested group and other element correctly vertically", () => {
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove it("centers nested group and other element correctly horizontally", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("centers nested group and other element correctly horizontally", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove it("aligns nested group and other element correctly to the right", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the right", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace replace replace keep replace keep keep
|
<mask>
<mask> it("centers nested group and other element correctly vertically", () => {
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(0);
<mask> expect(API.getSelectedElements()[1].y).toEqual(100);
<mask> expect(API.getSelectedElements()[2].y).toEqual(200);
<mask> expect(API.getSelectedElements()[3].y).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignVerticallyCentered);
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(50);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace replace keep replace replace keep
|
<mask>
<mask> expect(API.getSelectedElements()[0].y).toEqual(50);
<mask> expect(API.getSelectedElements()[1].y).toEqual(150);
<mask> expect(API.getSelectedElements()[2].y).toEqual(250);
<mask> expect(API.getSelectedElements()[3].y).toEqual(150);
<mask> });
<mask>
<mask> it("centers nested group and other element correctly horizontally", () => {
<mask> createAndSelectNestedGroupAndRectangle();
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300); </s> remove it("centers nested group and other element correctly vertically", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("centers nested group and other element correctly vertically", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the left", () => {
createAndSelectNestedGroupAndRectangle(); </s> remove it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle();
</s> add it("aligns nested group and other element correctly to the bottom", () => {
createAndSelectNestedGroupAndRectangle();
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep replace replace replace replace keep replace keep keep keep keep
|
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(0);
<mask> expect(API.getSelectedElements()[1].x).toEqual(100);
<mask> expect(API.getSelectedElements()[2].x).toEqual(200);
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(50);
<mask> expect(API.getSelectedElements()[1].x).toEqual(150);
<mask> expect(API.getSelectedElements()[2].x).toEqual(250);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(250);
expect(API.getSelectedElements()[3].x).toEqual(150);
</s> add expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(250);
expect(API.getSelectedElements()[3].x).toEqual(150);
}); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
</s> add expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(200);
}); </s> remove h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
</s> add it("centers a group with another element correctly vertically", () => {
createAndSelectGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(200);
expect(API.getSelectedElements()[1].x).toEqual(300);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
}); </s> remove expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(100);
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep keep keep replace replace replace replace keep
|
<mask> expect(API.getSelectedElements()[3].x).toEqual(300);
<mask>
<mask> h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
<mask>
<mask> expect(API.getSelectedElements()[0].x).toEqual(50);
<mask> expect(API.getSelectedElements()[1].x).toEqual(150);
<mask> expect(API.getSelectedElements()[2].x).toEqual(250);
<mask> expect(API.getSelectedElements()[3].x).toEqual(150);
<mask> });
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
</s> add h.app.actionManager.executeAction(actionAlignHorizontallyCentered); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
expect(API.getSelectedElements()[3].x).toEqual(300); </s> remove expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(100);
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200); </s> remove h.app.actionManager.executeAction(actionAlignHorizontallyCentered);
</s> add it("centers a group with another element correctly vertically", () => {
createAndSelectGroupAndRectangle(); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(100);
expect(API.getSelectedElements()[2].x).toEqual(200);
</s> add expect(API.getSelectedElements()[0].x).toEqual(100);
expect(API.getSelectedElements()[1].x).toEqual(200);
expect(API.getSelectedElements()[2].x).toEqual(200);
}); </s> remove mouse.restorePosition(200, 200);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add expect(API.getSelectedElements()[0].x).toEqual(50);
expect(API.getSelectedElements()[1].x).toEqual(150);
expect(API.getSelectedElements()[2].x).toEqual(100);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/align.test.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import { render, waitFor } from "./test-utils";
<mask> import App from "../components/App";
<mask> import { API } from "./helpers/api";
<mask> import { getDefaultAppState } from "../appState";
<mask>
<mask> const { h } = window;
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import { render, waitFor } from "./test-utils";
import App from "../components/App";
</s> add import { render, updateSceneData, waitFor } from "./test-utils";
import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/appState.test.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> describe("appState", () => {
<mask> it("drag&drop file doesn't reset non-persisted appState", async () => {
<mask> const defaultAppState = getDefaultAppState();
<mask> const exportBackground = !defaultAppState.exportBackground;
<mask> render(
<mask> <App
<mask> initialData={{
<mask> appState: {
<mask> ...defaultAppState,
<mask> exportBackground,
<mask> viewBackgroundColor: "#F00",
<mask> },
<mask> elements: [],
<mask> }}
<mask> />,
<mask> );
<mask>
<mask> await waitFor(() => {
<mask> expect(h.state.exportBackground).toBe(exportBackground);
<mask> expect(h.state.viewBackgroundColor).toBe("#F00");
<mask> });
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
viewBackgroundColor: "#FFF",
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
viewBackgroundColor: "#FFF",
},
},
}); </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
zenModeEnabled: true,
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
zenModeEnabled: true,
},
},
}); </s> remove render(
<App
initialData={{
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({ type: "rectangle", id: "B", isDeleted: true }),
],
}}
/>,
);
</s> add await render(<ExcalidrawApp />);
// To update the scene with deleted elements before starting collab
updateSceneData({
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({
type: "rectangle",
id: "B",
isDeleted: true,
}),
],
}); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove jest.mock("../data/firebase.ts", () => {
</s> add jest.mock("../excalidraw-app/data/firebase.ts", () => { </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/appState.test.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import { render } from "./test-utils";
<mask> import App from "../components/App";
<mask> import { UI, Pointer, Keyboard } from "./helpers/ui";
<mask> import { getTransformHandles } from "../element/transformHandles";
<mask> import { API } from "./helpers/api";
<mask> import { KEYS } from "../keys";
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import { render, waitFor } from "./test-utils";
import App from "../components/App";
</s> add import { render, updateSceneData, waitFor } from "./test-utils";
import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/binding.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> const mouse = new Pointer("mouse");
<mask>
<mask> describe("element binding", () => {
<mask> beforeEach(() => {
<mask> render(<App />);
<mask> });
<mask>
<mask> it("rotation of arrow should rebind both ends", () => {
<mask> const rectLeft = UI.createElement("rectangle", {
<mask> x: 0,
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangles with binding arrow", () => {
render(<App />);
</s> add it("rectangles with binding arrow", async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(async () => {
// Unmount ReactDOM from root
ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
mouse.reset();
await setLanguage("en.json");
render(<App />);
});
</s> add </s> remove it("rectangle", () => {
render(<App />);
</s> add it("rectangle", async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
</s> add beforeEach(async () => { </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/binding.test.tsx
|
keep replace replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import { render, waitFor } from "./test-utils";
<mask> import App from "../components/App";
<mask> import { API } from "./helpers/api";
<mask> import { createUndoAction } from "../actions/actionHistory";
<mask>
<mask> const { h } = window;
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/collab.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> },
<mask> },
<mask> });
<mask>
<mask> jest.mock("../data/firebase.ts", () => {
<mask> const loadFromFirebase = async () => null;
<mask> const saveToFirebase = () => {};
<mask> const isSavedToFirebase = () => true;
<mask>
<mask> return {
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove export default function ExcalidrawApp() {
</s> add const shouldForceLoadScene = (
scene: ResolutionType<typeof loadScene>,
): boolean => {
if (!scene.elements.length) {
return true;
}
const roomMatch = getCollaborationLinkData(window.location.href);
if (!roomMatch) {
return false;
}
const roomId = roomMatch[1];
let collabForceLoadFlag;
try {
collabForceLoadFlag = localStorage?.getItem(
STORAGE_KEYS.LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
);
} catch {}
if (collabForceLoadFlag) {
try {
const {
room: previousRoom,
timestamp,
}: { room: string; timestamp: number } = JSON.parse(collabForceLoadFlag);
// if loading same room as the one previously unloaded within 15sec
// force reload without prompting
if (previousRoom === roomId && Date.now() - timestamp < 15000) {
return true;
}
} catch {}
}
return false;
};
type Scene = ImportedDataState & { commitToHistory: boolean };
const initializeScene = async (opts: {
resetScene: ExcalidrawImperativeAPI["resetScene"];
initializeSocketClient: CollabAPI["initializeSocketClient"];
onLateInitialization?: (scene: Scene) => void;
}): Promise<Scene | null> => {
const searchParams = new URLSearchParams(window.location.search);
const id = searchParams.get("id");
const jsonMatch = window.location.hash.match(
/^#json=([0-9]+),([a-zA-Z0-9_-]+)$/,
);
const initialData = importFromLocalStorage();
let scene = await loadScene(null, null, initialData);
let isCollabScene = !!getCollaborationLinkData(window.location.href);
const isExternalScene = !!(id || jsonMatch || isCollabScene);
if (isExternalScene) {
if (
shouldForceLoadScene(scene) ||
window.confirm(t("alerts.loadSceneOverridePrompt"))
) {
// Backwards compatibility with legacy url format
if (id) {
scene = await loadScene(id, null, initialData);
} else if (jsonMatch) {
scene = await loadScene(jsonMatch[1], jsonMatch[2], initialData);
}
if (!isCollabScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin);
}
} else {
// https://github.com/excalidraw/excalidraw/issues/1919
if (document.hidden) {
window.addEventListener(
"focus",
() =>
initializeScene(opts).then((_scene) => {
opts?.onLateInitialization?.(_scene || scene);
}),
{
once: true,
},
);
return null;
}
isCollabScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin);
}
}
if (isCollabScene) {
// when joining a room we don't want user's local scene data to be merged
// into the remote scene
opts.resetScene();
const scenePromise = opts.initializeSocketClient();
trackEvent(EVENT_SHARE, "session join");
try {
const [, roomId, roomKey] = getCollaborationLinkData(
window.location.href,
)!;
const elements = await loadFromFirebase(roomId, roomKey);
if (elements) {
return {
elements,
commitToHistory: true,
};
}
return {
...(await scenePromise),
commitToHistory: true,
};
} catch (error) {
// log the error and move on. other peers will sync us the scene.
console.error(error);
}
return null;
} else if (scene) {
return scene;
}
return null;
};
function ExcalidrawWrapper(props: { collab: CollabAPI }) {
// dimensions
// ---------------------------------------------------------------------------
</s> remove render(
<App
initialData={{
appState: {
...defaultAppState,
exportBackground,
viewBackgroundColor: "#F00",
},
elements: [],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
appState: {
exportBackground,
viewBackgroundColor: "#F00",
},
},
}); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/collab.test.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> });
<mask>
<mask> describe("collaboration", () => {
<mask> it("creating room should reset deleted elements", async () => {
<mask> render(
<mask> <App
<mask> initialData={{
<mask> elements: [
<mask> API.createElement({ type: "rectangle", id: "A" }),
<mask> API.createElement({ type: "rectangle", id: "B", isDeleted: true }),
<mask> ],
<mask> }}
<mask> />,
<mask> );
<mask>
<mask> await waitFor(() => {
<mask> expect(h.elements).toEqual([
<mask> expect.objectContaining({ id: "A" }),
<mask> expect.objectContaining({ id: "B", isDeleted: true }),
<mask> ]);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove
await h.app.openPortal();
</s> add h.collab.openPortal(); </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
viewBackgroundColor: "#FFF",
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
viewBackgroundColor: "#FFF",
},
},
}); </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
zenModeEnabled: true,
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
zenModeEnabled: true,
},
},
}); </s> remove render(
<App
initialData={{
appState: {
...defaultAppState,
exportBackground,
viewBackgroundColor: "#F00",
},
elements: [],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
appState: {
exportBackground,
viewBackgroundColor: "#F00",
},
},
}); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove private beforeUnload = withBatchedUpdates((event: BeforeUnloadEvent) => {
if (this.state.isCollaborating && this.portal.roomId) {
try {
localStorage?.setItem(
LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG,
JSON.stringify({
timestamp: Date.now(),
room: this.portal.roomId,
}),
);
} catch {}
}
const syncableElements = getSyncableElements(
this.scene.getElementsIncludingDeleted(),
);
if (
this.state.isCollaborating &&
!isSavedToFirebase(this.portal, syncableElements)
) {
// this won't run in time if user decides to leave the site, but
// the purpose is to run in immediately after user decides to stay
this.saveCollabRoomToFirebase(syncableElements);
event.preventDefault();
// NOTE: modern browsers no longer allow showing a custom message here
event.returnValue = "";
}
});
queueBroadcastAllElements = throttle(() => {
this.portal.broadcastScene(SCENE.UPDATE, /* syncAll */ true);
}, SYNC_FULL_SCENE_INTERVAL_MS);
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/collab.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect.objectContaining({ id: "B", isDeleted: true }),
<mask> ]);
<mask> expect(API.getStateHistory().length).toBe(1);
<mask> });
<mask>
<mask> await h.app.openPortal();
<mask> await waitFor(() => {
<mask> expect(h.elements).toEqual([expect.objectContaining({ id: "A" })]);
<mask> expect(API.getStateHistory().length).toBe(1);
<mask> });
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove render(
<App
initialData={{
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({ type: "rectangle", id: "B", isDeleted: true }),
],
}}
/>,
);
</s> add await render(<ExcalidrawApp />);
// To update the scene with deleted elements before starting collab
updateSceneData({
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({
type: "rectangle",
id: "B",
isDeleted: true,
}),
],
}); </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
viewBackgroundColor: "#FFF",
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
viewBackgroundColor: "#FFF",
},
},
}); </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
zenModeEnabled: true,
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
zenModeEnabled: true,
},
},
}); </s> remove render(
<App
initialData={{
appState: {
...defaultAppState,
exportBackground,
viewBackgroundColor: "#F00",
},
elements: [],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
appState: {
exportBackground,
viewBackgroundColor: "#F00",
},
},
}); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove isCollaborating: true,
isLoading: opts.showLoadingState ? true : this.state.isLoading,
</s> add viewBackgroundColor: sceneData.appState.viewBackgroundColor,
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/collab.test.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import ReactDOM from "react-dom";
<mask> import App from "../components/App";
<mask> import * as Renderer from "../renderer/renderScene";
<mask> import { KEYS } from "../keys";
<mask> import { render, fireEvent } from "./test-utils";
<mask> import { ExcalidrawLinearElement } from "../element/types";
<mask> import { reseed } from "../random";
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> const { h } = window;
<mask>
<mask> describe("add element to the scene when pointer dragging long enough", () => {
<mask> it("rectangle", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("rectangle");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("create selection element on pointer down", () => {
const { getByToolName, container } = render(<App />);
</s> add it("create selection element on pointer down", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // finish (position does not matter)
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask>
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.elements[0].type).toEqual("rectangle");
<mask> expect(h.elements[0].x).toEqual(30);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect(h.elements.length).toMatchSnapshot();
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("ellipse", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("ellipse");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // finish (position does not matter)
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask>
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.elements[0].type).toEqual("ellipse");
<mask> expect(h.elements[0].x).toEqual(30);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect(h.elements.length).toMatchSnapshot();
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("diamond", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("diamond");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // finish (position does not matter)
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask>
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.elements[0].type).toEqual("diamond");
<mask> expect(h.elements[0].x).toEqual(30);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect(h.elements.length).toMatchSnapshot();
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("arrow", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("arrow");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // finish (position does not matter)
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask>
<mask> expect(h.elements.length).toEqual(1);
<mask>
<mask> const element = h.elements[0] as ExcalidrawLinearElement;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect(h.elements.length).toMatchSnapshot();
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("line", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("line");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow escape", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow escape", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // finish (position does not matter)
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask>
<mask> expect(h.elements.length).toEqual(1);
<mask>
<mask> const element = h.elements[0] as ExcalidrawLinearElement;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask>
<mask> describe("do not add element to the scene if size is too small", () => {
<mask> it("rectangle", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("rectangle");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("resize selection element on pointer move", () => {
const { getByToolName, container } = render(<App />);
</s> add it("resize selection element on pointer move", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("remove selection element on pointer up", () => {
const { getByToolName, container } = render(<App />);
</s> add it("remove selection element on pointer up", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep replace replace keep
|
<mask>
<mask> // finish (position does not matter)
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(4);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask>
<mask> it("ellipse", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep replace keep keep keep keep replace replace keep keep keep
|
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(4);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask>
<mask> it("diamond", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("diamond");
<mask> fireEvent.click(tool);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep replace replace keep keep keep
|
<mask>
<mask> // finish (position does not matter)
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(4);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask>
<mask> it("arrow", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("arrow");
<mask> fireEvent.click(tool);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep replace replace keep keep keep keep
|
<mask>
<mask> // we need to finalize it because arrows and lines enter multi-mode
<mask> fireEvent.keyDown(document, { key: KEYS.ENTER });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask>
<mask> it("line", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("line");
<mask> fireEvent.click(tool);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep
|
<mask>
<mask> // we need to finalize it because arrows and lines enter multi-mode
<mask> fireEvent.keyDown(document, { key: KEYS.ENTER });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask> });
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(11);
</s> add expect(renderScene).toHaveBeenCalledTimes(12); </s> remove expect(renderScene).toHaveBeenCalledTimes(11);
</s> add expect(renderScene).toHaveBeenCalledTimes(12); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/dragCreate.test.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import { render, waitFor } from "./test-utils";
<mask> import App from "../components/App";
<mask> import { API } from "./helpers/api";
<mask> import {
<mask> encodePngMetadata,
<mask> encodeSvgMetadata,
<mask> decodeSvgMetadata,
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import { render, waitFor } from "./test-utils";
import App from "../components/App";
</s> add import { render, updateSceneData, waitFor } from "./test-utils";
import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/export.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> },
<mask> });
<mask>
<mask> describe("export", () => {
<mask> beforeEach(() => {
<mask> render(<App />);
<mask> });
<mask>
<mask> it("export embedded png and reimport", async () => {
<mask> const pngBlob = await API.loadFile("./fixtures/smiley.png");
<mask> const pngBlobEmbedded = await encodePngMetadata({
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove render(<App />);
</s> add await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/export.test.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import { render } from "./test-utils";
<mask> import App from "../components/App";
<mask> import { UI } from "./helpers/ui";
<mask> import { API } from "./helpers/api";
<mask> import { getDefaultAppState } from "../appState";
<mask> import { waitFor } from "@testing-library/react";
<mask> import { createUndoAction, createRedoAction } from "../actions/actionHistory";
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import { render, waitFor } from "./test-utils";
import App from "../components/App";
</s> add import { render, updateSceneData, waitFor } from "./test-utils";
import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/history.test.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> const { h } = window;
<mask>
<mask> describe("history", () => {
<mask> it("initializing scene should end up with single history entry", async () => {
<mask> render(
<mask> <App
<mask> initialData={{
<mask> appState: {
<mask> ...getDefaultAppState(),
<mask> zenModeEnabled: true,
<mask> },
<mask> elements: [API.createElement({ type: "rectangle", id: "A" })],
<mask> }}
<mask> />,
<mask> );
<mask>
<mask> await waitFor(() => expect(h.state.zenModeEnabled).toBe(true));
<mask> await waitFor(() =>
<mask> expect(h.elements).toEqual([expect.objectContaining({ id: "A" })]),
<mask> );
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
viewBackgroundColor: "#FFF",
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
viewBackgroundColor: "#FFF",
},
},
}); </s> remove render(
<App
initialData={{
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({ type: "rectangle", id: "B", isDeleted: true }),
],
}}
/>,
);
</s> add await render(<ExcalidrawApp />);
// To update the scene with deleted elements before starting collab
updateSceneData({
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({
type: "rectangle",
id: "B",
isDeleted: true,
}),
],
}); </s> remove render(
<App
initialData={{
appState: {
...defaultAppState,
exportBackground,
viewBackgroundColor: "#F00",
},
elements: [],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
appState: {
exportBackground,
viewBackgroundColor: "#F00",
},
},
}); </s> remove
await h.app.openPortal();
</s> add h.collab.openPortal(); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/history.test.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> expect(API.getStateHistory().length).toBe(2);
<mask> });
<mask>
<mask> it("scene import via drag&drop should create new history entry", async () => {
<mask> render(
<mask> <App
<mask> initialData={{
<mask> appState: {
<mask> ...getDefaultAppState(),
<mask> viewBackgroundColor: "#FFF",
<mask> },
<mask> elements: [API.createElement({ type: "rectangle", id: "A" })],
<mask> }}
<mask> />,
<mask> );
<mask>
<mask> await waitFor(() => expect(h.state.viewBackgroundColor).toBe("#FFF"));
<mask> await waitFor(() =>
<mask> expect(h.elements).toEqual([expect.objectContaining({ id: "A" })]),
<mask> );
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove render(
<App
initialData={{
appState: {
...getDefaultAppState(),
zenModeEnabled: true,
},
elements: [API.createElement({ type: "rectangle", id: "A" })],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
elements: [API.createElement({ type: "rectangle", id: "A" })],
appState: {
zenModeEnabled: true,
},
},
}); </s> remove render(
<App
initialData={{
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({ type: "rectangle", id: "B", isDeleted: true }),
],
}}
/>,
);
</s> add await render(<ExcalidrawApp />);
// To update the scene with deleted elements before starting collab
updateSceneData({
elements: [
API.createElement({ type: "rectangle", id: "A" }),
API.createElement({
type: "rectangle",
id: "B",
isDeleted: true,
}),
],
}); </s> remove render(
<App
initialData={{
appState: {
...defaultAppState,
exportBackground,
viewBackgroundColor: "#F00",
},
elements: [],
}}
/>,
);
</s> add await render(<ExcalidrawApp />, {
localStorageData: {
appState: {
exportBackground,
viewBackgroundColor: "#F00",
},
},
}); </s> remove
await h.app.openPortal();
</s> add h.collab.openPortal(); </s> remove render(<App />);
</s> add await render(<ExcalidrawApp />); </s> remove return initialState ? (
</s> add const onChange = (
elements: readonly ExcalidrawElement[],
appState: AppState,
) => {
saveDebounced(elements, appState);
if (collab.isCollaborating) {
collab.broadcastElements(elements, appState);
}
};
return (
<Excalidraw
ref={excalidrawRef}
onChange={onChange}
width={dimensions.width}
height={dimensions.height}
initialData={initialStatePromiseRef.current.promise}
user={{ name: collab.username }}
onCollabButtonClick={collab.onCollabButtonClick}
isCollaborating={collab.isCollaborating}
onPointerUpdate={collab.onPointerUpdate}
/>
);
}
export default function ExcalidrawApp() {
return (
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/history.test.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import { render, waitFor } from "./test-utils";
<mask> import App from "../components/App";
<mask> import { API } from "./helpers/api";
<mask> import { MIME_TYPES } from "../constants";
<mask> import { LibraryItem } from "../types";
<mask>
<mask> const { h } = window;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import { render, waitFor } from "./test-utils";
import App from "../components/App";
</s> add import { render, updateSceneData, waitFor } from "./test-utils";
import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/library.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> const { h } = window;
<mask>
<mask> describe("library", () => {
<mask> beforeEach(() => {
<mask> h.library.resetLibrary();
<mask> render(<App />);
<mask> });
<mask>
<mask> it("import library via drag&drop", async () => {
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove render(<App />);
</s> add await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("create selection element on pointer down", () => {
const { getByToolName, container } = render(<App />);
</s> add it("create selection element on pointer down", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/library.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> describe("library", () => {
<mask> beforeEach(() => {
<mask> h.library.resetLibrary();
<mask> render(<App />);
<mask> });
<mask>
<mask> it("import library via drag&drop", async () => {
<mask> expect(await h.library.loadLibrary()).toEqual([]);
<mask> await API.drop(
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove beforeEach(() => {
</s> add beforeEach(async () => { </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
render(<App />);
</s> add it("rectangle", async () => {
await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/library.test.tsx
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import ReactDOM from "react-dom";
<mask> import { render, fireEvent } from "./test-utils";
<mask> import App from "../components/App";
<mask> import * as Renderer from "../renderer/renderScene";
<mask> import { reseed } from "../random";
<mask> import { bindOrUnbindLinearElement } from "../element/binding";
<mask> import {
<mask> ExcalidrawLinearElement,
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/move.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> const { h } = window;
<mask>
<mask> describe("move element", () => {
<mask> it("rectangle", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask>
<mask> {
<mask> // create element
<mask> const tool = getByToolName("rectangle");
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("create selection element on pointer down", () => {
const { getByToolName, container } = render(<App />);
</s> add it("create selection element on pointer down", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/move.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
<mask> fireEvent.pointerMove(canvas, { clientX: 60, clientY: 70 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask> expect([h.elements[0].x, h.elements[0].y]).toEqual([30, 20]);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/move.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("rectangles with binding arrow", () => {
<mask> render(<App />);
<mask>
<mask> // create elements
<mask> const rectA = UI.createElement("rectangle", { size: 100 });
<mask> const rectB = UI.createElement("rectangle", { x: 200, y: 0, size: 300 });
<mask> const line = UI.createElement("line", { x: 110, y: 50, size: 80 });
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
render(<App />);
</s> add it("rectangle", async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow escape", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow escape", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/move.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // select the second rectangles
<mask> new Pointer("mouse").clickOn(rectB);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(19);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(3);
<mask> expect(h.state.selectedElementIds[rectB.id]).toBeTruthy();
<mask> expect([rectA.x, rectA.y]).toEqual([0, 0]);
<mask> expect([rectB.x, rectB.y]).toEqual([200, 0]);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(2);
</s> add expect(renderScene).toHaveBeenCalledTimes(3); </s> remove // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
</s> add expect(API.getSelectedElements()[0].y).toEqual(100);
expect(API.getSelectedElements()[1].y).toEqual(200);
expect(API.getSelectedElements()[2].y).toEqual(100);
expect(API.getSelectedElements()[3].y).toEqual(200); </s> remove h.app.actionManager.executeAction(actionAlignTop);
</s> add // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
}); </s> remove UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
</s> add expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110); </s> remove // Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
</s> add expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110); </s> remove expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
});
</s> add const createAndSelectNestedGroupAndRectangle = () => {
UI.clickTool("rectangle");
mouse.down();
mouse.up(100, 100);
UI.clickTool("rectangle");
mouse.down(0, 0);
mouse.up(100, 100);
// Select the first element.
// The second rectangle is already reselected because it was the last element created
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create first group of rectangles
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(200, 200);
mouse.up(100, 100);
// Add group to current selection
mouse.restorePosition(0, 0);
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
// Create the nested group
h.app.actionManager.executeAction(actionGroup);
mouse.reset();
UI.clickTool("rectangle");
mouse.down(300, 300);
mouse.up(100, 100);
// Select the nested group, the rectangle is already selected
mouse.reset();
Keyboard.withModifierKeys({ shift: true }, () => {
mouse.click();
});
};
it("aligns nested group and other element correctly to the top", () => {
createAndSelectNestedGroupAndRectangle();
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(300);
h.app.actionManager.executeAction(actionAlignTop);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(100);
expect(API.getSelectedElements()[2].y).toEqual(200);
expect(API.getSelectedElements()[3].y).toEqual(0);
});
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/move.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask>
<mask> describe("duplicate element on move when ALT is clicked", () => {
<mask> it("rectangle", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask>
<mask> {
<mask> // create element
<mask> const tool = getByToolName("rectangle");
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/move.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
<mask> fireEvent.pointerMove(canvas, { clientX: 60, clientY: 70 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask> expect([h.elements[0].x, h.elements[0].y]).toEqual([30, 20]);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/move.test.tsx
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import ReactDOM from "react-dom";
<mask> import { render, fireEvent } from "./test-utils";
<mask> import App from "../components/App";
<mask> import * as Renderer from "../renderer/renderScene";
<mask> import { KEYS } from "../keys";
<mask> import { ExcalidrawLinearElement } from "../element/types";
<mask> import { reseed } from "../random";
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> const { h } = window;
<mask>
<mask> describe("remove shape in non linear elements", () => {
<mask> it("rectangle", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("rectangle");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("create selection element on pointer down", () => {
const { getByToolName, container } = render(<App />);
</s> add it("create selection element on pointer down", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep replace keep keep keep replace replace keep keep keep keep
|
<mask> fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(4);
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask>
<mask> it("ellipse", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("ellipse");
<mask> fireEvent.click(tool);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace keep keep keep replace replace
|
<mask> const canvas = container.querySelector("canvas")!;
<mask> fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
<mask> fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(4);
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask>
<mask> it("diamond", () => {
<mask> const { getByToolName, container } = render(<App />);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(3);
</s> add expect(renderScene).toHaveBeenCalledTimes(4); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const canvas = container.querySelector("canvas")!;
<mask> fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
<mask> fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(4);
<mask> expect(h.elements.length).toEqual(0);
<mask> });
<mask> });
<mask>
<mask> describe("multi point mode in linear elements", () => {
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(3);
</s> add expect(renderScene).toHaveBeenCalledTimes(4); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask>
<mask> describe("multi point mode in linear elements", () => {
<mask> it("arrow", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("arrow");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fireEvent.pointerDown(canvas);
<mask> fireEvent.pointerUp(canvas);
<mask> fireEvent.keyDown(document, { key: KEYS.ENTER });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(11);
<mask> expect(h.elements.length).toEqual(1);
<mask>
<mask> const element = h.elements[0] as ExcalidrawLinearElement;
<mask>
<mask> expect(element.type).toEqual("arrow");
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(11);
</s> add expect(renderScene).toHaveBeenCalledTimes(12); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("line", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("line");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow escape", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow escape", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fireEvent.pointerDown(canvas);
<mask> fireEvent.pointerUp(canvas);
<mask> fireEvent.keyDown(document, { key: KEYS.ENTER });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(11);
<mask> expect(h.elements.length).toEqual(1);
<mask>
<mask> const element = h.elements[0] as ExcalidrawLinearElement;
<mask>
<mask> expect(element.type).toEqual("line");
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(11);
</s> add expect(renderScene).toHaveBeenCalledTimes(12); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/multiPointCreate.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> screen,
<mask> fireEvent,
<mask> GlobalTestState,
<mask> } from "./test-utils";
<mask> import App from "../components/App";
<mask> import { setLanguage } from "../i18n";
<mask> import { setDateTimeForTests } from "../utils";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { getTransformHandles as _getTransformHandles } from "../element";
<mask> import { queryByText } from "@testing-library/react";
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/regressionTests.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> finger1.reset();
<mask> finger2.reset();
<mask>
<mask> await setLanguage("en.json");
<mask> render(<App offsetLeft={0} offsetTop={0} />);
<mask> });
<mask>
<mask> afterEach(() => {
<mask> checkpoint("end of test");
<mask> });
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove beforeEach(async () => {
// Unmount ReactDOM from root
ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
mouse.reset();
await setLanguage("en.json");
render(<App />);
});
</s> add </s> remove render(<App />);
</s> add await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove expect(API.getSelectedElements()[0].x).toEqual(0);
expect(API.getSelectedElements()[1].x).toEqual(110);
expect(API.getSelectedElements()[0].y).toEqual(0);
expect(API.getSelectedElements()[1].y).toEqual(110);
Keyboard.withModifierKeys({ ctrl: true, shift: true }, () => {
Keyboard.keyPress(KEYS.ARROW_UP);
</s> add await setLanguage("en.json");
await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/regressionTests.test.tsx
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import ReactDOM from "react-dom";
<mask> import { render, fireEvent } from "./test-utils";
<mask> import App from "../components/App";
<mask> import * as Renderer from "../renderer/renderScene";
<mask> import { reseed } from "../random";
<mask> import { UI, Pointer, Keyboard } from "./helpers/ui";
<mask> import { getTransformHandles } from "../element/transformHandles";
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/resize.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> const { h } = window;
<mask>
<mask> describe("resize element", () => {
<mask> it("rectangle", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask>
<mask> {
<mask> // create element
<mask> const tool = getByToolName("rectangle");
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("create selection element on pointer down", () => {
const { getByToolName, container } = render(<App />);
</s> add it("create selection element on pointer down", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/resize.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 });
<mask> fireEvent.pointerMove(canvas, { clientX: 60, clientY: 70 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(5);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask> expect([h.elements[0].x, h.elements[0].y]).toEqual([30, 20]);
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/resize.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask>
<mask> describe("resize element with aspect ratio when SHIFT is clicked", () => {
<mask> it("rectangle", () => {
<mask> render(<App />);
<mask>
<mask> const rectangle = UI.createElement("rectangle", {
<mask> x: 0,
<mask> width: 30,
<mask> height: 50,
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangles with binding arrow", () => {
render(<App />);
</s> add it("rectangles with binding arrow", async () => {
await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove beforeEach(() => {
render(<App />);
</s> add beforeEach(async () => {
await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/resize.test.tsx
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import ReactDOM from "react-dom";
<mask> import { render, fireEvent } from "./test-utils";
<mask> import App from "../components/App";
<mask> import * as Renderer from "../renderer/renderScene";
<mask> import { KEYS } from "../keys";
<mask> import { reseed } from "../random";
<mask>
<mask> // Unmount ReactDOM from root
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> const { h } = window;
<mask>
<mask> describe("selection element", () => {
<mask> it("create selection element on pointer down", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("selection");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("resize selection element on pointer move", () => {
const { getByToolName, container } = render(<App />);
</s> add it("resize selection element on pointer move", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("remove selection element on pointer up", () => {
const { getByToolName, container } = render(<App />);
</s> add it("remove selection element on pointer up", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> const canvas = container.querySelector("canvas")!;
<mask> fireEvent.pointerDown(canvas, { clientX: 60, clientY: 100 });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(2);
<mask> const selectionElement = h.state.selectionElement!;
<mask> expect(selectionElement).not.toBeNull();
<mask> expect(selectionElement.type).toEqual("selection");
<mask> expect([selectionElement.x, selectionElement.y]).toEqual([60, 100]);
<mask> expect([selectionElement.width, selectionElement.height]).toEqual([0, 0]);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(3);
</s> add expect(renderScene).toHaveBeenCalledTimes(4); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> // TODO: There is a memory leak if pointer up is not triggered
<mask> fireEvent.pointerUp(canvas);
<mask> });
<mask>
<mask> it("resize selection element on pointer move", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("selection");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("remove selection element on pointer up", () => {
const { getByToolName, container } = render(<App />);
</s> add it("remove selection element on pointer up", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("create selection element on pointer down", () => {
const { getByToolName, container } = render(<App />);
</s> add it("create selection element on pointer down", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const canvas = container.querySelector("canvas")!;
<mask> fireEvent.pointerDown(canvas, { clientX: 60, clientY: 100 });
<mask> fireEvent.pointerMove(canvas, { clientX: 150, clientY: 30 });
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(3);
<mask> const selectionElement = h.state.selectionElement!;
<mask> expect(selectionElement).not.toBeNull();
<mask> expect(selectionElement.type).toEqual("selection");
<mask> expect([selectionElement.x, selectionElement.y]).toEqual([60, 30]);
<mask> expect([selectionElement.width, selectionElement.height]).toEqual([90, 70]);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(2);
</s> add expect(renderScene).toHaveBeenCalledTimes(3); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> // TODO: There is a memory leak if pointer up is not triggered
<mask> fireEvent.pointerUp(canvas);
<mask> });
<mask>
<mask> it("remove selection element on pointer up", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> // select tool
<mask> const tool = getByToolName("selection");
<mask> fireEvent.click(tool);
<mask>
<mask> const canvas = container.querySelector("canvas")!;
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("resize selection element on pointer move", () => {
const { getByToolName, container } = render(<App />);
</s> add it("resize selection element on pointer move", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("create selection element on pointer down", () => {
const { getByToolName, container } = render(<App />);
</s> add it("create selection element on pointer down", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fireEvent.pointerDown(canvas, { clientX: 60, clientY: 100 });
<mask> fireEvent.pointerMove(canvas, { clientX: 150, clientY: 30 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(4);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> });
<mask> });
<mask>
<mask> describe("select single element on the scene", () => {
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(3);
</s> add expect(renderScene).toHaveBeenCalledTimes(4); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5); </s> remove expect(renderScene).toHaveBeenCalledTimes(4);
</s> add expect(renderScene).toHaveBeenCalledTimes(5);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask>
<mask> describe("select single element on the scene", () => {
<mask> it("rectangle", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask> {
<mask> // create element
<mask> const tool = getByToolName("rectangle");
<mask> fireEvent.click(tool);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("rectangle", () => {
const { getByToolName, container } = render(<App />);
</s> add it("rectangle", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // click on a line on the rectangle
<mask> fireEvent.pointerDown(canvas, { clientX: 45, clientY: 20 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(8);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("diamond", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask> {
<mask> // create element
<mask> const tool = getByToolName("diamond");
<mask> fireEvent.click(tool);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow escape", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow escape", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // click on a line on the rectangle
<mask> fireEvent.pointerDown(canvas, { clientX: 45, clientY: 20 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(8);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("ellipse", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask> {
<mask> // create element
<mask> const tool = getByToolName("ellipse");
<mask> fireEvent.click(tool);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow escape", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow escape", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // click on a line on the rectangle
<mask> fireEvent.pointerDown(canvas, { clientX: 45, clientY: 20 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(8);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("arrow", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask> {
<mask> // create element
<mask> const tool = getByToolName("arrow");
<mask> fireEvent.click(tool);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow escape", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow escape", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // click on a line on the arrow
<mask> fireEvent.pointerDown(canvas, { clientX: 40, clientY: 40 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(8);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
<mask> });
<mask>
<mask> it("arrow escape", () => {
<mask> const { getByToolName, container } = render(<App />);
<mask> const canvas = container.querySelector("canvas")!;
<mask> {
<mask> // create element
<mask> const tool = getByToolName("line");
<mask> fireEvent.click(tool);
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("line", () => {
const { getByToolName, container } = render(<App />);
</s> add it("line", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("arrow", () => {
const { getByToolName, container } = render(<App />);
</s> add it("arrow", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("diamond", () => {
const { getByToolName, container } = render(<App />);
</s> add it("diamond", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />); </s> remove it("ellipse", () => {
const { getByToolName, container } = render(<App />);
</s> add it("ellipse", async () => {
const { getByToolName, container } = await render(<ExcalidrawApp />);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // click on a line on the arrow
<mask> fireEvent.pointerDown(canvas, { clientX: 40, clientY: 40 });
<mask> fireEvent.pointerUp(canvas);
<mask>
<mask> expect(renderScene).toHaveBeenCalledTimes(8);
<mask> expect(h.state.selectionElement).toBeNull();
<mask> expect(h.elements.length).toEqual(1);
<mask> expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
<mask>
<mask> h.elements.forEach((element) => expect(element).toMatchSnapshot());
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(8);
</s> add expect(renderScene).toHaveBeenCalledTimes(9); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6); </s> remove expect(renderScene).toHaveBeenCalledTimes(5);
</s> add expect(renderScene).toHaveBeenCalledTimes(6);
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/selection.test.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> queries,
<mask> RenderResult,
<mask> RenderOptions,
<mask> } from "@testing-library/react";
<mask>
<mask> import * as toolQueries from "./queries/toolQueries";
<mask> import { ImportedDataState } from "../data/types";
<mask> import { STORAGE_KEYS } from "../excalidraw-app/data/localStorage";
<mask>
</s> Factor out collaboration code (#2313)
Co-authored-by: Lipis <[email protected]>
Co-authored-by: dwelle <[email protected]> </s> add import { ImportedDataState } from "../data/types";
import { STORAGE_KEYS } from "../excalidraw-app/data/localStorage";
import { SceneData } from "../types"; </s> remove import App from "../components/App";
</s> add import Excalidraw from "../packages/excalidraw/index"; </s> remove import { SocketUpdateDataSource } from "./data";
</s> add </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app"; </s> remove import App from "../components/App";
</s> add import ExcalidrawApp from "../excalidraw-app";
|
https://github.com/excalidraw/excalidraw/commit/e617ccc2521b46bc1e25a1a771019e09d12ea338
|
src/tests/test-utils.ts
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.