survey-core 2.3.1 → 2.3.2

package/fesm/survey-core.mjs

@@ -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)
  */
@@ -9337,6 +9337,8 @@ class ListModel extends ActionContainer {
     isItemVisible(item) {
         if (item.id === this.loadingIndicator.id)
             return item.visible;
+        if (this.disableSearch)
+            return item.visible;
         return item.visible && this.hasText(item, this.filterString);
     }
     getRenderedActions() {
@@ -9573,10 +9575,7 @@ class ListModel extends ActionContainer {
     }
     onPointerDown(event, item) { }
     refresh() {
-        if (this.filterString !== "") {
-            this.filterString = "";
-        }
-        else {
+        if (this.filterString == "") {
             this.raiseUpdate({ needUpdateIsEmpty: true });
         }
         this.resetFocusedItem();
@@ -9739,6 +9738,9 @@ __decorate([
 __decorate([
     property()
 ], ListModel.prototype, "listAriaLabel", void 0);
+__decorate([
+    property({ defaultValue: false })
+], ListModel.prototype, "disableSearch", void 0);
 
 class PopupModel extends Base {
     refreshInnerModel() {
@@ -9967,6 +9969,11 @@ function createPopupModelWithListModel(listOptions, popupOptions) {
             _popupOptions.onShow();
         listModel.scrollToSelectedItem();
     };
+    popupModel.onHide = () => {
+        if (!!_popupOptions.onHide)
+            _popupOptions.onHide();
+        listModel.filterString = "";
+    };
     return popupModel;
 }
 function getActionDropdownButtonTarget(container) {
@@ -17639,6 +17646,9 @@ class Question extends SurveyElement {
     set value(newValue) {
         this.setNewValue(newValue);
     }
+    getStructuredValue(level = -1) {
+        return this.value;
+    }
     get hasFilteredValue() { return false; }
     getFilteredValue(isUnwrapped) { return this.value; }
     getFilteredName() { return this.getValueName(); }
@@ -19679,8 +19689,10 @@ class CalculatedValue extends Base {
         }
     }
     ensureExpression() {
-        if (!!this.expressionRunner)
+        if (!!this.expressionRunner) {
+            this.expressionRunner.expression = this.expression;
             return;
+        }
         this.expressionRunner = new ExpressionRunner(this.expression);
         this.expressionRunner.onRunComplete = newValue => {
             if (!Helpers.isTwoValueEquals(newValue, this.value, false, true, false)) {
@@ -20538,7 +20550,6 @@ class QuestionMatrixBaseModel extends Question {
         super(name);
         this.generatedVisibleRows = null;
         this.generatedTotalRow = null;
-        this.filteredRows = null;
         this.columns = this.createColumnValues();
         this.rows = this.createItemValues("rows");
     }
@@ -20717,6 +20728,9 @@ class QuestionMatrixBaseModel extends Question {
         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;
     }
@@ -21817,7 +21831,9 @@ class QuestionCompositeModel extends QuestionCustomModelBase {
             json.createElements(res, this);
         }
         this.initElement(res);
+        this.setIsContentElement(res);
         res.readOnly = this.isReadOnly;
+        res.onGetNoCallback = (no) => { return this.no; };
         res.questions.forEach(q => {
             q.setParentQuestion(this);
             q.onUpdateCssClassesCallback = (css) => { this.onUpdateQuestionCssClasses(q, css); };
@@ -32140,7 +32156,7 @@ class PanelModelBase extends SurveyElement {
                 const 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) {
@@ -32702,6 +32718,8 @@ class PanelModelBase extends SurveyElement {
         return res;
     }
     childVisibilityChanged() {
+        if (this.isRunningConditions)
+            return;
         var newIsVisibleValue = this.getIsPageVisible(null);
         var oldIsVisibleValue = this.getPropertyValue("isVisible", true);
         if (newIsVisibleValue !== oldIsVisibleValue) {
@@ -33352,10 +33370,17 @@ class PanelModelBase extends SurveyElement {
         if (this.isDesignMode || this.isLoadingFromJson)
             return;
         var elements = this.elements.slice();
+        const prevContentVisibility = this.getIsPageVisible();
+        this.isRunningConditions = true;
         for (var i = 0; i < elements.length; i++) {
             elements[i].runCondition(properties);
         }
         this.runConditionCore(properties);
+        const newContentVisibility = this.getIsPageVisible();
+        this.isRunningConditions = false;
+        if (prevContentVisibility !== newContentVisibility) {
+            this.childVisibilityChanged();
+        }
     }
     onAnyValueChanged(name, questionName) {
         var els = this.elements;
@@ -33608,6 +33633,9 @@ class PanelModel extends PanelModelBase {
     }
     calcNo() {
         let no = Helpers.getNumberByIndex(this.visibleIndex, this.getStartIndex());
+        if (this.onGetNoCallback) {
+            no = this.onGetNoCallback(no);
+        }
         if (!!this.parent) {
             no = this.parent.addNoFromChild(no);
         }
@@ -37815,7 +37843,7 @@ class SurveyModel extends SurveyElementCore {
         const 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);
     }
     getStructuredData(includePages = true, level = -1) {
         if (level === 0)
@@ -40898,6 +40926,9 @@ class SurveyModel extends SurveyElementCore {
         this.onValueChanging.fire(this, options);
         return options.value;
     }
+    getLocNotification(loc, value, oldValue) {
+        return loc || Helpers.isTwoValueEquals(value, oldValue, false, true, false);
+    }
     updateQuestionValue(valueName, newValue) {
         if (this.isLoadingFromJson)
             return;
@@ -41576,6 +41607,7 @@ class SurveyModel extends SurveyElementCore {
             newValue = this.getUnbindValue(newValue);
             this.setDataValueCore(this.valuesHash, name, newValue);
         }
+        locNotification = this.getLocNotification(locNotification, newValue, oldValue);
         this.updateOnSetValue(name, newValue, oldValue, locNotification, allowNotifyValueChanged, questionName);
     }
     isValueEmpyOnSetValue(name, val) {
@@ -41732,6 +41764,7 @@ class SurveyModel extends SurveyElementCore {
             return;
         const 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);
         }
@@ -44225,12 +44258,22 @@ class QuestionSelectBase extends Question {
     valueFromData(val) {
         let item = this.getItemByValue(val, this.activeChoices);
         if (!!item) {
-            if (typeof val === "object" && item.showCommentArea && !Helpers.isValueEmpty(val[this.commentPropertyValue]))
-                return { value: item.value, [this.commentPropertyValue]: val[this.commentPropertyValue] };
-            return item.value;
+            return this.getChoiceValue(item, val, false);
         }
         return super.valueFromData(val);
     }
+    getChoiceValue(choice, val, objOnComment) {
+        const isObj = typeof val === "object";
+        const comment = isObj ? val[this.commentPropertyValue] : "";
+        const hasComment = !Helpers.isValueEmpty(comment);
+        if (isObj && choice.showCommentArea && (objOnComment || hasComment)) {
+            const res = { value: choice.value };
+            if (hasComment)
+                res[this.commentPropertyValue] = comment;
+            return res;
+        }
+        return choice.value;
+    }
     getItemByValue(val, choices) {
         const chs = choices || this.visibleChoices;
         if (!!val && typeof val === "object" && !Helpers.isValueEmpty(val.value)) {
@@ -46105,7 +46148,6 @@ class DropdownListModel extends Base {
         }, 1);
     }
     onHidePopup() {
-        this.resetFilterString();
         this.question.suggestedItem = null;
         if (this.choicesLazyLoadEnabled) {
             this.resetItemsSettings();
@@ -46157,17 +46199,17 @@ class DropdownListModel extends Base {
         return res;
     }
     setQuestionValue(item) {
+        let selectedItem = item;
         if (this.allowCustomChoices && item.id === this.customItemValue.id) {
             const 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);
+            }
         }
     }
     createCustomItem() {
@@ -46195,6 +46237,7 @@ class DropdownListModel extends Base {
             }
         });
         model.isAllDataLoaded = !this.choicesLazyLoadEnabled;
+        model.disableSearch = this.choicesLazyLoadEnabled;
         model.actions.forEach(a => a.disableTabStop = true);
         model.setOnFilterStringChangedCallback(this.listModelFilterStringChanged);
     }
@@ -46206,12 +46249,13 @@ class DropdownListModel extends Base {
     resetFilterString() {
         if (!!this.filterString) {
             this.filterString = undefined;
+            this.listModel.filterString = "";
         }
+        this.inputString = null;
+        this.hintString = "";
     }
     clear() {
         this.customValue = undefined;
-        this.inputString = null;
-        this.hintString = "";
         this.resetFilterString();
     }
     onSetFilterString() {
@@ -46471,6 +46515,8 @@ class DropdownListModel extends Base {
     }
     setChoicesLazyLoadEnabled(newValue) {
         this.choicesLazyLoadEnabled = newValue;
+        this.listModel.disableSearch = newValue;
+        this.listModel.isAllDataLoaded = !newValue;
     }
     setInputPlaceholder(newValue) {
         this.inputPlaceholder = newValue;
@@ -46628,8 +46674,6 @@ class DropdownListModel extends Base {
         doKey2ClickBlur(event);
         this._popupModel.hide();
         this.resetFilterString();
-        this.inputString = null;
-        this.hintString = "";
         event.stopPropagation();
     }
     onFocus(event) {
@@ -46642,9 +46686,6 @@ class DropdownListModel extends Base {
         if (this.searchEnabled && !!newValue) {
             this.applyInputString(newValue);
         }
-        else {
-            this.inputString = null;
-        }
     }
     dispose() {
         super.dispose();
@@ -50815,7 +50856,13 @@ class QuestionCheckboxModel extends QuestionCheckboxBase {
             const index = this.getItemValIndexByItemValue(item.value);
             if (index > -1) {
                 const val = this.createValueCopy();
-                val[index][this.commentPropertyValue] = newValue;
+                const itemVal = val[index];
+                if (newValue) {
+                    itemVal[this.commentPropertyValue] = newValue;
+                }
+                else {
+                    delete itemVal[this.commentPropertyValue];
+                }
                 this.value = val;
             }
         }
@@ -51117,6 +51164,9 @@ class QuestionCheckboxModel extends QuestionCheckboxBase {
         return -1;
     }
     removeNoneItemsValues(value, newValue) {
+        if (value.length === 1 && newValue.length === 1
+            && this.getRealValue(value[0]) === this.getRealValue(newValue[0]))
+            return;
         const noneValues = this.getNoneItems().map(item => item.value);
         if (noneValues.length > 0) {
             const prevNone = this.noneIndexInArray(value, noneValues);
@@ -51285,9 +51335,9 @@ class QuestionCheckboxModel extends QuestionCheckboxBase {
             return [super.valueFromData(val)];
         let value = [];
         for (let i = 0; i < val.length; i++) {
-            let choiceitem = ItemValue.getItemByValue(this.visibleChoices, val[i]);
+            const 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]);
@@ -51301,9 +51351,13 @@ class QuestionCheckboxModel extends QuestionCheckboxBase {
     }
     convertValueFromObject(val) {
         const valProp = this.getValuePropertyName();
-        if (!valProp)
+        if (!valProp || !Array.isArray(val))
             return val;
-        return Helpers.convertArrayObjectToValue(val, valProp);
+        const res = [];
+        for (let i = 0; i < val.length; i++) {
+            res.push(this.getRealValue(val[i]));
+        }
+        return res;
     }
     renderedValueFromDataCore(val) {
         if (!val || !Array.isArray(val))
@@ -51556,11 +51610,6 @@ class DropdownMultiSelectListModel extends DropdownListModel {
         res.forceShowFilter = this.question.choicesLazyLoadEnabled;
         return res;
     }
-    resetFilterString() {
-        super.resetFilterString();
-        this.inputString = null;
-        this.hintString = "";
-    }
     get shouldResetAfterCancel() {
         return IsTouch && !this.closeOnSelect;
     }
@@ -56856,16 +56905,12 @@ class QuestionBooleanModel extends Question {
         }
         this.setBooleanValue(val);
     }
-    get checkedValue() { return this.booleanValue; }
-    set checkedValue(val) { this.booleanValue = val; }
     setBooleanValue(val) {
         if (this.isValueEmpty(val)) {
             this.value = undefined;
-            this.booleanValueRendered = undefined;
         }
         else {
             this.value = val == true ? this.getValueTrue() : this.getValueFalse();
-            this.booleanValueRendered = val;
         }
     }
     get defaultValue() {
@@ -57088,7 +57133,7 @@ class QuestionBooleanModel extends Question {
         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) {
@@ -57119,9 +57164,6 @@ class QuestionBooleanModel extends Question {
         return "switch";
     }
 }
-__decorate([
-    property()
-], QuestionBooleanModel.prototype, "booleanValueRendered", void 0);
 __decorate([
     property({ localizable: true })
 ], QuestionBooleanModel.prototype, "label", void 0);
@@ -59020,7 +59062,7 @@ class PanelDynamicItemGetterContext extends QuestionItemValueGetterContext {
         }
         const expVar = settings.expressionVariables;
         const panelPrefix = expVar.panel;
-        if (path.length > 1 && path[0].name === expVar.parentPanel.toLocaleLowerCase()) {
+        if (path.length > 1 && path[0].name.toLocaleLowerCase() === expVar.parentPanel.toLocaleLowerCase()) {
             const q = this.item.data;
             if (!!q && !!q.parentQuestion && !!q.parent && !!q.parent.data) {
                 path[0].name = panelPrefix;
@@ -59981,6 +60023,19 @@ class QuestionPanelDynamicModel extends Question {
     set panelsState(val) {
         this.setPropertyValue("panelsState", val);
     }
+    getStructuredValue(level = -1) {
+        if (level < 0 || this.isEmpty() || !Array.isArray(this.value))
+            return this.value;
+        const data = new Array();
+        const valCount = Math.min(this.visiblePanelCount, this.value.length);
+        for (let i = 0; i < valCount; i++) {
+            const panel = this.visiblePanels[i];
+            const panelData = {};
+            panel.collectValues(panelData, level);
+            data.push(panelData);
+        }
+        return data;
+    }
     setTemplatePanelSurveyImpl() {
         this.template.setSurveyImpl(this.useTemplatePanel
             ? this.surveyImpl
@@ -65138,11 +65193,11 @@ var Version;
 var ReleaseDate;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-Version = `${"2.3.1"}`;
+Version = `${"2.3.2"}`;
 settings.version = Version;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-ReleaseDate = `${"2025-08-06"}`;
+ReleaseDate = `${"2025-08-13"}`;
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         const str = "survey-core has version '" + Version + "' and " + libraryName