survey-creator-core 1.11.5 → 1.11.7

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.11.5
+ * SurveyJS Creator v1.11.7
  * (c) 2015-2024 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator
@@ -130,7 +130,7 @@ License: MIT
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
- * surveyjs - Survey JavaScript library v1.11.5
+ * surveyjs - Survey JavaScript library v1.11.7
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -4704,9 +4704,12 @@ var SurveyElementActionContainer = /** @class */ (function (_super) {
 var SurveyElementAdornerBase = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(SurveyElementAdornerBase, _super);
     function SurveyElementAdornerBase(creator, surveyElement) {
+        var _a, _b, _c;
         var _this = _super.call(this) || this;
         _this.creator = creator;
         _this.surveyElement = surveyElement;
+        _this.designerStateManager = (_a = creator.getPlugin("designer")) === null || _a === void 0 ? void 0 : _a.designerStateManager;
+        (_b = _this.designerStateManager) === null || _b === void 0 ? void 0 : _b.initForElement(surveyElement);
         _this.selectedPropPageFunc = function (sender, options) {
             if (options.name === "isSelectedInDesigner") {
                 _this.onElementSelectedChanged(options.newValue);
@@ -4720,6 +4723,17 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
         _this.actionContainer = new SurveyElementActionContainer();
         _this.actionContainer.dotsItem.iconSize = 16;
         _this.actionContainer.dotsItem.popupModel.horizontalPosition = "center";
+        _this.topActionContainer = new survey_core__WEBPACK_IMPORTED_MODULE_1__["ActionContainer"]();
+        _this.topActionContainer.sizeMode = "small";
+        _this.topActionContainer.setItems([{
+                id: "collapse",
+                iconName: new survey_core__WEBPACK_IMPORTED_MODULE_1__["ComputedUpdater"](function () { return _this.collapsed ? "icon-restore_16x16" : "icon-collapse-detail-light_16x16"; }),
+                iconSize: 16,
+                action: function () {
+                    _this.collapsed = !_this.collapsed;
+                }
+            }]);
+        _this.collapsed = !!surveyElement && ((_c = _this.designerStateManager) === null || _c === void 0 ? void 0 : _c.getElementState(surveyElement).collapsed);
         _this.setSurveyElement(surveyElement);
         _this.creator.sidebar.onPropertyChanged.add(_this.sidebarFlyoutModeChangedFunc);
         _this.setShowAddQuestionButton(true);
@@ -4816,9 +4830,8 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
             title: this.creator.getLocString("survey.duplicate"),
             visibleIndex: 10,
             iconSize: 16,
-            action: function () {
-                _this.duplicate();
-            }
+            action: function () { return _this.duplicate(); },
+            onFocus: function (isMouse, event) { return _this.disableActionFocusing(isMouse, event); }
         }));
         items.push(new survey_core__WEBPACK_IMPORTED_MODULE_1__["Action"]({
             id: "settings",
@@ -4845,9 +4858,18 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
             iconSize: 16,
             action: function () {
                 _this.delete();
-            }
+            },
+            onFocus: function (isMouse, event) { return _this.disableActionFocusing(isMouse, event); }
         }));
     };
+    SurveyElementAdornerBase.prototype.disableActionFocusing = function (isMouse, event) {
+        this.isDisableSelecting = isMouse;
+    };
+    SurveyElementAdornerBase.prototype.canSelectElement = function () {
+        var res = !this.isDisableSelecting;
+        this.isDisableSelecting = false;
+        return res;
+    };
     Object.defineProperty(SurveyElementAdornerBase.prototype, "allowEdit", {
         get: function () {
             return !!this.creator && !this.creator.readOnly && this.allowEditOption;
@@ -4872,6 +4894,23 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({ defaultValue: true })
     ], SurveyElementAdornerBase.prototype, "allowDragging", void 0);
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
+        Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({
+            onSet: function (val, target) {
+                target.renderedCollapsed = val;
+                if (target.designerStateManager && target.surveyElement) {
+                    target.designerStateManager.getElementState(target.surveyElement).collapsed = val;
+                }
+                setTimeout(function () {
+                    target.creator.survey.pages.forEach(function (p) { return p.ensureRowsVisibility(); });
+                    target.creator.survey.getAllPanels().forEach(function (p) { return p.ensureRowsVisibility(); });
+                }, 50);
+            }
+        })
+    ], SurveyElementAdornerBase.prototype, "collapsed", void 0);
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
+        Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])()
+    ], SurveyElementAdornerBase.prototype, "renderedCollapsed", void 0);
     return SurveyElementAdornerBase;
 }(survey_core__WEBPACK_IMPORTED_MODULE_1__["Base"]));
 
@@ -7032,6 +7071,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _action_container_view_model__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./action-container-view-model */ "./src/components/action-container-view-model.ts");
 /* harmony import */ var _creator_settings__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../creator-settings */ "./src/creator-settings.ts");
 /* harmony import */ var _string_editor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./string-editor */ "./src/components/string-editor.ts");
+/* harmony import */ var _toolbox__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../toolbox */ "./src/toolbox.ts");
 
 
 
@@ -7041,6 +7081,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__(/*! ./question.scss */ "./src/components/question.scss");
 
 
+
 var QuestionAdornerViewModel = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(QuestionAdornerViewModel, _super);
     function QuestionAdornerViewModel(creator, surveyElement, templateData) {
@@ -7077,10 +7118,12 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    QuestionAdornerViewModel.prototype.canSelectElement = function () {
+        return _super.prototype.canSelectElement.call(this) && this.surveyElement.isInteractiveDesignElement;
+    };
     QuestionAdornerViewModel.prototype.select = function (model, event) {
-        if (!model.surveyElement.isInteractiveDesignElement) {
+        if (!model.canSelectElement())
             return;
-        }
         var creator = model.creator;
         var selEl = model.surveyElement;
         var el = document === null || document === void 0 ? void 0 : document.activeElement;
@@ -7093,7 +7136,11 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         return true;
     };
     QuestionAdornerViewModel.prototype.rootCss = function () {
-        return this.surveyElement.isQuestion && !this.surveyElement.startWithNewLine ? " svc-question__adorner--start-with-new-line" : "";
+        var isStartWithNewLine = this.surveyElement.isQuestion && !this.surveyElement.startWithNewLine;
+        return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]()
+            .append("svc-question__adorner--start-with-new-line", isStartWithNewLine)
+            .append("svc-question__adorner--collapse-" + this.creator.expandCollapseButtonVisibility, true)
+            .append("svc-question__adorner--collapsed", !!this.renderedCollapsed).toString();
     };
     QuestionAdornerViewModel.prototype.css = function () {
         if (!this.surveyElement.isInteractiveDesignElement)
@@ -7342,7 +7389,7 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
     QuestionAdornerViewModel.prototype.onPointerDown = function (pointerDownEvent) {
         this.dragOrClickHelper.onPointerDown(pointerDownEvent);
     };
-    QuestionAdornerViewModel.prototype.getConvertToTypesActions = function () {
+    QuestionAdornerViewModel.prototype.getConvertToTypes = function () {
         var _this = this;
         var availableItems = this.creator.getAvailableToolboxItems(this.element, false);
         var itemNames = [];
@@ -7353,19 +7400,36 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         });
         var convertClasses = _questionconverter__WEBPACK_IMPORTED_MODULE_3__["QuestionConverter"].getConvertToClasses(this.currentType, itemNames, true);
         var res = [];
-        var lastItem = null;
         convertClasses.forEach(function (className) {
             var items = _this.creator.toolbox.items.filter(function (item) { return item.name == className; });
             if (Array.isArray(items) && items.length > 0) {
                 var item = items[0];
-                var needSeparator = lastItem && item.category != lastItem.category;
-                var action = _this.creator.createIActionBarItemByClass(item.name, item.title, item.iconName, needSeparator);
-                lastItem = item;
-                res.push(action);
+                res.push(item);
             }
         });
         return res;
     };
+    QuestionAdornerViewModel.prototype.getConvertToTypesActions = function (parentAction) {
+        var _this = this;
+        var availableItems = this.getConvertToTypes();
+        var res = [];
+        var lastItem = null;
+        availableItems.forEach(function (item) {
+            var needSeparator = lastItem && item.category != lastItem.category;
+            var action = _this.creator.createIActionBarItemByClass(item, needSeparator, function (questionType, subtype) {
+                if (_this.surveyElement.getType() !== questionType) {
+                    _this.creator.convertCurrentQuestion(questionType);
+                }
+                var propertyName = _toolbox__WEBPACK_IMPORTED_MODULE_8__["QuestionToolbox"].getSubTypePropertyName(questionType);
+                if (!!propertyName && !!subtype)
+                    _this.creator.selectedElement.setPropertyValue(propertyName, subtype);
+                parentAction === null || parentAction === void 0 ? void 0 : parentAction.hidePopup();
+            });
+            lastItem = item;
+            res.push(action);
+        });
+        return res;
+    };
     Object.defineProperty(QuestionAdornerViewModel.prototype, "currentType", {
         get: function () {
             return this.surveyElement.getType();
@@ -7387,46 +7451,62 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
             title: actionTitle,
             iconName: (_a = this.creator.toolbox.getItemByName(this.element.getType())) === null || _a === void 0 ? void 0 : _a.iconName
         };
-        var newAction = this.createDropdownModel(actionData, actions, function (listModel) {
-            var newItems = _this.getConvertToTypesActions();
-            listModel.setItems(newItems);
-            listModel.selectedItem = _this.getSelectedItem(newItems, _this.currentType);
-        }, function (item) {
-            _this.creator.convertCurrentQuestion(item.id);
+        var newAction = this.createDropdownModel({
+            actionData: actionData,
+            items: actions,
+            updateListModel: function (listModel) {
+                var newItems = _this.getConvertToTypesActions(newAction);
+                listModel.setItems(newItems);
+                listModel.selectedItem = _this.getSelectedItem(newItems, _this.currentType);
+                var propertyName = _toolbox__WEBPACK_IMPORTED_MODULE_8__["QuestionToolbox"].getSubTypePropertyName(_this.currentType);
+                newItems.forEach(function (action) {
+                    var _a;
+                    if (((_a = action.items) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                        var selectedSubItem = action.items.filter(function (item) { return item.id === _this.element[propertyName]; })[0];
+                        if (selectedSubItem) {
+                            var _listModel = action.popupModel.contentComponentData.model;
+                            _listModel.selectedItem = selectedSubItem;
+                        }
+                    }
+                });
+            }
         });
+        newAction.disableHide = true;
         return newAction;
     };
     QuestionAdornerViewModel.prototype.createConvertInputType = function () {
         var _this = this;
-        var prop = null;
-        if (this.surveyElement.getType() === "text")
-            prop = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].findProperty("text", "inputType");
-        if (this.surveyElement.getType() === "rating")
-            prop = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].findProperty("rating", "rateDisplayMode");
-        if (!prop || !Object(_utils_utils__WEBPACK_IMPORTED_MODULE_4__["isPropertyVisible"])(this.surveyElement, prop.name))
+        var questionType = this.surveyElement.getType();
+        var toolboxItem = this.creator.toolbox.items.filter(function (item) { return item.id === questionType; })[0];
+        if (!toolboxItem || !toolboxItem.items || toolboxItem.items.length < 1)
             return null;
-        var propName = prop.name;
+        var propName = _toolbox__WEBPACK_IMPORTED_MODULE_8__["QuestionToolbox"].getSubTypePropertyName(questionType);
         var questionSubType = this.surveyElement.getPropertyValue(propName);
-        var items = prop.getChoices(this.surveyElement, function (chs) { });
         var getAvailableTypes = function () {
-            var availableTypes = [];
-            items.forEach(function (item) {
-                availableTypes.push({ id: item, title: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getPropertyValueInEditor(prop.name, item) });
+            return toolboxItem.items.map(function (item) {
+                return {
+                    id: item.id,
+                    title: item.title,
+                    action: function (item) {
+                        var newValue = _this.getUpdatedPropertyValue(propName, item.id);
+                        _this.surveyElement.setPropertyValue(propName, newValue);
+                    }
+                };
             });
-            return availableTypes;
         };
         var actionData = {
             id: "convertInputType",
             visibleIndex: 1,
-            title: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getPropertyValueInEditor(prop.name, questionSubType),
+            title: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getPropertyValueInEditor(propName, questionSubType),
         };
-        var newAction = this.createDropdownModel(actionData, getAvailableTypes(), function (listModel) {
-            var newItems = getAvailableTypes();
-            listModel.setItems(newItems);
-            listModel.selectedItem = _this.getSelectedItem(newItems, _this.surveyElement.getPropertyValue(propName));
-        }, function (item) {
-            var newValue = _this.getUpdatedPropertyValue(propName, item.id);
-            _this.surveyElement.setPropertyValue(propName, newValue);
+        var newAction = this.createDropdownModel({
+            actionData: actionData,
+            items: getAvailableTypes(),
+            updateListModel: function (listModel) {
+                var newItems = getAvailableTypes();
+                listModel.setItems(newItems);
+                listModel.selectedItem = _this.getSelectedItem(newItems, _this.surveyElement.getPropertyValue(propName));
+            }
         });
         newAction.disableShrink = true;
         this.surveyElement.registerFunctionOnPropertyValueChanged(propName, function () {
@@ -7445,27 +7525,26 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         var selectedItems = actions.filter(function (item) { return item.id === id; });
         return selectedItems.length > 0 ? selectedItems[0] : undefined;
     };
-    QuestionAdornerViewModel.prototype.createDropdownModel = function (actionData, items, updateListModel, onSelectionChanged) {
+    QuestionAdornerViewModel.prototype.createDropdownModel = function (options) {
         var newAction = Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["createDropdownActionModel"])({
-            id: actionData.id,
+            id: options.actionData.id,
             css: "sv-action--convertTo sv-action-bar-item--secondary",
-            iconName: actionData.iconName,
+            iconName: options.actionData.iconName,
             iconSize: 24,
-            title: actionData.title,
-            enabled: actionData.enabled,
-            visibleIndex: actionData.visibleIndex,
+            title: options.actionData.title,
+            enabled: options.actionData.enabled,
+            visibleIndex: options.actionData.visibleIndex,
             disableShrink: false,
             location: "start",
             action: function (newType) {
             },
         }, {
-            items: items,
-            onSelectionChanged: onSelectionChanged,
+            items: options.items,
             allowSelection: true,
             horizontalPosition: "center",
             onShow: function () {
                 var listModel = newAction.popupModel.contentComponentData.model;
-                updateListModel(listModel);
+                options.updateListModel(listModel);
             },
         });
         newAction.popupModel.displayMode = this.creator.isTouch ? "overlay" : "popup";
@@ -7525,8 +7604,7 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
     QuestionAdornerViewModel.prototype.duplicate = function () {
         var _this = this;
         setTimeout(function () {
-            var newElement = _this.creator.fastCopyQuestion(_this.surveyElement);
-            _this.creator.selectElement(newElement);
+            _this.creator.fastCopyQuestion(_this.surveyElement, true);
         }, 1);
     };
     QuestionAdornerViewModel.prototype.addNewQuestion = function () {
@@ -8880,6 +8958,9 @@ var StringEditorViewModelBase = /** @class */ (function (_super) {
         if (this.creator) {
             this.creator.selectFromStringEditor = true;
         }
+        if (this.locString.hasHtml && this.editAsText) {
+            event.target.innerText = event.target.textContent = this.locString.calculatedText;
+        }
         event.target.parentElement.click();
         event.target.spellcheck = true;
         event.target.setAttribute("tabindex", -1);
@@ -8986,7 +9067,7 @@ var StringEditorViewModelBase = /** @class */ (function (_super) {
             clearedText = mdText;
         }
         else {
-            var txt = this.locString.hasHtml ? html : text;
+            var txt = this.locString.hasHtml && !this.editAsText ? html : text;
             if (!this.locString.allowLineBreaks)
                 txt = Object(_utils_utils__WEBPACK_IMPORTED_MODULE_3__["clearNewLines"])(txt);
             clearedText = txt;
@@ -9294,6 +9375,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _property_grid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../property-grid */ "./src/property-grid/index.ts");
 /* harmony import */ var _property_grid_property_grid_view_model__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../property-grid/property-grid-view-model */ "./src/property-grid/property-grid-view-model.ts");
 /* harmony import */ var _designer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./designer */ "./src/components/tabs/designer.ts");
+/* harmony import */ var _designer_state_manager__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./designer-state-manager */ "./src/components/tabs/designer-state-manager.ts");
+
 
 
 
@@ -9323,6 +9406,13 @@ var TabDesignerPlugin = /** @class */ (function () {
             return result;
         });
         this.toolboxTab = this.creator.sidebar.addTab("toolbox", "svc-toolbox", creator);
+        this.designerStateManager = new _designer_state_manager__WEBPACK_IMPORTED_MODULE_5__["DesignerStateManager"]();
+        this.designerStateManager.initForSurvey(this.creator.survey);
+        this.creator.onSurveyInstanceCreated.add(function (s, o) {
+            if (o.reason == "designer") {
+                _this.designerStateManager.initForSurvey(o.survey);
+            }
+        });
         this.creator.onPropertyChanged.add(function (sender, options) {
             if (options.name === "toolboxLocation") {
                 if (_this.toolboxTab.visible && options.newVal !== "sidebar") {
@@ -9485,6 +9575,71 @@ var TabDesignerPlugin = /** @class */ (function () {
 
 
 
+/***/ }),
+
+/***/ "./src/components/tabs/designer-state-manager.ts":
+/*!*******************************************************!*\
+  !*** ./src/components/tabs/designer-state-manager.ts ***!
+  \*******************************************************/
+/*! exports provided: DesignerStateManager */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DesignerStateManager", function() { return DesignerStateManager; });
+var ElementState = /** @class */ (function () {
+    function ElementState() {
+        this.collapsed = false;
+    }
+    return ElementState;
+}());
+var DesignerStateManager = /** @class */ (function () {
+    function DesignerStateManager() {
+        var _this = this;
+        this.elementState = {};
+        this.pageState = {};
+        this.onQuestionAddedHandler = function (sender, opts) {
+            _this.elementState[opts.question.name] = new ElementState();
+        };
+        this.onPageAddedHandler = function (sender, opts) {
+            _this.pageState[opts.page.name] = new ElementState();
+        };
+        this.onPanelAddedHandler = function (sender, opts) {
+            _this.elementState[opts.panel.name] = new ElementState();
+        };
+    }
+    DesignerStateManager.prototype.getStateMapForElement = function (element) {
+        return (element && element.isPage) ? this.pageState : this.elementState;
+    };
+    DesignerStateManager.prototype.initForSurvey = function (survey) {
+        survey.onQuestionAdded.add(this.onQuestionAddedHandler);
+        survey.onPageAdded.add(this.onPageAddedHandler);
+        survey.onPanelAdded.add(this.onPanelAddedHandler);
+    };
+    DesignerStateManager.prototype.initForElement = function (element) {
+        if (!element)
+            return;
+        var stateMap = this.getStateMapForElement(element);
+        element.registerFunctionOnPropertyValueChanged("name", function (newName) {
+            delete stateMap[element.name];
+            stateMap[newName] = new ElementState();
+        }, "designerStateManager");
+    };
+    DesignerStateManager.prototype.getElementState = function (element) {
+        var stateMap = this.getStateMapForElement(element);
+        var name = element.name;
+        var state = stateMap[name];
+        if (state)
+            return state;
+        state = new ElementState();
+        stateMap[name] = new ElementState();
+        return state;
+    };
+    return DesignerStateManager;
+}());
+
+
+
 /***/ }),
 
 /***/ "./src/components/tabs/designer.scss":
@@ -10196,7 +10351,7 @@ var TabJsonEditorAcePlugin = /** @class */ (function (_super) {
         return new AceJsonEditorModel(creator);
     };
     TabJsonEditorAcePlugin.hasAceEditor = function () {
-        return typeof window["ace"] !== "undefined";
+        return typeof window !== "undefined" && typeof window["ace"] !== "undefined";
     };
     return TabJsonEditorAcePlugin;
 }(_json_editor_plugin__WEBPACK_IMPORTED_MODULE_3__["TabJsonEditorBasePlugin"]));
@@ -14630,10 +14785,10 @@ var PreviewViewModel = /** @class */ (function (_super) {
             this.survey["onNavigateToUrl"].add(function (sender, options) {
                 var url = options.url;
                 options.url = "";
-                if (!!url) {
+                if (!!url && options.allow) {
                     var message = Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("ed.navigateToMsg") + " '" + url + "'.";
-                    if (!!this.surveyProvider) {
-                        this.surveyProvider.notify(message);
+                    if (!!_this.surveyProvider) {
+                        _this.surveyProvider.notify(message);
                     }
                     else {
                         alert(message);
@@ -17017,6 +17172,8 @@ __webpack_require__.r(__webpack_exports__);
  * const creator = new SurveyCreatorModel(creatorOptions);
  * creator.themeEditor.settingName = "value";
  * ```
+ *
+ * [Theme Editor Documentation](https://surveyjs.io/survey-creator/documentation/theme-editor (linkStyle))
  */
 var ThemeTabPlugin = /** @class */ (function () {
     function ThemeTabPlugin(creator) {
@@ -20194,18 +20351,20 @@ __webpack_require__.r(__webpack_exports__);
 
 var ToolboxToolViewModel = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(ToolboxToolViewModel, _super);
-    function ToolboxToolViewModel(item, creator) {
+    function ToolboxToolViewModel(item, creator, model) {
         var _this = _super.call(this) || this;
         _this.item = item;
         _this.creator = creator;
+        _this.model = model;
         _this.click = function (event) {
             if (!_this.allowAdd)
                 return;
             _this.creator.clickToolboxItem(_this.item.json);
+            _this.hidePopup();
         };
         _this.onPointerUp = function (pointerUpEvent) {
-            _this._node.classList.remove("svc-toolbox__tool--pressed");
-            _this._node = null;
+            _this.hidePopup();
+            _this.toolboxItem.isPressed = false;
             document.removeEventListener("pointerup", _this.onPointerUp);
         };
         _this.startDragToolboxItem = function (pointerDownEvent, currentTarget) {
@@ -20216,6 +20375,13 @@ var ToolboxToolViewModel = /** @class */ (function (_super) {
         _this.dragOrClickHelper = new survey_core__WEBPACK_IMPORTED_MODULE_1__["DragOrClickHelper"](_this.startDragToolboxItem);
         return _this;
     }
+    Object.defineProperty(ToolboxToolViewModel.prototype, "toolboxItem", {
+        get: function () {
+            return this.item;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(ToolboxToolViewModel.prototype, "allowAdd", {
         get: function () {
             return !this.creator.readOnly;
@@ -20223,18 +20389,28 @@ var ToolboxToolViewModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    ToolboxToolViewModel.prototype.onMouseOver = function (itemValue, mouseoverEvent) {
+        this.model.mouseOverHandler(itemValue);
+    };
+    ToolboxToolViewModel.prototype.onMouseLeave = function (itemValue, mouseoverEvent) {
+        itemValue.hidePopupDelayed(this.creator.toolbox.subItemsHideDelay);
+    };
     ToolboxToolViewModel.prototype.onPointerDown = function (pointerDownEvent) {
         var _a;
+        pointerDownEvent.stopPropagation();
         if (!this.allowAdd)
             return;
         if (this.item.id.indexOf("dotsItem-id") === 0)
             return true; //toolbox responsive popup
         this.dragOrClickHelper.onPointerDown(pointerDownEvent);
-        this._node = pointerDownEvent.currentTarget;
-        this._node.classList.add("svc-toolbox__tool--pressed");
+        this.toolboxItem.isPressed = true;
         document.addEventListener("pointerup", this.onPointerUp);
         (_a = this.creator) === null || _a === void 0 ? void 0 : _a.onDragDropItemStart();
     };
+    ToolboxToolViewModel.prototype.hidePopup = function () {
+        this.toolboxItem.hidePopup();
+        this.toolboxItem.isHovered = false;
+    };
     Object.defineProperty(ToolboxToolViewModel.prototype, "dragDropHelper", {
         get: function () {
             return this.creator.dragDropSurveyElements;
@@ -20596,6 +20772,10 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
          * [Customize Survey Elements on Creation](https://surveyjs.io/survey-creator/documentation/customize-survey-creation-process#customize-survey-elements-on-creation (linkStyle))
          */
         _this.onPageAdded = _this.addCreatorEvent();
+        /**
+         * An event that is raised when a [question's type is being changed](https://surveyjs.io/survey-creator/documentation/end-user-guide/user-interface#how-to-change-the-question-type).
+         */
+        _this.onQuestionConverting = _this.addCreatorEvent();
         /**
          * An event that is raised when Survey Creator renders action buttons under each page on the design surface. Use this event to add, remove, or modify the buttons.
          * @see onDefineElementMenuItems
@@ -20949,6 +21129,18 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             button: "",
             shown: "svc-notifier--shown"
         });
+        /**
+         * Specifies where to add new questions when users click the "Add Question" button.
+         *
+         * Accepted values:
+         *
+         * - `true` (default)
+         * New questions are added to the end of a survey page.
+         *
+         * - `false`
+         * New questions are added after the currently selected question on the design surface.
+         */
+        _this.addNewQuestionLast = true;
         _this.onKeyDownHandler = function (event) {
             _this.findSuitableShortcuts(event).forEach(function (shortcut) {
                 if ((event.keyCode < 48 || event.keyCode == 89 || event.keyCode == 90) && isTextInput(event.target))
@@ -22104,6 +22296,9 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             _this.selectElement(options.draggedElement, undefined, false, editTitle);
             isDraggedFromToolbox = false;
             _this.onDragEnd.fire(_this, options);
+            if (!options.fromElement) {
+                _this.setModified({ type: "ADDED_FROM_TOOLBOX", question: options.draggedElement });
+            }
         });
     };
     SurveyCreatorModel.prototype.initDragDropChoices = function () {
@@ -22275,12 +22470,31 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             return "";
         var json = this.survey.toJSON();
         json = this.singlePageJSON(json);
+        this.moveElementsToTheEnd(json);
         var indent = _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].jsonEditor.indentation;
         if (this.generateValidJSON) {
             return JSON.stringify(json, null, indent);
         }
         return new _json5__WEBPACK_IMPORTED_MODULE_4__["SurveyJSON5"]().stringify(json, null, indent);
     };
+    SurveyCreatorModel.prototype.moveElementsToTheEnd = function (json) {
+        var _this = this;
+        if (!json)
+            return;
+        if (Array.isArray(json)) {
+            json.forEach(function (el) { return _this.moveElementsToTheEnd(el); });
+        }
+        else {
+            if (typeof json === "object") {
+                if (!!json["elements"]) {
+                    var els = json["elements"];
+                    delete json["elements"];
+                    json["elements"] = els;
+                }
+                Object.keys(json).forEach(function (key) { return _this.moveElementsToTheEnd(json[key]); });
+            }
+        }
+    };
     SurveyCreatorModel.prototype.setTextValue = function (value) {
         if (!!this.setSurveyJSONTextCallback) {
             this.setSurveyJSONTextCallback(value);
@@ -22467,7 +22681,14 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
         }
     };
     SurveyCreatorModel.prototype.convertQuestion = function (obj, className) {
-        var newQuestion = _questionconverter__WEBPACK_IMPORTED_MODULE_5__["QuestionConverter"].convertObject(obj, className, this.getDefaultElementJSON(obj.getType()), this.getDefaultElementJSON(className));
+        var objJSON = _questionconverter__WEBPACK_IMPORTED_MODULE_5__["QuestionConverter"].getObjJSON(obj, this.getDefaultElementJSON(obj.getType()));
+        var options = {
+            sourceQuestion: obj,
+            targetType: className,
+            json: objJSON
+        };
+        this.onQuestionConverting.fire(this, options);
+        var newQuestion = _questionconverter__WEBPACK_IMPORTED_MODULE_5__["QuestionConverter"].convertObject(obj, className, options.json, this.getDefaultElementJSON(className));
         this.setModified({
             type: "QUESTION_CONVERTED",
             className: className,
@@ -22552,9 +22773,14 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             }
             parent = selectedElement.parent;
             if (index < 0) {
-                index = parent.elements.indexOf(selectedElement);
-                if (index > -1)
-                    index++;
+                if (this.addNewQuestionLast && modifiedType === "ADDED_FROM_PAGEBUTTON") {
+                    index = parent.elements.length;
+                }
+                else {
+                    index = parent.elements.indexOf(selectedElement);
+                    if (index > -1)
+                        index++;
+                }
             }
         }
         if (panel) {
@@ -22693,11 +22919,12 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
         return this.createNewElement(json);
     };
     /**
-     * Creates a copy of a specified question and inserts the copy next to this question.
+     * Creates a copy of a specified question, inserts the copy next to this question, and (optionally) selects it on the design surface.
      * @param question A question to copy.
+     * @param selectCopy *(Optional)* Pass `true` if you want to select the copy on the design surface. Default value: `false`.
      * @returns The instance of a new question.
      */
-    SurveyCreatorModel.prototype.fastCopyQuestion = function (question) {
+    SurveyCreatorModel.prototype.fastCopyQuestion = function (question, selectCopy) {
         var newElement = this.copyElement(question);
         var index = !!question["parent"]
             ? question["parent"].elements.indexOf(question) + 1
@@ -22709,6 +22936,9 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             }
         }
         this.doClickQuestionCore(newElement, "ELEMENT_COPIED", index, question["parent"]);
+        if (selectCopy) {
+            this.selectElement(newElement);
+        }
         return newElement;
     };
     Object.defineProperty(SurveyCreatorModel.prototype, "selectedElement", {
@@ -23178,6 +23408,7 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
     };
     SurveyCreatorModel.prototype.deletePanelOrQuestion = function (obj) {
         var _this = this;
+        var changeSelection = obj === this.selectedElement;
         var parent = obj["parent"];
         var elements = parent.elements;
         var objIndex = elements.indexOf(obj);
@@ -23191,7 +23422,9 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
         if (parent.isPage && (this.pageEditMode === "single" || elements.length === 0)) {
             parent = this.survey;
         }
-        this.selectElement(objIndex > -1 ? elements[objIndex] : parent);
+        if (changeSelection) {
+            this.selectElement(objIndex > -1 ? elements[objIndex] : parent);
+        }
     };
     SurveyCreatorModel.prototype.onCanShowObjectProperty = function (object, property, showMode, parentObj, parentProperty) {
         if (this.hiddenProperties[property.id])
@@ -23647,9 +23880,14 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
     SurveyCreatorModel.prototype.getQuestionTypeSelectorModel = function (beforeAdd, element) {
         var _this = this;
         var panel = !!element && element.isPanel ? element : null;
+        var onSelectQuestionType = function (questionType, subtype) {
+            _this.currentAddQuestionType = questionType;
+            _this.addNewQuestionInPage(beforeAdd, panel, questionType, subtype);
+            newAction.popupModel.hide();
+        };
         var getActions = function () {
             var availableTypes = _this.getAvailableToolboxItems(element).map(function (item) {
-                return _this.createIActionBarItemByClass(item.name, item.title, item.iconName, item.needSeparator);
+                return _this.createIActionBarItemByClass(item, item.needSeparator, onSelectQuestionType);
             });
             return availableTypes;
         };
@@ -23658,10 +23896,6 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             title: this.getLocString("ed.addNewQuestion"),
         }, {
             items: getActions(),
-            onSelectionChanged: function (item) {
-                _this.currentAddQuestionType = item.id;
-                _this.addNewQuestionInPage(beforeAdd, panel);
-            },
             onShow: function () {
                 var listModel = newAction.popupModel.contentComponentData.model;
                 listModel.setItems(getActions());
@@ -23682,9 +23916,10 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
         this.onGetPageActions.fire(this, options);
         return options.actions;
     };
-    SurveyCreatorModel.prototype.addNewQuestionInPage = function (beforeAdd, panel, type) {
+    SurveyCreatorModel.prototype.addNewQuestionInPage = function (beforeAdd, panel, type, subtype) {
         if (panel === void 0) { panel = null; }
         if (type === void 0) { type = null; }
+        if (subtype === void 0) { subtype = null; }
         if (!type)
             type = this.currentAddQuestionType;
         if (!type)
@@ -23696,15 +23931,34 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             json = toolboxItem.json;
         }
         var newElement = this.createNewElement(json);
+        var propertyName = _toolbox__WEBPACK_IMPORTED_MODULE_7__["QuestionToolbox"].getSubTypePropertyName(type);
+        if (!!propertyName && !!subtype)
+            newElement.setPropertyValue(propertyName, subtype);
         this.clickToolboxItem(newElement, panel, "ADDED_FROM_PAGEBUTTON");
     };
-    SurveyCreatorModel.prototype.createIActionBarItemByClass = function (className, title, iconName, needSeparator) {
+    SurveyCreatorModel.prototype.createIActionBarItemByClass = function (item, needSeparator, onSelectQuestionType) {
         var action = new survey_core__WEBPACK_IMPORTED_MODULE_1__["Action"]({
-            title: title,
-            id: className,
-            iconName: iconName,
+            title: item.title,
+            id: item.name,
+            iconName: item.iconName,
+            visible: item.visible,
+            enabled: item.enabled,
+            needSeparator: needSeparator
         });
-        action.needSeparator = needSeparator;
+        action.action = function () {
+            onSelectQuestionType(item.typeName);
+        };
+        if (!!item.items && item.items.length > 0) {
+            var innerItems = item.items.map(function (i) { return new survey_core__WEBPACK_IMPORTED_MODULE_1__["Action"]({
+                id: i.id,
+                title: i.title,
+                action: function () {
+                    action.hidePopup();
+                    onSelectQuestionType(item.typeName, i.id);
+                }
+            }); });
+            action.setSubItems({ items: innerItems });
+        }
         return action;
     };
     SurveyCreatorModel.prototype.onElementMenuItemsChanged = function (element, items) {
@@ -23947,6 +24201,9 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({ defaultValue: "right" })
     ], SurveyCreatorModel.prototype, "sidebarLocation", void 0);
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
+        Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({ defaultValue: "never" })
+    ], SurveyCreatorModel.prototype, "expandCollapseButtonVisibility", void 0);
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({
             defaultValue: false,
@@ -24489,7 +24746,7 @@ var settings = {
         allowCollapseSidebar: true
     },
     jsonEditor: {
-        indentation: 1,
+        indentation: 2,
         exportFileName: "survey.json"
     }
 };
@@ -25894,7 +26151,7 @@ var __spreadArray = function (to, from) {
 /*!******************************!*\
   !*** ./src/entries/index.ts ***!
   \******************************/
-/*! exports provided: Version, enStrings, editorLocalization, defaultStrings, localization, QuestionConvertMode, settings, EmptySurveyCreatorOptions, CreatorAction, TabbedMenuItem, TabbedMenuContainer, ToolbarActionContainer, CreatorEvent, SurveyCreatorModel, CreatorBase, StylesManager, initializeDesignTimeSurveyModel, editableStringRendererName, getElementWrapperComponentName, getQuestionContentWrapperComponentName, getElementWrapperComponentData, getItemValueWrapperComponentName, getItemValueWrapperComponentData, isStringEditable, isTextInput, registerAdorner, removeAdorners, CreatorResponsivityManager, AceJsonEditorModel, TabJsonEditorAcePlugin, JsonEditorBaseModel, TabJsonEditorBasePlugin, TextareaJsonEditorModel, TabJsonEditorTextareaPlugin, TestSurveyTabViewModel, TabTestPlugin, updatecoloralphaJSON, createColor, updateShadowEffectsJSON, createBoxShadow, createBoxShadowReset, parseBoxShadow, DefaultFonts, updateFontSettingsJSON, fontsettingsToCssVariable, fontsettingsFromCssVariable, updateBackgroundCornerRadiusJSON, backgroundCornerRadiusToCssVariable, backgroundCornerRadiusFromCssVariable, Themes, PredefinedThemes, PredefinedColors, ThemeTabViewModel, ThemeTabPlugin, themeModelPropertyGridDefinition, ThemeModelEditorDefinition, initLogicOperator, LogicEvent, SurveyLogic, TranslationItemBase, TranslationItemString, TranslationItem, TranslationGroup, Translation, TranslationForEditor, TranslationEditor, createImportCSVAction, createExportCSVAction, translationCss, TabTranslationPlugin, initialSettingsAllowShowEmptyTitleInDesignMode, TabDesignerViewModel, TabDesignerPlugin, SurveyLogicUI, TabLogicPlugin, logicCss, ToolboxToolViewModel, PageNavigatorViewModel, PageAdorner, RowViewModel, QuestionAdornerViewModel, QuestionDropdownAdornerViewModel, QuestionImageAdornerViewModel, QuestionRatingAdornerViewModel, ItemValueWrapperViewModel, ImageItemValueWrapperViewModel, MatrixCellWrapperEditSurvey, MatrixCellWrapperViewModel, SurveySimulatorModel, DEFAULT_MONITOR_DPI, simulatorDevices, SurveyResultsItemModel, SurveyResultsModel, LogoImageViewModel, StringItemsNavigatorBase, StringEditorConnector, StringEditorViewModelBase, QuestionEmbeddedSurveyModel, QuestionLinkValueModel, EditorLocalization, getLocString, SurveyJSON5, QuestionSpinEditorModel, QuestionColorModel, QuestionFileEditorModel, ResetValueAdorner, QuestionTextWithResetModel, QuestionCommentWithResetModel, setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridEditorDateTime, PropertyGridLinkEditor, PropertyGridEditorColor, PropertyGridEditorColorWithAlpha, PropertyGridEditorNumber, PropertyGridEditorSpinEdit, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionCarryForward, PropertyGridEditorQuestionValue, PropertyGridEditorExpression, PropertyGridEditorCondition, PropertyGridEditorMatrix, PropertyGridEditorMatrixItemValues, PropertyGridEditorMatrixRateValues, PropertyGridEditorMatrixColumns, PropertyGridEditorMatrixPages, PropertyGridEditorMatrixCalculatedValues, PropertyGridEditorMatrixHtmlConditions, PropertyGridEditorMatrixUrlConditions, PropertyGridEditorMatrixMutlipleTextItems, PropertyGridEditorMatrixMultipleTypes, PropertyGridEditorMatrixValidators, PropertyGridEditorMatrixTriggers, PropertyGridEditorBindings, PropertyGridViewModel, ObjectSelectorItem, ObjectSelector, ObjectSelectorModel, PropertyGridEditorQuestionRestfull, PropertyGridEditorFontSettings, PropertyGridEditorBackgroundCornerRadius, PropertyGridEditorShadowEffects, PropertyGridValueEditorBase, PropertyGridCellsEditor, PropertyGridValueEditor, PropertyGridRowValueEditor, PropertyGridPanelValueEditor, PropertyGridTriggerValueEditor, PropertyGridTriggerValueInLogicEditor, SearchManager, SearchManagerToolbox, SearchManagerPropertyGrid, PropertyGridEditorQuestionMaskSettings, PropertyGridEditorMaskType, PropertyGridEditorQuestionHeader, propertyGridCss, QuestionConverter, svgBundle, SurveyTextWorkerError, SurveyTextWorkerParserError, SurveyTextWorkerJsonError, SurveyTextWorker, JsonDuplicateNameError, QuestionToolboxCategory, QuestionToolboxItem, QuestionToolbox, SidebarModel, SidebarTabModel, Switcher, roundTo2Decimals, getNextItemValue, getNextItemText, getNextValue, findParentNode, focusFirstControl, getFirstNonTextElement, getNodesFromKoComponentInfo, propertyExists, isPropertyVisible, toggleHovered, clearNewLines, select, copyObject, copyCssClasses, assignDefaultV2Classes, wrapTextByCurlyBraces, capitalize, notShortCircuitAnd, imageMimeTypes, getAcceptedTypesByContentMode, getQuestionFromObj, scrollElementIntoView, ingectAlpha, convertRgbaToString, parseRgbaFromString, parseColor, HSBToRGB, RGBToHSB, trimEmptyFields, assign, ColorCalculator, saveToFileHandler, defaultPropertyGridDefinition, SurveyQuestionEditorDefinition, ObjType, SurveyHelper, ResizeManager, UndoRedoPlugin, undoRedoTransaction, ignoreUndoRedo, UndoRedoManager, Transaction, UndoRedoAction, UndoRedoArrayAction, PagesController */
+/*! exports provided: Version, enStrings, editorLocalization, defaultStrings, localization, QuestionConvertMode, settings, EmptySurveyCreatorOptions, CreatorAction, TabbedMenuItem, TabbedMenuContainer, ToolbarActionContainer, CreatorEvent, SurveyCreatorModel, CreatorBase, StylesManager, initializeDesignTimeSurveyModel, editableStringRendererName, getElementWrapperComponentName, getQuestionContentWrapperComponentName, getElementWrapperComponentData, getItemValueWrapperComponentName, getItemValueWrapperComponentData, isStringEditable, isTextInput, registerAdorner, removeAdorners, CreatorResponsivityManager, AceJsonEditorModel, TabJsonEditorAcePlugin, JsonEditorBaseModel, TabJsonEditorBasePlugin, TextareaJsonEditorModel, TabJsonEditorTextareaPlugin, TestSurveyTabViewModel, TabTestPlugin, updatecoloralphaJSON, createColor, updateShadowEffectsJSON, createBoxShadow, createBoxShadowReset, parseBoxShadow, DefaultFonts, updateFontSettingsJSON, fontsettingsToCssVariable, fontsettingsFromCssVariable, updateBackgroundCornerRadiusJSON, backgroundCornerRadiusToCssVariable, backgroundCornerRadiusFromCssVariable, Themes, PredefinedThemes, PredefinedColors, ThemeTabViewModel, ThemeTabPlugin, themeModelPropertyGridDefinition, ThemeModelEditorDefinition, initLogicOperator, LogicEvent, SurveyLogic, TranslationItemBase, TranslationItemString, TranslationItem, TranslationGroup, Translation, TranslationForEditor, TranslationEditor, createImportCSVAction, createExportCSVAction, translationCss, TabTranslationPlugin, initialSettingsAllowShowEmptyTitleInDesignMode, TabDesignerViewModel, TabDesignerPlugin, SurveyLogicUI, TabLogicPlugin, logicCss, ToolboxToolViewModel, PageNavigatorViewModel, PageAdorner, RowViewModel, QuestionAdornerViewModel, QuestionDropdownAdornerViewModel, QuestionImageAdornerViewModel, QuestionRatingAdornerViewModel, ItemValueWrapperViewModel, ImageItemValueWrapperViewModel, MatrixCellWrapperEditSurvey, MatrixCellWrapperViewModel, SurveySimulatorModel, DEFAULT_MONITOR_DPI, simulatorDevices, SurveyResultsItemModel, SurveyResultsModel, LogoImageViewModel, StringItemsNavigatorBase, StringEditorConnector, StringEditorViewModelBase, QuestionEmbeddedSurveyModel, QuestionLinkValueModel, EditorLocalization, getLocString, SurveyJSON5, QuestionSpinEditorModel, QuestionColorModel, QuestionFileEditorModel, ResetValueAdorner, QuestionTextWithResetModel, QuestionCommentWithResetModel, setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorUndefinedBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridEditorDateTime, PropertyGridLinkEditor, PropertyGridEditorColor, PropertyGridEditorColorWithAlpha, PropertyGridEditorNumber, PropertyGridEditorSpinEdit, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionCarryForward, PropertyGridEditorQuestionValue, PropertyGridEditorExpression, PropertyGridEditorCondition, PropertyGridEditorMatrix, PropertyGridEditorMatrixItemValues, PropertyGridEditorMatrixRateValues, PropertyGridEditorMatrixColumns, PropertyGridEditorMatrixPages, PropertyGridEditorMatrixCalculatedValues, PropertyGridEditorMatrixHtmlConditions, PropertyGridEditorMatrixUrlConditions, PropertyGridEditorMatrixMutlipleTextItems, PropertyGridEditorMatrixMultipleTypes, PropertyGridEditorMatrixValidators, PropertyGridEditorMatrixTriggers, PropertyGridEditorBindings, PropertyGridViewModel, ObjectSelectorItem, ObjectSelector, ObjectSelectorModel, PropertyGridEditorQuestionRestfull, PropertyGridEditorFontSettings, PropertyGridEditorBackgroundCornerRadius, PropertyGridEditorShadowEffects, PropertyGridValueEditorBase, PropertyGridCellsEditor, PropertyGridValueEditor, PropertyGridRowValueEditor, PropertyGridPanelValueEditor, PropertyGridTriggerValueEditor, PropertyGridTriggerValueInLogicEditor, SearchManager, SearchManagerToolbox, SearchManagerPropertyGrid, PropertyGridEditorQuestionMaskSettings, PropertyGridEditorMaskType, PropertyGridEditorQuestionHeader, propertyGridCss, QuestionConverter, svgBundle, SurveyTextWorkerError, SurveyTextWorkerParserError, SurveyTextWorkerJsonError, SurveyTextWorker, JsonDuplicateNameError, QuestionToolboxCategory, QuestionToolboxItem, QuestionToolbox, SidebarModel, SidebarTabModel, Switcher, roundTo2Decimals, getNextItemValue, getNextItemText, getNextValue, findParentNode, focusFirstControl, getFirstNonTextElement, getNodesFromKoComponentInfo, propertyExists, isPropertyVisible, toggleHovered, clearNewLines, select, copyObject, copyCssClasses, assignDefaultV2Classes, wrapTextByCurlyBraces, capitalize, notShortCircuitAnd, imageMimeTypes, getAcceptedTypesByContentMode, getQuestionFromObj, scrollElementIntoView, ingectAlpha, convertRgbaToString, parseRgbaFromString, parseColor, HSBToRGB, RGBToHSB, trimEmptyFields, assign, ColorCalculator, saveToFileHandler, defaultPropertyGridDefinition, SurveyQuestionEditorDefinition, ObjType, SurveyHelper, ResizeManager, UndoRedoPlugin, undoRedoTransaction, ignoreUndoRedo, UndoRedoManager, Transaction, UndoRedoAction, UndoRedoArrayAction, PagesController */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -26181,6 +26438,8 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorBoolean", function() { return _property_grid__WEBPACK_IMPORTED_MODULE_50__["PropertyGridEditorBoolean"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorUndefinedBoolean", function() { return _property_grid__WEBPACK_IMPORTED_MODULE_50__["PropertyGridEditorUndefinedBoolean"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorStringBase", function() { return _property_grid__WEBPACK_IMPORTED_MODULE_50__["PropertyGridEditorStringBase"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorString", function() { return _property_grid__WEBPACK_IMPORTED_MODULE_50__["PropertyGridEditorString"]; });
@@ -26441,7 +26700,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_78___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_78__);
 var Version;
-Version = "" + "1.11.5";
+Version = "" + "1.11.7";
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -26538,7 +26797,7 @@ __webpack_require__(/*! ../utils/design.scss */ "./src/utils/design.scss");
 __webpack_require__(/*! ../utils/layout.scss */ "./src/utils/layout.scss");
 
 survey_core__WEBPACK_IMPORTED_MODULE_78__["settings"].supportCreatorV2 = true;
-Object(survey_core__WEBPACK_IMPORTED_MODULE_78__["checkLibraryVersion"])("" + "1.11.5", "survey-creator-core");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_78__["checkLibraryVersion"])("" + "1.11.7", "survey-creator-core");
 
 
 /***/ }),
@@ -26796,6 +27055,7 @@ var map = {
 	"./collapse-detail-light_16x16.svg": "./src/images/collapse-detail-light_16x16.svg",
 	"./collapse-detail_16x16.svg": "./src/images/collapse-detail_16x16.svg",
 	"./collapse-panel.svg": "./src/images/collapse-panel.svg",
+	"./collapse-v_16x16.svg": "./src/images/collapse-v_16x16.svg",
 	"./collapse_16x16.svg": "./src/images/collapse_16x16.svg",
 	"./color-picker.svg": "./src/images/color-picker.svg",
 	"./comment.svg": "./src/images/comment.svg",
@@ -26823,6 +27083,7 @@ var map = {
 	"./expand-detail-light_16x16.svg": "./src/images/expand-detail-light_16x16.svg",
 	"./expand-detail_16x16.svg": "./src/images/expand-detail_16x16.svg",
 	"./expand-panel.svg": "./src/images/expand-panel.svg",
+	"./expand-v_16x16.svg": "./src/images/expand-v_16x16.svg",
 	"./expand_16x16.svg": "./src/images/expand_16x16.svg",
 	"./export.svg": "./src/images/export.svg",
 	"./expression.svg": "./src/images/expression.svg",
@@ -26856,6 +27117,7 @@ var map = {
 	"./remove_16x16.svg": "./src/images/remove_16x16.svg",
 	"./required.svg": "./src/images/required.svg",
 	"./reset.svg": "./src/images/reset.svg",
+	"./restore_16x16.svg": "./src/images/restore_16x16.svg",
 	"./save.svg": "./src/images/save.svg",
 	"./select-page.svg": "./src/images/select-page.svg",
 	"./settings.svg": "./src/images/settings.svg",
@@ -27125,6 +27387,17 @@ module.exports = "<svg viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\
 
 /***/ }),
 
+/***/ "./src/images/collapse-v_16x16.svg":
+/*!*****************************************!*\
+  !*** ./src/images/collapse-v_16x16.svg ***!
+  \*****************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = "<svg viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\"><g id=\"Collapse V 16x16\"><path id=\"Vector\" d=\"M11.71 12.29C12.1 12.68 12.1 13.31 11.71 13.7C11.51 13.9 11.26 13.99 11 13.99C10.74 13.99 10.49 13.89 10.29 13.7L9.00002 12.41V15C9.00002 15.55 8.55002 16 8.00002 16C7.45002 16 7.00002 15.55 7.00002 15V12.41L5.71002 13.7C5.32002 14.09 4.69002 14.09 4.30002 13.7C3.91002 13.31 3.91002 12.68 4.30002 12.29L7.30002 9.29C7.69002 8.9 8.32002 8.9 8.71002 9.29L11.71 12.29ZM7.29002 6.71C7.49002 6.91 7.74002 7 8.00002 7C8.26002 7 8.51002 6.9 8.71002 6.71L11.71 3.71C12.1 3.32 12.1 2.69 11.71 2.3C11.32 1.91 10.69 1.91 10.3 2.3L9.01002 3.59V1C9.01002 0.45 8.56002 0 8.01002 0C7.46002 0 7.01002 0.45 7.01002 1V3.59L5.72002 2.3C5.33002 1.91 4.70002 1.91 4.31002 2.3C3.92002 2.69 3.90002 3.32 4.29002 3.71L7.29002 6.71Z\"></path></g></svg>"
+
+/***/ }),
+
 /***/ "./src/images/collapse_16x16.svg":
 /*!***************************************!*\
   !*** ./src/images/collapse_16x16.svg ***!
@@ -27422,6 +27695,17 @@ module.exports = "<svg viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\
 
 /***/ }),
 
+/***/ "./src/images/expand-v_16x16.svg":
+/*!***************************************!*\
+  !*** ./src/images/expand-v_16x16.svg ***!
+  \***************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = "<svg viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\"><g id=\"Expand V 16x16\" clip-path=\"url(#clip0_2625_3196)\"><path id=\"Vector\" d=\"M4.29006 4.71006C3.90006 4.32006 3.90006 3.69006 4.29006 3.30006L7.29006 0.290059C7.68006 -0.0999414 8.31006 -0.0999414 8.70006 0.290059L11.7001 3.29006C12.0901 3.68006 12.0901 4.31006 11.7001 4.70006C11.5001 4.90006 11.2501 4.99006 10.9901 4.99006C10.7301 4.99006 10.4801 4.89006 10.2801 4.70006L8.99006 3.41006V6.00006C8.99006 6.55006 8.54006 7.00006 7.99006 7.00006C7.44006 7.00006 6.99006 6.55006 6.99006 6.00006V3.41006L5.70006 4.70006C5.31006 5.09006 4.68006 5.09006 4.29006 4.70006V4.71006ZM10.2901 11.2901L9.00006 12.5801V9.99006C9.00006 9.44006 8.55006 8.99006 8.00006 8.99006C7.45006 8.99006 7.00006 9.44006 7.00006 9.99006V12.5801L5.71006 11.2901C5.32006 10.9001 4.69006 10.9001 4.30006 11.2901C3.91006 11.6801 3.91006 12.3101 4.30006 12.7001L7.30006 15.7001C7.50006 15.9001 7.75006 15.9901 8.01006 15.9901C8.27006 15.9901 8.52006 15.8901 8.72006 15.7001L11.7201 12.7001C12.1101 12.3101 12.1101 11.6801 11.7201 11.2901C11.3301 10.9001 10.7001 10.9001 10.3101 11.2901H10.2901Z\"></path></g><defs><clipPath id=\"clip0_2625_3196\"><rect width=\"16\" height=\"16\" fill=\"white\"></rect></clipPath></defs></svg>"
+
+/***/ }),
+
 /***/ "./src/images/expand_16x16.svg":
 /*!*************************************!*\
   !*** ./src/images/expand_16x16.svg ***!
@@ -27785,6 +28069,17 @@ module.exports = "<svg viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\
 
 /***/ }),
 
+/***/ "./src/images/restore_16x16.svg":
+/*!**************************************!*\
+  !*** ./src/images/restore_16x16.svg ***!
+  \**************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><path d=\"M12 13H4C2.9 13 2 12.1 2 11V5C2 3.9 2.9 3 4 3H12C13.1 3 14 3.9 14 5V11C14 12.1 13.1 13 12 13ZM4 5V11H12V5H4Z\"></path></svg>"
+
+/***/ }),
+
 /***/ "./src/images/save.svg":
 /*!*****************************!*\
   !*** ./src/images/save.svg ***!
@@ -29100,6 +29395,9 @@ var enStrings = {
         rateDescriptionLocation: "Label alignment",
         size: "Input field width (in characters)",
         cellErrorLocation: "Cell error message alignment",
+        enabled: "Enabled",
+        disabled: "Disabled",
+        inherit: "Inherit",
         apply: "Apply",
         ok: "OK",
         save: "Save",
@@ -30064,8 +30362,8 @@ var enStrings = {
         locale: "Choose a language to begin creating your survey. To add a translation, switch to a new language and translate the original text here or in the Translations tab.",
         detailPanelMode: "Sets the location of a details section in relation to a row. Choose from: \"None\" - no expansion is added; \"Under the row\" - a row expansion is placed under each row of the matrix; \"Under the row, display one row expansion only\" - an expansion is displayed under a single row only, the remaining row expansions are collapsed.",
         imageFit: "Choose from: \"None\" - image maintains its original size; \"Contain\" - image is resized to fit while maintaining its aspect ratio; \"Cover\" - image fills the entire box while maintaining its aspect ratio; \"Fill\" - image is stretched to fill the box without maintaining its aspect ratio.",
-        autoGrow: "Gradually increases the height of the input field as data is being entered. Overrides the \"Input field height (in lines)\" setting.",
-        allowResize: "The resize handle (or grip) appears in the corner and can be dragged to alter the size of the input field.",
+        autoGrow: "The \"Inherit\" option applies a survey-level setting (\"Disabled\" by default).",
+        allowResize: "The \"Inherit\" option applies a survey-level setting (\"Enabled\" by default).",
         maxTimeToFinish: "A time interval in seconds after which the survey auto-advances to the \"Thank You\" page.",
         maxTimeToFinishPage: "A time interval in seconds after which the survey auto-advances to the next page. Hides the \"Previous\" navigation button.",
         page: {
@@ -30131,6 +30429,7 @@ var enStrings = {
         filePlaceholder: "Applies when \"File source type\" is \"Local file\" or when camera is unavailable",
         photoPlaceholder: "Applies when \"File source type\" is \"Camera\".",
         fileOrPhotoPlaceholder: "Applies when \"File source type\" is \"Local file or camera\".",
+        colCount: "Arranges choice options in a multi-column layout. When set to 0, the options are displayed in a single line.",
         masksettings: {
             saveMaskedValue: "Select if you want to store the question value with an applied mask in survey results."
         },
@@ -32795,7 +33094,11 @@ var PropertyGridEditorExpression = /** @class */ (function (_super) {
         return prop.type == "expression";
     };
     PropertyGridEditorExpression.prototype.getJSON = function (obj, prop, options) {
-        return { type: "comment", showOptionsCaption: false };
+        return {
+            type: "comment",
+            showOptionsCaption: false,
+            rows: 2
+        };
     };
     PropertyGridEditorExpression.prototype.clearPropertyValue = function (obj, prop, question, options) {
         question.clearValue();
@@ -32814,7 +33117,8 @@ var PropertyGridEditorCondition = /** @class */ (function (_super) {
     PropertyGridEditorCondition.prototype.getJSON = function (obj, prop, options) {
         return {
             type: "comment",
-            showOptionsCaption: false
+            showOptionsCaption: false,
+            rows: 2,
         };
     };
     PropertyGridEditorCondition.prototype.canClearPropertyValue = function (obj, prop, question, options) {
@@ -33263,7 +33567,7 @@ _index__WEBPACK_IMPORTED_MODULE_2__["PropertyGridEditorCollection"].register(new
 /*!************************************!*\
   !*** ./src/property-grid/index.ts ***!
   \************************************/
-/*! exports provided: setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridEditorDateTime, PropertyGridLinkEditor, PropertyGridEditorColor, PropertyGridEditorColorWithAlpha, PropertyGridEditorNumber, PropertyGridEditorSpinEdit, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionCarryForward, PropertyGridEditorQuestionValue */
+/*! exports provided: setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorUndefinedBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridEditorDateTime, PropertyGridLinkEditor, PropertyGridEditorColor, PropertyGridEditorColorWithAlpha, PropertyGridEditorNumber, PropertyGridEditorSpinEdit, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionCarryForward, PropertyGridEditorQuestionValue */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -33276,6 +33580,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PropertyGridModel", function() { return PropertyGridModel; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditor", function() { return PropertyGridEditor; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorBoolean", function() { return PropertyGridEditorBoolean; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorUndefinedBoolean", function() { return PropertyGridEditorUndefinedBoolean; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorStringBase", function() { return PropertyGridEditorStringBase; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorString", function() { return PropertyGridEditorString; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PropertyGridEditorDateTime", function() { return PropertyGridEditorDateTime; });
@@ -34166,7 +34471,7 @@ var PropertyGridModel = /** @class */ (function () {
         return this.options.createSurvey(json, this.surveyInstanceCreatedArea, this, callback);
     };
     PropertyGridModel.prototype.getSurveyJSON = function () {
-        var res = {};
+        var res = { autoGrowComment: true, allowResizeComment: false };
         setSurveyJSONForPropertyGrid(res, true, false);
         return res;
     };
@@ -34490,6 +34795,43 @@ var PropertyGridEditorBoolean = /** @class */ (function (_super) {
     return PropertyGridEditorBoolean;
 }(PropertyGridEditor));
 
+var PropertyGridEditorUndefinedBoolean = /** @class */ (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(PropertyGridEditorUndefinedBoolean, _super);
+    function PropertyGridEditorUndefinedBoolean() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    PropertyGridEditorUndefinedBoolean.prototype.fit = function (prop, context) {
+        return prop.type == "boolean" && !!prop.defaultValueFunc && prop.defaultValueFunc(null) === undefined;
+    };
+    PropertyGridEditorUndefinedBoolean.prototype.getJSON = function (obj, prop, options) {
+        var choices = [
+            { value: "auto", text: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.inherit") },
+            { value: "false", text: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.disabled") },
+            { value: "true", text: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.enabled") },
+        ];
+        var res = {
+            type: "buttongroup",
+            choices: choices,
+            showOptionsCaption: false
+        };
+        return res;
+    };
+    PropertyGridEditorUndefinedBoolean.prototype.onCreated = function (obj, question, prop, options, propGridDefinition) {
+        question.valueFromDataCallback = function (val) { return val === undefined ? "auto" : val.toString(); };
+        question.valueToDataCallback = function (val) { return val === "auto" ? undefined : val === "true"; };
+    };
+    PropertyGridEditorUndefinedBoolean.prototype.onSetup = function (obj, question, prop, options) {
+        var objValue = obj.getPropertyValue(prop.name);
+        if (objValue === undefined) {
+            question.value = "auto";
+        }
+        else {
+            question.value = objValue === "true";
+        }
+    };
+    return PropertyGridEditorUndefinedBoolean;
+}(PropertyGridEditor));
+
 var PropertyGridEditorStringBase = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(PropertyGridEditorStringBase, _super);
     function PropertyGridEditorStringBase() {
@@ -34744,7 +35086,8 @@ var PropertyGridEditorText = /** @class */ (function (_super) {
     };
     PropertyGridEditorText.prototype.getJSON = function (obj, prop, options) {
         return this.updateType(prop, obj, this.updateMaxLength(prop, {
-            type: "comment"
+            type: "comment",
+            rows: 2
         }));
     };
     return PropertyGridEditorText;
@@ -34760,7 +35103,9 @@ var PropertyGridEditorHtml = /** @class */ (function (_super) {
     };
     PropertyGridEditorHtml.prototype.getJSON = function (obj, prop, options) {
         return this.updateMaxLength(prop, {
-            type: "comment"
+            type: "comment",
+            "allowResize": true,
+            "autoGrow": false,
         });
     };
     return PropertyGridEditorHtml;
@@ -34775,7 +35120,10 @@ var PropertyGridEditorStringArray = /** @class */ (function (_super) {
         return prop.type == "string[]";
     };
     PropertyGridEditorStringArray.prototype.getJSON = function (obj, prop, options) {
-        return { type: "comment" };
+        return {
+            type: "comment",
+            rows: 2
+        };
     };
     PropertyGridEditorStringArray.prototype.onCreated = function (obj, question, prop) {
         question.valueFromDataCallback = function (val) {
@@ -35104,6 +35452,7 @@ PropertyGridEditorCollection.register(new PropertyGridEditorImageSize());
 PropertyGridEditorCollection.register(new PropertyGridEditorColor());
 PropertyGridEditorCollection.register(new PropertyGridEditorColorWithAlpha());
 PropertyGridEditorCollection.register(new PropertyGridEditorDateTime());
+PropertyGridEditorCollection.register(new PropertyGridEditorUndefinedBoolean());
 survey_core__WEBPACK_IMPORTED_MODULE_1__["QuestionFactory"].Instance.registerQuestion("buttongroup", function (name) {
     return new survey_core__WEBPACK_IMPORTED_MODULE_1__["QuestionButtonGroupModel"](name);
 }, false);
@@ -37027,6 +37376,7 @@ var DefaultMatrixRowValueEditor = /** @class */ (function (_super) {
         json.minRowCount = 1;
         json.maxRowCount = 1;
         json.columnsLocation = "vertical";
+        delete json.defaultValue;
         return json;
     };
     return DefaultMatrixRowValueEditor;
@@ -37666,12 +38016,15 @@ var defaultProperties = {
             { name: "totalDisplayStyle", tab: "totals" },
             { name: "totalCurrency", tab: "totals" },
             { name: "totalFormat", tab: "totals" },
-            { name: "totalExpression", tab: "totals" }
+            { name: "totalExpression", tab: "totals" },
+            { name: "validators", tab: "validation" },
+            { name: "requiredErrorText", tab: "validation" }
         ],
         tabs: [
             { name: "general", index: 5 },
             { name: "logic", index: 20 },
-            { name: "totals", index: 40 }
+            { name: "totals", index: 40 },
+            { name: "validation", index: 60 }
         ]
     },
     "matrixdropdowncolumn@checkbox": {
@@ -37682,6 +38035,7 @@ var defaultProperties = {
             { name: "choiceTextsFromQuestion", tab: "choices" },
             { name: "showOtherItem", tab: "choices" },
             { name: "otherText", tab: "choices" },
+            { name: "otherPlaceholder", tab: "choices" },
             { name: "choicesOrder", tab: "choices" },
             { name: "colCount", tab: "choices" },
             { name: "showSelectAllItem", tab: "choices" },
@@ -37710,6 +38064,7 @@ var defaultProperties = {
             { name: "choiceTextsFromQuestion", tab: "choices" },
             { name: "showOtherItem", tab: "choices" },
             { name: "otherText", tab: "choices" },
+            { name: "otherPlaceholder", tab: "choices" },
             { name: "choicesOrder", tab: "choices" },
             { name: "colCount", tab: "choices" },
             { name: "showNoneItem", tab: "choices" },
@@ -37728,12 +38083,14 @@ var defaultProperties = {
     },
     "matrixdropdowncolumn@dropdown": {
         properties: [
+            "placeholder",
             { name: "choicesFromQuestion", tab: "choices" },
             { name: "choicesFromQuestionMode", tab: "choices" },
             { name: "choiceValuesFromQuestion", tab: "choices" },
             { name: "choiceTextsFromQuestion", tab: "choices" },
             { name: "showOtherItem", tab: "choices" },
             { name: "otherText", tab: "choices" },
+            { name: "otherPlaceholder", tab: "choices" },
             { name: "choicesOrder", tab: "choices" },
             { name: "optionsCaption", tab: "choices" },
             { name: "showNoneItem", tab: "choices" },
@@ -37755,12 +38112,14 @@ var defaultProperties = {
     },
     "matrixdropdowncolumn@tagbox": {
         properties: [
+            "placeholder",
             { name: "choicesFromQuestion", tab: "choices" },
             { name: "choicesFromQuestionMode", tab: "choices" },
             { name: "choiceValuesFromQuestion", tab: "choices" },
             { name: "choiceTextsFromQuestion", tab: "choices" },
             { name: "showOtherItem", tab: "choices" },
             { name: "otherText", tab: "choices" },
+            { name: "otherPlaceholder", tab: "choices" },
             { name: "choicesOrder", tab: "choices" },
             { name: "optionsCaption", tab: "choices" },
             { name: "showNoneItem", tab: "choices" },
@@ -38633,8 +38992,18 @@ var QuestionConverter = /** @class */ (function () {
         }
         return !!res ? res : [];
     };
-    QuestionConverter.convertObject = function (obj, convertToClass, defaultObjJSON, defaultJSON) {
-        if (defaultObjJSON === void 0) { defaultObjJSON = null; }
+    QuestionConverter.getObjJSON = function (obj, defaultObjJSON) {
+        var res = obj.toJSON();
+        if (defaultObjJSON) {
+            for (var key in defaultObjJSON) {
+                if (res[key] && survey_core__WEBPACK_IMPORTED_MODULE_0__["Helpers"].isTwoValueEquals(res[key], defaultObjJSON[key])) {
+                    delete res[key];
+                }
+            }
+        }
+        return res;
+    };
+    QuestionConverter.convertObject = function (obj, convertToClass, objJSON, defaultJSON) {
         if (defaultJSON === void 0) { defaultJSON = null; }
         if (!obj || !obj.parent || convertToClass == obj.getType())
             return null;
@@ -38644,14 +39013,8 @@ var QuestionConverter = /** @class */ (function () {
         }
         newQuestion.name = obj.name;
         var json = defaultJSON ? survey_core__WEBPACK_IMPORTED_MODULE_0__["Helpers"].createCopy(defaultJSON) : newQuestion.toJSON();
-        var qJson = obj.toJSON();
-        if (defaultObjJSON) {
-            for (var key in defaultObjJSON) {
-                if (qJson[key] && survey_core__WEBPACK_IMPORTED_MODULE_0__["Helpers"].isTwoValueEquals(qJson[key], defaultObjJSON[key])) {
-                    delete qJson[key];
-                }
-            }
-        }
+        //const qJson = QuestionConverter.getObjJSON(obj, objJSON);
+        var qJson = objJSON || {};
         for (var key in qJson) {
             json[key] = qJson[key];
         }
@@ -39027,21 +39390,25 @@ var DragDropSurveyElements = /** @class */ (function (_super) {
         var textSpan = document.createElement("span");
         textSpan.className = "svc-dragged-element-shortcut__text";
         textSpan.innerText = text;
-        draggedElementShortcut.appendChild(this.createDraggedElementIcon());
+        if (this.draggedElement.toolboxItemIconName) {
+            draggedElementShortcut.appendChild(this.createDraggedElementIcon());
+        }
         draggedElementShortcut.appendChild(textSpan);
         draggedElementShortcut.className = this.getDraggedElementClass();
         return draggedElementShortcut;
     };
     DragDropSurveyElements.prototype.createDraggedElementIcon = function () {
         var span = document.createElement("span");
+        span.className = "svc-dragged-element-shortcut__icon";
         var iconName = this.draggedElement.toolboxItemIconName;
         var svgString = "<svg class=\"sv-svg-icon\" role=\"img\" style=\"width: 24px; height: 24px;\"><use xlink:href=\"#" + iconName + "\"></use></svg>";
-        span.className = "svc-dragged-element-shortcut__icon";
         span.innerHTML = svgString;
         return span;
     };
     DragDropSurveyElements.prototype.getDraggedElementClass = function () {
         var result = "svc-dragged-element-shortcut";
+        if (!!this.draggedElement.toolboxItemIconName)
+            result += " svc-dragged-element-shortcut--has-icon";
         if (this.isDraggedElementSelected)
             result += " svc-dragged-element-shortcut--selected";
         return result;
@@ -39195,7 +39562,7 @@ var DragDropSurveyElements = /** @class */ (function (_super) {
             target: dropTarget,
             insertAfter: undefined,
             insertBefore: undefined,
-            allowMultipleElementsInRow: true
+            allowDropNextToAnother: true
         };
         if (dragOverLocation === survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Bottom || dragOverLocation === survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Right) {
             allowOptions.insertAfter = dropTarget;
@@ -39204,7 +39571,7 @@ var DragDropSurveyElements = /** @class */ (function (_super) {
             allowOptions.insertBefore = dropTarget;
         }
         this.survey.onDragDropAllow.fire(this.survey, allowOptions);
-        if (!allowOptions.allowMultipleElementsInRow) {
+        if (!allowOptions.allowDropNextToAnother) {
             if (dragOverLocation === survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Left) {
                 this.dragOverLocation = survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Top;
             }
@@ -39623,10 +39990,18 @@ var SurveyHelper = /** @class */ (function () {
         delete json["minWidth"];
         delete json["maxWidth"];
     };
+    SurveyHelper.deleteRandomProperties = function (json) {
+        ["choicesOrder", "rowsOrder"].forEach(function (prop) {
+            if (json[prop] === "random") {
+                delete json[prop];
+            }
+        });
+    };
     SurveyHelper.updateQuestionJson = function (questionJson) {
         questionJson.storeOthersAsComment = false;
         delete questionJson.valuePropertyName;
         SurveyHelper.deleteConditionProperties(questionJson);
+        SurveyHelper.deleteRandomProperties(questionJson);
         SurveyHelper.deleteConditionPropertiesFromArray(questionJson.choices);
         SurveyHelper.deleteConditionPropertiesFromArray(questionJson.rows);
         SurveyHelper.deleteConditionPropertiesFromArray(questionJson.columns);
@@ -40251,6 +40626,19 @@ var QuestionToolboxItem = /** @class */ (function (_super) {
         if (!_this.id) {
             _this.id = _this.name;
         }
+        var originalCss = _this.css;
+        _this.css = new survey_core__WEBPACK_IMPORTED_MODULE_1__["ComputedUpdater"](function () {
+            return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]()
+                .append("svc-toolbox__tool")
+                .append("svc-toolbox__tool--action")
+                .append(originalCss)
+                .append("svc-toolbox__tool--hovered", _this.isHovered)
+                .append("svc-toolbox__tool--pressed", _this.isPressed)
+                .append("svc-toolbox__tool--has-icon", !!_this.iconName)
+                .append("svc-toolbox__tool--disabled", _this.enabled === false)
+                .append("sv-action--hidden", !_this.isVisible)
+                .toString();
+        });
         return _this;
     }
     QuestionToolboxItem.prototype.toJSON = function () {
@@ -40273,6 +40661,9 @@ var QuestionToolboxItem = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    QuestionToolboxItem.prototype.getArea = function (target) {
+        return target.closest("#scrollableDiv-designer");
+    };
     QuestionToolboxItem.prototype.hasText = function (text) {
         if (!text)
             return;
@@ -40283,7 +40674,22 @@ var QuestionToolboxItem = /** @class */ (function (_super) {
 }(survey_core__WEBPACK_IMPORTED_MODULE_1__["Action"]));
 
 /**
- * The list of Toolbox items.
+ * An object that enables you to modify Survey Creator's Toolbox. To access this object, use the [`toolbox`](https://surveyjs.io/survey-creator/documentation/api-reference/survey-creator#toolbox) property on a Survey Creator instance:
+ *
+ * ```js
+ * const creatorOptions = { ... };
+ * const creator = new SurveyCreator.SurveyCreator(creatorOptions);
+ * creator.toolbox.settingName = "value";
+ *
+ * // In modular applications:
+ * import { SurveyCreatorModel } from "survey-creator-core";
+ *
+ * const creatorOptions = { ... };
+ * const creator = new SurveyCreatorModel(creatorOptions);
+ * creator.toolbox.settingName = "value";
+ * ```
+ *
+ * [Toolbox Customization](https://surveyjs.io/survey-creator/documentation/toolbox-customization (linkStyle))
  */
 var QuestionToolbox = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(QuestionToolbox, _super);
@@ -40301,9 +40707,6 @@ var QuestionToolbox = /** @class */ (function (_super) {
             "matrix", "matrixdropdown", "matrixdynamic",
             "html", "expression", "image", "signaturepad"
         ];
-        /**
-         * The maximum number of copied toolbox items. If an user adding copiedItemMaxCount + 1 item, the first added item will be removed.
-         */
         _this.copiedItemMaxCount = 3;
         _this.allowExpandMultipleCategoriesValue = false;
         _this.keepAllCategoriesExpandedValue = false;
@@ -40314,7 +40717,7 @@ var QuestionToolbox = /** @class */ (function (_super) {
         _this.searchManager.toolbox = _this;
         _this.searchItem = new survey_core__WEBPACK_IMPORTED_MODULE_1__["Action"]({
             id: "searchItem-id",
-            css: "svc-toolbox__search-button",
+            css: "svc-toolbox__tool svc-toolbox__search-button",
             innerCss: "sv-dots__item",
             iconName: "icon-search",
             component: "sv-action-bar-item",
@@ -40331,7 +40734,7 @@ var QuestionToolbox = /** @class */ (function (_super) {
     }
     Object.defineProperty(QuestionToolbox.prototype, "itemSelector", {
         get: function () {
-            return ".svc-toolbox__tool:not(.svc-toolbox__search-button):not(.sv-dots)";
+            return ".svc-toolbox__category>.svc-toolbox__tool--action";
         },
         enumerable: false,
         configurable: true
@@ -40348,10 +40751,15 @@ var QuestionToolbox = /** @class */ (function (_super) {
             return undefined;
         return _creator_settings__WEBPACK_IMPORTED_MODULE_3__["settings"].toolbox.defaultJSON[questionType];
     };
+    QuestionToolbox.getSubTypePropertyName = function (questionType) {
+        var propertyName = "";
+        if (questionType === "text")
+            propertyName = "inputType";
+        if (questionType === "rating")
+            propertyName = "rateType";
+        return propertyName;
+    };
     Object.defineProperty(QuestionToolbox.prototype, "orderedQuestions", {
-        /**
-         * Modify this array to change the toolbox items order.
-         */
         get: function () {
             return this._orderedQuestions;
         },
@@ -40388,6 +40796,14 @@ var QuestionToolbox = /** @class */ (function (_super) {
     };
     QuestionToolbox.prototype.initDotsItem = function () {
         var _this = this;
+        var originalCss = this.dotsItem.css;
+        this.dotsItem.css = new survey_core__WEBPACK_IMPORTED_MODULE_1__["ComputedUpdater"](function () {
+            return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]()
+                .append("svc-toolbox__tool")
+                .append(originalCss)
+                .append("sv-action--hidden", !_this.dotsItem.isVisible)
+                .toString();
+        });
         this.dotsItem.popupModel.horizontalPosition = "right";
         this.dotsItem.popupModel.verticalPosition = "top";
         this.dragOrClickHelper = new survey_core__WEBPACK_IMPORTED_MODULE_1__["DragOrClickHelper"](function (pointerDownEvent, currentTarget, itemModel) {
@@ -40492,9 +40908,6 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
     };
     Object.defineProperty(QuestionToolbox.prototype, "jsonText", {
-        /**
-         * The Array of Toolbox items as Text JSON.
-         */
         get: function () {
             return JSON.stringify(this.actions);
         },
@@ -40506,9 +40919,6 @@ var QuestionToolbox = /** @class */ (function (_super) {
         configurable: true
     });
     Object.defineProperty(QuestionToolbox.prototype, "copiedJsonText", {
-        /**
-         * The Array of copied Toolbox items as Text JSON.
-         */
         get: function () {
             return JSON.stringify(this.copiedItems);
         },
@@ -40525,7 +40935,10 @@ var QuestionToolbox = /** @class */ (function (_super) {
     });
     Object.defineProperty(QuestionToolbox.prototype, "items", {
         /**
-         * The Array of Toolbox items.
+         * An array of toolbox items.
+         * @see getItemByName
+         * @see addItem
+         * @see removeItem
          */
         get: function () {
             return this.actions;
@@ -40545,9 +40958,6 @@ var QuestionToolbox = /** @class */ (function (_super) {
         configurable: true
     });
     Object.defineProperty(QuestionToolbox.prototype, "copiedItems", {
-        /**
-         * The Array of copied Toolbox items
-         */
         get: function () {
             var result = [];
             for (var i = 0; i < this.actions.length; i++) {
@@ -40559,11 +40969,6 @@ var QuestionToolbox = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    /**
-     * Add toolbox items into the Toolbox
-     * @param items the list of new items
-     * @param clearAll set it to true to clear all previous items.
-     */
     QuestionToolbox.prototype.addItems = function (items, clearAll) {
         if (clearAll === void 0) { clearAll = false; }
         if (clearAll) {
@@ -40574,11 +40979,6 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
         this.onItemsChanged();
     };
-    /**
-     * Add a copied Question into Toolbox
-     * @param question a copied Survey.Question
-     * @param options a json object that allows you to override question properties. Attributes are: name, title, tooltip, isCopied, iconName, json and category.
-     */
     QuestionToolbox.prototype.addCopiedItem = function (question, options) {
         if (options === void 0) { options = null; }
         if (!options)
@@ -40592,7 +40992,7 @@ var QuestionToolbox = /** @class */ (function (_super) {
             name: name,
             title: title,
             tooltip: tooltip,
-            className: "svc-toolbox__item svc-toolbox__item--" + iconName,
+            className: this.getItemClassNames(iconName),
             isCopied: options.isCopied !== false,
             iconName: iconName,
             json: !!options.json ? options.json : this.getQuestionJSON(question),
@@ -40605,21 +41005,58 @@ var QuestionToolbox = /** @class */ (function (_super) {
             this.removeItem(copied[this.copiedItemMaxCount - 1].name);
         this.addItem(item);
     };
-    /**
-     * Add a toolbox item
-     * @param item the toolbox item description
-     * @param index the toolbox index to place the item, the item is added to the end if index not passed
-     * @see IQuestionToolboxItem
-     */
     QuestionToolbox.prototype.getActionByItem = function (item) {
         if (item instanceof QuestionToolboxItem) {
             return item;
         }
         else {
             item.iconName = item.iconName ? item.iconName : QuestionToolbox.defaultIconName;
-            return new QuestionToolboxItem(item);
+            var newItem = new QuestionToolboxItem(item);
+            this.addSubTypes(newItem);
+            return newItem;
         }
     };
+    QuestionToolbox.prototype.addSubTypes = function (parentItem) {
+        var _this = this;
+        var property = null;
+        var propName = QuestionToolbox.getSubTypePropertyName(parentItem.id);
+        if (propName)
+            property = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].findProperty(parentItem.id, propName);
+        if (!property || !property.visible)
+            return;
+        var newItems = property.choices.map(function (ch) {
+            var newJson = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__assign"])({}, parentItem.json);
+            newJson[propName] = ch;
+            var innerItem = new QuestionToolboxItem({
+                id: ch,
+                name: ch,
+                title: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getPropertyValueInEditor(propName, ch),
+                className: _this.getItemClassNames() + " svc-toolbox__item-subtype",
+                json: newJson,
+                iconName: null,
+                category: null,
+                isCopied: false,
+                component: "svc-toolbox-item"
+            });
+            return innerItem;
+        });
+        parentItem.setSubItems({ items: newItems });
+        parentItem.component = "svc-toolbox-item-group";
+        parentItem.popupModel.cssClass += " toolbox-subtypes";
+        parentItem.popupModel.isFocusedContainer = false;
+        var popup = parentItem.popupModel;
+        popup.contentComponentName = "svc-toolbox-list";
+        popup.contentComponentData["toolbox"] = this;
+        popup.isFocusedContent = false;
+    };
+    /**
+     * Adds a new item to the Toolbox.
+     * @param item A [toolbox item configuration](https://surveyjs.io/survey-creator/documentation/api-reference/iquestiontoolboxitem).
+     * @param index *(Optional)* A zero-based index at which to insert the item. If you do not specify this parameter, the item is added to the end.
+     * @see removeItem
+     * @see replaceItem
+     * @see items
+     */
     QuestionToolbox.prototype.addItem = function (item, index) {
         this.correctItem(item);
         var action = this.getActionByItem(item);
@@ -40645,9 +41082,9 @@ var QuestionToolbox = /** @class */ (function (_super) {
         configurable: true
     });
     /**
-     * Add a new toolbox item, add delete the old item with the same name
-     * @param item the toolbox item description
-     * @see IQuestionToolboxItem
+     * Adds a new toolbox item and deletes an existing item with the same name (if there is any).
+     * @param item A [toolbox item configuration](https://surveyjs.io/survey-creator/documentation/api-reference/iquestiontoolboxitem).
+     * @see addItem
      */
     QuestionToolbox.prototype.replaceItem = function (item) {
         this.correctItem(item);
@@ -40659,9 +41096,12 @@ var QuestionToolbox = /** @class */ (function (_super) {
         return true;
     };
     /**
-     * Remove a toolbox item by its name
-     * @param name toolbox item name
-     * @see IQuestionToolboxItem
+     * Removes a [toolbox item](https://surveyjs.io/survey-creator/documentation/api-reference/iquestiontoolboxitem) with a specified name.
+     * @param name A toolbox item's [`name`](https://surveyjs.io/survey-creator/documentation/api-reference/iquestiontoolboxitem#name).
+     * @returns `true` if the item is successfully deleted or `false` otherwise.
+     * @see clearItems
+     * @see addItem
+     * @see items
      */
     QuestionToolbox.prototype.removeItem = function (name) {
         var index = this.indexOf(name);
@@ -40672,15 +41112,15 @@ var QuestionToolbox = /** @class */ (function (_super) {
         return true;
     };
     /**
-     * Remove all toolbox items.
+     * Removes all items from the Toolbox.
+     * @see removeItem
+     * @see addItem
+     * @see items
      */
     QuestionToolbox.prototype.clearItems = function () {
         this.actions = [];
         this.onItemsChanged();
     };
-    /**
-     * Remove all copied toolbox items.
-     */
     QuestionToolbox.prototype.clearCopiedItems = function () {
         var removedItems = this.copiedItems;
         for (var i = 0; i < removedItems.length; i++) {
@@ -40688,8 +41128,9 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
     };
     /**
-     * Returns toolbox item by its name. Returns null if there is no toolbox item with this name
-     * @param name
+     * Returns a [toolbox item](https://surveyjs.io/survey-creator/documentation/api-reference/iquestiontoolboxitem) with a specified name.
+     * @param name A toolbox item's [`name`](https://surveyjs.io/survey-creator/documentation/api-reference/iquestiontoolboxitem#name).
+     * @returns A toolbox item or `null` if a toolbox item with the specified name isn't found.
      */
     QuestionToolbox.prototype.getItemByName = function (name) {
         if (!name)
@@ -40699,8 +41140,12 @@ var QuestionToolbox = /** @class */ (function (_super) {
     };
     Object.defineProperty(QuestionToolbox.prototype, "allowExpandMultipleCategories", {
         /**
-         * Set it to true, to allow end-user to expand more than one category. There will no active category in this case
-         * @see activeCategory
+         * Specifies whether more than one category can be in the expanded state at a time. Applies only if [`showCategoryTitles`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#showCategoryTitles) is `true`.
+         *
+         * If this property is `false`, the currently expanded category collapses when a user expands another category.
+         *
+         * Default value: `false`
+         * @see keepAllCategoriesExpanded
          */
         get: function () {
             return this.allowExpandMultipleCategoriesValue;
@@ -40714,7 +41159,8 @@ var QuestionToolbox = /** @class */ (function (_super) {
     });
     Object.defineProperty(QuestionToolbox.prototype, "keepAllCategoriesExpanded", {
         /**
-         * Set it to true to expand all categories and hide expand/collapse category buttons
+         * Specifies whether to expand all categories without the capability to collapse any of them. Applies only if [`showCategoryTitles`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#showCategoryTitles) is `true`.
+         * @see allowExpandMultipleCategories
          */
         get: function () {
             return this.keepAllCategoriesExpandedValue || !this.showCategoryTitlesValue;
@@ -40731,8 +41177,11 @@ var QuestionToolbox = /** @class */ (function (_super) {
         /**
          * Specifies whether to display category titles in the Toolbox.
          *
-         * If you disable this property, the Toolbox hides the titles but continues to display horizontal lines that divide categories. To remove these lines as well, call the `removeCategories()` method.
-         * @see removeCategories
+         * Default value: `false`
+         *
+         * If this property is disabled, the Toolbox hides the titles but continues to display horizontal lines that divide categories. To remove these lines as well, call the [`removeCategories()`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#removeCategories) method.
+         * @see allowExpandMultipleCategories
+         * @see keepAllCategoriesExpanded
          */
         get: function () {
             return this.showCategoryTitlesValue;
@@ -40778,20 +41227,22 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
     };
     /**
-     * Change the category of the toolbox item
-     * @param name the toolbox item name
-     * @param category new category name
+     * Changes the category of a toolbox item.
+     * @param itemName A toolbox item's [`name`](https://surveyjs.io/survey-creator/documentation/api-reference/iquestiontoolboxitem#name).
+     * @param categoryName A new category name. Out-of-the-box category names include `"general"`, `"choice"`, `"text"`, `"containers"`, `"matrix"`, and `"misc"`.
+     * @see defineCategories
      */
-    QuestionToolbox.prototype.changeCategory = function (name, category) {
-        this.changeCategories([{ name: name, category: category }]);
+    QuestionToolbox.prototype.changeCategory = function (itemName, categoryName) {
+        this.changeCategories([{ name: itemName, category: categoryName }]);
     };
     /**
-     * Change categories for several toolbox items.
-     * @param changedItems the array of objects {name: "your toolbox item name", category: "new category name"}
+     * Changes the categories of multiple toolbox items.
+     * @param items An array of objects with the following structure: `{ name: "toolboxItemName", category: "newCategoryName" }`.
+     * @see defineCategories
      */
-    QuestionToolbox.prototype.changeCategories = function (changedItems) {
-        for (var i = 0; i < changedItems.length; i++) {
-            var item = changedItems[i];
+    QuestionToolbox.prototype.changeCategories = function (items) {
+        for (var i = 0; i < items.length; i++) {
+            var item = items[i];
             var toolboxItem = this.getItemByName(item.name);
             if (toolboxItem) {
                 toolboxItem.category = item.category;
@@ -40877,7 +41328,7 @@ var QuestionToolbox = /** @class */ (function (_super) {
         this.onItemsChanged(false);
     };
     /**
-     * Removes categories from the Toolbox.
+     * Removes all categories from the Toolbox.
      */
     QuestionToolbox.prototype.removeCategories = function () {
         var allTypes = survey_core__WEBPACK_IMPORTED_MODULE_1__["ElementFactory"].Instance.getAllToolboxTypes();
@@ -40898,9 +41349,10 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
     };
     /**
-     * Expand a category by its name. If allowExpandMultipleCategories is false (default value), all other categories become collapsed
-     * @param categoryName the category name
-     * @see allowExpandMultipleCategories
+     * Expands a category with a specified name. Applies only if [`showCategoryTitles`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#showCategoryTitles) is `true`.
+     *
+     * If [`allowExpandMultipleCategories`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#allowExpandMultipleCategories) is `false`, all other categories become collapsed.
+     * @param categoryName A category name. Out-of-the-box category names include `"general"`, `"choice"`, `"text"`, `"containers"`, `"matrix"`, and `"misc"`.
      * @see collapseCategory
      */
     QuestionToolbox.prototype.expandCategory = function (categoryName) {
@@ -40917,9 +41369,9 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
     };
     /**
-     * Collapse a category by its name. If allowExpandMultipleCategories is false (default value) this function does nothing
-     * @param categoryName the category name
-     * @see allowExpandMultipleCategories
+     * Collapses a category with a specified name. Applies only if [`showCategoryTitles`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#showCategoryTitles) and [`allowExpandMultipleCategories`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#allowExpandMultipleCategories) are `true`.
+     * @param categoryName A category name. Out-of-the-box category names include `"general"`, `"choice"`, `"text"`, `"containers"`, `"matrix"`, and `"misc"`.
+     * @see expandCategory
      */
     QuestionToolbox.prototype.collapseCategory = function (categoryName) {
         if (!this.allowExpandMultipleCategories)
@@ -40930,15 +41382,15 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
     };
     /**
-     * Expand all categories. If allowExpandMultipleCategories is false (default value) this function does nothing
-     * @see allowExpandMultipleCategories
+     * Expands all categories. Applies only if [`showCategoryTitles`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#showCategoryTitles) and [`allowExpandMultipleCategories`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#allowExpandMultipleCategories) are `true`.
+     * @see collapseAllCategories
      */
     QuestionToolbox.prototype.expandAllCategories = function () {
         this.expandCollapseAllCategories(false);
     };
     /**
-     * Collapse all categories. If allowExpandMultipleCategories is false (default value) this function does nothing
-     * @see allowExpandMultipleCategories
+     * Collapses all categories. Applies only if [`showCategoryTitles`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#showCategoryTitles) and [`allowExpandMultipleCategories`](https://surveyjs.io/survey-creator/documentation/api-reference/questiontoolbox#allowExpandMultipleCategories) are `true`.
+     * @see expandAllCategories
      */
     QuestionToolbox.prototype.collapseAllCategories = function () {
         this.expandCollapseAllCategories(true);
@@ -41072,7 +41524,7 @@ var QuestionToolbox = /** @class */ (function (_super) {
                 iconName: iconName,
                 title: title,
                 tooltip: title,
-                className: "svc-toolbox__item svc-toolbox__item--" + iconName,
+                className: this.getItemClassNames(iconName),
                 json: json,
                 isCopied: false,
                 category: (defaultCategories[name_1] || "")
@@ -41110,6 +41562,13 @@ var QuestionToolbox = /** @class */ (function (_super) {
         var items = instanceOwner.Instance["items"];
         return !!items ? items : [];
     };
+    QuestionToolbox.prototype.getItemClassNames = function (iconName) {
+        return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]()
+            .append("svc-toolbox__item")
+            .append("svc-toolbox__item--has-icon", !!iconName)
+            .append("svc-toolbox__item--" + iconName, !!iconName)
+            .toString();
+    };
     QuestionToolbox.prototype.addItemFromJSON = function (json) {
         if (json.showInToolbox === false)
             return;
@@ -41133,7 +41592,7 @@ var QuestionToolbox = /** @class */ (function (_super) {
             iconName: iconName,
             title: title,
             tooltip: title,
-            className: "svc-toolbox__item svc-toolbox__item--" + iconName,
+            className: this.getItemClassNames(iconName),
             json: elementJson,
             isCopied: false,
             category: category
@@ -41187,6 +41646,14 @@ var QuestionToolbox = /** @class */ (function (_super) {
         }
         return questions;
     };
+    QuestionToolbox.prototype.hideAllInnerPopups = function () {
+        this.actions.forEach(function (action) {
+            action.hidePopup();
+        });
+    };
+    QuestionToolbox.prototype.onScroll = function (model, event) {
+        this.hideAllInnerPopups();
+    };
     QuestionToolbox.MINELEMENTCOUNT = 10;
     QuestionToolbox.defaultIconName = "icon-default";
     QuestionToolbox.defaultCategories = {