survey-core 2.3.3 → 2.3.4

package/survey.core.js

@@ -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)
  */
@@ -619,11 +619,11 @@ var Version;
 var ReleaseDate;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-Version = "".concat("2.3.3");
+Version = "".concat("2.3.4");
 _src_settings__WEBPACK_IMPORTED_MODULE_1__.settings.version = Version;
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-ReleaseDate = "".concat("2025-08-19");
+ReleaseDate = "".concat("2025-08-26");
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         var str = "survey-core has version '" + Version + "' and " + libraryName
@@ -3524,14 +3524,9 @@ var Base = /** @class */ (function () {
             return;
         if (!!info.canRun && !info.canRun(this))
             return;
-        if (!info.runner) {
-            info.runner = this.createExpressionRunner(expression);
-            info.runner.onRunComplete = function (res) {
-                info.onExecute(_this, res);
-            };
-        }
-        info.runner.expression = expression;
-        info.runner.runContext(this.getValueGetterContext(), properties);
+        this.runExpressionByProperty(propName, properties, function (res) {
+            info.onExecute(_this, res);
+        });
     };
     Base.prototype.doBeforeAsynRun = function (id) {
         if (!this.asynExpressionHash)
@@ -3565,6 +3560,51 @@ var Base = /** @class */ (function () {
         res.onAfterAsyncRun = function (id) { _this.doAfterAsynRun(id); };
         return res;
     };
+    Base.prototype.getExpressionFromSurvey = function (propName) {
+        var expression = this[propName];
+        if (!expression)
+            return "";
+        var survey = this.getSurvey();
+        return !!survey ? survey.beforeExpressionRunning(this, propName, expression) : expression;
+    };
+    Base.prototype.runExpressionByProperty = function (propName, properties, onExecute, canRun) {
+        if (!this[propName])
+            return false;
+        var expression = this.getExpressionFromSurvey(propName);
+        if (!!expression) {
+            var info_1 = this.getExpressionInfoByProperty(propName, expression);
+            var runner = info_1.runner;
+            if (!info_1.isRunning && (!canRun || canRun(runner))) {
+                info_1.isRunning = true;
+                runner.onRunComplete = function (value) {
+                    onExecute(value);
+                    info_1.isRunning = false;
+                };
+                runner.runContext(this.getValueGetterContext(), properties);
+            }
+        }
+        return true;
+    };
+    Base.prototype.getExpressionByProperty = function (propName) {
+        var expression = this.getExpressionFromSurvey(propName);
+        if (!expression)
+            return null;
+        return this.getExpressionInfoByProperty(propName, expression).runner;
+    };
+    Base.prototype.getExpressionInfoByProperty = function (propName, expression) {
+        if (!this.runExpressionHash) {
+            this.runExpressionHash = {};
+        }
+        var 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.
      *
@@ -4090,8 +4130,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./helpers */ "./src/helpers.ts");
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./base */ "./src/base.ts");
-/* harmony import */ var _conditions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./conditions */ "./src/conditions.ts");
-/* harmony import */ var _jsonobject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./jsonobject */ "./src/jsonobject.ts");
+/* harmony import */ var _jsonobject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./jsonobject */ "./src/jsonobject.ts");
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -4110,7 +4149,6 @@ var __extends = (undefined && undefined.__extends) || (function () {
 
 
 
-
 /**
  * The calculated value is a way to define the variable in Survey Creator.
  * It has two main properties: name and expression. Based on expression the value read-only property is automatically calculated.
@@ -4244,9 +4282,8 @@ var CalculatedValue = /** @class */ (function (_super) {
         this.runExpression(this.data.getFilteredProperties());
     };
     CalculatedValue.prototype.runExpressionCore = function (calculatedValues, properties) {
-        if (!this.canRunExpression)
+        if (!this.canRunExpression || !this.ensureExpression())
             return;
-        this.ensureExpression();
         this.locCalculation();
         if (!!calculatedValues) {
             this.runDependentExpressions(calculatedValues, properties);
@@ -4266,22 +4303,27 @@ var CalculatedValue = /** @class */ (function (_super) {
     };
     CalculatedValue.prototype.ensureExpression = function () {
         var _this = this;
+        var expression = this.getExpressionFromSurvey("expression");
+        if (!expression)
+            return false;
         if (!!this.expressionRunner) {
-            this.expressionRunner.expression = this.expression;
-            return;
+            this.expressionRunner.expression = expression;
         }
-        this.expressionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_2__.ExpressionRunner(this.expression);
-        this.expressionRunner.onRunComplete = function (newValue) {
-            if (!_helpers__WEBPACK_IMPORTED_MODULE_0__.Helpers.isTwoValueEquals(newValue, _this.value, false, true, false)) {
-                _this.setValue(newValue);
-            }
-            _this.unlocCalculation();
-        };
+        else {
+            this.expressionRunner = this.createExpressionRunner(expression);
+            this.expressionRunner.onRunComplete = function (newValue) {
+                if (!_helpers__WEBPACK_IMPORTED_MODULE_0__.Helpers.isTwoValueEquals(newValue, _this.value, false, true, false)) {
+                    _this.setValue(newValue);
+                }
+                _this.unlocCalculation();
+            };
+        }
+        return true;
     };
     return CalculatedValue;
 }(_base__WEBPACK_IMPORTED_MODULE_1__.Base));
 
-_jsonobject__WEBPACK_IMPORTED_MODULE_3__.Serializer.addClass("calculatedvalue", [
+_jsonobject__WEBPACK_IMPORTED_MODULE_2__.Serializer.addClass("calculatedvalue", [
     { name: "!name", isUnique: true },
     "expression:expression",
     "includeIntoResult:boolean",
@@ -9921,9 +9963,10 @@ var ExpressionItem = /** @class */ (function (_super) {
         return "expressionitem";
     };
     ExpressionItem.prototype.runCondition = function (properties) {
-        if (!this.expression)
+        var expression = this.getExpressionFromSurvey("expression");
+        if (!expression)
             return false;
-        return new _conditions__WEBPACK_IMPORTED_MODULE_2__.ConditionRunner(this.expression).runContext(this.getValueGetterContext(), properties);
+        return new _conditions__WEBPACK_IMPORTED_MODULE_2__.ConditionRunner(expression).runContext(this.getValueGetterContext(), properties);
     };
     Object.defineProperty(ExpressionItem.prototype, "expression", {
         /**
@@ -16334,19 +16377,21 @@ var ItemValue = /** @class */ (function (_super) {
         return this.getEnableConditionRunner();
     };
     ItemValue.prototype.getVisibleConditionRunner = function () {
-        if (!this.visibleIf)
+        var expression = this.getExpressionFromSurvey("visibleIf");
+        if (!expression)
             return null;
         if (!this.visibleConditionRunner)
-            this.visibleConditionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(this.visibleIf);
-        this.visibleConditionRunner.expression = this.visibleIf;
+            this.visibleConditionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(expression);
+        this.visibleConditionRunner.expression = expression;
         return this.visibleConditionRunner;
     };
     ItemValue.prototype.getEnableConditionRunner = function () {
-        if (!this.enableIf)
+        var expression = this.getExpressionFromSurvey("enableIf");
+        if (!expression)
             return null;
         if (!this.enableConditionRunner)
-            this.enableConditionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(this.enableIf);
-        this.enableConditionRunner.expression = this.enableIf;
+            this.enableConditionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(expression);
+        this.enableConditionRunner.expression = expression;
         return this.enableConditionRunner;
     };
     Object.defineProperty(ItemValue.prototype, "selected", {
@@ -20194,7 +20239,6 @@ var QuestionMatrixBaseModel = /** @class */ (function (_super) {
             this.onRowsChanged();
         }
     };
-    QuestionMatrixBaseModel.prototype.isRowsFiltered = function () { return !!this.filteredRows; };
     QuestionMatrixBaseModel.prototype.clearGeneratedRows = function () {
         this.generatedVisibleRows = null;
     };
@@ -20202,20 +20246,14 @@ var QuestionMatrixBaseModel = /** @class */ (function (_super) {
     QuestionMatrixBaseModel.prototype.runConditionsForRows = function (properties) {
         var showInvisibile = !!this.survey && this.survey.areInvisibleElementsShowing;
         var runner = !showInvisibile ? this.createRowsVisibleIfRunner() : null;
-        this.filteredRows = [];
-        var hasChanged = _itemvalue__WEBPACK_IMPORTED_MODULE_0__.ItemValue.runConditionsForItems(this.rows, this.filteredRows, runner, properties, !showInvisibile);
+        var hasChanged = _itemvalue__WEBPACK_IMPORTED_MODULE_0__.ItemValue.runConditionsForItems(this.rows, undefined, runner, properties, !showInvisibile);
         _itemvalue__WEBPACK_IMPORTED_MODULE_0__.ItemValue.runEnabledConditionsForItems(this.rows, undefined, properties);
-        if (this.filteredRows.length === this.rows.length) {
-            this.filteredRows = null;
-            if (!!this.generatedVisibleRows && this.generatedVisibleRows.length !== this.rows.length) {
-                this.generatedVisibleRows = null;
-            }
-        }
         return hasChanged;
     };
     QuestionMatrixBaseModel.prototype.runConditionsForColumns = function (properties) {
         var useColumnsExpression = !!this.survey && !this.survey.areInvisibleElementsShowing;
-        var runner = useColumnsExpression && !!this.columnsVisibleIf ? new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(this.columnsVisibleIf) : null;
+        var expression = this.getExpressionFromSurvey("columnsVisibleIf");
+        var runner = useColumnsExpression && !!expression ? new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(expression) : null;
         return _itemvalue__WEBPACK_IMPORTED_MODULE_0__.ItemValue.runConditionsForItems(this.columns, undefined, runner, properties, this.shouldRunColumnExpression());
     };
     QuestionMatrixBaseModel.prototype.clearInvisibleColumnValues = function () { };
@@ -27837,15 +27875,6 @@ var __extends = (undefined && undefined.__extends) || (function () {
 
 
 
-var TriggerExpressionInfo = /** @class */ (function () {
-    function TriggerExpressionInfo(name, canRun, doComplete) {
-        this.name = name;
-        this.canRun = canRun;
-        this.doComplete = doComplete;
-        this.getSecondRunner = function () { return undefined; };
-    }
-    return TriggerExpressionInfo;
-}());
 var QuestionValueGetterContext = /** @class */ (function () {
     function QuestionValueGetterContext(question, isUnwrapped) {
         this.question = question;
@@ -27976,6 +28005,7 @@ var Question = /** @class */ (function (_super) {
         var _this = _super.call(this, name) || this;
         _this.customWidgetData = { isNeedRender: true };
         _this.hasCssErrorCallback = function () { return false; };
+        _this.triggersInfo = [];
         _this.isReadyValue = true;
         _this.dependedQuestions = [];
         /**
@@ -27991,7 +28021,6 @@ var Question = /** @class */ (function (_super) {
          * Indicates the previous ready state.
          */
         _this.onReadyChanged = _this.addEvent();
-        _this.triggersInfo = [];
         _this.isRunningValidatorsValue = false;
         _this.isValueChangedInSurvey = false;
         _this.allowNotifyValueChanged = true;
@@ -28009,13 +28038,7 @@ var Question = /** @class */ (function (_super) {
         _this.createLocalizableString("requiredErrorText", _this);
         _this.createLocalizableString("commentPlaceholder", _this);
         _this.createLocalizableString("defaultDisplayValue", _this);
-        _this.addTriggerInfo("resetValueIf", function () { return !_this.isEmpty(); }, function () {
-            _this.startSetValueOnExpression();
-            _this.updateValueWithDefaultsOrClear();
-            _this.finishSetValueOnExpression();
-        });
-        var setValueIfInfo = _this.addTriggerInfo("setValueIf", function () { return true; }, function () { return _this.runSetValueExpression(); });
-        setValueIfInfo.getSecondRunner = function () { return _this.getSetValueExpressionRunner(); };
+        _this.addTriggersInfo();
         _this.registerPropertyChangedHandlers(["width"], function () {
             _this.updateQuestionCss();
             if (!!_this.parent) {
@@ -28607,63 +28630,15 @@ var Question = /** @class */ (function (_super) {
             requiredAnsweredQuestionCount: !this.isEmpty() && this.isRequired ? 1 : 0,
         };
     };
-    Question.prototype.ensureSetValueExpressionRunner = function () {
+    Question.prototype.runTriggerInfo = function (info, keys, properties) {
         var _this = this;
-        if (!this.setValueExpressionRunner) {
-            this.setValueExpressionRunner = this.createExpressionRunner(this.setValueExpression);
-            this.setValueExpressionRunner.onRunComplete = function (res) {
-                _this.runExpressionSetValue(res);
-            };
-        }
-        else {
-            this.setValueExpressionRunner.expression = this.setValueExpression;
-        }
-    };
-    Question.prototype.runSetValueExpression = function () {
-        if (!this.setValueExpression) {
-            this.clearValue();
-        }
-        else {
-            this.ensureSetValueExpressionRunner();
-            this.setValueExpressionRunner.runContext(this.getValueGetterContext(), this.getDataFilteredProperties());
-        }
-    };
-    Question.prototype.getSetValueExpressionRunner = function () {
-        this.ensureSetValueExpressionRunner();
-        return this.setValueExpressionRunner;
-    };
-    Question.prototype.addTriggerInfo = function (name, canRun, doComplete) {
-        var info = new TriggerExpressionInfo(name, canRun, doComplete);
-        this.triggersInfo.push(info);
-        return info;
-    };
-    Question.prototype.runTriggerInfo = function (info, keys) {
-        var expression = this[info.name];
-        if (!expression && !info.getSecondRunner() || info.isRunning || !info.canRun()) {
-            return;
-        }
-        if (!info.runner) {
-            info.runner = this.createExpressionRunner(expression);
-            info.runner.onRunComplete = function (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());
-        }
+        this.runExpressionByProperty(info.name, properties, function (value) {
+            info.doComplete(value, properties);
+        }, function (runner) {
+            if (!info.canRun())
+                return false;
+            return !keys || _this.canExecuteTriggerByKeys(keys, runner, _this.getExpressionByProperty(info.secondName));
+        });
     };
     Question.prototype.canExecuteTriggerByKeys = function (keys, runner, secondRunner) {
         if (!runner && !!secondRunner) {
@@ -28692,6 +28667,48 @@ var Question = /** @class */ (function (_super) {
     Question.prototype.getValueGetterContext = function (isUnwrapped) {
         return new QuestionValueGetterContext(this, isUnwrapped);
     };
+    Question.prototype.addTriggersInfo = function () {
+        var _this = this;
+        this.addTriggerInfo({
+            name: "resetValueIf",
+            canRun: function () { return !_this.isEmpty(); },
+            doComplete: function (res, properties) {
+                if (res === true) {
+                    _this.startSetValueOnExpression();
+                    _this.updateValueWithDefaultsOrClear();
+                    _this.finishSetValueOnExpression();
+                }
+            }
+        });
+        this.addTriggerInfo({
+            name: "setValueIf",
+            secondName: "setValueExpression",
+            canRun: function () { return true; },
+            doComplete: function (res, properties) {
+                if (res) {
+                    if (!_this.setValueExpression) {
+                        _this.clearValue();
+                    }
+                    else {
+                        var info = {
+                            name: "setValueExpression",
+                            canRun: function () { return true; },
+                            doComplete: function (res, properties) { return _this.runExpressionSetValue(res); }
+                        };
+                        _this.runTriggerInfo(info, undefined, properties);
+                    }
+                }
+            }
+        });
+        this.addTriggerInfo({
+            name: "setValueExpression",
+            canRun: function () { return !_this.setValueIf; },
+            doComplete: function (res, properties) { return _this.runExpressionSetValue(res); }
+        });
+    };
+    Question.prototype.addTriggerInfo = function (info) {
+        this.triggersInfo.push(info);
+    };
     Question.prototype.runTriggers = function (name, value, keys) {
         var _this = this;
         if (this.isSettingQuestionValue || (this.parentQuestion && this.parentQuestion.getValueName() === name))
@@ -28700,8 +28717,9 @@ var Question = /** @class */ (function (_super) {
             keys = {};
             keys[name] = value;
         }
+        var properties = this.getDataFilteredProperties();
         this.triggersInfo.forEach(function (info) {
-            _this.runTriggerInfo(info, keys);
+            _this.runTriggerInfo(info, keys, properties);
         });
     };
     Question.prototype.runConditions = function () {
@@ -28839,7 +28857,7 @@ var Question = /** @class */ (function (_super) {
         this.resetSingleInputCore();
     };
     Question.prototype.resetSingleInputCore = function () {
-        var prev = this.singleInputQuestion;
+        var prev = this.getPropertyValue("singleInputQuestion");
         this.resetPropertyValue("singleInputQuestion");
         if (!!prev) {
             this.onSingleInputChanged();
@@ -30285,8 +30303,7 @@ var Question = /** @class */ (function (_super) {
         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);
         }
     };
     Object.defineProperty(Question.prototype, "isInDesignMode", {
@@ -30929,15 +30946,6 @@ var Question = /** @class */ (function (_super) {
     Question.prototype.isDefaultValueEmpty = function () {
         return !this.defaultValueExpression && this.isValueEmpty(this.defaultValue, !this.allowSpaceAsAnswer);
     };
-    Question.prototype.getDefaultRunner = function (runner, expression) {
-        if (!runner && !!expression) {
-            runner = this.createExpressionRunner(expression);
-        }
-        if (!!runner) {
-            runner.expression = expression;
-        }
-        return runner;
-    };
     Question.prototype.setDefaultValue = function () {
         var _this = this;
         this.setDefaultValueCore(function (val) {
@@ -30950,9 +30958,14 @@ var Question = /** @class */ (function (_super) {
     Question.prototype.setDefaultIntoValue = function (val) {
         this.value = val;
     };
-    Question.prototype.setDefaultValueCore = function (func) {
-        this.defaultValueRunner = this.getDefaultRunner(this.defaultValueRunner, this.defaultValueExpression);
-        this.setValueAndRunExpression(this.defaultValueRunner, this.getUnbindValue(this.defaultValue), function (val) { return func(val); });
+    Question.prototype.setDefaultValueCore = function (setFunc) {
+        var _this = this;
+        var func = function (val) {
+            _this.runExpressionSetValueCore(val, setFunc);
+        };
+        if (!this.runDefaultValueExpression(undefined, func)) {
+            func(this.getUnbindValue(this.defaultValue));
+        }
     };
     Question.prototype.updateValueWithDefaultsOrClear = function () {
         if (this.isDesignMode || this.isLoadingFromJson)
@@ -30967,16 +30980,6 @@ var Question = /** @class */ (function (_super) {
     Question.prototype.isValueExpression = function (val) {
         return !!val && typeof val == "string" && val.length > 0 && val[0] == "=";
     };
-    Question.prototype.setValueAndRunExpression = function (runner, defaultValue, setFunc, properties) {
-        var _this = this;
-        if (properties === void 0) { properties = null; }
-        var func = function (val) {
-            _this.runExpressionSetValueCore(val, setFunc);
-        };
-        if (!this.runDefaultValueExpression(runner, properties, func)) {
-            func(defaultValue);
-        }
-    };
     Question.prototype.convertFuncValuetoQuestionValue = function (val) {
         return _helpers__WEBPACK_IMPORTED_MODULE_0__.Helpers.convertValToQuestionVal(val);
     };
@@ -31001,10 +31004,10 @@ var Question = /** @class */ (function (_super) {
         var _a;
         (_a = this.survey) === null || _a === void 0 ? void 0 : _a.finishSetValueOnExpression();
     };
-    Question.prototype.runDefaultValueExpression = function (runner, properties, setFunc) {
+    Question.prototype.runDefaultValueExpression = function (properties, setFunc) {
         var _this = this;
         if (properties === void 0) { properties = null; }
-        if (!runner || !this.data)
+        if (!this.data)
             return false;
         if (!setFunc) {
             setFunc = function (val) {
@@ -31015,17 +31018,13 @@ var Question = /** @class */ (function (_super) {
             properties = this.defaultValueExpression ? this.data.getFilteredProperties() : {};
             properties["question"] = this;
         }
-        if (!!runner && runner.canRun) {
-            runner.onRunComplete = function (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, function (res) {
+            if (res == undefined)
+                res = _this.defaultValue;
+            _this.isChangingViaDefaultValue = true;
+            setFunc(res);
+            _this.isChangingViaDefaultValue = false;
+        });
     };
     Object.defineProperty(Question.prototype, "comment", {
         /**
@@ -33172,22 +33171,24 @@ var QuestionSelectBase = /** @class */ (function (_super) {
         return [];
     };
     QuestionSelectBase.prototype.setConditionalChoicesRunner = function () {
-        if (this.choicesVisibleIf) {
+        var expression = this.getExpressionFromSurvey("choicesVisibleIf");
+        if (expression) {
             if (!this.conditionChoicesVisibleIfRunner) {
-                this.conditionChoicesVisibleIfRunner = new _conditions__WEBPACK_IMPORTED_MODULE_8__.ConditionRunner(this.choicesVisibleIf);
+                this.conditionChoicesVisibleIfRunner = new _conditions__WEBPACK_IMPORTED_MODULE_8__.ConditionRunner(expression);
             }
-            this.conditionChoicesVisibleIfRunner.expression = this.choicesVisibleIf;
+            this.conditionChoicesVisibleIfRunner.expression = expression;
         }
         else {
             this.conditionChoicesVisibleIfRunner = null;
         }
     };
     QuestionSelectBase.prototype.setConditionalEnableChoicesRunner = function () {
-        if (this.choicesEnableIf) {
+        var expression = this.getExpressionFromSurvey("choicesEnableIf");
+        if (expression) {
             if (!this.conditionChoicesEnableIfRunner) {
-                this.conditionChoicesEnableIfRunner = new _conditions__WEBPACK_IMPORTED_MODULE_8__.ConditionRunner(this.choicesEnableIf);
+                this.conditionChoicesEnableIfRunner = new _conditions__WEBPACK_IMPORTED_MODULE_8__.ConditionRunner(expression);
             }
-            this.conditionChoicesEnableIfRunner.expression = this.choicesEnableIf;
+            this.conditionChoicesEnableIfRunner.expression = expression;
         }
         else {
             this.conditionChoicesEnableIfRunner = null;
@@ -34346,10 +34347,10 @@ var QuestionSelectBase = /** @class */ (function (_super) {
         }
     };
     QuestionSelectBase.prototype.getStoreOthersAsComment = function () {
-        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)) ||
@@ -37797,11 +37798,24 @@ var QuestionCustomModelBase = /** @class */ (function (_super) {
         this.initElement(this.getElement());
         this.isSettingValOnLoading = false;
     };
+    QuestionCustomModelBase.prototype.onCustomQuestionLoaded = function () {
+        if (!this.isLoadedCalled && !!this.customQuestion && !!this.survey) {
+            this.customQuestion.onLoaded(this);
+            this.isLoadedCalled = true;
+        }
+    };
     QuestionCustomModelBase.prototype.onSurveyLoad = function () {
         _super.prototype.onSurveyLoad.call(this);
+        this.isLoadedCalled = false;
         if (!!this.getElement()) {
             this.getElement().onSurveyLoad();
-            this.customQuestion.onLoaded(this);
+        }
+        this.onCustomQuestionLoaded();
+    };
+    QuestionCustomModelBase.prototype.setSurveyCore = function (value) {
+        _super.prototype.setSurveyCore.call(this, value);
+        if (this.isLoadedCalled === false && value) {
+            this.onCustomQuestionLoaded();
         }
     };
     QuestionCustomModelBase.prototype.afterRenderQuestionElement = function (el) {
@@ -39339,11 +39353,6 @@ var QuestionExpressionModel = /** @class */ (function (_super) {
     function QuestionExpressionModel(name) {
         var _this = _super.call(this, name) || this;
         _this.createLocalizableString("format", _this);
-        _this.registerPropertyChangedHandlers(["expression"], function () {
-            if (_this.expressionRunner) {
-                _this.expressionRunner = _this.createRunner();
-            }
-        });
         _this.registerPropertyChangedHandlers(["format", "currency", "displayStyle"], function () {
             _this.updateFormatedValue();
         });
@@ -39398,22 +39407,19 @@ var QuestionExpressionModel = /** @class */ (function (_super) {
         configurable: true
     });
     QuestionExpressionModel.prototype.locCalculation = function () {
-        this.expressionIsRunning = true;
+        this.isExecutionLocked = true;
     };
     QuestionExpressionModel.prototype.unlocCalculation = function () {
-        this.expressionIsRunning = false;
+        this.isExecutionLocked = false;
     };
     QuestionExpressionModel.prototype.runConditionCore = function (properties) {
+        var _this = this;
         _super.prototype.runConditionCore.call(this, 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, function (val) {
+            _this.value = _this.roundValue(val);
+        });
     };
     QuestionExpressionModel.prototype.canCollectErrors = function () {
         return true;
@@ -39421,15 +39427,6 @@ var QuestionExpressionModel = /** @class */ (function (_super) {
     QuestionExpressionModel.prototype.hasRequiredError = function () {
         return false;
     };
-    QuestionExpressionModel.prototype.createRunner = function () {
-        var _this = this;
-        var res = this.createExpressionRunner(this.expression);
-        res.onRunComplete = function (newValue) {
-            _this.value = _this.roundValue(newValue);
-            _this.unlocCalculation();
-        };
-        return res;
-    };
     Object.defineProperty(QuestionExpressionModel.prototype, "maximumFractionDigits", {
         /**
          * 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.
@@ -42628,6 +42625,11 @@ var MatrixRowModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(MatrixRowModel.prototype, "isVisible", {
+        get: function () { return this.item.isVisible; },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(MatrixRowModel.prototype, "value", {
         get: function () {
             return this.getPropertyValue("value");
@@ -42909,7 +42911,7 @@ var MatrixValueGetterContext = /** @class */ (function (_super) {
     MatrixValueGetterContext.prototype.getRootObj = function () { return this.question.data; };
     MatrixValueGetterContext.prototype.updateValueByItem = function (name, res) {
         var _a;
-        var rows = this.question.visibleRows;
+        var rows = this.question.getMatrixRows();
         name = name.toLocaleLowerCase();
         for (var i = 0; i < rows.length; i++) {
             var row = rows[i];
@@ -43238,20 +43240,21 @@ var QuestionMatrixModel = /** @class */ (function (_super) {
         _super.prototype.runConditionCore.call(this, properties);
     };
     QuestionMatrixModel.prototype.createRowsVisibleIfRunner = function () {
-        return !!this.rowsVisibleIf ? new _conditions__WEBPACK_IMPORTED_MODULE_12__.ConditionRunner(this.rowsVisibleIf) : null;
+        var expression = this.getExpressionFromSurvey("rowsVisibleIf");
+        return !!expression ? new _conditions__WEBPACK_IMPORTED_MODULE_12__.ConditionRunner(expression) : null;
     };
     QuestionMatrixModel.prototype.onRowsChanged = function () {
         this.clearGeneratedRows();
         _super.prototype.onRowsChanged.call(this);
     };
-    QuestionMatrixModel.prototype.getVisibleRows = function () {
+    QuestionMatrixModel.prototype.getMatrixRows = function () {
         if (!!this.generatedVisibleRows)
             return this.generatedVisibleRows;
         var result = new Array();
         var val = this.value;
         if (!val)
             val = {};
-        var rows = this.filteredRows || this.rows;
+        var rows = this.rows;
         for (var i = 0; i < rows.length; i++) {
             var row = rows[i];
             if (this.isValueEmpty(row.value))
@@ -43262,6 +43265,15 @@ var QuestionMatrixModel = /** @class */ (function (_super) {
         this.generatedVisibleRows = result;
         return result;
     };
+    QuestionMatrixModel.prototype.getVisibleRows = function () {
+        var rows = [];
+        this.getMatrixRows().forEach(function (row) {
+            if (row.isVisible) {
+                rows.push(row);
+            }
+        });
+        return rows;
+    };
     QuestionMatrixModel.prototype.getRowByName = function (name) {
         var rows = this.visibleRows;
         for (var i = 0; i < rows.length; i++) {
@@ -44398,6 +44410,9 @@ var MatrixRowGetterContext = /** @class */ (function (_super) {
         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;
         }
@@ -45948,23 +45963,24 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
     QuestionMatrixDropdownModelBase.prototype.runCellsCondition = function (properties) {
         if (this.isDesignMode)
             return;
+        var rowsVisibleIf = this.getExpressionFromSurvey("rowsVisibleIf");
         var 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();
     };
     QuestionMatrixDropdownModelBase.prototype.runConditionsForColumns = function (properties) {
-        var _this = this;
+        var expression = this.getExpressionFromSurvey("columnsVisibleIf");
         this.columns.forEach(function (column) {
-            if (!_this.columnsVisibleIf) {
+            if (!expression) {
                 column.isColumnsVisibleIf = true;
             }
             else {
-                var condition = new _conditions__WEBPACK_IMPORTED_MODULE_15__.ConditionRunner(_this.columnsVisibleIf);
+                var condition = new _conditions__WEBPACK_IMPORTED_MODULE_15__.ConditionRunner(expression);
                 column.isColumnsVisibleIf = condition.runContext(column.getValueGetterContext(), properties) === true;
             }
         });
@@ -46178,6 +46194,7 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
          * 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.
@@ -47202,7 +47219,7 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
         }
     };
     QuestionMatrixDropdownModelBase.prototype.isRowsFiltered = function () {
-        return _super.prototype.isRowsFiltered.call(this) || (this.visibleRows !== this.generatedVisibleRows);
+        return this.visibleRows !== this.generatedVisibleRows;
     };
     QuestionMatrixDropdownModelBase.prototype.getQuestionFromArray = function (name, index) {
         if (index >= this.visibleRows.length)
@@ -47277,7 +47294,9 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
 _jsonobject__WEBPACK_IMPORTED_MODULE_0__.Serializer.addClass("matrixdropdownbase", [
     {
         name: "columns:matrixdropdowncolumns",
-        className: "matrixdropdowncolumn", isArray: true
+        uniqueProperty: "name",
+        className: "matrixdropdowncolumn",
+        isArray: true
     },
     {
         name: "columnLayout",
@@ -54590,14 +54609,12 @@ var QuestionPanelDynamicModel = /** @class */ (function (_super) {
             return;
         this.prepareValueForPanelCreating();
         var panels = [];
-        var panel;
         if (this.useTemplatePanel) {
-            panel = new QuestionPanelDynamicItem(this, this.template);
+            new QuestionPanelDynamicItem(this, this.template);
             panels.push(this.template);
         }
         else {
             for (var i = 0; i < this.panelCount; i++) {
-                panel = this.createNewPanel();
                 panels.push(this.createNewPanel());
             }
         }
@@ -55440,14 +55457,8 @@ var QuestionPanelDynamicModel = /** @class */ (function (_super) {
         new _jsonobject__WEBPACK_IMPORTED_MODULE_5__.JsonObject().toObject(json, panel);
         panel.renderWidth = "100%";
         panel.updateCustomWidgets();
+        panel.questions.forEach(function (q) { return 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();
@@ -59833,24 +59844,13 @@ var QuestionSliderModel = /** @class */ (function (_super) {
     QuestionSliderModel.prototype.runConditionCore = function (properties) {
         var _this = this;
         _super.prototype.runConditionCore.call(this, properties);
-        this.runMinMaxCondition(this.maxValueExpression, properties, function (value) {
+        this.runExpressionByProperty("maxValueExpression", properties, function (value) {
             _this.max = value !== null && value !== void 0 ? value : _this.renderedMax;
         });
-        this.runMinMaxCondition(this.minValueExpression, properties, function (value) {
+        this.runExpressionByProperty("minValueExpression", properties, function (value) {
             _this.min = value !== null && value !== void 0 ? value : _this.renderedMin;
         });
     };
-    QuestionSliderModel.prototype.runMinMaxCondition = function (expression, properties, setter) {
-        if (!expression)
-            return;
-        var runner = this.getDefaultRunner(this.defaultExpressionRunner, expression);
-        if (!!runner && runner.canRun) {
-            runner.onRunComplete = function (res) {
-                setter(res);
-            };
-            runner.runContext(this.getValueGetterContext(), properties);
-        }
-    };
     QuestionSliderModel.prototype.initPropertyDependencies = function () {
         var _this = this;
         // this.registerSychProperties(["segmentCount"],
@@ -61200,20 +61200,31 @@ var QuestionTextModel = /** @class */ (function (_super) {
     QuestionTextModel.prototype.setRenderedMinMax = function (properties) {
         var _this = this;
         if (properties === void 0) { properties = null; }
-        this.minValueRunner = this.getDefaultRunner(this.minValueRunner, this.minValueExpression);
-        this.setValueAndRunExpression(this.minValueRunner, this.min, function (val) {
+        var setProp = function (name, val) {
+            _this.setPropertyValue(name, _this.convertFuncValuetoQuestionValue(val));
+        };
+        var setMin = function (val) {
             if (!val && _this.isDateInputType && !!_settings__WEBPACK_IMPORTED_MODULE_6__.settings.minDate) {
                 val = _settings__WEBPACK_IMPORTED_MODULE_6__.settings.minDate;
             }
-            _this.setPropertyValue("renderedMin", val);
-        }, properties);
-        this.maxValueRunner = this.getDefaultRunner(this.maxValueRunner, this.maxValueExpression);
-        this.setValueAndRunExpression(this.maxValueRunner, this.max, function (val) {
+            setProp("renderedMin", val);
+        };
+        var setMax = function (val) {
             if (!val && _this.isDateInputType) {
                 val = !!_settings__WEBPACK_IMPORTED_MODULE_6__.settings.maxDate ? _settings__WEBPACK_IMPORTED_MODULE_6__.settings.maxDate : "2999-12-31";
             }
-            _this.setPropertyValue("renderedMax", val);
-        }, properties);
+            setProp("renderedMax", val);
+        };
+        if (!this.runExpressionByProperty("minValueExpression", properties, function (val) {
+            setMin(val);
+        })) {
+            setMin(this.min);
+        }
+        if (!this.runExpressionByProperty("maxValueExpression", properties, function (val) {
+            setMax(val);
+        })) {
+            setMax(this.max);
+        }
     };
     Object.defineProperty(QuestionTextModel.prototype, "step", {
         /**
@@ -62799,6 +62810,7 @@ var settings = {
         row: "row",
         totalRow: "totalRow",
         rowIndex: "rowIndex",
+        visibleRowIndex: "visibleRowIndex",
         rowValue: "rowValue",
         rowName: "rowName",
         rowTitle: "rowTitle",
@@ -65677,6 +65689,10 @@ var SurveyModel = /** @class */ (function (_super) {
          */
         _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.
          */
@@ -67744,6 +67760,11 @@ var SurveyModel = /** @class */ (function (_super) {
         };
         return exp.runContext(this.getValueGetterContext(), properties) || onCompleteRes;
     };
+    SurveyModel.prototype.beforeExpressionRunning = function (obj, propertyName, expression) {
+        var opt = { element: obj, propertyName: propertyName, expression: expression, allow: true };
+        this.onExpressionRunning.fire(this, opt);
+        return opt.allow ? opt.expression : "";
+    };
     Object.defineProperty(SurveyModel.prototype, "isSettingValueOnExpression", {
         get: function () { return this.setValueOnExpressionCounter > 0; },
         enumerable: false,
@@ -74578,8 +74599,8 @@ _jsonobject__WEBPACK_IMPORTED_MODULE_1__.Serializer.addClass("survey", [
         dependsOn: ["showTOC"],
         visibleIf: function (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" },
@@ -75818,10 +75839,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./helpers */ "./src/helpers.ts");
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./base */ "./src/base.ts");
 /* harmony import */ var _jsonobject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./jsonobject */ "./src/jsonobject.ts");
-/* harmony import */ var _conditions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./conditions */ "./src/conditions.ts");
-/* harmony import */ var _expressions_expressions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./expressions/expressions */ "./src/expressions/expressions.ts");
-/* harmony import */ var _conditionProcessValue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./conditionProcessValue */ "./src/conditionProcessValue.ts");
-/* harmony import */ var _settings__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./settings */ "./src/settings.ts");
+/* harmony import */ var _expressions_expressions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./expressions/expressions */ "./src/expressions/expressions.ts");
+/* harmony import */ var _conditionProcessValue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./conditionProcessValue */ "./src/conditionProcessValue.ts");
+/* harmony import */ var _settings__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./settings */ "./src/settings.ts");
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -75843,7 +75863,6 @@ var __extends = (undefined && undefined.__extends) || (function () {
 
 
 
-
 /**
  * A base class for all triggers.
  * A trigger calls a method when the expression change the result: from false to true or from true to false.
@@ -75854,10 +75873,6 @@ var Trigger = /** @class */ (function (_super) {
     function Trigger() {
         var _this = _super.call(this) || this;
         _this.idValue = (Trigger.idCounter++);
-        _this.registerPropertyChangedHandlers(["operator", "value", "name"], function () {
-            _this.oldPropertiesChanged();
-        });
-        _this.registerPropertyChangedHandlers(["expression"], function () { _this.onExpressionChanged(); });
         return _this;
     }
     Object.defineProperty(Trigger, "operators", {
@@ -75911,7 +75926,7 @@ var Trigger = /** @class */ (function (_super) {
     };
     Trigger.prototype.toString = function () {
         var res = this.getType().replace("trigger", "");
-        var exp = !!this.expression ? this.expression : this.buildExpression();
+        var exp = this.expression;
         if (exp) {
             res += ", " + exp;
         }
@@ -75961,7 +75976,7 @@ var Trigger = /** @class */ (function (_super) {
     });
     Object.defineProperty(Trigger.prototype, "expression", {
         get: function () {
-            return this.getPropertyValue("expression", "");
+            return this.getPropertyValue("expression", this.buildExpression());
         },
         set: function (val) {
             this.setPropertyValue("expression", val);
@@ -75976,23 +75991,24 @@ var Trigger = /** @class */ (function (_super) {
         return false;
     };
     Trigger.prototype.checkExpression = function (options) {
+        var _this = this;
         this.isExecutingOnNextPage = options.isOnNextPage;
         this.isExecutingOnNavigation = options.isOnNavigation || options.isOnNextPage;
         if (!this.canBeExecuted(options.isOnNextPage))
             return;
         if (options.isOnComplete && !this.canBeExecutedOnComplete())
             return;
-        if (!this.isCheckRequired(options.keys))
-            return;
         var 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);
+        var props = options.properties || null;
+        if (!this.runExpressionByProperty("expression", props, function (val) {
+            _this.triggerResult(val === true, props);
+        }, function (runner) {
+            return _this.isCheckRequired(runner, options.keys);
+        })) {
+            if (this.isCheckRequired(null, options.keys) && this.canSuccessOnEmptyExpression()) {
+                this.triggerResult(true, props);
             }
         }
     };
@@ -76014,13 +76030,6 @@ var Trigger = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Trigger.prototype.perform = function (properties) {
-        var _this = this;
-        this.conditionRunner.onRunComplete = function (res) {
-            _this.triggerResult(res, properties);
-        };
-        this.conditionRunner.runContext(this.getValueGetterContext(), properties);
-    };
     Trigger.prototype.triggerResult = function (res, properties) {
         if (res) {
             this.onSuccess(properties);
@@ -76033,16 +76042,6 @@ var Trigger = /** @class */ (function (_super) {
     Trigger.prototype.onSuccess = function (properties) { };
     Trigger.prototype.onFailure = function () { };
     Trigger.prototype.onSuccessExecuted = function () { };
-    Trigger.prototype.endLoadingFromJson = function () {
-        _super.prototype.endLoadingFromJson.call(this);
-        this.oldPropertiesChanged();
-    };
-    Trigger.prototype.oldPropertiesChanged = function () {
-        this.onExpressionChanged();
-    };
-    Trigger.prototype.onExpressionChanged = function () {
-        this.conditionRunner = null;
-    };
     Trigger.prototype.buildExpression = function () {
         if (!this.name)
             return "";
@@ -76053,22 +76052,21 @@ var Trigger = /** @class */ (function (_super) {
             "} " +
             this.operator +
             " " +
-            _expressions_expressions__WEBPACK_IMPORTED_MODULE_4__.OperandMaker.toOperandString(this.value));
+            _expressions_expressions__WEBPACK_IMPORTED_MODULE_3__.OperandMaker.toOperandString(this.value));
     };
-    Trigger.prototype.isCheckRequired = function (keys) {
+    Trigger.prototype.isCheckRequired = function (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 _conditionProcessValue__WEBPACK_IMPORTED_MODULE_5__.ValueGetter().isAnyKeyChanged(keys, this.getUsedVariables());
+        return new _conditionProcessValue__WEBPACK_IMPORTED_MODULE_4__.ValueGetter().isAnyKeyChanged(keys, this.getUsedVariables(runner));
     };
-    Trigger.prototype.getUsedVariables = function () {
-        if (!this.conditionRunner)
+    Trigger.prototype.getUsedVariables = function (runner) {
+        if (!runner)
             return [];
-        var res = this.conditionRunner.getVariables();
+        var res = runner.getVariables();
         if (Array.isArray(res)) {
-            var unw = _settings__WEBPACK_IMPORTED_MODULE_6__.settings.expressionVariables.unwrapPostfix;
+            var unw = _settings__WEBPACK_IMPORTED_MODULE_5__.settings.expressionVariables.unwrapPostfix;
             for (var i = res.length - 1; i >= 0; i--) {
                 var s = res[i];
                 if (s.endsWith(unw)) {
@@ -76078,17 +76076,6 @@ var Trigger = /** @class */ (function (_super) {
         }
         return res;
     };
-    Trigger.prototype.createConditionRunner = function () {
-        if (!!this.conditionRunner)
-            return;
-        var expression = this.expression;
-        if (!expression) {
-            expression = this.buildExpression();
-        }
-        if (!expression)
-            return;
-        this.conditionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(expression);
-    };
     Object.defineProperty(Trigger.prototype, "isRequireValue", {
         get: function () {
             return this.operator !== "empty" && this.operator != "notempty";
@@ -76193,7 +76180,7 @@ var SurveyTriggerComplete = /** @class */ (function (_super) {
         configurable: true
     });
     SurveyTriggerComplete.prototype.isRealExecution = function () {
-        return !_settings__WEBPACK_IMPORTED_MODULE_6__.settings.triggers.executeCompleteOnValueChanged === this.isExecutingOnNavigation;
+        return !_settings__WEBPACK_IMPORTED_MODULE_5__.settings.triggers.executeCompleteOnValueChanged === this.isExecutingOnNavigation;
     };
     SurveyTriggerComplete.prototype.onSuccess = function (properties) {
         if (!this.owner)
@@ -76304,7 +76291,7 @@ var SurveyTriggerSkip = /** @class */ (function (_super) {
         configurable: true
     });
     SurveyTriggerSkip.prototype.canBeExecuted = function (isOnNextPage) {
-        return isOnNextPage === !_settings__WEBPACK_IMPORTED_MODULE_6__.settings.triggers.executeSkipOnValueChanged;
+        return isOnNextPage === !_settings__WEBPACK_IMPORTED_MODULE_5__.settings.triggers.executeSkipOnValueChanged;
     };
     SurveyTriggerSkip.prototype.onSuccess = function (properties) {
         if (!this.gotoName || !this.owner)
@@ -76350,15 +76337,11 @@ var SurveyTriggerRunExpression = /** @class */ (function (_super) {
     };
     SurveyTriggerRunExpression.prototype.onSuccess = function (properties) {
         var _this = this;
-        if (!this.owner || !this.runExpression)
+        if (!this.owner)
             return;
-        var expression = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ExpressionRunner(this.runExpression);
-        if (expression.canRun) {
-            expression.onRunComplete = function (res) {
-                _this.onCompleteRunExpression(res);
-            };
-            expression.runContext(this.getValueGetterContext(), properties);
-        }
+        this.runExpressionByProperty("runExpression", properties, function (res) {
+            _this.onCompleteRunExpression(res);
+        });
     };
     SurveyTriggerRunExpression.prototype.onCompleteRunExpression = function (newValue) {
         if (!!this.setToName && newValue !== undefined) {
@@ -76423,8 +76406,8 @@ var SurveyTriggerCopyValue = /** @class */ (function (_super) {
         this.owner.copyTriggerValue(this.setToName, this.fromName, this.copyDisplayValue);
     };
     SurveyTriggerCopyValue.prototype.canSuccessOnEmptyExpression = function () { return true; };
-    SurveyTriggerCopyValue.prototype.getUsedVariables = function () {
-        var res = _super.prototype.getUsedVariables.call(this);
+    SurveyTriggerCopyValue.prototype.getUsedVariables = function (runner) {
+        var res = _super.prototype.getUsedVariables.call(this, runner);
         if (res.length === 0 && !!this.fromName) {
             res.push(this.fromName);
         }
@@ -79504,13 +79487,14 @@ var ExpressionValidator = /** @class */ (function (_super) {
         return this.getLocalizationFormatString("invalidExpression", this.expression);
     };
     ExpressionValidator.prototype.ensureConditionRunner = function (reNew) {
-        if (!this.expression)
+        var expression = this.getExpressionFromSurvey("expression");
+        if (!expression)
             return false;
         if (reNew || !this.conditionRunner) {
-            this.conditionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(this.expression);
+            this.conditionRunner = new _conditions__WEBPACK_IMPORTED_MODULE_3__.ConditionRunner(expression);
         }
         else {
-            this.conditionRunner.expression = this.expression;
+            this.conditionRunner.expression = expression;
         }
         return true;
     };