From 05a70fce494e955b022d4b472580bfe0a8818809 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 1 Apr 2026 13:29:55 +0400
Subject: [PATCH] Add sorterLayers test

---
 .../test/specs/utils/sorter/sorterLayers.ts   | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 packages/core/test/specs/utils/sorter/sorterLayers.ts

diff --git a/packages/core/test/specs/utils/sorter/sorterLayers.ts b/packages/core/test/specs/utils/sorter/sorterLayers.ts
new file mode 100644
index 000000000..3d1005410
--- /dev/null
+++ b/packages/core/test/specs/utils/sorter/sorterLayers.ts
@@ -0,0 +1,74 @@
+import Component from '../../../../src/dom_components/model/Component';
+import Editor from '../../../../src/editor';
+import LayersComponentNode from '../../../../src/utils/sorter/LayersComponentNode';
+import { setupTestEditor } from '../../../common';
+
+describe('Layers sorter', () => {
+  let editor: Editor;
+  let fixtures: HTMLElement;
+
+  const setCanvasVisibility = (cmp: Component, visible: boolean) => {
+    const el = cmp.getEl();
+
+    Object.defineProperty(el, 'offsetWidth', {
+      configurable: true,
+      get: () => (visible ? 120 : 0),
+    });
+
+    Object.defineProperty(el, 'offsetHeight', {
+      configurable: true,
+      get: () => (visible ? 24 : 0),
+    });
+  };
+
+  const getChildIds = (cmp: Component) => cmp.components().map((child) => child.getAttributes().id);
+
+  beforeEach(() => {
+    ({ editor, fixtures } = setupTestEditor({ withCanvas: true }));
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+    editor.destroy();
+  });
+
+  test('removes the wrong hidden sibling when sorting layers with hidden siblings in the same collection', () => {
+    editor.setComponents(`
+      <div id="hidden-a" style="display: none;"></div>
+      <div id="visible-a">Visible A</div>
+      <div id="visible-b">Visible B</div>
+      <div id="hidden-b" style="display: none;"></div>
+    `);
+
+    const wrapper = editor.getWrapper()!;
+    const source = wrapper.find('#hidden-a')[0];
+    const target = wrapper.find('#visible-a')[0];
+    const visibleSibling = wrapper.find('#visible-b')[0];
+    const trailingHidden = wrapper.find('#hidden-b')[0];
+
+    editor.select(source);
+    editor.Layers.setRoot(wrapper);
+
+    fixtures.appendChild(editor.Layers.render());
+
+    const sorter = source.viewLayer!.sorter;
+    const sourceLayer = source.viewLayer!.el;
+
+    setCanvasVisibility(source, false);
+    setCanvasVisibility(target, true);
+    setCanvasVisibility(visibleSibling, true);
+    setCanvasVisibility(trailingHidden, false);
+
+    sorter.startSort([{ element: sourceLayer }]);
+    sorter.dropLocationDeterminer.lastMoveData = {
+      targetNode: new LayersComponentNode(wrapper),
+      index: 1,
+    };
+
+    sorter.endDrag();
+
+    expect(getChildIds(wrapper)).toEqual(['hidden-a', 'visible-a', 'visible-b']);
+    expect(getChildIds(wrapper)).not.toContain('hidden-b');
+    expect(getChildIds(wrapper).indexOf('hidden-a')).toBe(0);
+  });
+});