123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512 |
- import { reseed } from "@excalidraw/common";
- import {
- actionSendBackward,
- actionBringForward,
- actionBringToFront,
- actionSendToBack,
- actionDuplicateSelection,
- } from "@excalidraw/excalidraw/actions";
- import { Excalidraw } from "@excalidraw/excalidraw";
- import { API } from "@excalidraw/excalidraw/tests/helpers/api";
- import {
- act,
- getCloneByOrigId,
- render,
- unmountComponent,
- } from "@excalidraw/excalidraw/tests/test-utils";
- import type { AppState } from "@excalidraw/excalidraw/types";
- import { selectGroupsForSelectedElements } from "../src/groups";
- import type {
- ExcalidrawElement,
- ExcalidrawFrameElement,
- ExcalidrawSelectionElement,
- } from "../src/types";
- unmountComponent();
- beforeEach(() => {
- localStorage.clear();
- reseed(7);
- });
- const { h } = window;
- type ExcalidrawElementType = Exclude<
- ExcalidrawElement,
- ExcalidrawSelectionElement
- >["type"];
- const populateElements = (
- elements: {
- id: string;
- type?: ExcalidrawElementType;
- isDeleted?: boolean;
- isSelected?: boolean;
- groupIds?: string[];
- y?: number;
- x?: number;
- width?: number;
- height?: number;
- containerId?: string;
- frameId?: ExcalidrawFrameElement["id"];
- index?: ExcalidrawElement["index"];
- }[],
- appState?: Partial<AppState>,
- ) => {
- const selectedElementIds: any = {};
- const newElements = elements.map(
- ({
- id,
- isDeleted = false,
- isSelected = false,
- groupIds = [],
- y = 100,
- x = 100,
- width = 100,
- height = 100,
- containerId = null,
- frameId = null,
- type,
- }) => {
- const element = API.createElement({
- type: type ?? (containerId ? "text" : "rectangle"),
- id,
- isDeleted,
- x,
- y,
- width,
- height,
- groupIds,
- containerId,
- frameId: frameId || null,
- });
- if (isSelected) {
- selectedElementIds[element.id] = true;
- }
- return element;
- },
- );
- // initialize `boundElements` on containers, if applicable
- API.setElements(
- newElements.map((element, index, elements) => {
- const nextElement = elements[index + 1];
- if (
- nextElement &&
- "containerId" in nextElement &&
- element.id === nextElement.containerId
- ) {
- return {
- ...element,
- boundElements: [{ type: "text", id: nextElement.id }],
- };
- }
- return element;
- }),
- );
- act(() => {
- h.setState({
- ...selectGroupsForSelectedElements(
- { ...h.state, ...appState, selectedElementIds },
- h.elements,
- h.state,
- null,
- ),
- ...appState,
- selectedElementIds,
- } as AppState);
- });
- return selectedElementIds;
- };
- type Actions =
- | typeof actionBringForward
- | typeof actionSendBackward
- | typeof actionBringToFront
- | typeof actionSendToBack;
- const assertZindex = ({
- elements,
- appState,
- operations,
- }: {
- elements: {
- id: string;
- isDeleted?: true;
- isSelected?: true;
- groupIds?: string[];
- containerId?: string;
- frameId?: ExcalidrawFrameElement["id"];
- type?: ExcalidrawElementType;
- }[];
- appState?: Partial<AppState>;
- operations: [Actions, string[]][];
- }) => {
- const selectedElementIds = populateElements(elements, appState);
- operations.forEach(([action, expected]) => {
- API.executeAction(action);
- expect(h.elements.map((element) => element.id)).toEqual(expected);
- expect(h.state.selectedElementIds).toEqual(selectedElementIds);
- });
- };
- describe("z-index manipulation", () => {
- beforeEach(async () => {
- await render(<Excalidraw />);
- });
- it("send back", () => {
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isDeleted: true },
- { id: "C", isDeleted: true },
- { id: "D", isSelected: true },
- ],
- operations: [
- [actionSendBackward, ["D", "A", "B", "C"]],
- // noop
- [actionSendBackward, ["D", "A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isSelected: true },
- { id: "C", isSelected: true },
- ],
- operations: [
- // noop
- [actionSendBackward, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isDeleted: true },
- { id: "B" },
- { id: "C", isDeleted: true },
- { id: "D", isSelected: true },
- ],
- operations: [[actionSendBackward, ["A", "D", "B", "C"]]],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isDeleted: true },
- { id: "C", isDeleted: true },
- { id: "D", isSelected: true },
- { id: "E", isSelected: true },
- { id: "F" },
- ],
- operations: [
- [actionSendBackward, ["D", "E", "A", "B", "C", "F"]],
- // noop
- [actionSendBackward, ["D", "E", "A", "B", "C", "F"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B" },
- { id: "C", isDeleted: true },
- { id: "D", isDeleted: true },
- { id: "E", isSelected: true },
- { id: "F" },
- { id: "G", isSelected: true },
- ],
- operations: [
- [actionSendBackward, ["A", "E", "B", "C", "D", "G", "F"]],
- [actionSendBackward, ["E", "A", "G", "B", "C", "D", "F"]],
- [actionSendBackward, ["E", "G", "A", "B", "C", "D", "F"]],
- // noop
- [actionSendBackward, ["E", "G", "A", "B", "C", "D", "F"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B" },
- { id: "C", isDeleted: true },
- { id: "D", isSelected: true },
- { id: "E", isDeleted: true },
- { id: "F", isSelected: true },
- { id: "G" },
- ],
- operations: [
- [actionSendBackward, ["A", "D", "E", "F", "B", "C", "G"]],
- [actionSendBackward, ["D", "E", "F", "A", "B", "C", "G"]],
- // noop
- [actionSendBackward, ["D", "E", "F", "A", "B", "C", "G"]],
- ],
- });
- // elements should not duplicate
- assertZindex({
- elements: [
- { id: "A", containerId: "C" },
- { id: "B" },
- { id: "C", isSelected: true },
- ],
- operations: [
- [actionSendBackward, ["A", "C", "B"]],
- // noop
- [actionSendBackward, ["A", "C", "B"]],
- ],
- });
- // grouped elements should be atomic
- // -------------------------------------------------------------------------
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g1"] },
- { id: "D", isDeleted: true },
- { id: "E", isDeleted: true },
- { id: "F", isSelected: true },
- ],
- operations: [
- [actionSendBackward, ["A", "F", "B", "C", "D", "E"]],
- [actionSendBackward, ["F", "A", "B", "C", "D", "E"]],
- // noop
- [actionSendBackward, ["F", "A", "B", "C", "D", "E"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g2", "g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g1"] },
- { id: "E", isDeleted: true },
- { id: "F", isSelected: true },
- ],
- operations: [
- [actionSendBackward, ["A", "F", "B", "C", "D", "E"]],
- [actionSendBackward, ["F", "A", "B", "C", "D", "E"]],
- // noop
- [actionSendBackward, ["F", "A", "B", "C", "D", "E"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g2", "g1"] },
- { id: "E", isDeleted: true },
- { id: "F", isSelected: true },
- ],
- operations: [
- [actionSendBackward, ["A", "F", "B", "C", "D", "E"]],
- [actionSendBackward, ["F", "A", "B", "C", "D", "E"]],
- // noop
- [actionSendBackward, ["F", "A", "B", "C", "D", "E"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B1", groupIds: ["g1"] },
- { id: "C1", groupIds: ["g1"] },
- { id: "D2", groupIds: ["g2"], isSelected: true },
- { id: "E2", groupIds: ["g2"], isSelected: true },
- ],
- appState: {
- editingGroupId: null,
- },
- operations: [[actionSendBackward, ["A", "D2", "E2", "B1", "C1"]]],
- });
- // in-group siblings
- // -------------------------------------------------------------------------
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g2", "g1"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionSendBackward, ["A", "B", "D", "C"]],
- // noop (prevented)
- [actionSendBackward, ["A", "B", "D", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g2", "g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g1"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionSendBackward, ["A", "D", "B", "C"]],
- // noop (prevented)
- [actionSendBackward, ["A", "D", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g2", "g1"], isSelected: true },
- { id: "D", groupIds: ["g2", "g1"], isDeleted: true },
- { id: "E", groupIds: ["g2", "g1"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionSendBackward, ["A", "C", "D", "E", "B"]],
- // noop (prevented)
- [actionSendBackward, ["A", "C", "D", "E", "B"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g2", "g1"] },
- { id: "E", groupIds: ["g3", "g1"], isSelected: true },
- { id: "F", groupIds: ["g3", "g1"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionSendBackward, ["A", "B", "E", "F", "C", "D"]],
- [actionSendBackward, ["A", "E", "F", "B", "C", "D"]],
- // noop (prevented)
- [actionSendBackward, ["A", "E", "F", "B", "C", "D"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g1"] },
- { id: "B", groupIds: ["g2"] },
- { id: "C", groupIds: ["g1"] },
- { id: "D", groupIds: ["g2"], isSelected: true },
- { id: "E", groupIds: ["g2"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionSendBackward, ["A", "D", "E", "B", "C"]],
- // noop
- [actionSendBackward, ["A", "D", "E", "B", "C"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g1"] },
- { id: "B", groupIds: ["g2"] },
- { id: "C", groupIds: ["g1"] },
- { id: "D", groupIds: ["g2"], isSelected: true },
- { id: "F" },
- { id: "G", groupIds: ["g2"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionSendBackward, ["A", "D", "G", "B", "C", "F"]],
- // noop
- [actionSendBackward, ["A", "D", "G", "B", "C", "F"]],
- ],
- });
- });
- it("bring forward", () => {
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isSelected: true },
- { id: "C", isSelected: true },
- { id: "D", isDeleted: true },
- { id: "E" },
- ],
- operations: [
- [actionBringForward, ["A", "D", "E", "B", "C"]],
- // noop
- [actionBringForward, ["A", "D", "E", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isSelected: true },
- { id: "C", isSelected: true },
- ],
- operations: [
- // noop
- [actionBringForward, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isDeleted: true },
- { id: "C", isDeleted: true },
- { id: "D" },
- { id: "E", isSelected: true },
- { id: "F", isDeleted: true },
- { id: "G" },
- ],
- operations: [
- [actionBringForward, ["B", "C", "D", "A", "F", "G", "E"]],
- [actionBringForward, ["B", "C", "D", "F", "G", "A", "E"]],
- // noop
- [actionBringForward, ["B", "C", "D", "F", "G", "A", "E"]],
- ],
- });
- // grouped elements should be atomic
- // -------------------------------------------------------------------------
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isDeleted: true },
- { id: "C", isDeleted: true },
- { id: "D", groupIds: ["g1"] },
- { id: "E", groupIds: ["g1"] },
- { id: "F" },
- ],
- operations: [
- [actionBringForward, ["B", "C", "D", "E", "A", "F"]],
- [actionBringForward, ["B", "C", "D", "E", "F", "A"]],
- // noop
- [actionBringForward, ["B", "C", "D", "E", "F", "A"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isSelected: true },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g2", "g1"] },
- { id: "E", groupIds: ["g1"] },
- { id: "F" },
- ],
- operations: [
- [actionBringForward, ["A", "C", "D", "E", "B", "F"]],
- [actionBringForward, ["A", "C", "D", "E", "F", "B"]],
- // noop
- [actionBringForward, ["A", "C", "D", "E", "F", "B"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isSelected: true },
- { id: "C", groupIds: ["g1"] },
- { id: "D", groupIds: ["g2", "g1"] },
- { id: "E", groupIds: ["g2", "g1"] },
- { id: "F" },
- ],
- operations: [
- [actionBringForward, ["A", "C", "D", "E", "B", "F"]],
- [actionBringForward, ["A", "C", "D", "E", "F", "B"]],
- // noop
- [actionBringForward, ["A", "C", "D", "E", "F", "B"]],
- ],
- });
- // in-group siblings
- // -------------------------------------------------------------------------
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g2", "g1"], isSelected: true },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionBringForward, ["A", "C", "B", "D"]],
- // noop (prevented)
- [actionBringForward, ["A", "C", "B", "D"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g1"], isSelected: true },
- { id: "B", groupIds: ["g2", "g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D" },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionBringForward, ["B", "C", "A", "D"]],
- // noop (prevented)
- [actionBringForward, ["B", "C", "A", "D"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g2", "g1"], isSelected: true },
- { id: "B", groupIds: ["g2", "g1"], isSelected: true },
- { id: "C", groupIds: ["g1"] },
- { id: "D" },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionBringForward, ["C", "A", "B", "D"]],
- // noop (prevented)
- [actionBringForward, ["C", "A", "B", "D"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g2"], isSelected: true },
- { id: "B", groupIds: ["g2"], isSelected: true },
- { id: "C", groupIds: ["g1"] },
- { id: "D", groupIds: ["g2"] },
- { id: "E", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionBringForward, ["C", "D", "A", "B", "E"]],
- // noop
- [actionBringForward, ["C", "D", "A", "B", "E"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g2"], isSelected: true },
- { id: "B" },
- { id: "C", groupIds: ["g2"], isSelected: true },
- { id: "D", groupIds: ["g1"] },
- { id: "E", groupIds: ["g2"] },
- { id: "F", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionBringForward, ["B", "D", "E", "A", "C", "F"]],
- // noop
- [actionBringForward, ["B", "D", "E", "A", "C", "F"]],
- ],
- });
- });
- it("bring to front", () => {
- assertZindex({
- elements: [
- { id: "0" },
- { id: "A", isSelected: true },
- { id: "B", isDeleted: true },
- { id: "C", isDeleted: true },
- { id: "D" },
- { id: "E", isSelected: true },
- { id: "F", isDeleted: true },
- { id: "G" },
- ],
- operations: [
- [actionBringToFront, ["0", "B", "C", "D", "F", "G", "A", "E"]],
- // noop
- [actionBringToFront, ["0", "B", "C", "D", "F", "G", "A", "E"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isSelected: true },
- { id: "C", isSelected: true },
- ],
- operations: [
- // noop
- [actionBringToFront, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isSelected: true },
- { id: "C", isSelected: true },
- ],
- operations: [
- // noop
- [actionBringToFront, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isSelected: true },
- { id: "C" },
- ],
- operations: [
- [actionBringToFront, ["C", "A", "B"]],
- // noop
- [actionBringToFront, ["C", "A", "B"]],
- ],
- });
- // in-group sorting
- // -------------------------------------------------------------------------
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g1"], isSelected: true },
- { id: "D", groupIds: ["g1"] },
- { id: "E", groupIds: ["g1"], isSelected: true },
- { id: "F", groupIds: ["g2", "g1"] },
- { id: "G", groupIds: ["g2", "g1"] },
- { id: "H", groupIds: ["g3", "g1"] },
- { id: "I", groupIds: ["g3", "g1"] },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionBringToFront, ["A", "B", "D", "F", "G", "H", "I", "C", "E"]],
- // noop (prevented)
- [actionBringToFront, ["A", "B", "D", "F", "G", "H", "I", "C", "E"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g2", "g1"], isSelected: true },
- { id: "D", groupIds: ["g2", "g1"] },
- { id: "C", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionBringToFront, ["A", "D", "B", "C"]],
- // noop (prevented)
- [actionBringToFront, ["A", "D", "B", "C"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g2", "g3"], isSelected: true },
- { id: "B", groupIds: ["g1", "g3"] },
- { id: "C", groupIds: ["g2", "g3"] },
- { id: "D", groupIds: ["g1", "g3"] },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionBringToFront, ["B", "C", "A", "D"]],
- // noop
- [actionBringToFront, ["B", "C", "A", "D"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g2"], isSelected: true },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g2"] },
- { id: "D", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionBringToFront, ["B", "C", "A", "D"]],
- // noop
- [actionBringToFront, ["B", "C", "A", "D"]],
- ],
- });
- });
- it("send to back", () => {
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isDeleted: true },
- { id: "C" },
- { id: "D", isDeleted: true },
- { id: "E", isSelected: true },
- { id: "F", isDeleted: true },
- { id: "G" },
- { id: "H", isSelected: true },
- { id: "I" },
- ],
- operations: [
- [actionSendToBack, ["E", "H", "A", "B", "C", "D", "F", "G", "I"]],
- // noop
- [actionSendToBack, ["E", "H", "A", "B", "C", "D", "F", "G", "I"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isSelected: true },
- { id: "C", isSelected: true },
- ],
- operations: [
- // noop
- [actionSendToBack, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B", isSelected: true },
- { id: "C" },
- ],
- operations: [
- // noop
- [actionSendToBack, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isSelected: true },
- { id: "C", isSelected: true },
- ],
- operations: [
- [actionSendToBack, ["B", "C", "A"]],
- // noop
- [actionSendToBack, ["B", "C", "A"]],
- ],
- });
- // in-group sorting
- // -------------------------------------------------------------------------
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g2", "g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g3", "g1"] },
- { id: "E", groupIds: ["g3", "g1"] },
- { id: "F", groupIds: ["g1"], isSelected: true },
- { id: "G", groupIds: ["g1"] },
- { id: "H", groupIds: ["g1"], isSelected: true },
- { id: "I", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionSendToBack, ["A", "F", "H", "B", "C", "D", "E", "G", "I"]],
- // noop (prevented)
- [actionSendToBack, ["A", "F", "H", "B", "C", "D", "E", "G", "I"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", groupIds: ["g1"] },
- { id: "C", groupIds: ["g2", "g1"] },
- { id: "D", groupIds: ["g2", "g1"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionSendToBack, ["A", "B", "D", "C"]],
- // noop (prevented)
- [actionSendToBack, ["A", "B", "D", "C"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g1", "g3"] },
- { id: "B", groupIds: ["g2", "g3"] },
- { id: "C", groupIds: ["g1", "g3"] },
- { id: "D", groupIds: ["g2", "g3"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionSendToBack, ["A", "D", "B", "C"]],
- // noop
- [actionSendToBack, ["A", "D", "B", "C"]],
- ],
- });
- // invalid z-indexes across groups (legacy) → allow to sort to next sibling
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g1"] },
- { id: "B", groupIds: ["g2"] },
- { id: "C", groupIds: ["g1"] },
- { id: "D", groupIds: ["g2"], isSelected: true },
- ],
- appState: {
- editingGroupId: "g2",
- },
- operations: [
- [actionSendToBack, ["A", "D", "B", "C"]],
- // noop
- [actionSendToBack, ["A", "D", "B", "C"]],
- ],
- });
- });
- it("duplicating elements should retain zindex integrity", () => {
- populateElements([
- { id: "A", isSelected: true },
- { id: "B", isSelected: true },
- ]);
- API.executeAction(actionDuplicateSelection);
- expect(h.elements).toMatchObject([
- { id: "A" },
- { id: getCloneByOrigId("A").id },
- { id: "B" },
- { id: getCloneByOrigId("B").id },
- ]);
- populateElements([
- { id: "A", groupIds: ["g1"], isSelected: true },
- { id: "B", groupIds: ["g1"], isSelected: true },
- ]);
- API.executeAction(actionDuplicateSelection);
- expect(h.elements).toMatchObject([
- { id: "A" },
- { id: "B" },
- {
- id: getCloneByOrigId("A").id,
- groupIds: [expect.stringMatching(/.{3,}/)],
- },
- {
- id: getCloneByOrigId("B").id,
- groupIds: [expect.stringMatching(/.{3,}/)],
- },
- ]);
- populateElements([
- { id: "A", groupIds: ["g1"], isSelected: true },
- { id: "B", groupIds: ["g1"], isSelected: true },
- { id: "C" },
- ]);
- API.executeAction(actionDuplicateSelection);
- expect(h.elements).toMatchObject([
- { id: "A" },
- { id: "B" },
- {
- id: getCloneByOrigId("A").id,
- groupIds: [expect.stringMatching(/.{3,}/)],
- },
- {
- id: getCloneByOrigId("B").id,
- groupIds: [expect.stringMatching(/.{3,}/)],
- },
- { id: "C" },
- ]);
- populateElements([
- { id: "A", groupIds: ["g1"], isSelected: true },
- { id: "B", groupIds: ["g1"], isSelected: true },
- { id: "C", isSelected: true },
- ]);
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "B",
- getCloneByOrigId("A").id,
- getCloneByOrigId("B").id,
- "C",
- getCloneByOrigId("C").id,
- ]);
- populateElements([
- { id: "A", groupIds: ["g1"], isSelected: true },
- { id: "B", groupIds: ["g1"], isSelected: true },
- { id: "C", groupIds: ["g2"], isSelected: true },
- { id: "D", groupIds: ["g2"], isSelected: true },
- ]);
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "B",
- getCloneByOrigId("A").id,
- getCloneByOrigId("B").id,
- "C",
- "D",
- getCloneByOrigId("C").id,
- getCloneByOrigId("D").id,
- ]);
- populateElements(
- [
- { id: "A", groupIds: ["g1", "g2"], isSelected: true },
- { id: "B", groupIds: ["g1", "g2"], isSelected: true },
- { id: "C", groupIds: ["g2"], isSelected: true },
- ],
- {
- selectedGroupIds: { g1: true },
- },
- );
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "B",
- getCloneByOrigId("A").id,
- getCloneByOrigId("B").id,
- "C",
- getCloneByOrigId("C").id,
- ]);
- populateElements(
- [
- { id: "A", groupIds: ["g1", "g2"], isSelected: true },
- { id: "B", groupIds: ["g1", "g2"], isSelected: true },
- { id: "C", groupIds: ["g2"], isSelected: true },
- ],
- {
- selectedGroupIds: { g2: true },
- },
- );
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "B",
- "C",
- getCloneByOrigId("A").id,
- getCloneByOrigId("B").id,
- getCloneByOrigId("C").id,
- ]);
- populateElements(
- [
- { id: "A", groupIds: ["g1", "g2"], isSelected: true },
- { id: "B", groupIds: ["g1", "g2"], isSelected: true },
- { id: "C", groupIds: ["g2"], isSelected: true },
- { id: "D", groupIds: ["g3", "g4"], isSelected: true },
- { id: "E", groupIds: ["g3", "g4"], isSelected: true },
- { id: "F", groupIds: ["g4"], isSelected: true },
- ],
- {
- selectedGroupIds: { g2: true, g4: true },
- },
- );
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "B",
- "C",
- getCloneByOrigId("A").id,
- getCloneByOrigId("B").id,
- getCloneByOrigId("C").id,
- "D",
- "E",
- "F",
- getCloneByOrigId("D").id,
- getCloneByOrigId("E").id,
- getCloneByOrigId("F").id,
- ]);
- populateElements(
- [
- { id: "A", groupIds: ["g1", "g2"], isSelected: true },
- { id: "B", groupIds: ["g1", "g2"] },
- { id: "C", groupIds: ["g2"] },
- ],
- { editingGroupId: "g1" },
- );
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- getCloneByOrigId("A").id,
- "B",
- "C",
- ]);
- populateElements(
- [
- { id: "A", groupIds: ["g1", "g2"] },
- { id: "B", groupIds: ["g1", "g2"], isSelected: true },
- { id: "C", groupIds: ["g2"] },
- ],
- { editingGroupId: "g1" },
- );
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "B",
- getCloneByOrigId("B").id,
- "C",
- ]);
- populateElements(
- [
- { id: "A", groupIds: ["g1", "g2"], isSelected: true },
- { id: "B", groupIds: ["g1", "g2"], isSelected: true },
- { id: "C", groupIds: ["g2"] },
- ],
- { editingGroupId: "g1" },
- );
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- getCloneByOrigId("A").id,
- "B",
- getCloneByOrigId("B").id,
- "C",
- ]);
- });
- it("duplicating incorrectly interleaved elements (group elements should be together) should still produce reasonable result", () => {
- populateElements([
- { id: "A", groupIds: ["g1"], isSelected: true },
- { id: "B" },
- { id: "C", groupIds: ["g1"], isSelected: true },
- ]);
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "C",
- getCloneByOrigId("A").id,
- getCloneByOrigId("C").id,
- "B",
- ]);
- });
- it("group-selected duplication should includes deleted elements that weren't selected on account of being deleted", () => {
- populateElements([
- { id: "A", groupIds: ["g1"], isDeleted: true },
- { id: "B", groupIds: ["g1"], isSelected: true },
- { id: "C", groupIds: ["g1"], isSelected: true },
- { id: "D" },
- ]);
- expect(h.state.selectedGroupIds).toEqual({ g1: true });
- API.executeAction(actionDuplicateSelection);
- expect(h.elements.map((element) => element.id)).toEqual([
- "A",
- "B",
- "C",
- getCloneByOrigId("A").id,
- getCloneByOrigId("B").id,
- getCloneByOrigId("C").id,
- "D",
- ]);
- });
- it("text-container binding should be atomic", () => {
- assertZindex({
- elements: [
- { id: "A", isSelected: true },
- { id: "B" },
- { id: "C", containerId: "B" },
- ],
- operations: [
- [actionBringForward, ["B", "C", "A"]],
- [actionSendBackward, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A" },
- { id: "B", isSelected: true },
- { id: "C", containerId: "B" },
- ],
- operations: [
- [actionSendBackward, ["B", "C", "A"]],
- [actionBringForward, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", isSelected: true, groupIds: ["g1"] },
- { id: "B", groupIds: ["g1"] },
- { id: "C", containerId: "B", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionBringForward, ["B", "C", "A"]],
- [actionSendBackward, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g1"] },
- { id: "B", groupIds: ["g1"], isSelected: true },
- { id: "C", containerId: "B", groupIds: ["g1"] },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [
- [actionSendBackward, ["B", "C", "A"]],
- [actionBringForward, ["A", "B", "C"]],
- ],
- });
- assertZindex({
- elements: [
- { id: "A", groupIds: ["g1"] },
- { id: "B", isSelected: true, groupIds: ["g1"] },
- { id: "C" },
- { id: "D", containerId: "C" },
- ],
- appState: {
- editingGroupId: "g1",
- },
- operations: [[actionBringForward, ["A", "B", "C", "D"]]],
- });
- });
- });
- describe("z-indexing with frames", () => {
- beforeEach(async () => {
- await render(<Excalidraw />);
- });
- // naming scheme:
- // F# ... frame element
- // F#_# ... frame child of F# (rectangle)
- // R# ... unrelated element (rectangle)
- it("moving whole frame by one (normalized)", () => {
- // normalized frame order
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "F1_2", frameId: "F1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "R1" },
- { id: "R2" },
- ],
- operations: [
- // +1
- [actionBringForward, ["R1", "F1_1", "F1_2", "F1", "R2"]],
- // +1
- [actionBringForward, ["R1", "R2", "F1_1", "F1_2", "F1"]],
- // noop
- [actionBringForward, ["R1", "R2", "F1_1", "F1_2", "F1"]],
- // -1
- [actionSendBackward, ["R1", "F1_1", "F1_2", "F1", "R2"]],
- // -1
- [actionSendBackward, ["F1_1", "F1_2", "F1", "R1", "R2"]],
- // noop
- [actionSendBackward, ["F1_1", "F1_2", "F1", "R1", "R2"]],
- ],
- });
- });
- it("moving whole frame by one (DENORMALIZED)", () => {
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "F1_2", frameId: "F1" },
- { id: "R1" },
- { id: "R2" },
- ],
- operations: [
- // +1
- [actionBringForward, ["R1", "F1_1", "F1", "F1_2", "R2"]],
- // +1
- [actionBringForward, ["R1", "R2", "F1_1", "F1", "F1_2"]],
- // noop
- [actionBringForward, ["R1", "R2", "F1_1", "F1", "F1_2"]],
- ],
- });
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "R1" },
- { id: "F1_2", frameId: "F1" },
- { id: "R2" },
- ],
- operations: [
- // +1
- [actionBringForward, ["R1", "F1_1", "F1", "R2", "F1_2"]],
- // +1
- [actionBringForward, ["R1", "R2", "F1_1", "F1", "F1_2"]],
- // noop
- [actionBringForward, ["R1", "R2", "F1_1", "F1", "F1_2"]],
- ],
- });
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "R1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "R2" },
- { id: "F1_2", frameId: "F1" },
- { id: "R3" },
- ],
- operations: [
- // +1
- [actionBringForward, ["R1", "F1_1", "R2", "F1", "R3", "F1_2"]],
- // +1
- // FIXME incorrect, should put F1_1 after R3
- [actionBringForward, ["R1", "R2", "F1_1", "R3", "F1", "F1_2"]],
- // +1
- // FIXME should be noop from previous step after it's fixed
- [actionBringForward, ["R1", "R2", "R3", "F1_1", "F1", "F1_2"]],
- ],
- });
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "R1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "R2" },
- { id: "F1_2", frameId: "F1" },
- { id: "R3" },
- ],
- operations: [
- // -1
- [actionSendBackward, ["F1_1", "F1", "R1", "F1_2", "R2", "R3"]],
- // -1
- [actionSendBackward, ["F1_1", "F1", "F1_2", "R1", "R2", "R3"]],
- ],
- });
- });
- it("moving selected frame children by one (normalized)", () => {
- // normalized frame order
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1", isSelected: true },
- { id: "F1_2", frameId: "F1" },
- { id: "F1", type: "frame" },
- { id: "R1" },
- ],
- operations: [
- // +1
- [actionBringForward, ["F1_2", "F1_1", "F1", "R1"]],
- // noop
- [actionBringForward, ["F1_2", "F1_1", "F1", "R1"]],
- ],
- });
- // normalized frame order, multiple frames
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1", isSelected: true },
- { id: "F1_2", frameId: "F1" },
- { id: "F1", type: "frame" },
- { id: "R1" },
- { id: "F2_1", frameId: "F2", isSelected: true },
- { id: "F2_2", frameId: "F2" },
- { id: "F2", type: "frame" },
- { id: "R2" },
- ],
- operations: [
- // +1
- [
- actionBringForward,
- ["F1_2", "F1_1", "F1", "R1", "F2_2", "F2_1", "F2", "R2"],
- ],
- // noop
- [
- actionBringForward,
- ["F1_2", "F1_1", "F1", "R1", "F2_2", "F2_1", "F2", "R2"],
- ],
- ],
- });
- });
- it("moving selected frame children by one (DENORMALIZED)", () => {
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1", isSelected: true },
- { id: "F1", type: "frame" },
- { id: "F1_2", frameId: "F1" },
- { id: "R1" },
- ],
- operations: [
- // +1
- // NOTE not sure what we wanna do here
- [actionBringForward, ["F1", "F1_2", "F1_1", "R1"]],
- // noop
- [actionBringForward, ["F1", "F1_2", "F1_1", "R1"]],
- // -1
- [actionSendBackward, ["F1", "F1_1", "F1_2", "R1"]],
- // noop
- [actionSendBackward, ["F1", "F1_1", "F1_2", "R1"]],
- ],
- });
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1", isSelected: true },
- { id: "R1" },
- { id: "F1", type: "frame" },
- { id: "F1_2", frameId: "F1" },
- { id: "R2" },
- ],
- operations: [
- // +1
- // NOTE not sure what we wanna do here
- [actionBringForward, ["R1", "F1", "F1_2", "F1_1", "R2"]],
- // noop
- [actionBringForward, ["R1", "F1", "F1_2", "F1_1", "R2"]],
- // -1
- [actionSendBackward, ["R1", "F1", "F1_1", "F1_2", "R2"]],
- // noop
- [actionSendBackward, ["R1", "F1", "F1_1", "F1_2", "R2"]],
- ],
- });
- });
- it("moving whole frame to front/end", () => {
- // normalized frame order
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "F1_2", frameId: "F1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "R1" },
- { id: "R2" },
- ],
- operations: [
- // +∞
- [actionBringToFront, ["R1", "R2", "F1_1", "F1_2", "F1"]],
- // noop
- [actionBringToFront, ["R1", "R2", "F1_1", "F1_2", "F1"]],
- // -∞
- [actionSendToBack, ["F1_1", "F1_2", "F1", "R1", "R2"]],
- // noop
- [actionSendToBack, ["F1_1", "F1_2", "F1", "R1", "R2"]],
- ],
- });
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "F1_2", frameId: "F1" },
- { id: "R1" },
- { id: "R2" },
- ],
- operations: [
- // +∞
- [actionBringToFront, ["R1", "R2", "F1_1", "F1", "F1_2"]],
- // noop
- [actionBringToFront, ["R1", "R2", "F1_1", "F1", "F1_2"]],
- // -∞
- [actionSendToBack, ["F1_1", "F1", "F1_2", "R1", "R2"]],
- // noop
- [actionSendToBack, ["F1_1", "F1", "F1_2", "R1", "R2"]],
- ],
- });
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "R1" },
- { id: "F1_2", frameId: "F1" },
- { id: "R2" },
- ],
- operations: [
- // +∞
- [actionBringToFront, ["R1", "R2", "F1_1", "F1", "F1_2"]],
- ],
- });
- // DENORMALIZED FRAME ORDER
- assertZindex({
- elements: [
- { id: "F1_1", frameId: "F1" },
- { id: "R1" },
- { id: "F1", type: "frame", isSelected: true },
- { id: "R2" },
- { id: "F1_2", frameId: "F1" },
- { id: "R3" },
- ],
- operations: [
- // +1
- [actionBringToFront, ["R1", "R2", "R3", "F1_1", "F1", "F1_2"]],
- ],
- });
- });
- });
|