survey-core 2.3.1 → 2.3.2

package/survey.core.js

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v2.3.1
+ * surveyjs - Survey JavaScript library v2.3.2
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -619,11 +619,11 @@ var Version;
 var ReleaseDate;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-Version = "".concat("2.3.1");
+Version = "".concat("2.3.2");
 _src_settings__WEBPACK_IMPORTED_MODULE_1__.settings.version = Version;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-ReleaseDate = "".concat("2025-08-06");
+ReleaseDate = "".concat("2025-08-13");
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         var str = "survey-core has version '" + Version + "' and " + libraryName
@@ -1503,6 +1503,11 @@ function createPopupModelWithListModel(listOptions, popupOptions) {
             _popupOptions.onShow();
         listModel.scrollToSelectedItem();
     };
+    popupModel.onHide = function () {
+        if (!!_popupOptions.onHide)
+            _popupOptions.onHide();
+        listModel.filterString = "";
+    };
     return popupModel;
 }
 function getActionDropdownButtonTarget(container) {
@@ -4261,8 +4266,10 @@ var CalculatedValue = /** @class */ (function (_super) {
     };
     CalculatedValue.prototype.ensureExpression = function () {
         var _this = this;
-        if (!!this.expressionRunner)
+        if (!!this.expressionRunner) {
+            this.expressionRunner.expression = this.expression;
             return;
+        }
         this.expressionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_2__.ExpressionRunner(this.expression);
         this.expressionRunner.onRunComplete = function (newValue) {
             if (!_helpers__WEBPACK_IMPORTED_MODULE_0__.Helpers.isTwoValueEquals(newValue, _this.value, false, true, false)) {
@@ -8496,7 +8503,6 @@ var DropdownListModel = /** @class */ (function (_super) {
         }, 1);
     };
     DropdownListModel.prototype.onHidePopup = function () {
-        this.resetFilterString();
         this.question.suggestedItem = null;
         if (this.choicesLazyLoadEnabled) {
             this.resetItemsSettings();
@@ -8550,17 +8556,17 @@ var DropdownListModel = /** @class */ (function (_super) {
         return res;
     };
     DropdownListModel.prototype.setQuestionValue = function (item) {
+        var selectedItem = item;
         if (this.allowCustomChoices && item.id === this.customItemValue.id) {
             var newChoice = this.createCustomItem();
-            if (!!newChoice) {
-                this.question.selectItem(newChoice);
-                this.hintString = "";
-            }
+            selectedItem = newChoice;
         }
-        else {
-            this.question.selectItem(item);
-            if (this.searchEnabled)
-                this.applyInputString(item);
+        if (!!selectedItem) {
+            this.resetFilterString();
+            this.question.selectItem(selectedItem);
+            if (this.searchEnabled) {
+                this.applyInputString(selectedItem);
+            }
         }
     };
     DropdownListModel.prototype.createCustomItem = function () {
@@ -8589,6 +8595,7 @@ var DropdownListModel = /** @class */ (function (_super) {
             }
         });
         model.isAllDataLoaded = !this.choicesLazyLoadEnabled;
+        model.disableSearch = this.choicesLazyLoadEnabled;
         model.actions.forEach(function (a) { return a.disableTabStop = true; });
         model.setOnFilterStringChangedCallback(this.listModelFilterStringChanged);
     };
@@ -8600,12 +8607,13 @@ var DropdownListModel = /** @class */ (function (_super) {
     DropdownListModel.prototype.resetFilterString = function () {
         if (!!this.filterString) {
             this.filterString = undefined;
+            this.listModel.filterString = "";
         }
+        this.inputString = null;
+        this.hintString = "";
     };
     DropdownListModel.prototype.clear = function () {
         this.customValue = undefined;
-        this.inputString = null;
-        this.hintString = "";
         this.resetFilterString();
     };
     DropdownListModel.prototype.onSetFilterString = function () {
@@ -9004,6 +9012,8 @@ var DropdownListModel = /** @class */ (function (_super) {
     };
     DropdownListModel.prototype.setChoicesLazyLoadEnabled = function (newValue) {
         this.choicesLazyLoadEnabled = newValue;
+        this.listModel.disableSearch = newValue;
+        this.listModel.isAllDataLoaded = !newValue;
     };
     DropdownListModel.prototype.setInputPlaceholder = function (newValue) {
         this.inputPlaceholder = newValue;
@@ -9161,8 +9171,6 @@ var DropdownListModel = /** @class */ (function (_super) {
         (0,_utils_utils__WEBPACK_IMPORTED_MODULE_13__.doKey2ClickBlur)(event);
         this._popupModel.hide();
         this.resetFilterString();
-        this.inputString = null;
-        this.hintString = "";
         event.stopPropagation();
     };
     DropdownListModel.prototype.onFocus = function (event) {
@@ -9175,9 +9183,6 @@ var DropdownListModel = /** @class */ (function (_super) {
         if (this.searchEnabled && !!newValue) {
             this.applyInputString(newValue);
         }
-        else {
-            this.inputString = null;
-        }
     };
     DropdownListModel.prototype.dispose = function () {
         _super.prototype.dispose.call(this);
@@ -9390,11 +9395,6 @@ var DropdownMultiSelectListModel = /** @class */ (function (_super) {
         res.forceShowFilter = this.question.choicesLazyLoadEnabled;
         return res;
     };
-    DropdownMultiSelectListModel.prototype.resetFilterString = function () {
-        _super.prototype.resetFilterString.call(this);
-        this.inputString = null;
-        this.hintString = "";
-    };
     Object.defineProperty(DropdownMultiSelectListModel.prototype, "shouldResetAfterCancel", {
         get: function () {
             return _utils_devices__WEBPACK_IMPORTED_MODULE_5__.IsTouch && !this.closeOnSelect;
@@ -18781,6 +18781,8 @@ var ListModel = /** @class */ (function (_super) {
     ListModel.prototype.isItemVisible = function (item) {
         if (item.id === this.loadingIndicator.id)
             return item.visible;
+        if (this.disableSearch)
+            return item.visible;
         return item.visible && this.hasText(item, this.filterString);
     };
     ListModel.prototype.getRenderedActions = function () {
@@ -18949,10 +18951,7 @@ var ListModel = /** @class */ (function (_super) {
     };
     ListModel.prototype.onPointerDown = function (event, item) { };
     ListModel.prototype.refresh = function () {
-        if (this.filterString !== "") {
-            this.filterString = "";
-        }
-        else {
+        if (this.filterString == "") {
             this.raiseUpdate({ needUpdateIsEmpty: true });
         }
         this.resetFocusedItem();
@@ -19115,6 +19114,9 @@ var ListModel = /** @class */ (function (_super) {
     __decorate([
         (0,_jsonobject__WEBPACK_IMPORTED_MODULE_0__.property)()
     ], ListModel.prototype, "listAriaLabel", void 0);
+    __decorate([
+        (0,_jsonobject__WEBPACK_IMPORTED_MODULE_0__.property)({ defaultValue: false })
+    ], ListModel.prototype, "disableSearch", void 0);
     return ListModel;
 }(_actions_container__WEBPACK_IMPORTED_MODULE_1__.ActionContainer));
 
@@ -19990,7 +19992,6 @@ var QuestionMatrixBaseModel = /** @class */ (function (_super) {
         var _this = _super.call(this, name) || this;
         _this.generatedVisibleRows = null;
         _this.generatedTotalRow = null;
-        _this.filteredRows = null;
         _this.columns = _this.createColumnValues();
         _this.rows = _this.createItemValues("rows");
         return _this;
@@ -20206,6 +20207,9 @@ var QuestionMatrixBaseModel = /** @class */ (function (_super) {
         _itemvalue__WEBPACK_IMPORTED_MODULE_0__.ItemValue.runEnabledConditionsForItems(this.rows, undefined, properties);
         if (this.filteredRows.length === this.rows.length) {
             this.filteredRows = null;
+            if (!!this.generatedVisibleRows && this.generatedVisibleRows.length !== this.rows.length) {
+                this.generatedVisibleRows = null;
+            }
         }
         return hasChanged;
     };
@@ -23821,7 +23825,7 @@ var PanelModelBase = /** @class */ (function (_super) {
                 var q = el;
                 if (!q.isEmpty()) {
                     var valueName = q.getValueName();
-                    data[valueName] = q.value;
+                    data[valueName] = q.getStructuredValue(level - 1);
                     if (!!this.data) {
                         var comment = this.data.getComment(valueName);
                         if (!!comment) {
@@ -24421,6 +24425,8 @@ var PanelModelBase = /** @class */ (function (_super) {
         configurable: true
     });
     PanelModelBase.prototype.childVisibilityChanged = function () {
+        if (this.isRunningConditions)
+            return;
         var newIsVisibleValue = this.getIsPageVisible(null);
         var oldIsVisibleValue = this.getPropertyValue("isVisible", true);
         if (newIsVisibleValue !== oldIsVisibleValue) {
@@ -25131,10 +25137,17 @@ var PanelModelBase = /** @class */ (function (_super) {
         if (this.isDesignMode || this.isLoadingFromJson)
             return;
         var elements = this.elements.slice();
+        var prevContentVisibility = this.getIsPageVisible();
+        this.isRunningConditions = true;
         for (var i = 0; i < elements.length; i++) {
             elements[i].runCondition(properties);
         }
         this.runConditionCore(properties);
+        var newContentVisibility = this.getIsPageVisible();
+        this.isRunningConditions = false;
+        if (prevContentVisibility !== newContentVisibility) {
+            this.childVisibilityChanged();
+        }
     };
     PanelModelBase.prototype.onAnyValueChanged = function (name, questionName) {
         var els = this.elements;
@@ -25459,6 +25472,9 @@ var PanelModel = /** @class */ (function (_super) {
     });
     PanelModel.prototype.calcNo = function () {
         var no = _helpers__WEBPACK_IMPORTED_MODULE_1__.Helpers.getNumberByIndex(this.visibleIndex, this.getStartIndex());
+        if (this.onGetNoCallback) {
+            no = this.onGetNoCallback(no);
+        }
         if (!!this.parent) {
             no = this.parent.addNoFromChild(no);
         }
@@ -30445,6 +30461,10 @@ var Question = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Question.prototype.getStructuredValue = function (level) {
+        if (level === void 0) { level = -1; }
+        return this.value;
+    };
     Object.defineProperty(Question.prototype, "hasFilteredValue", {
         get: function () { return false; },
         enumerable: false,
@@ -33358,15 +33378,24 @@ var QuestionSelectBase = /** @class */ (function (_super) {
         _super.prototype.setNewValue.call(this, newValue);
     };
     QuestionSelectBase.prototype.valueFromData = function (val) {
-        var _a;
         var item = this.getItemByValue(val, this.activeChoices);
         if (!!item) {
-            if (typeof val === "object" && item.showCommentArea && !_helpers__WEBPACK_IMPORTED_MODULE_9__.Helpers.isValueEmpty(val[this.commentPropertyValue]))
-                return _a = { value: item.value }, _a[this.commentPropertyValue] = val[this.commentPropertyValue], _a;
-            return item.value;
+            return this.getChoiceValue(item, val, false);
         }
         return _super.prototype.valueFromData.call(this, val);
     };
+    QuestionSelectBase.prototype.getChoiceValue = function (choice, val, objOnComment) {
+        var isObj = typeof val === "object";
+        var comment = isObj ? val[this.commentPropertyValue] : "";
+        var hasComment = !_helpers__WEBPACK_IMPORTED_MODULE_9__.Helpers.isValueEmpty(comment);
+        if (isObj && choice.showCommentArea && (objOnComment || hasComment)) {
+            var res = { value: choice.value };
+            if (hasComment)
+                res[this.commentPropertyValue] = comment;
+            return res;
+        }
+        return choice.value;
+    };
     QuestionSelectBase.prototype.getItemByValue = function (val, choices) {
         var chs = choices || this.visibleChoices;
         if (!!val && typeof val === "object" && !_helpers__WEBPACK_IMPORTED_MODULE_9__.Helpers.isValueEmpty(val.value)) {
@@ -35332,20 +35361,12 @@ var QuestionBooleanModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(QuestionBooleanModel.prototype, "checkedValue", {
-        get: function () { return this.booleanValue; },
-        set: function (val) { this.booleanValue = val; },
-        enumerable: false,
-        configurable: true
-    });
     QuestionBooleanModel.prototype.setBooleanValue = function (val) {
         if (this.isValueEmpty(val)) {
             this.value = undefined;
-            this.booleanValueRendered = undefined;
         }
         else {
             this.value = val == true ? this.getValueTrue() : this.getValueFalse();
-            this.booleanValueRendered = val;
         }
     };
     Object.defineProperty(QuestionBooleanModel.prototype, "defaultValue", {
@@ -35630,7 +35651,7 @@ var QuestionBooleanModel = /** @class */ (function (_super) {
         if (css.radioItem) {
             className = css.radioItem;
         }
-        if (css.radioItemChecked && value === this.booleanValue) {
+        if (css.radioItemChecked && value === this.value) {
             className = (className ? className + " " : "") + css.radioItemChecked;
         }
         if (this.isDisabledStyle) {
@@ -35668,9 +35689,6 @@ var QuestionBooleanModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    __decorate([
-        (0,_jsonobject__WEBPACK_IMPORTED_MODULE_1__.property)()
-    ], QuestionBooleanModel.prototype, "booleanValueRendered", void 0);
     __decorate([
         (0,_jsonobject__WEBPACK_IMPORTED_MODULE_1__.property)({ localizable: true })
     ], QuestionBooleanModel.prototype, "label", void 0);
@@ -36453,7 +36471,13 @@ var QuestionCheckboxModel = /** @class */ (function (_super) {
             var index = this.getItemValIndexByItemValue(item.value);
             if (index > -1) {
                 var val = this.createValueCopy();
-                val[index][this.commentPropertyValue] = newValue;
+                var itemVal = val[index];
+                if (newValue) {
+                    itemVal[this.commentPropertyValue] = newValue;
+                }
+                else {
+                    delete itemVal[this.commentPropertyValue];
+                }
                 this.value = val;
             }
         }
@@ -36785,6 +36809,9 @@ var QuestionCheckboxModel = /** @class */ (function (_super) {
         return -1;
     };
     QuestionCheckboxModel.prototype.removeNoneItemsValues = function (value, newValue) {
+        if (value.length === 1 && newValue.length === 1
+            && this.getRealValue(value[0]) === this.getRealValue(newValue[0]))
+            return;
         var noneValues = this.getNoneItems().map(function (item) { return item.value; });
         if (noneValues.length > 0) {
             var prevNone = this.noneIndexInArray(value, noneValues);
@@ -36956,9 +36983,9 @@ var QuestionCheckboxModel = /** @class */ (function (_super) {
             return [_super.prototype.valueFromData.call(this, val)];
         var value = [];
         for (var i = 0; i < val.length; i++) {
-            var choiceitem = _itemvalue__WEBPACK_IMPORTED_MODULE_4__.ItemValue.getItemByValue(this.visibleChoices, val[i]);
+            var choiceitem = this.getItemByValue(val[i], this.visibleChoices);
             if (!!choiceitem) {
-                value.push(choiceitem.value);
+                value.push(this.getChoiceValue(choiceitem, val[i], true));
             }
             else {
                 value.push(val[i]);
@@ -36972,9 +36999,13 @@ var QuestionCheckboxModel = /** @class */ (function (_super) {
     };
     QuestionCheckboxModel.prototype.convertValueFromObject = function (val) {
         var valProp = this.getValuePropertyName();
-        if (!valProp)
+        if (!valProp || !Array.isArray(val))
             return val;
-        return _helpers__WEBPACK_IMPORTED_MODULE_3__.Helpers.convertArrayObjectToValue(val, valProp);
+        var res = [];
+        for (var i = 0; i < val.length; i++) {
+            res.push(this.getRealValue(val[i]));
+        }
+        return res;
     };
     QuestionCheckboxModel.prototype.renderedValueFromDataCore = function (val) {
         if (!val || !Array.isArray(val))
@@ -38372,7 +38403,9 @@ var QuestionCompositeModel = /** @class */ (function (_super) {
             json.createElements(res, this);
         }
         this.initElement(res);
+        this.setIsContentElement(res);
         res.readOnly = this.isReadOnly;
+        res.onGetNoCallback = function (no) { return _this.no; };
         res.questions.forEach(function (q) {
             q.setParentQuestion(_this);
             q.onUpdateCssClassesCallback = function (css) { _this.onUpdateQuestionCssClasses(q, css); };
@@ -52722,7 +52755,7 @@ var PanelDynamicItemGetterContext = /** @class */ (function (_super) {
         }
         var expVar = _settings__WEBPACK_IMPORTED_MODULE_8__.settings.expressionVariables;
         var panelPrefix = expVar.panel;
-        if (path.length > 1 && path[0].name === expVar.parentPanel.toLocaleLowerCase()) {
+        if (path.length > 1 && path[0].name.toLocaleLowerCase() === expVar.parentPanel.toLocaleLowerCase()) {
             var q = this.item.data;
             if (!!q && !!q.parentQuestion && !!q.parent && !!q.parent.data) {
                 path[0].name = panelPrefix;
@@ -53951,6 +53984,20 @@ var QuestionPanelDynamicModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    QuestionPanelDynamicModel.prototype.getStructuredValue = function (level) {
+        if (level === void 0) { level = -1; }
+        if (level < 0 || this.isEmpty() || !Array.isArray(this.value))
+            return this.value;
+        var data = new Array();
+        var valCount = Math.min(this.visiblePanelCount, this.value.length);
+        for (var i = 0; i < valCount; i++) {
+            var panel = this.visiblePanels[i];
+            var panelData = {};
+            panel.collectValues(panelData, level);
+            data.push(panelData);
+        }
+        return data;
+    };
     QuestionPanelDynamicModel.prototype.setTemplatePanelSurveyImpl = function () {
         this.template.setSurveyImpl(this.useTemplatePanel
             ? this.surveyImpl
@@ -68492,7 +68539,7 @@ var SurveyModel = /** @class */ (function (_super) {
         var opt = options || { includePages: false, includePanels: false };
         if (!opt.includePages && !opt.includePanels)
             return this.data;
-        return this.getStructuredData(!!opt.includePages, !opt.includePanels ? (opt.includePages ? 1 : 0) : -1);
+        return this.getStructuredData(!!opt.includePages, !opt.includePanels ? (opt.includePages ? 1 : 0) : 100);
     };
     SurveyModel.prototype.getStructuredData = function (includePages, level) {
         if (includePages === void 0) { includePages = true; }
@@ -71955,6 +72002,9 @@ var SurveyModel = /** @class */ (function (_super) {
         this.onValueChanging.fire(this, options);
         return options.value;
     };
+    SurveyModel.prototype.getLocNotification = function (loc, value, oldValue) {
+        return loc || _helpers__WEBPACK_IMPORTED_MODULE_0__.Helpers.isTwoValueEquals(value, oldValue, false, true, false);
+    };
     SurveyModel.prototype.updateQuestionValue = function (valueName, newValue) {
         if (this.isLoadingFromJson)
             return;
@@ -72653,6 +72703,7 @@ var SurveyModel = /** @class */ (function (_super) {
             newValue = this.getUnbindValue(newValue);
             this.setDataValueCore(this.valuesHash, name, newValue);
         }
+        locNotification = this.getLocNotification(locNotification, newValue, oldValue);
         this.updateOnSetValue(name, newValue, oldValue, locNotification, allowNotifyValueChanged, questionName);
     };
     SurveyModel.prototype.isValueEmpyOnSetValue = function (name, val) {
@@ -72813,6 +72864,7 @@ var SurveyModel = /** @class */ (function (_super) {
             return;
         var commentName = name + this.commentSuffix;
         newValue = this.questionOnValueChanging(commentName, newValue, name);
+        locNotification = this.getLocNotification(locNotification, newValue, this.getComment(name));
         if (this.isValueEmpty(newValue)) {
             this.deleteDataValueCore(this.valuesHash, commentName);
         }