#6692 Toolbox subitems: Subitem dropdown contains incorrect subitems (#6693)

* #6692 Toolbox subitems: Subitem dropdown contains incorrect subitems
Fixes #6692

* add unit test, #6692

Author: novikov82

packages/survey-creator-core/src/components/question.ts

@@ -565,6 +565,7 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
       const action = this.creator.createIActionBarItemByClass(item, needSeparator, (questionType, json) => { this.convertQuestion(questionType, json, defaultJsons); });
       if (this.toolboxItemIsCorresponded(item, !!selectedAction)) {
         selectedAction = action;
+        selectedSubactions = item.items;
       }
       if (item.items?.length > 0 && this.creator.toolbox.showSubitems) {
         const subactions = [];
@@ -590,8 +591,8 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
         if (selectedSubactionLocal) {
           selectedAction = action;
           selectedSubaction = selectedSubactionLocal;
+          selectedSubactions = subactions;
         }
-        selectedSubactions = subactions;
       }
       lastItem = item;
       newItems.push(action);

packages/survey-creator-core/tests/question-adorner.tests.ts

@@ -64,6 +64,29 @@ test("Check question adorners popups display mode", (): any => {
   expect(convertToAction.popupModel.displayMode).toBe("overlay");
 });
 
+test("Check rating question input type list", (): any => {
+  const creator = new CreatorTester();
+  creator.JSON = {
+    elements: [
+      { type: "rating", name: "q1" },
+    ]
+  };
+  const question = creator.survey.getQuestionByName("q1");
+  let questionAdorner = new QuestionAdornerViewModel(
+    creator,
+    question,
+    <any>undefined
+  );
+
+  let convertInputTypeAction = questionAdorner.actionContainer.getActionById("convertInputType");
+  const popup = convertInputTypeAction.popupModel;
+  const popupViewModel = new PopupDropdownViewModel(popup); // need for popupModel.onShow
+  popup.show();
+  const list = popup.contentComponentData.model;
+
+  expect(list.actions.map(i => i.id)).toEqual(["labels", "stars", "smileys"]);
+});
+
 test("Check question converter with removed subitems", (): any => {
   surveySettings.animationEnabled = false;
   const creator = new CreatorTester();