survey-core 2.3.3 → 2.3.5

package/fesm/survey-core.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v2.3.3
+ * surveyjs - Survey JavaScript library v2.3.5
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -3084,6 +3084,16 @@ class VariableGetterContext extends ValueGetterContextCore {
         return undefined;
     }
 }
+class VariableGetterContextEx extends VariableGetterContext {
+    constructor(variables, second) {
+        super(variables);
+        this.second = second;
+    }
+    getValue(path, isRoot, index, createObjects) {
+        const res = super.getValue(path, isRoot, index, createObjects);
+        return !this.second || (res === null || res === void 0 ? void 0 : res.isFound) ? res : this.second.getValue(path, isRoot, index, createObjects);
+    }
+}
 class ProcessValue {
     constructor(context) {
         this.properties = null;
@@ -3310,15 +3320,15 @@ function convertToNumber(val) {
         return Helpers.isNumber(val) ? Helpers.getNumber(val) : undefined;
     return val;
 }
-function processItemInArray(item, name, res, func, needToConvert, condition) {
+function processItemInArray(item, name, res, func, needToConvert, condition, properties) {
     if (!item || Helpers.isValueEmpty(item[name]))
         return res;
-    if (condition && !condition.runValues(item))
+    if (condition && !condition.runValues(item, properties))
         return res;
     const val = needToConvert ? convertToNumber(item[name]) : 1;
     return func(res, val);
 }
-function calcInArray(params, originalParams, func, needToConvert = true) {
+function calcInArray(properties, params, originalParams, func, needToConvert = true) {
     var v = getInArrayParams(params, originalParams);
     if (!v)
         return undefined;
@@ -3329,18 +3339,26 @@ function calcInArray(params, originalParams, func, needToConvert = true) {
     var res = undefined;
     if (Array.isArray(v.data)) {
         for (var i = 0; i < v.data.length; i++) {
-            res = processItemInArray(v.data[i], v.name, res, func, needToConvert, condition);
+            res = processItemInArray(v.data[i], v.name, res, func, needToConvert, condition, properties);
         }
     }
     else {
         for (var key in v.data) {
-            res = processItemInArray(v.data[key], v.name, res, func, needToConvert, condition);
+            res = processItemInArray(v.data[key], v.name, res, func, needToConvert, condition, properties);
         }
     }
     return res;
 }
+function getProperties(self) {
+    var _a;
+    return {
+        survey: self.survey,
+        question: self.question,
+        context: (_a = self.survey) === null || _a === void 0 ? void 0 : _a.getValueGetterContext()
+    };
+}
 function sumInArray(params, originalParams) {
-    var res = calcInArray(params, originalParams, function (res, val) {
+    var res = calcInArray(getProperties(this), params, originalParams, function (res, val) {
         if (res == undefined)
             res = 0;
         if (val == undefined || val == null)
@@ -3351,7 +3369,7 @@ function sumInArray(params, originalParams) {
 }
 FunctionFactory.Instance.register("sumInArray", sumInArray);
 function minInArray(params, originalParams) {
-    return calcInArray(params, originalParams, function (res, val) {
+    return calcInArray(getProperties(this), params, originalParams, function (res, val) {
         if (res == undefined)
             return val;
         if (val == undefined || val == null)
@@ -3361,7 +3379,7 @@ function minInArray(params, originalParams) {
 }
 FunctionFactory.Instance.register("minInArray", minInArray);
 function maxInArray(params, originalParams) {
-    return calcInArray(params, originalParams, function (res, val) {
+    return calcInArray(getProperties(this), params, originalParams, function (res, val) {
         if (res == undefined)
             return val;
         if (val == undefined || val == null)
@@ -3371,7 +3389,7 @@ function maxInArray(params, originalParams) {
 }
 FunctionFactory.Instance.register("maxInArray", maxInArray);
 function countInArray(params, originalParams) {
-    var res = calcInArray(params, originalParams, function (res, val) {
+    var res = calcInArray(getProperties(this), params, originalParams, function (res, val) {
         if (res == undefined)
             res = 0;
         if (val == undefined || val == null)
@@ -3382,10 +3400,12 @@ function countInArray(params, originalParams) {
 }
 FunctionFactory.Instance.register("countInArray", countInArray);
 function avgInArray(params, originalParams) {
-    var count = countInArray(params, originalParams);
+    const properties = getProperties(this);
+    const funcCall = (name) => FunctionFactory.Instance.run(name, params, properties, originalParams);
+    const count = funcCall("countInArray");
     if (count == 0)
         return 0;
-    return sumInArray(params, originalParams) / count;
+    return funcCall("sumInArray") / count;
 }
 FunctionFactory.Instance.register("avgInArray", avgInArray);
 function iif(params) {
@@ -7414,8 +7434,8 @@ class ExpressionExecutor {
     canRun() {
         return !!this.operand;
     }
-    run(values, properties = null, id) {
-        return this.runContext(new VariableGetterContext(values), properties, id);
+    run(values, properties, id) {
+        return this.runContext(new VariableGetterContextEx(values, properties === null || properties === void 0 ? void 0 : properties.context), properties, id);
     }
     runContext(context, properties = null, id) {
         if (!this.operand) {
@@ -7477,8 +7497,8 @@ class ExpressionRunnerBase {
 }
 ExpressionRunnerBase.IdRunnerCounter = 1;
 class ConditionRunner extends ExpressionRunnerBase {
-    runValues(values, properties = null) {
-        return this.runContext(new VariableGetterContext(values), properties);
+    runValues(values, properties) {
+        return this.runContext(new VariableGetterContextEx(values, properties === null || properties === void 0 ? void 0 : properties.context), properties);
     }
     runContext(context, properties) {
         return this.runContextCore(context, properties) == true;
@@ -7490,8 +7510,8 @@ class ConditionRunner extends ExpressionRunnerBase {
     }
 }
 class ExpressionRunner extends ExpressionRunnerBase {
-    runValues(values, properties = null) {
-        return this.runContext(new VariableGetterContext(values), properties);
+    runValues(values, properties) {
+        return this.runContext(new VariableGetterContextEx(values, properties === null || properties === void 0 ? void 0 : properties.context), properties);
     }
     runContext(context, properties) {
         return this.runContextCore(context, properties);
@@ -8228,14 +8248,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 +8279,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 +14255,7 @@ var settings = {
         row: "row",
         totalRow: "totalRow",
         rowIndex: "rowIndex",
+        visibleRowIndex: "visibleRowIndex",
         rowValue: "rowValue",
         rowName: "rowName",
         rowTitle: "rowTitle",
@@ -15091,12 +15152,11 @@ class ExpressionValidator extends SurveyValidator {
         return this.isRunningValue;
     }
     validate(value, name = null, properties = null) {
-        if (!this.expression)
-            return null;
         if (!!this.conditionRunner) {
             this.conditionRunner.onRunComplete = null;
         }
-        this.ensureConditionRunner(true);
+        if (!this.ensureConditionRunner(true))
+            return null;
         this.conditionRunner.onRunComplete = (res) => {
             this.isRunningValue = false;
             if (!!this.onAsyncCompleted) {
@@ -15120,13 +15180,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 +15540,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;
@@ -15569,11 +15622,13 @@ class QuestionItemValueGetterContext extends ValueGetterContextCore {
         return res;
     }
     fillQuestions(qs, q, res) {
-        qs.forEach((question) => {
-            if (question !== q) {
-                res.push(question);
-            }
-        });
+        if (Array.isArray(qs)) {
+            qs.forEach((question) => {
+                if (question !== q) {
+                    res.push(question);
+                }
+            });
+        }
     }
     getRootObj() { return this.getQuestionData(); }
 }
@@ -15641,6 +15696,7 @@ class Question extends SurveyElement {
         super(name);
         this.customWidgetData = { isNeedRender: true };
         this.hasCssErrorCallback = () => false;
+        this.triggersInfo = [];
         this.isReadyValue = true;
         this.dependedQuestions = [];
         /**
@@ -15656,7 +15712,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 +15729,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 +16196,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 +16232,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 +16280,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 +16394,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 +17549,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 +18083,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 +18094,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 +18115,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 +18138,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 +18150,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.
@@ -18411,10 +18436,14 @@ class Question extends SurveyElement {
         }
     }
     setNewValue(newValue) {
+        if (this.survey) {
+            newValue = this.survey.questionValueChanging(this, newValue);
+        }
         if (this.isNewValueEqualsToValue(newValue))
             return;
         if (!this.checkIsValueCorrect(newValue))
             return;
+        const oldValue = this.getUnbindValue(this.value);
         this.isOldAnswered = this.isAnswered;
         this.isSettingQuestionValue = true;
         this.setNewValueInData(newValue);
@@ -18427,7 +18456,11 @@ class Question extends SurveyElement {
         if (this.parent) {
             this.parent.onQuestionValueChanged(this);
         }
+        if (this.survey) {
+            this.survey.questionValueChanged(this, oldValue);
+        }
     }
+    getValueChangingOptions(childQuestion) { return undefined; }
     checkIsValueCorrect(val) {
         const res = this.isValueEmpty(val, !this.allowSpaceAsAnswer) || this.isNewValueCorrect(val);
         if (!res) {
@@ -19458,19 +19491,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 +19703,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 +19723,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 +19761,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 +20755,6 @@ class QuestionMatrixBaseModel extends Question {
             this.onRowsChanged();
         }
     }
-    isRowsFiltered() { return !!this.filteredRows; }
     clearGeneratedRows() {
         this.generatedVisibleRows = null;
     }
@@ -20723,20 +20762,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 +21308,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) {
@@ -21922,6 +21968,9 @@ class QuestionCompositeModel extends QuestionCustomModelBase {
         super.setValue(name, newValue, locNotification, allowNotifyValueChanged);
         this.settingNewValue = false;
         this.runPanelTriggers(settings.expressionVariables.composite + "." + name, newValue);
+        if (this.isEditingSurveyElement) {
+            this.runCondition(this.getFilteredProperties());
+        }
     }
     setComment(name, newValue, locNotification) {
         let val = this.getUnbindValue(this.value);
@@ -22177,11 +22226,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 +22263,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 +22282,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.
      *
@@ -22721,6 +22753,7 @@ var matrixDropdownColumnTypes = {
     },
     expression: {},
     rating: {},
+    slider: {}
 };
 /**
  * An auxiliary class that describes a column in a [Multi-Select Matrix](https://surveyjs.io/form-library/documentation/api-reference/matrix-table-with-dropdown-list) or [Dynamic Matrix](https://surveyjs.io/form-library/documentation/api-reference/dynamic-matrix-table-question-model).
@@ -22817,6 +22850,7 @@ class MatrixDropdownColumn extends Base {
      * - [`"boolean"`](https://surveyjs.io/form-library/documentation/api-reference/boolean-question-model)
      * - [`"expression"`](https://surveyjs.io/form-library/documentation/api-reference/expression-model)
      * - [`"rating"`](https://surveyjs.io/form-library/documentation/api-reference/rating-scale-question-model)
+     * - [`"slider"`](https://surveyjs.io/form-library/documentation/api-reference/questionslidermodel)
      * - `"default"` (default) - Inherits the input type from the [`cellType`](https://surveyjs.io/form-library/documentation/api-reference/matrix-table-with-dropdown-list#cellType) property specified for the parent matrix.
      *
      * The input types are based upon standalone question types. Depending on the selected input type, the matrix column can have additional configuration properties inherited from the corresponding question type. For instance, Dropdown, Checkboxes, Radio Button Group, and Tag Box columns can specify the [`choices`](https://surveyjs.io/form-library/documentation/api-reference/radio-button-question-model#choices) array, similar to the question types upon which they are based. Refer to the API Reference of these question types for a full list of available properties.
@@ -24883,6 +24917,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;
         }
@@ -25860,9 +25897,19 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
         this.clearVisibleRows();
         this.resetRenderedTable();
         super.onRowsChanged();
+        this.updateRowsVisibleIndexes();
+    }
+    updateRowsVisibleIndexes() {
         const rows = this.visibleRows;
+        if (!Array.isArray(rows))
+            return;
+        const vriName = settings.expressionVariables.visibleRowIndex;
+        const keys = {};
+        keys[vriName] = 0;
         for (let i = 0; i < rows.length; i++) {
             rows[i].visibleIndex = i;
+            keys[vriName] = i + 1;
+            rows[i].runTriggers(vriName, i + 1, keys);
         }
     }
     onStartRowAddingRemoving() {
@@ -25985,6 +26032,7 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
      * - [`"boolean"`](https://surveyjs.io/form-library/documentation/api-reference/boolean-question-model)
      * - [`"expression"`](https://surveyjs.io/form-library/documentation/api-reference/expression-model)
      * - [`"rating"`](https://surveyjs.io/form-library/documentation/api-reference/rating-scale-question-model)
+     * - [`"slider"`](https://surveyjs.io/form-library/documentation/api-reference/questionslidermodel)
      *
      * Default value: `"dropdown"` (inherited from [`settings.matrix.defaultCellType`](https://surveyjs.io/form-library/documentation/settings#matrixDefaultCellType))
      *
@@ -26227,22 +26275,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 +26481,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.
@@ -26496,6 +26547,7 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
             return this.visibleRowsArray;
         this.generateVisibleRowsIfNeeded();
         this.visibleRowsArray = this.getVisibleFromGenerated(this.generatedVisibleRows);
+        this.updateRowsVisibleIndexes();
         return this.visibleRowsArray;
     }
     get allRows() {
@@ -27252,8 +27304,10 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
         if (this.isObject(rowValue) && Object.keys(rowValue).length === 0) {
             newValue = this.deleteRowValue(newValue, row);
         }
+        newValue = this.correctValueForMinMaxRows(newValue);
         return { value: newValue, rowValue: rowValue };
     }
+    correctValueForMinMaxRows(newValue) { return newValue; }
     getRowIndex(row) {
         if (!Array.isArray(this.generatedVisibleRows))
             return -1;
@@ -27407,7 +27461,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 +27530,9 @@ class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel {
 Serializer.addClass("matrixdropdownbase", [
     {
         name: "columns:matrixdropdowncolumns",
-        className: "matrixdropdowncolumn", isArray: true
+        uniqueProperty: "name",
+        className: "matrixdropdowncolumn",
+        isArray: true
     },
     {
         name: "columnLayout",
@@ -28700,6 +28756,9 @@ class QuestionMatrixDynamicModel extends QuestionMatrixDropdownModelBase {
     valueFromData(val) {
         if (this.minRowCount < 1 || this.isEmpty())
             return super.valueFromData(val);
+        return this.correctValueForMinMaxRows(val);
+    }
+    correctValueForMinMaxRows(val) {
         if (!Array.isArray(val))
             val = [];
         for (var i = val.length; i < this.minRowCount; i++)
@@ -29230,9 +29289,12 @@ class QuestionMatrixDynamicModel extends QuestionMatrixDropdownModelBase {
         this.onEndRowRemoving(row);
     }
     removeRowCore(index) {
-        var row = this.generatedVisibleRows
-            ? this.generatedVisibleRows[index]
+        var row = this.visibleRows
+            ? this.visibleRows[index]
             : null;
+        index = this.generatedVisibleRows.indexOf(row);
+        if (index < 0)
+            return;
         if (this.generatedVisibleRows && index < this.generatedVisibleRows.length) {
             this.generatedVisibleRows.splice(index, 1);
         }
@@ -35552,6 +35614,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 +37239,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++;
@@ -40408,14 +40479,6 @@ class SurveyModel extends SurveyElementCore {
         this.onDynamicPanelRemoving.fire(this, options);
         return options.allow;
     }
-    dynamicPanelItemValueChanged(question, options) {
-        options.question = question;
-        this.onDynamicPanelValueChanged.fire(this, options);
-    }
-    dynamicPanelItemValueChanging(question, options) {
-        options.question = question;
-        this.onDynamicPanelValueChanging.fire(this, options);
-    }
     dynamicPanelGetTabTitle(question, options) {
         options.question = question;
         this.onGetDynamicPanelTabTitle.fire(this, options);
@@ -41176,15 +41239,14 @@ class SurveyModel extends SurveyElementCore {
         }
     }
     runConditionOnValueChanged(name, value) {
+        if (!this.questionTriggersKeys) {
+            this.questionTriggersKeys = {};
+        }
+        this.questionTriggersKeys[name] = value;
         if (this.isRunningConditions) {
-            if (this.questionTriggersKeys) {
-                this.questionTriggersKeys[name] = value;
-            }
             this.isValueChangedOnRunningCondition = true;
         }
         else {
-            this.questionTriggersKeys = {};
-            this.questionTriggersKeys[name] = value;
             this.runConditions();
             this.runQuestionsTriggers(name, value);
             this.questionTriggersKeys = undefined;
@@ -41625,6 +41687,35 @@ class SurveyModel extends SurveyElementCore {
         locNotification = this.getLocNotification(locNotification, newValue, oldValue);
         this.updateOnSetValue(name, newValue, oldValue, locNotification, allowNotifyValueChanged, questionName);
     }
+    questionValueChanging(question, newValue) {
+        const q = question;
+        const parentQ = q.parentQuestion;
+        if (!parentQ)
+            return newValue;
+        if (parentQ.isDescendantOf("paneldynamic") && !this.onDynamicPanelValueChanging.isEmpty) {
+            const options = parentQ.getValueChangingOptions(q);
+            if (options) {
+                options.value = newValue;
+                this.onDynamicPanelValueChanging.fire(this, options);
+                return options.value;
+            }
+        }
+        return newValue;
+    }
+    questionValueChanged(question, oldValue) {
+        const q = question;
+        const parentQ = q.parentQuestion;
+        if (!!parentQ) {
+            if (parentQ.isDescendantOf("paneldynamic") && !this.onDynamicPanelValueChanged.isEmpty) {
+                const options = parentQ.getValueChangingOptions(q);
+                if (options) {
+                    options.value = q.value;
+                    options.oldValue = oldValue;
+                    this.onDynamicPanelValueChanged.fire(this, options);
+                }
+            }
+        }
+    }
     isValueEmpyOnSetValue(name, val) {
         if (!this.isValueEmpty(val, false))
             return false;
@@ -43323,8 +43414,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 +44172,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 +45194,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 +47349,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 +47577,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 +47834,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 +47859,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 +49104,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.
@@ -56240,6 +56355,8 @@ class QuestionSliderModel extends Question {
         this.handleRangeOnChange = (event) => {
             if (!this.isRangeMoving)
                 return;
+            if (!this.isAllowToChange())
+                return;
             const { renderedMax: max, renderedMin: min, renderedValue, ensureMaxRangeBorders, ensureMinRangeBorders } = this;
             const inputNode = event.target;
             const diff = this.oldInputValue - +inputNode.value;
@@ -56325,7 +56442,7 @@ class QuestionSliderModel extends Question {
             input.style.setProperty("--sjs-range-slider-range-input-thumb-position", "absolute");
         };
         this.setSliderValue = (newValue) => {
-            if (!this.isReadOnly && !this.isDisabledAttr && !this.isPreviewStyle && !this.isDisabledStyle) {
+            if (this.isAllowToChange()) {
                 let result;
                 if (this.sliderType === "single") {
                     result = Array.isArray(newValue) ? newValue[0] : newValue;
@@ -56385,6 +56502,8 @@ class QuestionSliderModel extends Question {
             refreshInputRange();
         };
         this.handleOnChange = (event, inputNumber) => {
+            if (!this.isAllowToChange())
+                return;
             if (this.oldValue === null)
                 return; // Firefox raise one more OnChange after PointerUp and break the value
             const { allowSwap, ensureMaxRangeBorders, ensureMinRangeBorders, renderedValue } = this;
@@ -56594,24 +56713,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"],
         //   () => {
@@ -56716,6 +56824,9 @@ class QuestionSliderModel extends Question {
         }
         return value;
     }
+    isAllowToChange() {
+        return !this.isReadOnly && !this.isDisabledAttr && !this.isPreviewStyle && !this.isDisabledStyle;
+    }
 }
 __decorate([
     property({ defaultValue: "single" })
@@ -60564,7 +60675,6 @@ class QuestionPanelDynamicModel extends Question {
         }
         else {
             for (var i = 0; i < this.panelCount; i++) {
-                this.createNewPanel();
                 panels.push(this.createNewPanel());
             }
         }
@@ -61364,14 +61474,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();
@@ -61479,6 +61583,22 @@ class QuestionPanelDynamicModel extends Question {
     isNewValueCorrect(val) {
         return Array.isArray(val);
     }
+    getValueChangingOptions(childQuestion) {
+        let pnl = childQuestion.parent;
+        while (pnl.parent) {
+            pnl = pnl.parent;
+        }
+        const panel = pnl;
+        const panelIndex = this.panels.indexOf(panel);
+        return {
+            question: this,
+            panel: panel,
+            name: childQuestion.name,
+            panelIndex: panelIndex,
+            panelData: this.getPanelItemDataByIndex(panelIndex),
+            oldValue: childQuestion.value
+        };
+    }
     //IQuestionPanelDynamicData
     getItemIndex(item) {
         var res = this.items.indexOf(item);
@@ -61493,8 +61613,10 @@ class QuestionPanelDynamicModel extends Question {
         return visPanels.length;
     }
     getPanelItemData(item) {
-        var items = this.items;
-        var index = items.indexOf(item);
+        return this.getPanelItemDataByIndex(this.items.indexOf(item));
+    }
+    getPanelItemDataByIndex(index) {
+        const items = this.items;
         var qValue = this.value;
         if (index < 0 && Array.isArray(qValue) && qValue.length > items.length) {
             index = items.length;
@@ -61527,7 +61649,7 @@ class QuestionPanelDynamicModel extends Question {
         }
         if (!qValue[index])
             qValue[index] = {};
-        const oldVal = qValue[index][name];
+        qValue[index][name];
         if (!this.isValueEmpty(val)) {
             qValue[index][name] = val;
         }
@@ -61537,22 +61659,8 @@ class QuestionPanelDynamicModel extends Question {
         if (index >= 0 && index < this.panelsCore.length) {
             this.changingValueQuestion = this.panelsCore[index].getQuestionByValueName(name);
         }
-        const options = {
-            panel: item.panel,
-            name: name,
-            panelIndex: index,
-            panelData: qValue[index],
-            value: val,
-            oldValue: oldVal
-        };
-        if (this.survey) {
-            this.survey.dynamicPanelItemValueChanging(this, options);
-        }
         this.value = qValue;
         this.changingValueQuestion = null;
-        if (this.survey) {
-            this.survey.dynamicPanelItemValueChanged(this, options);
-        }
         this.isSetPanelItemData[name]--;
         if (this.isSetPanelItemData[name] - 1) {
             delete this.isSetPanelItemData[name];
@@ -62094,10 +62202,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 +62209,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 +62242,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 +62260,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 +62288,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 +62300,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 +62312,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 +62334,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 +62533,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 +62587,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 +65304,11 @@ var Version;
 var ReleaseDate;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-Version = `${"2.3.3"}`;
+Version = `${"2.3.5"}`;
 settings.version = Version;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-ReleaseDate = `${"2025-08-19"}`;
+ReleaseDate = `${"2025-09-02"}`;
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         const str = "survey-core has version '" + Version + "' and " + libraryName