Fix unit test and typos #8462

Author: andrewtelnov

src/dragdrop/ranking-choices.ts

@@ -82,10 +82,10 @@ export class DragDropRankingChoices extends DragDropChoices {
     const node = this.domAdapter.draggedElementShortcut.querySelector<HTMLElement>(".sv-ranking-item");
     node.style.cursor = "grabbing";
   };
-  public getIndixies(model: any, fromChoicesArray: Array<ItemValue>, toChoicesArray: Array<ItemValue>) {
+  public getIndices(model: any, fromChoicesArray: Array<ItemValue>, toChoicesArray: Array<ItemValue>) {
     let fromIndex = fromChoicesArray.indexOf(this.draggedElement);
     let toIndex = toChoicesArray.indexOf(this.dropTarget);
-    if(fromIndex < 0) {
+    if(fromIndex < 0 && !!this.draggedElement) {
       this.draggedElement = ItemValue.getItemByValue(fromChoicesArray, this.draggedElement.value) || this.draggedElement;
       fromIndex = fromChoicesArray.indexOf(this.draggedElement);
     }
@@ -103,7 +103,7 @@ export class DragDropRankingChoices extends DragDropChoices {
   }
 
   protected afterDragOver(dropTargetNode: HTMLElement): void {
-    const { fromIndex, toIndex } = this.getIndixies(this.parentElement, this.parentElement.rankingChoices, this.parentElement.rankingChoices);
+    const { fromIndex, toIndex } = this.getIndices(this.parentElement, this.parentElement.rankingChoices, this.parentElement.rankingChoices);
     this.reorderRankedItem(this.parentElement as QuestionRankingModel, fromIndex, toIndex);
   }
 

src/dragdrop/ranking-select-to-rank.ts

@@ -78,7 +78,7 @@ export class DragDropRankingSelectToRank extends DragDropRankingChoices {
   ): void {
     const questionModel: any = this.parentElement;
 
-    let { fromIndex, toIndex } = this.getIndixies(questionModel, fromChoicesArray, toChoicesArray);
+    let { fromIndex, toIndex } = this.getIndices(questionModel, fromChoicesArray, toChoicesArray);
 
     rankFunction(questionModel, fromIndex, toIndex, dropTargetNode);
   }

tests/dragdrophelpertests.ts

@@ -318,56 +318,56 @@ QUnit.test("DragDropRankingSelectToRank reorderRankedItem", function (assert) {
   assert.equal(questionModel.rankingChoices.length, 2, "rankingChoices count");
 });
 
-QUnit.test("DragDropRankingSelectToRank getIndixies", function (assert) {
+QUnit.test("DragDropRankingSelectToRank getIndices", function (assert) {
   const withDefaultValue = true;
   const dndModel = new DragDropRankingSelectToRank();
   const questionModel = createRankingQuestionModel(withDefaultValue);
-  let toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.unRankingChoices).toIndex;
+  let toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.unRankingChoices).toIndex;
   assert.equal(toIndex, 2);
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
   assert.equal(toIndex, 2);
 
   dndModel.draggedElement = questionModel.rankingChoices[0];
   dndModel.dropTarget = questionModel.rankingChoices[1];
   dndModel["_isBottom"] = false;
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
   assert.equal(toIndex, 0);
 
   dndModel.draggedElement = questionModel.rankingChoices[0];
   dndModel.dropTarget = questionModel.rankingChoices[1];
   dndModel["_isBottom"] = true;
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
   assert.equal(toIndex, 1);
 
   dndModel.draggedElement = questionModel.rankingChoices[1];
   dndModel.dropTarget = questionModel.rankingChoices[0];
   dndModel["_isBottom"] = false;
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
   assert.equal(toIndex, 0);
 
   dndModel.draggedElement = questionModel.rankingChoices[1];
   dndModel.dropTarget = questionModel.rankingChoices[0];
   dndModel["_isBottom"] = true;
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
   assert.equal(toIndex, 1);
 
   dndModel.dropTarget = questionModel.unRankingChoices[0];
   dndModel.draggedElement = questionModel.rankingChoices[1];
   dndModel["_isBottom"] = true;
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.unRankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.unRankingChoices).toIndex;
   assert.equal(toIndex, 1);
 
   dndModel["_isBottom"] = false;
   dndModel.dropTarget = questionModel.unRankingChoices[0];
   dndModel.draggedElement = questionModel.rankingChoices[1];
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.unRankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.unRankingChoices).toIndex;
   assert.equal(toIndex, 0);
 
   questionModel.value = ["11", "22", "33"];
   dndModel.draggedElement = questionModel.rankingChoices[0];
   dndModel.dropTarget = questionModel.rankingChoices[1];
   dndModel["_isBottom"] = true;
-  toIndex = dndModel.getIndixies(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
+  toIndex = dndModel.getIndices(questionModel, questionModel.rankingChoices, questionModel.rankingChoices).toIndex;
   assert.equal(toIndex, 1);
 });
 // EO selectToRankEnabled