survey-core 2.3.3 → 2.3.4

package/fesm/survey-core.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v2.3.3
+ * surveyjs - Survey JavaScript library v2.3.4
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -8228,14 +8228,9 @@ class Base {
             return;
         if (!!info.canRun && !info.canRun(this))
             return;
-        if (!info.runner) {
-            info.runner = this.createExpressionRunner(expression);
-            info.runner.onRunComplete = (res) => {
-                info.onExecute(this, res);
-            };
-        }
-        info.runner.expression = expression;
-        info.runner.runContext(this.getValueGetterContext(), properties);
+        this.runExpressionByProperty(propName, properties, (res) => {
+            info.onExecute(this, res);
+        });
     }
     doBeforeAsynRun(id) {
         if (!this.asynExpressionHash)
@@ -8264,6 +8259,51 @@ class Base {
         res.onAfterAsyncRun = (id) => { this.doAfterAsynRun(id); };
         return res;
     }
+    getExpressionFromSurvey(propName) {
+        let expression = this[propName];
+        if (!expression)
+            return "";
+        const survey = this.getSurvey();
+        return !!survey ? survey.beforeExpressionRunning(this, propName, expression) : expression;
+    }
+    runExpressionByProperty(propName, properties, onExecute, canRun) {
+        if (!this[propName])
+            return false;
+        const expression = this.getExpressionFromSurvey(propName);
+        if (!!expression) {
+            const info = this.getExpressionInfoByProperty(propName, expression);
+            const runner = info.runner;
+            if (!info.isRunning && (!canRun || canRun(runner))) {
+                info.isRunning = true;
+                runner.onRunComplete = (value) => {
+                    onExecute(value);
+                    info.isRunning = false;
+                };
+                runner.runContext(this.getValueGetterContext(), properties);
+            }
+        }
+        return true;
+    }
+    getExpressionByProperty(propName) {
+        const expression = this.getExpressionFromSurvey(propName);
+        if (!expression)
+            return null;
+        return this.getExpressionInfoByProperty(propName, expression).runner;
+    }
+    getExpressionInfoByProperty(propName, expression) {
+        if (!this.runExpressionHash) {
+            this.runExpressionHash = {};
+        }
+        let info = this.runExpressionHash[propName];
+        if (!info) {
+            info = { runner: this.createExpressionRunner(expression) };
+            this.runExpressionHash[propName] = info;
+        }
+        else {
+            info.runner.expression = expression;
+        }
+        return info;
+    }
     /**
      * Registers a single value change handler for one or multiple properties.
      *
@@ -14195,6 +14235,7 @@ var settings = {
         row: "row",
         totalRow: "totalRow",
         rowIndex: "rowIndex",
+        visibleRowIndex: "visibleRowIndex",
         rowValue: "rowValue",
         rowName: "rowName",
         rowTitle: "rowTitle",
@@ -15120,13 +15161,14 @@ class ExpressionValidator extends SurveyValidator {
         return this.getLocalizationFormatString("invalidExpression", this.expression);
     }
     ensureConditionRunner(reNew) {
-        if (!this.expression)
+        const expression = this.getExpressionFromSurvey("expression");
+        if (!expression)
             return false;
         if (reNew || !this.conditionRunner) {
-            this.conditionRunner = new ConditionRunner(this.expression);
+            this.conditionRunner = new ConditionRunner(expression);
         }
         else {
-            this.conditionRunner.expression = this.expression;
+            this.conditionRunner.expression = expression;
         }
         return true;
     }
@@ -15479,14 +15521,6 @@ class TextAreaModel {
     }
 }
 
-class TriggerExpressionInfo {
-    constructor(name, canRun, doComplete) {
-        this.name = name;
-        this.canRun = canRun;
-        this.doComplete = doComplete;
-        this.getSecondRunner = () => undefined;
-    }
-}
 class QuestionValueGetterContext {
     constructor(question, isUnwrapped) {
         this.question = question;
@@ -15641,6 +15675,7 @@ class Question extends SurveyElement {
         super(name);
         this.customWidgetData = { isNeedRender: true };
         this.hasCssErrorCallback = () => false;
+        this.triggersInfo = [];
         this.isReadyValue = true;
         this.dependedQuestions = [];
         /**
@@ -15656,7 +15691,6 @@ class Question extends SurveyElement {
          * Indicates the previous ready state.
          */
         this.onReadyChanged = this.addEvent();
-        this.triggersInfo = [];
         this.isRunningValidatorsValue = false;
         this.isValueChangedInSurvey = false;
         this.allowNotifyValueChanged = true;
@@ -15674,13 +15708,7 @@ class Question extends SurveyElement {
         this.createLocalizableString("requiredErrorText", this);
         this.createLocalizableString("commentPlaceholder", this);
         this.createLocalizableString("defaultDisplayValue", this);
-        this.addTriggerInfo("resetValueIf", () => !this.isEmpty(), () => {
-            this.startSetValueOnExpression();
-            this.updateValueWithDefaultsOrClear();
-            this.finishSetValueOnExpression();
-        });
-        const setValueIfInfo = this.addTriggerInfo("setValueIf", () => true, () => this.runSetValueExpression());
-        setValueIfInfo.getSecondRunner = () => this.getSetValueExpressionRunner();
+        this.addTriggersInfo();
         this.registerPropertyChangedHandlers(["width"], () => {
             this.updateQuestionCss();
             if (!!this.parent) {
@@ -16147,62 +16175,14 @@ class Question extends SurveyElement {
             requiredAnsweredQuestionCount: !this.isEmpty() && this.isRequired ? 1 : 0,
         };
     }
-    ensureSetValueExpressionRunner() {
-        if (!this.setValueExpressionRunner) {
-            this.setValueExpressionRunner = this.createExpressionRunner(this.setValueExpression);
-            this.setValueExpressionRunner.onRunComplete = (res) => {
-                this.runExpressionSetValue(res);
-            };
-        }
-        else {
-            this.setValueExpressionRunner.expression = this.setValueExpression;
-        }
-    }
-    runSetValueExpression() {
-        if (!this.setValueExpression) {
-            this.clearValue();
-        }
-        else {
-            this.ensureSetValueExpressionRunner();
-            this.setValueExpressionRunner.runContext(this.getValueGetterContext(), this.getDataFilteredProperties());
-        }
-    }
-    getSetValueExpressionRunner() {
-        this.ensureSetValueExpressionRunner();
-        return this.setValueExpressionRunner;
-    }
-    addTriggerInfo(name, canRun, doComplete) {
-        const info = new TriggerExpressionInfo(name, canRun, doComplete);
-        this.triggersInfo.push(info);
-        return info;
-    }
-    runTriggerInfo(info, keys) {
-        const expression = this[info.name];
-        if (!expression && !info.getSecondRunner() || info.isRunning || !info.canRun()) {
-            return;
-        }
-        if (!info.runner) {
-            info.runner = this.createExpressionRunner(expression);
-            info.runner.onRunComplete = (res) => {
-                if (res === true) {
-                    info.doComplete();
-                }
-                info.isRunning = false;
-            };
-        }
-        else {
-            info.runner.expression = expression;
-        }
-        if (!this.canExecuteTriggerByKeys(keys, info.runner, info.getSecondRunner()))
-            return;
-        info.isRunning = true;
-        if (!expression && info.getSecondRunner()) {
-            info.doComplete();
-            info.isRunning = false;
-        }
-        else {
-            info.runner.runContext(this.getValueGetterContext(), this.getDataFilteredProperties());
-        }
+    runTriggerInfo(info, keys, properties) {
+        this.runExpressionByProperty(info.name, properties, (value) => {
+            info.doComplete(value, properties);
+        }, (runner) => {
+            if (!info.canRun())
+                return false;
+            return !keys || this.canExecuteTriggerByKeys(keys, runner, this.getExpressionByProperty(info.secondName));
+        });
     }
     canExecuteTriggerByKeys(keys, runner, secondRunner) {
         if (!runner && !!secondRunner) {
@@ -16231,6 +16211,47 @@ class Question extends SurveyElement {
     getValueGetterContext(isUnwrapped) {
         return new QuestionValueGetterContext(this, isUnwrapped);
     }
+    addTriggersInfo() {
+        this.addTriggerInfo({
+            name: "resetValueIf",
+            canRun: () => !this.isEmpty(),
+            doComplete: (res, properties) => {
+                if (res === true) {
+                    this.startSetValueOnExpression();
+                    this.updateValueWithDefaultsOrClear();
+                    this.finishSetValueOnExpression();
+                }
+            }
+        });
+        this.addTriggerInfo({
+            name: "setValueIf",
+            secondName: "setValueExpression",
+            canRun: () => true,
+            doComplete: (res, properties) => {
+                if (res) {
+                    if (!this.setValueExpression) {
+                        this.clearValue();
+                    }
+                    else {
+                        const info = {
+                            name: "setValueExpression",
+                            canRun: () => true,
+                            doComplete: (res, properties) => this.runExpressionSetValue(res)
+                        };
+                        this.runTriggerInfo(info, undefined, properties);
+                    }
+                }
+            }
+        });
+        this.addTriggerInfo({
+            name: "setValueExpression",
+            canRun: () => !this.setValueIf,
+            doComplete: (res, properties) => this.runExpressionSetValue(res)
+        });
+    }
+    addTriggerInfo(info) {
+        this.triggersInfo.push(info);
+    }
     runTriggers(name, value, keys) {
         if (this.isSettingQuestionValue || (this.parentQuestion && this.parentQuestion.getValueName() === name))
             return;
@@ -16238,8 +16259,9 @@ class Question extends SurveyElement {
             keys = {};
             keys[name] = value;
         }
+        const properties = this.getDataFilteredProperties();
         this.triggersInfo.forEach(info => {
-            this.runTriggerInfo(info, keys);
+            this.runTriggerInfo(info, keys, properties);
         });
     }
     runConditions() {
@@ -16351,7 +16373,7 @@ class Question extends SurveyElement {
         this.resetSingleInputCore();
     }
     resetSingleInputCore() {
-        const prev = this.singleInputQuestion;
+        const prev = this.getPropertyValue("singleInputQuestion");
         this.resetPropertyValue("singleInputQuestion");
         if (!!prev) {
             this.onSingleInputChanged();
@@ -17506,8 +17528,7 @@ class Question extends SurveyElement {
         properties["question"] = this;
         this.runConditionCore(properties);
         if (!this.isValueChangedDirectly && (!this.isClearValueOnHidden || this.isVisibleInSurvey)) {
-            this.defaultValueRunner = this.getDefaultRunner(this.defaultValueRunner, this.defaultValueExpression);
-            this.runDefaultValueExpression(this.defaultValueRunner, properties);
+            this.runDefaultValueExpression(properties);
         }
     }
     get isInDesignMode() {
@@ -18041,15 +18062,6 @@ class Question extends SurveyElement {
     isDefaultValueEmpty() {
         return !this.defaultValueExpression && this.isValueEmpty(this.defaultValue, !this.allowSpaceAsAnswer);
     }
-    getDefaultRunner(runner, expression) {
-        if (!runner && !!expression) {
-            runner = this.createExpressionRunner(expression);
-        }
-        if (!!runner) {
-            runner.expression = expression;
-        }
-        return runner;
-    }
     setDefaultValue() {
         this.setDefaultValueCore((val) => {
             val = this.convertToCorrectValue(val);
@@ -18061,9 +18073,13 @@ class Question extends SurveyElement {
     setDefaultIntoValue(val) {
         this.value = val;
     }
-    setDefaultValueCore(func) {
-        this.defaultValueRunner = this.getDefaultRunner(this.defaultValueRunner, this.defaultValueExpression);
-        this.setValueAndRunExpression(this.defaultValueRunner, this.getUnbindValue(this.defaultValue), (val) => func(val));
+    setDefaultValueCore(setFunc) {
+        const func = (val) => {
+            this.runExpressionSetValueCore(val, setFunc);
+        };
+        if (!this.runDefaultValueExpression(undefined, func)) {
+            func(this.getUnbindValue(this.defaultValue));
+        }
     }
     updateValueWithDefaultsOrClear() {
         if (this.isDesignMode || this.isLoadingFromJson)
@@ -18078,14 +18094,6 @@ class Question extends SurveyElement {
     isValueExpression(val) {
         return !!val && typeof val == "string" && val.length > 0 && val[0] == "=";
     }
-    setValueAndRunExpression(runner, defaultValue, setFunc, properties = null) {
-        const func = (val) => {
-            this.runExpressionSetValueCore(val, setFunc);
-        };
-        if (!this.runDefaultValueExpression(runner, properties, func)) {
-            func(defaultValue);
-        }
-    }
     convertFuncValuetoQuestionValue(val) {
         return Helpers.convertValToQuestionVal(val);
     }
@@ -18109,8 +18117,8 @@ class Question extends SurveyElement {
         var _a;
         (_a = this.survey) === null || _a === void 0 ? void 0 : _a.finishSetValueOnExpression();
     }
-    runDefaultValueExpression(runner, properties = null, setFunc) {
-        if (!runner || !this.data)
+    runDefaultValueExpression(properties = null, setFunc) {
+        if (!this.data)
             return false;
         if (!setFunc) {
             setFunc = (val) => {
@@ -18121,17 +18129,13 @@ class Question extends SurveyElement {
             properties = this.defaultValueExpression ? this.data.getFilteredProperties() : {};
             properties["question"] = this;
         }
-        if (!!runner && runner.canRun) {
-            runner.onRunComplete = (res) => {
-                if (res == undefined)
-                    res = this.defaultValue;
-                this.isChangingViaDefaultValue = true;
-                setFunc(res);
-                this.isChangingViaDefaultValue = false;
-            };
-            runner.runContext(this.getValueGetterContext(), properties);
-        }
-        return true;
+        return this.runExpressionByProperty("defaultValueExpression", properties, (res) => {
+            if (res == undefined)
+                res = this.defaultValue;
+            this.isChangingViaDefaultValue = true;
+            setFunc(res);
+            this.isChangingViaDefaultValue = false;
+        });
     }
     /**
      * A comment to the selected question value. Enable the `showCommentArea` property to allow users to leave comments.
@@ -19458,19 +19462,21 @@ class ItemValue extends BaseAction {
         return this.getEnableConditionRunner();
     }
     getVisibleConditionRunner() {
-        if (!this.visibleIf)
+        const expression = this.getExpressionFromSurvey("visibleIf");
+        if (!expression)
             return null;
         if (!this.visibleConditionRunner)
-            this.visibleConditionRunner = new ConditionRunner(this.visibleIf);
-        this.visibleConditionRunner.expression = this.visibleIf;
+            this.visibleConditionRunner = new ConditionRunner(expression);
+        this.visibleConditionRunner.expression = expression;
         return this.visibleConditionRunner;
     }
     getEnableConditionRunner() {
-        if (!this.enableIf)
+        const expression = this.getExpressionFromSurvey("enableIf");
+        if (!expression)
             return null;
         if (!this.enableConditionRunner)
-            this.enableConditionRunner = new ConditionRunner(this.enableIf);
-        this.enableConditionRunner.expression = this.enableIf;
+            this.enableConditionRunner = new ConditionRunner(expression);
+        this.enableConditionRunner.expression = expression;
         return this.enableConditionRunner;
     }
     get selected() {
@@ -19668,9 +19674,8 @@ class CalculatedValue extends Base {
         this.runExpression(this.data.getFilteredProperties());
     }
     runExpressionCore(calculatedValues, properties) {
-        if (!this.canRunExpression)
+        if (!this.canRunExpression || !this.ensureExpression())
             return;
-        this.ensureExpression();
         this.locCalculation();
         if (!!calculatedValues) {
             this.runDependentExpressions(calculatedValues, properties);
@@ -19689,17 +19694,22 @@ class CalculatedValue extends Base {
         }
     }
     ensureExpression() {
+        const expression = this.getExpressionFromSurvey("expression");
+        if (!expression)
+            return false;
         if (!!this.expressionRunner) {
-            this.expressionRunner.expression = this.expression;
-            return;
+            this.expressionRunner.expression = expression;
         }
-        this.expressionRunner = new ExpressionRunner(this.expression);
-        this.expressionRunner.onRunComplete = newValue => {
-            if (!Helpers.isTwoValueEquals(newValue, this.value, false, true, false)) {
-                this.setValue(newValue);
-            }
-            this.unlocCalculation();
-        };
+        else {
+            this.expressionRunner = this.createExpressionRunner(expression);
+            this.expressionRunner.onRunComplete = newValue => {
+                if (!Helpers.isTwoValueEquals(newValue, this.value, false, true, false)) {
+                    this.setValue(newValue);
+                }
+                this.unlocCalculation();
+            };
+        }
+        return true;
     }
 }
 Serializer.addClass("calculatedvalue", [
@@ -19722,9 +19732,10 @@ class ExpressionItem extends Base {
         return "expressionitem";
     }
     runCondition(properties) {
-        if (!this.expression)
+        const expression = this.getExpressionFromSurvey("expression");
+        if (!expression)
             return false;
-        return new ConditionRunner(this.expression).runContext(this.getValueGetterContext(), properties);
+        return new ConditionRunner(expression).runContext(this.getValueGetterContext(), properties);
     }
     /**
      * The expression property. If this expression returns true, then survey will use html property to show on complete page.
@@ -20715,7 +20726,6 @@ class QuestionMatrixBaseModel extends Question {
             this.onRowsChanged();
         }
     }
-    isRowsFiltered() { return !!this.filteredRows; }
     clearGeneratedRows() {
         this.generatedVisibleRows = null;
     }
@@ -20723,20 +20733,14 @@ class QuestionMatrixBaseModel extends Question {
     runConditionsForRows(properties) {
         const showInvisibile = !!this.survey && this.survey.areInvisibleElementsShowing;
         const runner = !showInvisibile ? this.createRowsVisibleIfRunner() : null;
-        this.filteredRows = [];
-        const hasChanged = ItemValue.runConditionsForItems(this.rows, this.filteredRows, runner, properties, !showInvisibile);
+        const hasChanged = ItemValue.runConditionsForItems(this.rows, undefined, runner, properties, !showInvisibile);
         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;
     }
     runConditionsForColumns(properties) {
         const useColumnsExpression = !!this.survey && !this.survey.areInvisibleElementsShowing;
-        const runner = useColumnsExpression && !!this.columnsVisibleIf ? new ConditionRunner(this.columnsVisibleIf) : null;
+        const expression = this.getExpressionFromSurvey("columnsVisibleIf");
+        const runner = useColumnsExpression && !!expression ? new ConditionRunner(expression) : null;
         return ItemValue.runConditionsForItems(this.columns, undefined, runner, properties, this.shouldRunColumnExpression());
     }
     clearInvisibleColumnValues() { }
@@ -21275,11 +21279,24 @@ class QuestionCustomModelBase extends Question {
         this.initElement(this.getElement());
         this.isSettingValOnLoading = false;
     }
+    onCustomQuestionLoaded() {
+        if (!this.isLoadedCalled && !!this.customQuestion && !!this.survey) {
+            this.customQuestion.onLoaded(this);
+            this.isLoadedCalled = true;
+        }
+    }
     onSurveyLoad() {
         super.onSurveyLoad();
+        this.isLoadedCalled = false;
         if (!!this.getElement()) {
             this.getElement().onSurveyLoad();
-            this.customQuestion.onLoaded(this);
+        }
+        this.onCustomQuestionLoaded();
+    }
+    setSurveyCore(value) {
+        super.setSurveyCore(value);
+        if (this.isLoadedCalled === false && value) {
+            this.onCustomQuestionLoaded();
         }
     }
     afterRenderQuestionElement(el) {
@@ -22177,11 +22194,6 @@ class QuestionExpressionModel extends Question {
     constructor(name) {
         super(name);
         this.createLocalizableString("format", this);
-        this.registerPropertyChangedHandlers(["expression"], () => {
-            if (this.expressionRunner) {
-                this.expressionRunner = this.createRunner();
-            }
-        });
         this.registerPropertyChangedHandlers(["format", "currency", "displayStyle"], () => {
             this.updateFormatedValue();
         });
@@ -22219,22 +22231,18 @@ class QuestionExpressionModel extends Question {
         this.setPropertyValue("expression", val);
     }
     locCalculation() {
-        this.expressionIsRunning = true;
+        this.isExecutionLocked = true;
     }
     unlocCalculation() {
-        this.expressionIsRunning = false;
+        this.isExecutionLocked = false;
     }
     runConditionCore(properties) {
         super.runConditionCore(properties);
-        if (!this.expression ||
-            this.expressionIsRunning ||
-            (!this.runIfReadOnly && this.isReadOnly))
+        if (this.isExecutionLocked || !this.runIfReadOnly && this.isReadOnly)
             return;
-        this.locCalculation();
-        if (!this.expressionRunner) {
-            this.expressionRunner = this.createRunner();
-        }
-        this.expressionRunner.runContext(this.getValueGetterContext(), properties);
+        this.runExpressionByProperty("expression", properties, (val) => {
+            this.value = this.roundValue(val);
+        });
     }
     canCollectErrors() {
         return true;
@@ -22242,14 +22250,6 @@ class QuestionExpressionModel extends Question {
     hasRequiredError() {
         return false;
     }
-    createRunner() {
-        const res = this.createExpressionRunner(this.expression);
-        res.onRunComplete = (newValue) => {
-            this.value = this.roundValue(newValue);
-            this.unlocCalculation();
-        };
-        return res;
-    }
     /**
      * The maximum number of fraction digits. Applies only if the `displayStyle` property is not `"none"`. Accepts values in the range from -1 to 20, where -1 disables the property.
      *
@@ -24883,6 +24883,9 @@ class MatrixRowGetterContext extends QuestionItemValueGetterContext {
         if (name === setVar.rowIndex.toLocaleLowerCase()) {
             return this.row.rowIndex;
         }
+        if (name === setVar.visibleRowIndex.toLocaleLowerCase()) {
+            return this.getQuestionData().visibleRows.indexOf(this.row) + 1;
+        }
         if ([setVar.item, setVar.rowName.toLocaleLowerCase(), setVar.rowValue.toLocaleLowerCase()].indexOf(name) > -1) {
             return this.row.rowName;
         }
@@ -26227,22 +26230,24 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
     runCellsCondition(properties) {
         if (this.isDesignMode)
             return;
+        const rowsVisibleIf = this.getExpressionFromSurvey("rowsVisibleIf");
         const rows = this.generatedVisibleRows;
         if (!!rows) {
             for (var i = 0; i < rows.length; i++) {
-                rows[i].runCondition(properties, this.rowsVisibleIf);
+                rows[i].runCondition(properties, rowsVisibleIf);
             }
         }
         this.checkColumnsVisibility();
         this.checkColumnsRenderedRequired();
     }
     runConditionsForColumns(properties) {
+        const expression = this.getExpressionFromSurvey("columnsVisibleIf");
         this.columns.forEach(column => {
-            if (!this.columnsVisibleIf) {
+            if (!expression) {
                 column.isColumnsVisibleIf = true;
             }
             else {
-                const condition = new ConditionRunner(this.columnsVisibleIf);
+                const condition = new ConditionRunner(expression);
                 column.isColumnsVisibleIf = condition.runContext(column.getValueGetterContext(), properties) === true;
             }
         });
@@ -26431,6 +26436,7 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
      * The template can contain the following placeholders:
      *
      * - `{rowIndex}` - A row index within the collection of all rows. Starts with 1.
+     * - `{visibleRowIndex}` - A row index within the collection of visible rows. Starts with 1.
      * - `{rowName}` - A row name (the `value` property within objects in the [`rows`](#rows) array). Use this placeholder if you need to distinguish between matrix rows.
      * - `{rowTitle}` - A row title (the `text` property within objects in the `rows` array).
      * - `{row.columnname}` - The value of a cell in the same row.
@@ -27407,7 +27413,7 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
         }
     }
     isRowsFiltered() {
-        return super.isRowsFiltered() || (this.visibleRows !== this.generatedVisibleRows);
+        return this.visibleRows !== this.generatedVisibleRows;
     }
     getQuestionFromArray(name, index) {
         if (index >= this.visibleRows.length)
@@ -27476,7 +27482,9 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
 Serializer.addClass("matrixdropdownbase", [
     {
         name: "columns:matrixdropdowncolumns",
-        className: "matrixdropdowncolumn", isArray: true
+        uniqueProperty: "name",
+        className: "matrixdropdowncolumn",
+        isArray: true
     },
     {
         name: "columnLayout",
@@ -35552,6 +35560,10 @@ class SurveyModel extends SurveyElementCore {
          */
         this.onDragDropAllow = this.addEvent();
         this.onMatrixRowDragOver = this.addEvent();
+        /**
+         * An event that is raised when an [expression](https://surveyjs.io/form-library/documentation/design-survey/conditional-logic#expressions) is about to be evaluated. Use this event to intercept or cancel the evaluation.
+         */
+        this.onExpressionRunning = this.addEvent();
         /**
          * An event this is raised before a survey element (usually page) is scrolled to the top. Use this event to cancel the scroll operation.
          */
@@ -37173,6 +37185,11 @@ class SurveyModel extends SurveyElementCore {
         };
         return exp.runContext(this.getValueGetterContext(), properties) || onCompleteRes;
     }
+    beforeExpressionRunning(obj, propertyName, expression) {
+        const opt = { element: obj, propertyName: propertyName, expression: expression, allow: true };
+        this.onExpressionRunning.fire(this, opt);
+        return opt.allow ? opt.expression : "";
+    }
     get isSettingValueOnExpression() { return this.setValueOnExpressionCounter > 0; }
     startSetValueOnExpression() {
         this.setValueOnExpressionCounter++;
@@ -43323,8 +43340,8 @@ Serializer.addClass("survey", [
         dependsOn: ["showTOC"],
         visibleIf: (survey) => { return !!survey && survey.showTOC; }
     },
-    { name: "readOnly:boolean", default: false },
-    { name: "mode", default: "edit", choices: ["edit", "display"], visible: false },
+    { name: "readOnly:boolean" },
+    { name: "mode", visible: false, isSerializable: false },
     { name: "storeOthersAsComment:boolean", default: true },
     { name: "maxTextLength:number", default: 0, minValue: 0 },
     { name: "maxCommentLength:number", default: 0, minValue: 0, alternativeName: "maxOthersLength" },
@@ -44081,22 +44098,24 @@ class QuestionSelectBase extends Question {
         return [];
     }
     setConditionalChoicesRunner() {
-        if (this.choicesVisibleIf) {
+        const expression = this.getExpressionFromSurvey("choicesVisibleIf");
+        if (expression) {
             if (!this.conditionChoicesVisibleIfRunner) {
-                this.conditionChoicesVisibleIfRunner = new ConditionRunner(this.choicesVisibleIf);
+                this.conditionChoicesVisibleIfRunner = new ConditionRunner(expression);
             }
-            this.conditionChoicesVisibleIfRunner.expression = this.choicesVisibleIf;
+            this.conditionChoicesVisibleIfRunner.expression = expression;
         }
         else {
             this.conditionChoicesVisibleIfRunner = null;
         }
     }
     setConditionalEnableChoicesRunner() {
-        if (this.choicesEnableIf) {
+        const expression = this.getExpressionFromSurvey("choicesEnableIf");
+        if (expression) {
             if (!this.conditionChoicesEnableIfRunner) {
-                this.conditionChoicesEnableIfRunner = new ConditionRunner(this.choicesEnableIf);
+                this.conditionChoicesEnableIfRunner = new ConditionRunner(expression);
             }
-            this.conditionChoicesEnableIfRunner.expression = this.choicesEnableIf;
+            this.conditionChoicesEnableIfRunner.expression = expression;
         }
         else {
             this.conditionChoicesEnableIfRunner = null;
@@ -45101,10 +45120,10 @@ class QuestionSelectBase extends Question {
         }
     }
     getStoreOthersAsComment() {
-        if (this.checkHasChoicesComments())
-            return true;
         if (this.showCommentArea)
             return false;
+        if (this.checkHasChoicesComments())
+            return true;
         return (this.storeOthersAsComment === true ||
             (this.storeOthersAsComment == "default" &&
                 (this.survey != null ? this.survey.storeOthersAsComment : true)) ||
@@ -47256,6 +47275,7 @@ class MatrixRowModel extends Base {
     get locText() {
         return this.item.locText;
     }
+    get isVisible() { return this.item.isVisible; }
     get value() {
         return this.getPropertyValue("value");
     }
@@ -47483,7 +47503,7 @@ class MatrixValueGetterContext extends ValueGetterContextCore {
     getRootObj() { return this.question.data; }
     updateValueByItem(name, res) {
         var _a;
-        const rows = this.question.visibleRows;
+        const rows = this.question.getMatrixRows();
         name = name.toLocaleLowerCase();
         for (let i = 0; i < rows.length; i++) {
             const row = rows[i];
@@ -47740,20 +47760,21 @@ class QuestionMatrixModel extends QuestionMatrixBaseModel {
         super.runConditionCore(properties);
     }
     createRowsVisibleIfRunner() {
-        return !!this.rowsVisibleIf ? new ConditionRunner(this.rowsVisibleIf) : null;
+        const expression = this.getExpressionFromSurvey("rowsVisibleIf");
+        return !!expression ? new ConditionRunner(expression) : null;
     }
     onRowsChanged() {
         this.clearGeneratedRows();
         super.onRowsChanged();
     }
-    getVisibleRows() {
+    getMatrixRows() {
         if (!!this.generatedVisibleRows)
             return this.generatedVisibleRows;
         const result = new Array();
         let val = this.value;
         if (!val)
             val = {};
-        const rows = this.filteredRows || this.rows;
+        const rows = this.rows;
         for (let i = 0; i < rows.length; i++) {
             const row = rows[i];
             if (this.isValueEmpty(row.value))
@@ -47764,6 +47785,15 @@ class QuestionMatrixModel extends QuestionMatrixBaseModel {
         this.generatedVisibleRows = result;
         return result;
     }
+    getVisibleRows() {
+        const rows = [];
+        this.getMatrixRows().forEach(row => {
+            if (row.isVisible) {
+                rows.push(row);
+            }
+        });
+        return rows;
+    }
     getRowByName(name) {
         const rows = this.visibleRows;
         for (let i = 0; i < rows.length; i++) {
@@ -49000,20 +49030,31 @@ class QuestionTextModel extends QuestionTextBase {
         return this.isDateInputType ? this.createDate(minMax) : minMax;
     }
     setRenderedMinMax(properties = null) {
-        this.minValueRunner = this.getDefaultRunner(this.minValueRunner, this.minValueExpression);
-        this.setValueAndRunExpression(this.minValueRunner, this.min, (val) => {
+        const setProp = (name, val) => {
+            this.setPropertyValue(name, this.convertFuncValuetoQuestionValue(val));
+        };
+        const setMin = (val) => {
             if (!val && this.isDateInputType && !!settings.minDate) {
                 val = settings.minDate;
             }
-            this.setPropertyValue("renderedMin", val);
-        }, properties);
-        this.maxValueRunner = this.getDefaultRunner(this.maxValueRunner, this.maxValueExpression);
-        this.setValueAndRunExpression(this.maxValueRunner, this.max, (val) => {
+            setProp("renderedMin", val);
+        };
+        const setMax = (val) => {
             if (!val && this.isDateInputType) {
                 val = !!settings.maxDate ? settings.maxDate : "2999-12-31";
             }
-            this.setPropertyValue("renderedMax", val);
-        }, properties);
+            setProp("renderedMax", val);
+        };
+        if (!this.runExpressionByProperty("minValueExpression", properties, (val) => {
+            setMin(val);
+        })) {
+            setMin(this.min);
+        }
+        if (!this.runExpressionByProperty("maxValueExpression", properties, (val) => {
+            setMax(val);
+        })) {
+            setMax(this.max);
+        }
     }
     /**
      * A value passed on to the [`step`](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/step) attribute of the underlying `<input>` element.
@@ -56594,24 +56635,13 @@ class QuestionSliderModel extends Question {
     }
     runConditionCore(properties) {
         super.runConditionCore(properties);
-        this.runMinMaxCondition(this.maxValueExpression, properties, (value) => {
+        this.runExpressionByProperty("maxValueExpression", properties, (value) => {
             this.max = value !== null && value !== void 0 ? value : this.renderedMax;
         });
-        this.runMinMaxCondition(this.minValueExpression, properties, (value) => {
+        this.runExpressionByProperty("minValueExpression", properties, (value) => {
             this.min = value !== null && value !== void 0 ? value : this.renderedMin;
         });
     }
-    runMinMaxCondition(expression, properties, setter) {
-        if (!expression)
-            return;
-        const runner = this.getDefaultRunner(this.defaultExpressionRunner, expression);
-        if (!!runner && runner.canRun) {
-            runner.onRunComplete = (res) => {
-                setter(res);
-            };
-            runner.runContext(this.getValueGetterContext(), properties);
-        }
-    }
     initPropertyDependencies() {
         // this.registerSychProperties(["segmentCount"],
         //   () => {
@@ -60564,7 +60594,6 @@ class QuestionPanelDynamicModel extends Question {
         }
         else {
             for (var i = 0; i < this.panelCount; i++) {
-                this.createNewPanel();
                 panels.push(this.createNewPanel());
             }
         }
@@ -61364,14 +61393,8 @@ class QuestionPanelDynamicModel extends Question {
         new JsonObject().toObject(json, panel);
         panel.renderWidth = "100%";
         panel.updateCustomWidgets();
+        panel.questions.forEach(q => q.setParentQuestion(this));
         new QuestionPanelDynamicItem(this, panel);
-        if (!this.isDesignMode && !this.isReadOnly && !this.isValueEmpty(panel.getValue())) {
-            this.runPanelsCondition([panel], this.getDataFilteredProperties());
-        }
-        var questions = panel.questions;
-        for (var i = 0; i < questions.length; i++) {
-            questions[i].setParentQuestion(this);
-        }
         if (this.wasRendered) {
             panel.onFirstRendering();
             panel.locStrsChanged();
@@ -62094,10 +62117,6 @@ class Trigger extends Base {
     constructor() {
         super();
         this.idValue = (Trigger.idCounter++);
-        this.registerPropertyChangedHandlers(["operator", "value", "name"], () => {
-            this.oldPropertiesChanged();
-        });
-        this.registerPropertyChangedHandlers(["expression"], () => { this.onExpressionChanged(); });
     }
     get id() { return this.idValue; }
     getType() {
@@ -62105,7 +62124,7 @@ class Trigger extends Base {
     }
     toString() {
         var res = this.getType().replace("trigger", "");
-        var exp = !!this.expression ? this.expression : this.buildExpression();
+        var exp = this.expression;
         if (exp) {
             res += ", " + exp;
         }
@@ -62138,7 +62157,7 @@ class Trigger extends Base {
         this.setPropertyValue("name", val);
     }
     get expression() {
-        return this.getPropertyValue("expression", "");
+        return this.getPropertyValue("expression", this.buildExpression());
     }
     set expression(val) {
         this.setPropertyValue("expression", val);
@@ -62156,17 +62175,17 @@ class Trigger extends Base {
             return;
         if (options.isOnComplete && !this.canBeExecutedOnComplete())
             return;
-        if (!this.isCheckRequired(options.keys))
-            return;
         const keys = Object.keys(options.keys);
         if (Array.isArray(keys) && !this.canBeExecuteOnKeysChange(keys))
             return;
-        if (!!this.conditionRunner) {
-            this.perform(options.properties || null);
-        }
-        else {
-            if (this.canSuccessOnEmptyExpression()) {
-                this.triggerResult(true, options.properties || null);
+        const props = options.properties || null;
+        if (!this.runExpressionByProperty("expression", props, (val) => {
+            this.triggerResult(val === true, props);
+        }, (runner) => {
+            return this.isCheckRequired(runner, options.keys);
+        })) {
+            if (this.isCheckRequired(null, options.keys) && this.canSuccessOnEmptyExpression()) {
+                this.triggerResult(true, props);
             }
         }
     }
@@ -62184,12 +62203,6 @@ class Trigger extends Base {
         }
     }
     get requireValidQuestion() { return false; }
-    perform(properties) {
-        this.conditionRunner.onRunComplete = (res) => {
-            this.triggerResult(res, properties);
-        };
-        this.conditionRunner.runContext(this.getValueGetterContext(), properties);
-    }
     triggerResult(res, properties) {
         if (res) {
             this.onSuccess(properties);
@@ -62202,16 +62215,6 @@ class Trigger extends Base {
     onSuccess(properties) { }
     onFailure() { }
     onSuccessExecuted() { }
-    endLoadingFromJson() {
-        super.endLoadingFromJson();
-        this.oldPropertiesChanged();
-    }
-    oldPropertiesChanged() {
-        this.onExpressionChanged();
-    }
-    onExpressionChanged() {
-        this.conditionRunner = null;
-    }
     buildExpression() {
         if (!this.name)
             return "";
@@ -62224,18 +62227,17 @@ class Trigger extends Base {
             " " +
             OperandMaker.toOperandString(this.value));
     }
-    isCheckRequired(keys) {
+    isCheckRequired(runner, keys) {
         if (!keys)
             return false;
-        this.createConditionRunner();
-        if (this.conditionRunner && this.conditionRunner.hasFunction() === true)
+        if ((runner === null || runner === void 0 ? void 0 : runner.hasFunction()) === true)
             return true;
-        return new ValueGetter().isAnyKeyChanged(keys, this.getUsedVariables());
+        return new ValueGetter().isAnyKeyChanged(keys, this.getUsedVariables(runner));
     }
-    getUsedVariables() {
-        if (!this.conditionRunner)
+    getUsedVariables(runner) {
+        if (!runner)
             return [];
-        const res = this.conditionRunner.getVariables();
+        const res = runner.getVariables();
         if (Array.isArray(res)) {
             const unw = settings.expressionVariables.unwrapPostfix;
             for (let i = res.length - 1; i >= 0; i--) {
@@ -62247,17 +62249,6 @@ class Trigger extends Base {
         }
         return res;
     }
-    createConditionRunner() {
-        if (!!this.conditionRunner)
-            return;
-        var expression = this.expression;
-        if (!expression) {
-            expression = this.buildExpression();
-        }
-        if (!expression)
-            return;
-        this.conditionRunner = new ConditionRunner(expression);
-    }
     get isRequireValue() {
         return this.operator !== "empty" && this.operator != "notempty";
     }
@@ -62457,15 +62448,11 @@ class SurveyTriggerRunExpression extends SurveyTrigger {
         return !isOnNextPage;
     }
     onSuccess(properties) {
-        if (!this.owner || !this.runExpression)
+        if (!this.owner)
             return;
-        var expression = new ExpressionRunner(this.runExpression);
-        if (expression.canRun) {
-            expression.onRunComplete = (res) => {
-                this.onCompleteRunExpression(res);
-            };
-            expression.runContext(this.getValueGetterContext(), properties);
-        }
+        this.runExpressionByProperty("runExpression", properties, (res) => {
+            this.onCompleteRunExpression(res);
+        });
     }
     onCompleteRunExpression(newValue) {
         if (!!this.setToName && newValue !== undefined) {
@@ -62515,8 +62502,8 @@ class SurveyTriggerCopyValue extends SurveyTrigger {
         this.owner.copyTriggerValue(this.setToName, this.fromName, this.copyDisplayValue);
     }
     canSuccessOnEmptyExpression() { return true; }
-    getUsedVariables() {
-        const res = super.getUsedVariables();
+    getUsedVariables(runner) {
+        const res = super.getUsedVariables(runner);
         if (res.length === 0 && !!this.fromName) {
             res.push(this.fromName);
         }
@@ -65232,11 +65219,11 @@ var Version;
 var ReleaseDate;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-Version = `${"2.3.3"}`;
+Version = `${"2.3.4"}`;
 settings.version = Version;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-ReleaseDate = `${"2025-08-19"}`;
+ReleaseDate = `${"2025-08-26"}`;
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         const str = "survey-core has version '" + Version + "' and " + libraryName