List: fix keyboard reordering not working in second and subsequent groups (T1326785) (#33296)

Author: EugeniyKiyashko

packages/devextreme/js/__internal/ui/list/list.edit.ts

@@ -60,17 +60,19 @@ class ListEdit extends ListBase {
       }
 
       if (e.shiftKey && itemDragging?.allowReordering) {
+        if (focusedItemIndex === NOT_EXISTING_INDEX) {
+          return;
+        }
+
         const nextItemIndex = focusedItemIndex + (moveUp ? -1 : 1);
 
-        if (nextItemIndex < 0
-          || nextItemIndex === NOT_EXISTING_INDEX
-          || nextItemIndex > this._getLastItemIndex()) {
+        if (nextItemIndex < 0) {
           return;
         }
 
         const $nextItem = editStrategy.getItemElement(nextItemIndex);
 
-        if (!$nextItem) {
+        if (!$nextItem?.length) {
           return;
         }
 

packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js

@@ -446,6 +446,42 @@ QUnit.module('keyboard navigation', {
             assert.deepEqual(this.list.option('items'), this.items, 'items are not reordered');
         });
 
+        QUnit.test('shift+arrowUp should reorder items within second group', function(assert) {
+            const $secondGroupLastItem = this.$list
+                .find(`.${LIST_GROUP_CLASS}`).eq(1)
+                .find(`.${LIST_ITEM_CLASS}`).last();
+
+            $secondGroupLastItem.trigger('dxpointerdown');
+            this.clock.tick(10);
+            this.keyboard.keyDown('arrowUp', { shiftKey: true });
+
+            const expectedItems = [{
+                items: ['1-1', '1-2'],
+            }, {
+                items: ['2-2', '2-1'],
+            }];
+
+            assert.deepEqual(this.list.option('items'), expectedItems, 'items in second group were reordered');
+        });
+
+        QUnit.test('shift+arrowDown should reorder items within second group', function(assert) {
+            const $secondGroupFirstItem = this.$list
+                .find(`.${LIST_GROUP_CLASS}`).eq(1)
+                .find(`.${LIST_ITEM_CLASS}`).first();
+
+            $secondGroupFirstItem.trigger('dxpointerdown');
+            this.clock.tick(10);
+            this.keyboard.keyDown('arrowDown', { shiftKey: true });
+
+            const expectedItems = [{
+                items: ['1-1', '1-2'],
+            }, {
+                items: ['2-2', '2-1'],
+            }];
+
+            assert.deepEqual(this.list.option('items'), expectedItems, 'items in second group were reordered');
+        });
+
         QUnit.test('shift+arrowDown should not move group header (T1281673)', function(assert) {
             const $lastGroupHeader = this.$list.find(`.${LIST_GROUP_HEADER_CLASS}`).last();