@@ -2380,7 +2380,8 @@ describe('IgxQueryBuilder', () => {
23802380 igx_query_builder_dialog_message : 'My changing entity message' ,
23812381 igx_query_builder_dialog_checkbox_text : 'My do not show this dialog again' ,
23822382 igx_query_builder_dialog_cancel : 'My Cancel' ,
2383- igx_query_builder_dialog_confirm : 'My Confirm'
2383+ igx_query_builder_dialog_confirm : 'My Confirm' ,
2384+ igx_query_builder_drop_ghost_text : 'My Drop here to insert'
23842385 } ) ;
23852386 fix . detectChanges ( ) ;
23862387
@@ -2415,6 +2416,18 @@ describe('IgxQueryBuilder', () => {
24152416 expect ( dialogOutlet . querySelector ( '.igx-query-builder-dialog' ) . children [ 1 ] . textContent . trim ( ) ) . toBe ( 'My do not show this dialog again' ) ;
24162417 expect ( dialogOutlet . querySelector ( '.igx-dialog__window-actions' ) . children [ 0 ] . textContent . trim ( ) ) . toBe ( 'My Cancel' ) ;
24172418 expect ( dialogOutlet . querySelector ( '.igx-dialog__window-actions' ) . children [ 1 ] . textContent . trim ( ) ) . toBe ( 'My Confirm' ) ;
2419+
2420+ //Drag ghost text check
2421+ queryBuilder . expressionTree = QueryBuilderFunctions . generateExpressionTree ( ) ;
2422+ fix . detectChanges ( ) ;
2423+ tick ( 100 ) ;
2424+ fix . detectChanges ( ) ;
2425+ const draggedChip = fix . debugElement . queryAll ( By . directive ( IgxChipComponent ) ) [ 3 ] . componentInstance ;
2426+ UIInteractions . moveDragDirective ( fix , draggedChip . dragDirective , 10 , 10 , false ) ;
2427+ const dropGhost = QueryBuilderFunctions . getDropGhost ( fix ) as HTMLElement ;
2428+ expect ( draggedChip . dragDirective . ghostElement ) . toBeTruthy ( ) ;
2429+ expect ( dropGhost ) . toBeDefined ( ) ;
2430+ expect ( dropGhost . innerText ) . toBe ( 'My Drop here to insert' ) ;
24182431 } ) ) ;
24192432 } ) ;
24202433
@@ -2917,64 +2930,144 @@ describe('IgxQueryBuilder', () => {
29172930 expect ( QueryBuilderFunctions . getChipContent ( newGroupConditions [ 0 ] ) ) . toBe ( "OrderDate Today" ) ;
29182931 } ) ;
29192932
2920- it ( 'should render drop ghost properly when keyboard dragged.' , async ( ) => {
2933+ it ( 'should render drop ghost properly when keyboard dragged.' , ( ) => {
29212934 const draggedIndicator = fix . debugElement . queryAll ( By . css ( '.igx-drag-indicator' ) ) [ 1 ] ;
29222935 const tree = fix . debugElement . query ( By . css ( '.igx-filter-tree' ) ) ;
2923- let keyPress = new KeyboardEvent ( 'keydown' , { code : 'ArrowDown' } ) ;
29242936
29252937 draggedIndicator . triggerEventHandler ( 'focus' , { } ) ;
29262938 draggedIndicator . nativeElement . focus ( ) ;
29272939
29282940 spyOn ( tree . nativeElement , 'dispatchEvent' ) . and . callThrough ( ) ;
29292941 const dropGhostContent = QueryBuilderFunctions . GetChipsContentAsArray ( fix ) [ 1 ] ;
29302942
2943+ //pass 1 down to bottom
2944+ let keyPress = new KeyboardEvent ( 'keydown' , { code : 'ArrowDown' } ) ;
29312945 for ( let i = 0 ; i <= 5 ; i ++ ) {
29322946 tree . nativeElement . dispatchEvent ( keyPress ) ;
2933- await wait ( ) ;
2947+ wait ( ) ;
29342948 fix . detectChanges ( ) ;
29352949
2950+ const dropGhost = QueryBuilderFunctions . getDropGhost ( fix ) ;
2951+ const prevElement = dropGhost && dropGhost . previousElementSibling ? QueryBuilderFunctions . getChipContent ( dropGhost . previousElementSibling ) : null ;
2952+ const nextElement = dropGhost && dropGhost . nextElementSibling ? QueryBuilderFunctions . getChipContent ( dropGhost . nextElementSibling ) : null ;
29362953 const newChipContents = QueryBuilderFunctions . GetChipsContentAsArray ( fix ) ;
29372954
29382955 switch ( true ) {
29392956 case i === 0 :
2957+ expect ( dropGhost ) . toBeDefined ( ) ;
2958+ expect ( prevElement ) . toBeNull ( ) ;
2959+ expect ( nextElement ) . toEqual ( "OrderName Ends With a" ) ;
29402960 expect ( newChipContents [ 4 ] ) . toBe ( dropGhostContent ) ;
29412961 break ;
29422962 case i === 1 :
2963+ expect ( dropGhost ) . toBeDefined ( ) ;
2964+ expect ( prevElement ) . toEqual ( "OrderName Ends With a" ) ;
2965+ expect ( nextElement ) . toBeUndefined ( ) ;
29432966 expect ( newChipContents [ 5 ] ) . toBe ( dropGhostContent ) ;
29442967 break ;
2945- case i >= 2 :
2968+ case i === 2 :
2969+ expect ( dropGhost ) . toBeDefined ( ) ;
2970+ expect ( prevElement ) . toEqual ( "OrderDate Today" ) ;
2971+ expect ( nextElement ) . toBeUndefined ( ) ;
2972+ expect ( newChipContents [ 6 ] ) . toBe ( dropGhostContent ) ;
2973+ break ;
2974+ case i >= 3 :
2975+ expect ( dropGhost ) . toBeDefined ( ) ;
2976+ expect ( prevElement ) . toEqual ( "or OrderName Ends With a OrderDate Today" ) ;
2977+ expect ( nextElement ) . toBeNull ( ) ;
29462978 expect ( newChipContents [ 6 ] ) . toBe ( dropGhostContent ) ;
29472979 break ;
29482980 }
29492981 }
29502982
2983+ //pass 2 up to top
29512984 keyPress = new KeyboardEvent ( 'keydown' , { code : 'ArrowUp' } ) ;
2952-
29532985 for ( let i = 0 ; i <= 10 ; i ++ ) {
29542986 tree . nativeElement . dispatchEvent ( keyPress ) ;
2955- await wait ( ) ;
2987+ wait ( ) ;
29562988 fix . detectChanges ( ) ;
29572989
2990+ const dropGhost = QueryBuilderFunctions . getDropGhost ( fix ) ;
2991+ const prevElement = dropGhost && dropGhost . previousElementSibling ? QueryBuilderFunctions . getChipContent ( dropGhost . previousElementSibling ) : null ;
2992+ const nextElement = dropGhost && dropGhost . nextElementSibling ? QueryBuilderFunctions . getChipContent ( dropGhost . nextElementSibling ) : null ;
29582993 const newChipContents = QueryBuilderFunctions . GetChipsContentAsArray ( fix ) ;
29592994
29602995 switch ( true ) {
29612996 case i === 0 :
2997+ expect ( dropGhost ) . toBeDefined ( ) ;
2998+ expect ( prevElement ) . toEqual ( "OrderDate Today" ) ;
2999+ expect ( nextElement ) . toBeUndefined ( ) ;
29623000 expect ( newChipContents [ 6 ] ) . toBe ( dropGhostContent ) ;
29633001 break ;
29643002 case i === 1 :
3003+ expect ( dropGhost ) . toBeDefined ( ) ;
3004+ expect ( prevElement ) . toBeUndefined ( ) ;
3005+ expect ( nextElement ) . toEqual ( "OrderDate Today" ) ;
29653006 expect ( newChipContents [ 5 ] ) . toBe ( dropGhostContent ) ;
29663007 break ;
29673008 case i === 2 :
3009+ expect ( dropGhost ) . toBeDefined ( ) ;
3010+ expect ( prevElement ) . toBeNull ( ) ;
3011+ expect ( nextElement ) . toEqual ( "OrderName Ends With a" ) ;
29683012 expect ( newChipContents [ 4 ] ) . toBe ( dropGhostContent ) ;
29693013 break ;
29703014 case i === 3 :
3015+ expect ( dropGhost ) . toBeDefined ( ) ;
3016+ expect ( prevElement ) . toBeUndefined ( ) ;
3017+ expect ( nextElement ) . toEqual ( "or OrderName Ends With a OrderDate Today" ) ;
29713018 expect ( newChipContents [ 4 ] ) . toBe ( dropGhostContent ) ;
29723019 break ;
2973- case i === 4 :
3020+ case i >= 4 :
3021+ expect ( dropGhost ) . toBeDefined ( ) ;
3022+ expect ( prevElement ) . toBeNull ( ) ;
3023+ expect ( nextElement ) . toEqual ( "OrderName Equals foo" ) ;
29743024 expect ( newChipContents [ 0 ] ) . toBe ( dropGhostContent ) ;
29753025 break ;
2976- case i >= 5 :
2977- expect ( newChipContents [ 0 ] ) . toBe ( dropGhostContent ) ;
3026+ }
3027+ }
3028+
3029+ //pass 3 down to bottom again
3030+ keyPress = new KeyboardEvent ( 'keydown' , { code : 'ArrowDown' } ) ;
3031+ for ( let i = 0 ; i <= 10 ; i ++ ) {
3032+ tree . nativeElement . dispatchEvent ( keyPress ) ;
3033+ wait ( ) ;
3034+ fix . detectChanges ( ) ;
3035+
3036+ const dropGhost = QueryBuilderFunctions . getDropGhost ( fix ) ;
3037+ const prevElement = dropGhost && dropGhost . previousElementSibling ? QueryBuilderFunctions . getChipContent ( dropGhost . previousElementSibling ) : null ;
3038+ const nextElement = dropGhost && dropGhost . nextElementSibling ? QueryBuilderFunctions . getChipContent ( dropGhost . nextElementSibling ) : null ;
3039+ const newChipContents = QueryBuilderFunctions . GetChipsContentAsArray ( fix ) ;
3040+
3041+ switch ( true ) {
3042+ case i === 0 :
3043+ expect ( dropGhost ) . toBeDefined ( ) ;
3044+ expect ( prevElement ) . toEqual ( "OrderName Equals foo" ) ;
3045+ expect ( nextElement ) . toBeUndefined ( ) ;
3046+ expect ( newChipContents [ 1 ] ) . toBe ( dropGhostContent ) ;
3047+ break ;
3048+ case i === 1 :
3049+ expect ( dropGhost ) . toBeDefined ( ) ;
3050+ expect ( prevElement ) . toBeNull ( ) ;
3051+ expect ( nextElement ) . toEqual ( "OrderName Ends With a" ) ;
3052+ expect ( newChipContents [ 4 ] ) . toBe ( dropGhostContent ) ;
3053+ break ;
3054+ case i === 2 :
3055+ expect ( dropGhost ) . toBeDefined ( ) ;
3056+ expect ( prevElement ) . toEqual ( "OrderName Ends With a" ) ;
3057+ expect ( nextElement ) . toBeUndefined ( ) ;
3058+ expect ( newChipContents [ 5 ] ) . toBe ( dropGhostContent ) ;
3059+ break ;
3060+ case i === 3 :
3061+ expect ( dropGhost ) . toBeDefined ( ) ;
3062+ expect ( prevElement ) . toEqual ( "OrderDate Today" ) ;
3063+ expect ( nextElement ) . toBeUndefined ( ) ;
3064+ expect ( newChipContents [ 6 ] ) . toBe ( dropGhostContent ) ;
3065+ break ;
3066+ case i >= 4 :
3067+ expect ( dropGhost ) . toBeDefined ( ) ;
3068+ expect ( prevElement ) . toEqual ( "or OrderName Ends With a OrderDate Today" ) ;
3069+ expect ( nextElement ) . toBeNull ( ) ;
3070+ expect ( newChipContents [ 6 ] ) . toBe ( dropGhostContent ) ;
29783071 break ;
29793072 }
29803073 }
0 commit comments