Choices are updated incorrectly after fixing the value duplication er…

…ror fix surveyjs/survey-creator#5915

packages/survey-core/src/question.ts

@@ -2227,11 +2227,12 @@ export class Question extends SurveyElement<Question>
   private addCustomError(error: string): SurveyError {
     return new CustomError(error, this.survey);
   }
-  public removeError(error: SurveyError): void {
-    if (!error) return;
-    var errors = this.errors;
-    var index = errors.indexOf(error);
+  public removeError(error: SurveyError): boolean {
+    if (!error) return false;
+    const errors = this.errors;
+    const index = errors.indexOf(error);
     if (index !== -1) errors.splice(index, 1);
+    return index !== -1;
   }
   private checkForErrors(isOnValueChanged: boolean, fireCallback: boolean): Array<SurveyError> {
     var qErrors = new Array<SurveyError>();

packages/survey-core/src/question_matrixdropdownbase.ts

@@ -2229,7 +2229,7 @@ export class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel<Mat
       if(duplicatedRows.indexOf(row) < 0) {
         const question = row.getQuestionByName(columnName);
         if(question) {
-          this.removeDuplicationError(question);
+          this.removeDuplicationError(row, question);
         }
       }
     });
@@ -2246,8 +2246,10 @@ export class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel<Mat
       question.addError(new KeyDuplicationError(this.keyDuplicationError, this));
     }
   }
-  private removeDuplicationError(question: Question) {
-    question.removeError(this.getDuplicationError(question));
+  private removeDuplicationError(row: MatrixDropdownRowModelBase, question: Question) {
+    if(question.removeError(this.getDuplicationError(question)) && question.errors.length === 0 && !!row.editingObj) {
+      row.editingObj[question.getValueName()] = question.value;
+    }
   }
   public getFirstQuestionToFocus(withError: boolean): Question {
     return this.getFirstCellQuestion(withError);

packages/survey-core/tests/editingObjectTests.ts

@@ -1261,6 +1261,33 @@ QUnit.test("Edit choices in matrix dynamic column, check errors", function (asse
   assert.equal(row0Q.errors.length, 0, "row0Q errors, #4");
   assert.equal(row1Q.errors.length, 0, "row1Q errors, #4");
 });
+QUnit.test("Edit choices in matrix dynamic column, set correct value", function (assert) {
+  const question = new QuestionDropdownModel("q1");
+  question.choices = ["Item1", "Item2", "Item3"];
+  const survey = new SurveyModel({
+    elements: [
+      {
+        type: "matrixdynamic",
+        name: "choices",
+        rowCount: 0,
+        keyName: "value",
+        columns: [
+          { cellType: "text", name: "value", isRequired: true, isUnique: true }
+        ]
+      },
+    ],
+    checkErrorsMode: "onValueChanging"
+  });
+  survey.editingObj = question;
+  const matrix = <QuestionMatrixDynamicModel>survey.getQuestionByName("choices");
+  assert.equal(matrix.rowCount, 3, "There are 3 items");
+  const rows = matrix.visibleRows;
+  rows[1].cells[0].question.value = "Item1";
+  rows[0].cells[0].question.value = "Item2";
+  assert.equal(question.choices[0].value, "Item2", "choice 0");
+  assert.equal(question.choices[1].value, "Item1", "choice 1");
+});
+
 QUnit.test("Edit question.page property", function (assert) {
   var questionSurvey = new SurveyModel();
   questionSurvey.addNewPage("page1");