@@ -6,7 +6,7 @@ import { debounceTimeout } from "./resources";
6
6
import { CSS } from "../list-item/resources" ;
7
7
import { DEBOUNCE_TIMEOUT as FILTER_DEBOUNCE_TIMEOUT } from "../filter/resources" ;
8
8
import { GlobalTestProps , dragAndDrop , isElementFocused , getFocusedElementProp } from "../../tests/utils" ;
9
- import { DragDetail } from "../../utils/sortableComponent " ;
9
+ import { ListDragDetail } from "./interfaces " ;
10
10
11
11
const placeholder = placeholderImage ( {
12
12
width : 140 ,
@@ -733,6 +733,10 @@ describe("calcite-list", () => {
733
733
oldIndex : number ;
734
734
startCalledTimes : number ;
735
735
endCalledTimes : number ;
736
+ endNewIndex : number ;
737
+ endOldIndex : number ;
738
+ startNewIndex : number ;
739
+ startOldIndex : number ;
736
740
} > ;
737
741
738
742
it ( "works using a mouse" , async ( ) => {
@@ -746,16 +750,20 @@ describe("calcite-list", () => {
746
750
testWindow . oldIndex = - 1 ;
747
751
testWindow . startCalledTimes = 0 ;
748
752
testWindow . endCalledTimes = 0 ;
749
- list . addEventListener ( "calciteListOrderChange" , ( event : CustomEvent < DragDetail > ) => {
753
+ list . addEventListener ( "calciteListOrderChange" , ( event : CustomEvent < ListDragDetail > ) => {
750
754
testWindow . calledTimes ++ ;
751
755
testWindow . newIndex = event ?. detail ?. newIndex ;
752
756
testWindow . oldIndex = event ?. detail ?. oldIndex ;
753
757
} ) ;
754
- list . addEventListener ( "calciteListDragEnd" , ( ) => {
758
+ list . addEventListener ( "calciteListDragEnd" , ( event : CustomEvent < ListDragDetail > ) => {
755
759
testWindow . endCalledTimes ++ ;
760
+ testWindow . endNewIndex = event . detail . newIndex ;
761
+ testWindow . endOldIndex = event . detail . oldIndex ;
756
762
} ) ;
757
- list . addEventListener ( "calciteListDragStart" , ( ) => {
763
+ list . addEventListener ( "calciteListDragStart" , ( event : CustomEvent < ListDragDetail > ) => {
758
764
testWindow . startCalledTimes ++ ;
765
+ testWindow . startNewIndex = event . detail . newIndex ;
766
+ testWindow . startOldIndex = event . detail . oldIndex ;
759
767
} ) ;
760
768
} ) ;
761
769
@@ -785,6 +793,10 @@ describe("calcite-list", () => {
785
793
newIndex : testWindow . newIndex ,
786
794
endCalledTimes : testWindow . endCalledTimes ,
787
795
startCalledTimes : testWindow . startCalledTimes ,
796
+ endNewIndex : testWindow . endNewIndex ,
797
+ endOldIndex : testWindow . endOldIndex ,
798
+ startNewIndex : testWindow . startNewIndex ,
799
+ startOldIndex : testWindow . startOldIndex ,
788
800
} ;
789
801
} ) ;
790
802
@@ -793,6 +805,10 @@ describe("calcite-list", () => {
793
805
expect ( results . endCalledTimes ) . toBe ( 1 ) ;
794
806
expect ( results . oldIndex ) . toBe ( 0 ) ;
795
807
expect ( results . newIndex ) . toBe ( 1 ) ;
808
+ expect ( results . startNewIndex ) . toBe ( null ) ;
809
+ expect ( results . startOldIndex ) . toBe ( 0 ) ;
810
+ expect ( results . endNewIndex ) . toBe ( 1 ) ;
811
+ expect ( results . endOldIndex ) . toBe ( 0 ) ;
796
812
} ) ;
797
813
798
814
it ( "supports dragging items between lists" , async ( ) => {
0 commit comments