@@ -49,6 +49,37 @@ describe("core-feature/keyboard-drag-and-drop", () => {
4949 tree . expect . substate ( "assistiveDndState" , AssistiveDndState . Started ) ;
5050 } ) ;
5151
52+ it ( "starts dragging only focused item" , ( ) => {
53+ tree . item ( "x3" ) . setFocused ( ) ;
54+ tree . do . hotkey ( "startDrag" ) ;
55+ tree . expect . substate ( "dnd" , {
56+ draggedItems : [ tree . item ( "x3" ) ] ,
57+ dragTarget : {
58+ childIndex : 3 ,
59+ dragLineIndex : 19 ,
60+ dragLineLevel : 0 ,
61+ insertionIndex : 2 ,
62+ item : tree . item ( "x" ) ,
63+ } ,
64+ } ) ;
65+ } ) ;
66+
67+ it ( "starts dragging both selected and focused item" , ( ) => {
68+ tree . do . selectMultiple ( "x111" , "x112" ) ;
69+ tree . item ( "x3" ) . setFocused ( ) ;
70+ tree . do . hotkey ( "startDrag" ) ;
71+ tree . expect . substate ( "dnd" , {
72+ draggedItems : [ tree . item ( "x111" ) , tree . item ( "x112" ) , tree . item ( "x3" ) ] ,
73+ dragTarget : {
74+ childIndex : 3 ,
75+ dragLineIndex : 19 ,
76+ dragLineLevel : 0 ,
77+ insertionIndex : 2 ,
78+ item : tree . item ( "x" ) ,
79+ } ,
80+ } ) ;
81+ } ) ;
82+
5283 it ( "moves down 1" , ( ) => {
5384 tree . do . selectMultiple ( "x111" , "x112" ) ;
5485 tree . do . hotkey ( "startDrag" ) ;
@@ -355,13 +386,13 @@ describe("core-feature/keyboard-drag-and-drop", () => {
355386
356387 it ( "doesnt go below end of tree" , ( ) => {
357388 const lastState = {
358- draggedItems : [ tree . item ( "x111" ) ] ,
389+ draggedItems : [ tree . item ( "x111" ) , tree . item ( "x3" ) ] ,
359390 dragTarget : {
360391 item : tree . item ( "x" ) ,
361392 childIndex : 4 ,
362393 dragLineIndex : 20 ,
363394 dragLineLevel : 0 ,
364- insertionIndex : 4 ,
395+ insertionIndex : 3 ,
365396 } ,
366397 } ;
367398
@@ -378,7 +409,7 @@ describe("core-feature/keyboard-drag-and-drop", () => {
378409
379410 it ( "doesnt go above top of tree" , ( ) => {
380411 const firstState = {
381- draggedItems : [ tree . item ( "x111" ) ] ,
412+ draggedItems : [ tree . item ( "x111" ) , tree . item ( "x1" ) ] ,
382413 dragTarget : {
383414 item : tree . item ( "x" ) ,
384415 childIndex : 0 ,
0 commit comments