survey-core 1.12.7 → 1.12.8

package/survey.core.js

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.12.7
+ * surveyjs - Survey JavaScript library v1.12.8
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -1872,6 +1872,7 @@ var englishStrings = {
     numericError: "The value should be numeric.",
     minError: "The value should not be less than {0}",
     maxError: "The value should not be greater than {0}",
+    textNoDigitsAllow: "Numbers are not allowed.",
     textMinLength: "Please enter at least {0} character(s).",
     textMaxLength: "Please enter no more than {0} character(s).",
     textMinMaxLength: "Please enter at least {0} and no more than {1} characters.",
@@ -2347,19 +2348,24 @@ var jsonobject_JsonObjectProperty = /** @class */ (function () {
         return this.isDefaultValueByObj(undefined, value);
     };
     JsonObjectProperty.prototype.isDefaultValueByObj = function (obj, value) {
+        if (this.isLocalizable)
+            return value === null || value === undefined;
         var dValue = this.getDefaultValue(obj);
         if (!helpers_Helpers.isValueEmpty(dValue)) {
             return helpers_Helpers.isTwoValueEquals(value, dValue, false, true, false);
         }
-        if (this.isLocalizable)
-            return value === null || value === undefined;
         return ((value === false && (this.type == "boolean" || this.type == "switch") && !this.defaultValueFunc) ||
             value === "" || helpers_Helpers.isValueEmpty(value));
     };
-    JsonObjectProperty.prototype.getSerializableValue = function (obj) {
+    JsonObjectProperty.prototype.getSerializableValue = function (obj, storeDefaults) {
         if (!!this.onSerializeValue)
             return this.onSerializeValue(obj);
-        return this.getValue(obj);
+        var value = this.getValue(obj);
+        if (value === undefined || value === null)
+            return undefined;
+        if (!storeDefaults && this.isDefaultValueByObj(obj, value))
+            return undefined;
+        return value;
     };
     JsonObjectProperty.prototype.getValue = function (obj) {
         if (this.onGetValue) {
@@ -2397,7 +2403,7 @@ var jsonobject_JsonObjectProperty = /** @class */ (function () {
         }
         else {
             if (this.serializationProperty && !!obj[this.serializationProperty])
-                obj[this.serializationProperty].setJson(value);
+                obj[this.serializationProperty].setJson(value, true);
             else {
                 if (value && typeof value === "string") {
                     if (this.type == "number") {
@@ -3141,7 +3147,7 @@ var JsonMetadata = /** @class */ (function () {
         if (obj[name] === val)
             return;
         if (!!obj[name] && !!obj[name].setJson) {
-            obj[name].setJson(val);
+            obj[name].setJson(val, true);
         }
         else {
             if (Array.isArray(val)) {
@@ -3904,8 +3910,8 @@ var jsonobject_JsonObject = /** @class */ (function () {
             this.valueToJsonCore(obj, result, serProp, options);
             return;
         }
-        var value = prop.getSerializableValue(obj);
-        if (!options.storeDefaults && prop.isDefaultValueByObj(obj, value))
+        var value = prop.getSerializableValue(obj, options.storeDefaults);
+        if (value === undefined)
             return;
         if (this.isValueArray(value)) {
             var arrValue = [];
@@ -4128,6 +4134,7 @@ var conditionProcessValue_ProcessValue = /** @class */ (function () {
     function ProcessValue() {
         this.values = null;
         this.properties = null;
+        this.asyncValues = {};
     }
     ProcessValue.prototype.getFirstName = function (text, obj) {
         if (obj === void 0) { obj = null; }
@@ -4887,10 +4894,15 @@ var expressions_extends = (undefined && undefined.__extends) || (function () {
 
 
 
-
 var Operand = /** @class */ (function () {
     function Operand() {
+        this._id = Operand.counter++;
     }
+    Object.defineProperty(Operand.prototype, "id", {
+        get: function () { return this._id; },
+        enumerable: false,
+        configurable: true
+    });
     Operand.prototype.toString = function (func) {
         if (func === void 0) { func = undefined; }
         return "";
@@ -4906,6 +4918,7 @@ var Operand = /** @class */ (function () {
     Operand.prototype.areOperatorsEquals = function (op1, op2) {
         return !op1 && !op2 || !!op1 && op1.isEqual(op2);
     };
+    Operand.counter = 1;
     return Operand;
 }());
 
@@ -5298,7 +5311,6 @@ var expressions_FunctionOperand = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         _this.originalValue = originalValue;
         _this.parameters = parameters;
-        _this.isReadyValue = false;
         if (Array.isArray(parameters) && parameters.length === 0) {
             _this.parameters = new ArrayOperand([]);
         }
@@ -5307,26 +5319,26 @@ var expressions_FunctionOperand = /** @class */ (function (_super) {
     FunctionOperand.prototype.getType = function () {
         return "function";
     };
-    FunctionOperand.prototype.evaluateAsync = function (processValue) {
-        var _this = this;
-        this.isReadyValue = false;
-        var asyncProcessValue = new conditionProcessValue_ProcessValue();
-        asyncProcessValue.values = helpers_Helpers.createCopy(processValue.values);
-        asyncProcessValue.properties = helpers_Helpers.createCopy(processValue.properties);
-        asyncProcessValue.properties.returnResult = function (result) {
-            _this.asynResult = result;
-            _this.isReadyValue = true;
-            _this.onAsyncReady();
-        };
-        this.evaluateCore(asyncProcessValue);
-    };
     FunctionOperand.prototype.evaluate = function (processValue) {
-        if (this.isReady)
-            return this.asynResult;
+        var asyncVal = this.getAsynValue(processValue);
+        if (!!asyncVal)
+            return asyncVal.value;
         return this.evaluateCore(processValue);
     };
     FunctionOperand.prototype.evaluateCore = function (processValue) {
-        return functionsfactory_FunctionFactory.Instance.run(this.originalValue, this.parameters.evaluate(processValue), processValue.properties, this.parameters.values);
+        var properties = processValue.properties;
+        if (this.isAsyncFunction) {
+            properties = helpers_Helpers.createCopy(processValue.properties);
+            var id_1 = this.id;
+            var asyncValues_1 = processValue.asyncValues;
+            var onComplete_1 = processValue.onCompleteAsyncFunc;
+            var item_1 = this;
+            properties.returnResult = function (result) {
+                asyncValues_1[id_1] = { value: result };
+                onComplete_1(item_1);
+            };
+        }
+        return functionsfactory_FunctionFactory.Instance.run(this.originalValue, this.parameters.evaluate(processValue), properties, this.parameters.values);
     };
     FunctionOperand.prototype.toString = function (func) {
         if (func === void 0) { func = undefined; }
@@ -5340,16 +5352,13 @@ var expressions_FunctionOperand = /** @class */ (function (_super) {
     FunctionOperand.prototype.setVariables = function (variables) {
         this.parameters.setVariables(variables);
     };
-    Object.defineProperty(FunctionOperand.prototype, "isReady", {
-        get: function () {
-            return this.isReadyValue;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    FunctionOperand.prototype.hasFunction = function () {
-        return true;
+    FunctionOperand.prototype.isReady = function (proccessValue) {
+        return !!this.getAsynValue(proccessValue);
+    };
+    FunctionOperand.prototype.getAsynValue = function (proccessValue) {
+        return proccessValue.asyncValues[this.id];
     };
+    FunctionOperand.prototype.hasFunction = function () { return true; };
     FunctionOperand.prototype.hasAsyncFunction = function () {
         return this.isAsyncFunction() || this.parameters.hasAsyncFunction();
     };
@@ -8684,9 +8693,100 @@ var conditions_extends = (undefined && undefined.__extends) || (function () {
 
 
 
+
+var conditions_ExpressionExecutorRunner = /** @class */ (function () {
+    function ExpressionExecutorRunner(operand, id, onComplete, values, properties) {
+        this.operand = operand;
+        this.id = id;
+        this.onComplete = onComplete;
+        this.processValue = new conditionProcessValue_ProcessValue();
+        this.processValue.values = values;
+        this.processValue.properties = properties;
+    }
+    ExpressionExecutorRunner.prototype.run = function (isAsync) {
+        var _this = this;
+        if (!isAsync)
+            return this.runValues();
+        this.processValue.values = helpers_Helpers.createCopy(this.processValue.values);
+        this.processValue.onCompleteAsyncFunc = function (op) {
+            var item = _this.getAsyncItemByOperand(op, _this.asyncFuncList);
+            if (item) {
+                _this.doAsyncFunctionReady(item);
+            }
+        };
+        this.asyncFuncList = new Array();
+        this.operand.addToAsyncList(this.asyncFuncList);
+        for (var i = 0; i < this.asyncFuncList.length; i++) {
+            this.runAsyncItem(this.asyncFuncList[i]);
+        }
+        return false;
+    };
+    ExpressionExecutorRunner.prototype.getAsyncItemByOperand = function (op, list) {
+        if (!Array.isArray(list))
+            return null;
+        for (var i = 0; i < list.length; i++) {
+            if (list[i].operand === op)
+                return list[i];
+            var res = this.getAsyncItemByOperand(op, list[i].children);
+            if (!!res)
+                return res;
+        }
+        return null;
+    };
+    ExpressionExecutorRunner.prototype.runAsyncItem = function (item) {
+        var _this = this;
+        if (item.children) {
+            item.children.forEach(function (child) { return _this.runAsyncItem(child); });
+        }
+        else {
+            this.runAsyncItemCore(item);
+        }
+    };
+    ExpressionExecutorRunner.prototype.runAsyncItemCore = function (item) {
+        if (item.operand) {
+            item.operand.evaluate(this.processValue);
+        }
+        else {
+            this.doAsyncFunctionReady(item);
+        }
+    };
+    ExpressionExecutorRunner.prototype.doAsyncFunctionReady = function (item) {
+        if (item.parent && this.isAsyncChildrenReady(item)) {
+            this.runAsyncItemCore(item.parent);
+            return;
+        }
+        for (var i = 0; i < this.asyncFuncList.length; i++) {
+            if (!this.isAsyncFuncReady(this.asyncFuncList[i]))
+                return;
+        }
+        this.runValues();
+    };
+    ExpressionExecutorRunner.prototype.isAsyncFuncReady = function (item) {
+        if (item.operand && !item.operand.isReady(this.processValue))
+            return false;
+        return this.isAsyncChildrenReady(item);
+    };
+    ExpressionExecutorRunner.prototype.isAsyncChildrenReady = function (item) {
+        if (item.children) {
+            for (var i = 0; i < item.children.length; i++) {
+                if (!this.isAsyncFuncReady(item.children[i]))
+                    return false;
+            }
+        }
+        return true;
+    };
+    ExpressionExecutorRunner.prototype.runValues = function () {
+        var res = this.operand.evaluate(this.processValue);
+        if (!!this.onComplete) {
+            this.onComplete(res, this.id);
+        }
+        return res;
+    };
+    return ExpressionExecutorRunner;
+}());
+
 var conditions_ExpressionExecutor = /** @class */ (function () {
     function ExpressionExecutor(expression) {
-        this.processValue = new conditionProcessValue_ProcessValue();
         this.parser = new conditionsParser_ConditionsParser();
         this.isAsyncValue = false;
         this.hasFunctionValue = false;
@@ -8729,7 +8829,7 @@ var conditions_ExpressionExecutor = /** @class */ (function () {
     ExpressionExecutor.prototype.canRun = function () {
         return !!this.operand;
     };
-    ExpressionExecutor.prototype.run = function (values, properties) {
+    ExpressionExecutor.prototype.run = function (values, properties, id) {
         if (properties === void 0) { properties = null; }
         if (!this.operand) {
             if (!!this.expression) {
@@ -8737,67 +8837,8 @@ var conditions_ExpressionExecutor = /** @class */ (function () {
             }
             return null;
         }
-        this.processValue.values = values;
-        this.processValue.properties = properties;
-        if (!this.isAsync)
-            return this.runValues();
-        this.asyncFuncList = new Array();
-        this.operand.addToAsyncList(this.asyncFuncList);
-        for (var i = 0; i < this.asyncFuncList.length; i++) {
-            this.runAsyncItem(this.asyncFuncList[i]);
-        }
-        return false;
-    };
-    ExpressionExecutor.prototype.runAsyncItem = function (item) {
-        var _this = this;
-        if (item.children) {
-            item.children.forEach(function (child) { return _this.runAsyncItem(child); });
-        }
-        else {
-            this.runAsyncItemCore(item);
-        }
-    };
-    ExpressionExecutor.prototype.runAsyncItemCore = function (item) {
-        var _this = this;
-        if (item.operand) {
-            item.operand.onAsyncReady = function () { return _this.doAsyncFunctionReady(item); };
-            item.operand.evaluateAsync(this.processValue);
-        }
-        else {
-            this.doAsyncFunctionReady(item);
-        }
-    };
-    ExpressionExecutor.prototype.doAsyncFunctionReady = function (item) {
-        if (item.parent && this.isAsyncChildrenReady(item)) {
-            this.runAsyncItemCore(item.parent);
-            return;
-        }
-        for (var i = 0; i < this.asyncFuncList.length; i++) {
-            if (!this.isAsyncFuncReady(this.asyncFuncList[i]))
-                return;
-        }
-        this.runValues();
-    };
-    ExpressionExecutor.prototype.isAsyncFuncReady = function (item) {
-        if (item.operand && !item.operand.isReady)
-            return false;
-        return this.isAsyncChildrenReady(item);
-    };
-    ExpressionExecutor.prototype.isAsyncChildrenReady = function (item) {
-        if (item.children) {
-            for (var i = 0; i < item.children.length; i++) {
-                if (!this.isAsyncFuncReady(item.children[i]))
-                    return false;
-            }
-        }
-        return true;
-    };
-    ExpressionExecutor.prototype.runValues = function () {
-        var res = this.operand.evaluate(this.processValue);
-        if (!!this.onComplete) {
-            this.onComplete(res);
-        }
-        return res;
+        var runner = new conditions_ExpressionExecutorRunner(this.operand, id, this.onComplete, values, properties);
+        return runner.run(this.isAsync);
     };
     ExpressionExecutor.createExpressionExecutor = function (expression) { return new ExpressionExecutor(expression); };
     return ExpressionExecutor;
@@ -8805,14 +8846,8 @@ var conditions_ExpressionExecutor = /** @class */ (function () {
 
 var ExpressionRunnerBase = /** @class */ (function () {
     function ExpressionRunnerBase(expression) {
-        this._id = ExpressionRunnerBase.IdCounter++;
         this.expression = expression;
     }
-    Object.defineProperty(ExpressionRunnerBase.prototype, "id", {
-        get: function () { return this._id; },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(ExpressionRunnerBase.prototype, "expression", {
         get: function () {
             return !!this.expressionExecutor ? this.expressionExecutor.expression : "";
@@ -8822,7 +8857,7 @@ var ExpressionRunnerBase = /** @class */ (function () {
             if (!!this.expressionExecutor && value === this.expression)
                 return;
             this.expressionExecutor = conditions_ExpressionExecutor.createExpressionExecutor(value);
-            this.expressionExecutor.onComplete = function (res) { _this.doOnComplete(res); };
+            this.expressionExecutor.onComplete = function (res, id) { _this.doOnComplete(res, id); };
             this.variables = undefined;
             this.containsFunc = undefined;
         },
@@ -8853,17 +8888,18 @@ var ExpressionRunnerBase = /** @class */ (function () {
     };
     ExpressionRunnerBase.prototype.runCore = function (values, properties) {
         if (properties === void 0) { properties = null; }
+        var id = ExpressionRunnerBase.IdRunnerCounter++;
         if (this.onBeforeAsyncRun && this.isAsync) {
-            this.onBeforeAsyncRun(this.id);
+            this.onBeforeAsyncRun(id);
         }
-        return this.expressionExecutor.run(values, properties);
+        return this.expressionExecutor.run(values, properties, id);
     };
-    ExpressionRunnerBase.prototype.doOnComplete = function (res) {
+    ExpressionRunnerBase.prototype.doOnComplete = function (res, id) {
         if (this.onAfterAsyncRun && this.isAsync) {
-            this.onAfterAsyncRun(this.id);
+            this.onAfterAsyncRun(id);
         }
     };
-    ExpressionRunnerBase.IdCounter = 1;
+    ExpressionRunnerBase.IdRunnerCounter = 1;
     return ExpressionRunnerBase;
 }());
 
@@ -8876,10 +8912,10 @@ var ConditionRunner = /** @class */ (function (_super) {
         if (properties === void 0) { properties = null; }
         return this.runCore(values, properties) == true;
     };
-    ConditionRunner.prototype.doOnComplete = function (res) {
+    ConditionRunner.prototype.doOnComplete = function (res, id) {
         if (!!this.onRunComplete)
             this.onRunComplete(res == true);
-        _super.prototype.doOnComplete.call(this, res);
+        _super.prototype.doOnComplete.call(this, res, id);
     };
     return ConditionRunner;
 }(ExpressionRunnerBase));
@@ -8893,10 +8929,10 @@ var ExpressionRunner = /** @class */ (function (_super) {
         if (properties === void 0) { properties = null; }
         return this.runCore(values, properties);
     };
-    ExpressionRunner.prototype.doOnComplete = function (res) {
+    ExpressionRunner.prototype.doOnComplete = function (res, id) {
         if (!!this.onRunComplete)
             this.onRunComplete(res);
-        _super.prototype.doOnComplete.call(this, res);
+        _super.prototype.doOnComplete.call(this, res, id);
     };
     return ExpressionRunner;
 }(ExpressionRunnerBase));
@@ -9009,7 +9045,7 @@ var base_Bindings = /** @class */ (function () {
         }
         return res;
     };
-    Bindings.prototype.setJson = function (value) {
+    Bindings.prototype.setJson = function (value, isLoading) {
         var oldValue = this.getJson();
         this.values = null;
         if (!!value) {
@@ -9018,7 +9054,9 @@ var base_Bindings = /** @class */ (function () {
                 this.values[key] = value[key];
             }
         }
-        this.onChangedJSON(oldValue);
+        if (!isLoading) {
+            this.onChangedJSON(oldValue);
+        }
     };
     Bindings.prototype.fillProperties = function () {
         if (this.properties !== null)
@@ -9674,7 +9712,7 @@ var base_Base = /** @class */ (function () {
     };
     Base.prototype.doBeforeAsynRun = function (id) {
         if (!this.asynExpressionHash)
-            this.asynExpressionHash = [];
+            this.asynExpressionHash = {};
         var isChanged = !this.isAsyncExpressionRunning;
         this.asynExpressionHash[id] = true;
         if (isChanged) {
@@ -9794,10 +9832,11 @@ var base_Base = /** @class */ (function () {
         var _this = this;
         if (useMarkDown === void 0) { useMarkDown = false; }
         if (defaultStr === void 0) { defaultStr = false; }
-        var locStr = new localizablestring_LocalizableString(owner, useMarkDown, name);
+        var locName = undefined;
         if (defaultStr) {
-            locStr.localizationName = defaultStr === true ? name : defaultStr;
+            locName = defaultStr === true ? name : defaultStr;
         }
+        var locStr = new localizablestring_LocalizableString(owner, useMarkDown, name, locName);
         locStr.onStrChanged = function (oldValue, newValue) {
             _this.propertyValueChanged(name, oldValue, newValue);
         };
@@ -14208,19 +14247,15 @@ var RenderingCompletedAwaiter = /** @class */ (function () {
  * It uses in all objects where support for multi-languages and markdown is required.
  */
 var localizablestring_LocalizableString = /** @class */ (function () {
-    function LocalizableString(owner, useMarkdown, name) {
+    function LocalizableString(owner, useMarkdown, name, locName) {
         if (useMarkdown === void 0) { useMarkdown = false; }
-        var _a;
         this.owner = owner;
         this.useMarkdown = useMarkdown;
         this.name = name;
         this.values = {};
         this.htmlValues = {};
-        this._allowLineBreaks = false;
         this.onStringChanged = new EventBase();
-        if (owner instanceof survey_element_SurveyElementCore) {
-            this._allowLineBreaks = ((_a = Serializer.findProperty(owner.getType(), name)) === null || _a === void 0 ? void 0 : _a.type) == "text";
-        }
+        this._localizationName = locName;
         this.onCreating();
     }
     Object.defineProperty(LocalizableString, "defaultLocale", {
@@ -14248,6 +14283,13 @@ var localizablestring_LocalizableString = /** @class */ (function () {
     });
     Object.defineProperty(LocalizableString.prototype, "allowLineBreaks", {
         get: function () {
+            var _a;
+            if (this._allowLineBreaks === undefined) {
+                this._allowLineBreaks = false;
+                if (!!this.name && this.owner instanceof survey_element_SurveyElementCore) {
+                    this._allowLineBreaks = ((_a = Serializer.findProperty(this.owner.getType(), this.name)) === null || _a === void 0 ? void 0 : _a.type) == "text";
+                }
+            }
             return this._allowLineBreaks;
         },
         enumerable: false,
@@ -14419,14 +14461,22 @@ var localizablestring_LocalizableString = /** @class */ (function () {
     };
     LocalizableString.prototype.setLocaleText = function (loc, value) {
         loc = this.getValueLoc(loc);
+        if (!!loc && value === undefined) {
+            var oldValue_1 = this.getValue(loc);
+            if (oldValue_1 !== undefined) {
+                this.deleteValue(loc);
+                this.fireStrChanged(loc, oldValue_1);
+            }
+            return;
+        }
         if (!this.storeDefaultText && this.isLocaleTextEqualsWithDefault(loc, value)) {
             if (!this.isValueEmpty(value) || !!loc && loc !== this.defaultLoc)
                 return;
             var dl = surveyLocalization.defaultLocale;
-            var oldValue_1 = this.getValue(dl);
-            if (!!dl && !this.isValueEmpty(oldValue_1)) {
+            var oldValue_2 = this.getValue(dl);
+            if (!!dl && !this.isValueEmpty(oldValue_2)) {
                 this.setValue(dl, value);
-                this.fireStrChanged(dl, oldValue_1);
+                this.fireStrChanged(dl, oldValue_2);
             }
             return;
         }
@@ -14525,24 +14575,35 @@ var localizablestring_LocalizableString = /** @class */ (function () {
         }
         return res;
     };
-    LocalizableString.prototype.setJson = function (value) {
+    LocalizableString.prototype.setJson = function (value, isLoading) {
         if (!!this.sharedData) {
-            this.sharedData.setJson(value);
+            this.sharedData.setJson(value, isLoading);
             return;
         }
         this.values = {};
         this.htmlValues = {};
         if (value === null || value === undefined)
             return;
-        if (typeof value === "string") {
-            this.setLocaleText(null, value);
+        if (isLoading) {
+            if (typeof value === "string") {
+                this.values[settings.defaultLocaleName] = value;
+            }
+            else {
+                this.values = value;
+                delete this.values["pos"];
+            }
         }
         else {
-            for (var key in value) {
-                this.setLocaleText(key, value[key]);
+            if (typeof value === "string") {
+                this.setLocaleText(null, value);
             }
+            else {
+                for (var key in value) {
+                    this.setLocaleText(key, value[key]);
+                }
+            }
+            this.strChanged();
         }
-        this.strChanged();
     };
     Object.defineProperty(LocalizableString.prototype, "renderAs", {
         get: function () {
@@ -16928,9 +16989,9 @@ var TextValidator = /** @class */ (function (_super) {
         if (this.isValueEmpty(value))
             return null;
         if (!this.allowDigits) {
-            var reg = /^[A-Za-z\s\.]*$/;
-            if (!reg.test(value)) {
-                return new ValidatorResult(null, this.createCustomError(name));
+            var reg = /\d+$/;
+            if (reg.test(value)) {
+                return new ValidatorResult(null, this.createCustomError("textNoDigitsAllow"));
             }
         }
         if (this.minLength > 0 && value.length < this.minLength) {
@@ -16942,6 +17003,8 @@ var TextValidator = /** @class */ (function (_super) {
         return null;
     };
     TextValidator.prototype.getDefaultErrorText = function (name) {
+        if (name === "textNoDigitsAllow")
+            return this.getLocalizationString(name);
         if (this.minLength > 0 && this.maxLength > 0)
             return this.getLocalizationFormatString("textMinMaxLength", this.minLength, this.maxLength);
         if (this.minLength > 0)
@@ -21269,10 +21332,10 @@ var itemvalue_ItemValue = /** @class */ (function (_super) {
         if (text)
             _this.locText.text = text;
         if (!!value && typeof value === "object") {
-            _this.setData(value);
+            _this.setData(value, true);
         }
         else {
-            _this.value = value;
+            _this.setValue(value, true);
         }
         if (_this.getType() != "itemvalue") {
             CustomPropertiesCollection.createProperties(_this);
@@ -21454,24 +21517,32 @@ var itemvalue_ItemValue = /** @class */ (function (_super) {
             return this.getPropertyValue("value");
         },
         set: function (newValue) {
-            var text = undefined;
-            if (!helpers_Helpers.isValueEmpty(newValue)) {
-                var str = newValue.toString();
-                var index = str.indexOf(settings.itemValueSeparator);
-                if (index > -1) {
-                    newValue = str.slice(0, index);
-                    text = str.slice(index + 1);
-                }
-            }
-            this.setPropertyValue("value", newValue);
-            if (!!text) {
-                this.text = text;
-            }
-            this.id = this.value;
+            this.setValue(newValue, false);
         },
         enumerable: false,
         configurable: true
     });
+    ItemValue.prototype.setValue = function (newValue, newItem) {
+        var text = undefined;
+        if (!helpers_Helpers.isValueEmpty(newValue)) {
+            var str = newValue.toString();
+            var index = str.indexOf(settings.itemValueSeparator);
+            if (index > -1) {
+                newValue = str.slice(0, index);
+                text = str.slice(index + 1);
+            }
+        }
+        if (newItem) {
+            this.setPropertyValueDirectly("value", newValue);
+        }
+        else {
+            this.setPropertyValue("value", newValue);
+        }
+        if (!!text) {
+            this.text = text;
+        }
+        this.id = this.value;
+    };
     Object.defineProperty(ItemValue.prototype, "hasText", {
         get: function () {
             return this.locText.pureText ? true : false;
@@ -21551,7 +21622,7 @@ var itemvalue_ItemValue = /** @class */ (function (_super) {
         }
         return res;
     };
-    ItemValue.prototype.setData = function (value) {
+    ItemValue.prototype.setData = function (value, isNewItem) {
         if (helpers_Helpers.isValueEmpty(value))
             return;
         if (typeof value.value === "undefined" && typeof value.text !== "undefined" && Object.keys(value).length === 1) {
@@ -21568,9 +21639,11 @@ var itemvalue_ItemValue = /** @class */ (function (_super) {
             new jsonobject_JsonObject().toObject(json, this);
         }
         else {
-            this.value = value;
+            this.setValue(value, isNewItem);
+        }
+        if (!isNewItem) {
+            this.locText.strChanged();
         }
-        this.locText.strChanged();
     };
     Object.defineProperty(ItemValue.prototype, "visibleIf", {
         get: function () {
@@ -26667,6 +26740,15 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedRow = /** @cla
     QuestionMatrixDropdownRenderedRow.prototype.getRootElement = function () {
         return this.rootElement;
     };
+    QuestionMatrixDropdownRenderedRow.prototype.focusCell = function (cellIndex) {
+        if (this.rootElement) {
+            var inputElementSelector = ":scope td:nth-of-type(" + (cellIndex + 1) + ") input, :scope td:nth-of-type(" + (cellIndex + 1) + ") button";
+            var inputElement = this.rootElement.querySelectorAll(inputElementSelector)[0];
+            if (inputElement) {
+                inputElement.focus();
+            }
+        }
+    };
     QuestionMatrixDropdownRenderedRow.counter = 1;
     question_matrixdropdownrendered_decorate([
         jsonobject_property({ defaultValue: false })
@@ -26912,7 +26994,7 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
             return;
         var rowIndex = this.getRenderedRowIndexByIndex(index);
         this.rowsActions.splice(index, 0, this.buildRowActions(row));
-        this.addHorizontalRow(this.rows, row, this.matrix.visibleRows.length == 1 && !this.matrix.showHeader, rowIndex);
+        this.addHorizontalRow(this.rows, row, rowIndex);
         this.updateShowTableAndAddRow();
     };
     QuestionMatrixDropdownRenderedTable.prototype.getRenderedRowIndexByIndex = function (index) {
@@ -26982,6 +27064,14 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
             this.rows.splice(panelRowIndex, 1);
         }
     };
+    QuestionMatrixDropdownRenderedTable.prototype.focusActionCell = function (row, actionCellIndex) {
+        var row2Focus = this.rows[this.rows.length - 1];
+        if (this.matrix.isColumnLayoutHorizontal) {
+            var nextRenderedRowIndex = this.getRenderedRowIndex(row);
+            row2Focus = this.rows[nextRenderedRowIndex];
+        }
+        row2Focus === null || row2Focus === void 0 ? void 0 : row2Focus.focusCell(actionCellIndex);
+    };
     QuestionMatrixDropdownRenderedTable.prototype.getRenderedRowIndex = function (row) {
         for (var i = 0; i < this.rows.length; i++) {
             if (this.rows[i].row == row)
@@ -27078,7 +27168,7 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
             else {
                 var editCell = this.createEditCell(cell);
                 if (cell.column) {
-                    this.setHeaderCellWidth(cell.column, editCell);
+                    this.setCellWidth(cell.column, editCell);
                 }
                 editCell.className = new CssClassBuilder().append(editCell.className)
                     .append(this.cssClasses.footerCell).toString();
@@ -27116,13 +27206,13 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
         var rows = this.matrix.visibleRows;
         var renderedRows = [];
         for (var i = 0; i < rows.length; i++) {
-            this.addHorizontalRow(renderedRows, rows[i], i == 0 && !this.matrix.showHeader);
+            this.addHorizontalRow(renderedRows, rows[i]);
         }
         return renderedRows;
     };
-    QuestionMatrixDropdownRenderedTable.prototype.addHorizontalRow = function (renderedRows, row, useAsHeader, index) {
+    QuestionMatrixDropdownRenderedTable.prototype.addHorizontalRow = function (renderedRows, row, index) {
         if (index === void 0) { index = -1; }
-        var renderedRow = this.createHorizontalRow(row, useAsHeader);
+        var renderedRow = this.createHorizontalRow(row);
         var errorRow = this.createErrorRow(renderedRow);
         renderedRow.row = row;
         if (index < 0) {
@@ -27302,7 +27392,7 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
         res.onAfterCreated();
         return res;
     };
-    QuestionMatrixDropdownRenderedTable.prototype.createHorizontalRow = function (row, useAsHeader) {
+    QuestionMatrixDropdownRenderedTable.prototype.createHorizontalRow = function (row) {
         var res = this.createRenderedRow(this.cssClasses);
         if (this.isRowsDragAndDrop) {
             var rowIndex = this.matrix.visibleRows.indexOf(row);
@@ -27313,7 +27403,7 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
             var renderedCell = this.createTextCell(row.locText);
             renderedCell.row = row;
             res.cells.push(renderedCell);
-            this.setHeaderCellWidth(null, renderedCell);
+            this.setCellWidth(null, renderedCell);
             renderedCell.className = new CssClassBuilder()
                 .append(renderedCell.className)
                 .append(this.cssClasses.rowTextCell)
@@ -27334,9 +27424,7 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
                 }
                 var renderedCell = this.createEditCell(cell);
                 res.cells.push(renderedCell);
-                if (useAsHeader) {
-                    this.setHeaderCellWidth(cell.column, renderedCell);
-                }
+                this.setCellWidth(cell.column, renderedCell);
             }
         }
         this.addRowActionsCell(row, res, "end");
@@ -27581,9 +27669,9 @@ var question_matrixdropdownrendered_QuestionMatrixDropdownRenderedTable = /** @c
         return cell;
     };
     QuestionMatrixDropdownRenderedTable.prototype.setHeaderCell = function (column, cell) {
-        this.setHeaderCellWidth(column, cell);
+        this.setCellWidth(column, cell);
     };
-    QuestionMatrixDropdownRenderedTable.prototype.setHeaderCellWidth = function (column, cell) {
+    QuestionMatrixDropdownRenderedTable.prototype.setCellWidth = function (column, cell) {
         cell.minWidth = column != null ? this.matrix.getColumnWidth(column) : this.matrix.getRowTitleWidth();
         cell.width = column != null ? column.width : this.matrix.getRowTitleWidth();
     };
@@ -29735,6 +29823,8 @@ var question_matrixdropdownbase_QuestionMatrixDropdownModelBase = /** @class */
     };
     QuestionMatrixDropdownModelBase.prototype.onHidingContent = function () {
         _super.prototype.onHidingContent.call(this);
+        if (!this.generatedVisibleRows)
+            return;
         var questions = [];
         this.collectNestedQuestions(questions, true);
         questions.forEach(function (q) { return q.onHidingContent(); });
@@ -30439,6 +30529,20 @@ var question_matrixdropdownbase_QuestionMatrixDropdownModelBase = /** @class */
     QuestionMatrixDropdownModelBase.prototype.getRootCss = function () {
         return new CssClassBuilder().append(_super.prototype.getRootCss.call(this)).append(this.cssClasses.rootScroll, this.horizontalScroll).toString();
     };
+    QuestionMatrixDropdownModelBase.prototype.afterRenderQuestionElement = function (el) {
+        _super.prototype.afterRenderQuestionElement.call(this, el);
+        this.setRootElement(el === null || el === void 0 ? void 0 : el.parentElement);
+    };
+    QuestionMatrixDropdownModelBase.prototype.beforeDestroyQuestionElement = function (el) {
+        _super.prototype.beforeDestroyQuestionElement.call(this, el);
+        this.setRootElement(undefined);
+    };
+    QuestionMatrixDropdownModelBase.prototype.setRootElement = function (val) {
+        this.rootElement = val;
+    };
+    QuestionMatrixDropdownModelBase.prototype.getRootElement = function () {
+        return this.rootElement;
+    };
     return QuestionMatrixDropdownModelBase;
 }(martixBase_QuestionMatrixBaseModel));
 
@@ -31350,6 +31454,7 @@ var matrix_rows_extends = (undefined && undefined.__extends) || (function () {
 })();
 
 
+
 var matrix_rows_DragDropMatrixRows = /** @class */ (function (_super) {
     matrix_rows_extends(DragDropMatrixRows, _super);
     function DragDropMatrixRows() {
@@ -31376,19 +31481,28 @@ var matrix_rows_DragDropMatrixRows = /** @class */ (function (_super) {
             _body.style.userSelect = "none";
         }
     };
+    Object.defineProperty(DragDropMatrixRows.prototype, "shortcutClass", {
+        get: function () {
+            return new CssClassBuilder()
+                .append(this.parentElement.cssClasses.draggedRow)
+                //.append(this.parentElement.cssClasses.dragShortcutMobileMod, IsMobile)
+                .toString();
+        },
+        enumerable: false,
+        configurable: true
+    });
     DragDropMatrixRows.prototype.createDraggedElementShortcut = function (text, draggedElementNode, event) {
         var _this = this;
         var draggedElementShortcut = DomDocumentHelper.createElement("div");
         if (!draggedElementShortcut)
             return;
-        // draggedElementShortcut.innerText = text;
-        draggedElementShortcut.style.cssText = " \n          cursor: grabbing;\n          position: absolute;\n          z-index: 10000;\n          font-family: var(--sjs-font-family, var(--font-family, var(--sjs-default-font-family)));\n        ";
+        draggedElementShortcut.className = this.shortcutClass;
         var isDeepClone = true;
         if (!!draggedElementNode) {
             var row = (draggedElementNode
                 .closest("[data-sv-drop-target-matrix-row]"));
             var clone = (row.cloneNode(isDeepClone));
-            clone.style.cssText = "\n        box-shadow: var(--sjs-shadow-large, 0px 8px 16px 0px rgba(0, 0, 0, 0.1)), var(--sjs-shadow-medium, 0px 2px 6px 0px rgba(0, 0, 0, 0.1));\n        background-color: var(--sjs-general-backcolor, var(--background, #fff));\n        display: flex;\n        flex-grow: 0;\n        flex-shrink: 0;\n        align-items: center;\n        line-height: 0;\n        width: " + row.offsetWidth + "px;\n      ";
+            clone.style.cssText = "\n        width: " + row.offsetWidth + "px;\n      ";
             clone.classList.remove("sv-matrix__drag-drop--moveup");
             clone.classList.remove("sv-matrix__drag-drop--movedown");
             this.draggedElement.isDragDropMoveDown = false;
@@ -32220,14 +32334,41 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
         }
         return res;
     };
+    QuestionMatrixDynamicModel.prototype.focusAddBUtton = function () {
+        var rootElement = this.getRootElement();
+        if (!!rootElement && !!this.cssClasses.buttonAdd) {
+            var addButton = rootElement.querySelectorAll("." + this.cssClasses.buttonAdd)[0];
+            addButton && addButton.focus();
+        }
+    };
+    QuestionMatrixDynamicModel.prototype.getActionCellIndex = function (row) {
+        var headerShift = this.showHeader ? 1 : 0;
+        if (this.isColumnLayoutHorizontal) {
+            return row.cells.length - 1 + headerShift;
+        }
+        return this.visibleRows.indexOf(row) + headerShift;
+    };
     QuestionMatrixDynamicModel.prototype.removeRowUI = function (value) {
+        var _this = this;
         if (!!value && !!value.rowName) {
             var index = this.visibleRows.indexOf(value);
             if (index < 0)
                 return;
             value = index;
         }
-        this.removeRow(value);
+        this.removeRow(value, undefined, function () {
+            var rowCount = _this.visibleRows.length;
+            var nextIndex = index >= rowCount ? rowCount - 1 : index;
+            var nextRow = nextIndex > -1 ? _this.visibleRows[nextIndex] : undefined;
+            setTimeout(function () {
+                if (nextRow) {
+                    _this.renderedTable.focusActionCell(nextRow, _this.getActionCellIndex(nextRow));
+                }
+                else {
+                    _this.focusAddBUtton();
+                }
+            }, 10);
+        });
     };
     QuestionMatrixDynamicModel.prototype.isRequireConfirmOnRowDelete = function (index) {
         if (!this.confirmDelete)
@@ -32246,7 +32387,7 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
      * @param index A zero-based row index.
      * @param confirmDelete *(Optional)* A Boolean value that specifies whether to display a confirmation dialog. If you do not specify this parameter, the [`confirmDelete`](https://surveyjs.io/form-library/documentation/api-reference/dynamic-matrix-table-question-model#confirmDelete) property value is used.
      */
-    QuestionMatrixDynamicModel.prototype.removeRow = function (index, confirmDelete) {
+    QuestionMatrixDynamicModel.prototype.removeRow = function (index, confirmDelete, onRowRemoved) {
         var _this = this;
         if (!this.canRemoveRows)
             return;
@@ -32259,10 +32400,14 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
             confirmDelete = this.isRequireConfirmOnRowDelete(index);
         }
         if (confirmDelete) {
-            confirmActionAsync(this.confirmDeleteText, function () { _this.removeRowAsync(index, row); }, undefined, this.getLocale(), this.survey.rootElement);
+            confirmActionAsync(this.confirmDeleteText, function () {
+                _this.removeRowAsync(index, row);
+                onRowRemoved && onRowRemoved();
+            }, undefined, this.getLocale(), this.survey.rootElement);
             return;
         }
         this.removeRowAsync(index, row);
+        onRowRemoved && onRowRemoved();
     };
     QuestionMatrixDynamicModel.prototype.removeRowAsync = function (index, row) {
         if (!!row && !!this.survey && !this.survey.matrixRowRemoving(this, index, row))
@@ -33284,7 +33429,7 @@ var defaultV2Css = {
         actionsCellDrag: "sd-table__cell--drag",
         emptyCell: "sd-table__cell--empty",
         verticalCell: "sd-table__cell--vertical",
-        cellQuestionWrapper: "sd-table__question-wrapper",
+        cellQuestionWrapper: "sd-matrix__question-wrapper sd-table__question-wrapper",
         compact: "sd-element--with-frame sd-element--compact"
     },
     matrixdynamic: {
@@ -33337,9 +33482,10 @@ var defaultV2Css = {
         emptyRowsSection: "sd-matrixdynamic__placeholder sd-question__placeholder",
         iconDrag: "sv-matrixdynamic__drag-icon",
         ghostRow: "sv-matrix-row--drag-drop-ghost-mod",
+        draggedRow: "sv-matrixdynamic-dragged-row",
         emptyCell: "sd-table__cell--empty",
         verticalCell: "sd-table__cell--vertical",
-        cellQuestionWrapper: "sd-table__question-wrapper",
+        cellQuestionWrapper: "sd-matrix__question-wrapper sd-table__question-wrapper",
         errorsCell: "sd-table__cell--error",
         errorsCellTop: "sd-table__cell--error-top",
         errorsCellBottom: "sd-table__cell--error-bottom",
@@ -37958,7 +38104,10 @@ var page_PageModel = /** @class */ (function (_super) {
     });
     Object.defineProperty(PageModel.prototype, "no", {
         get: function () {
-            return this.canShowPageNumber() ? this.num + ". " : "";
+            if (!this.canShowPageNumber() || !this.survey)
+                return "";
+            var no = this.isStartPage ? "" : this.num + ". ";
+            return this.survey.getUpdatedPageNo(this, no);
         },
         enumerable: false,
         configurable: true
@@ -39024,7 +39173,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
          *
          * For information on event handler parameters, refer to descriptions within the interface.
          *
-         * If you want to modify question numbers, handle the [`onGetQuestionNo`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#onGetQuestionNo) event.
+         * If you want to modify question numbers, handle the [`onGetQuestionNumber`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#onGetQuestionNumber) event.
          * @see requiredText
          */
         _this.onGetQuestionTitle = _this.addEvent();
@@ -39037,7 +39186,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
          *
          * [View Demo](https://surveyjs.io/form-library/examples/survey-titletagnames/ (linkStyle))
          * @see onGetQuestionTitle
-         * @see onGetQuestionNo
+         * @see onGetQuestionNumber
          */
         _this.onGetTitleTagName = _this.addEvent();
         /**
@@ -39049,7 +39198,21 @@ var survey_SurveyModel = /** @class */ (function (_super) {
          * @see onGetQuestionTitle
          * @see questionStartIndex
          */
-        _this.onGetQuestionNo = _this.addEvent();
+        _this.onGetQuestionNumber = _this.addEvent();
+        /**
+         * This event is obsolete. Use the [`onGetQuestionNumber`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#onGetQuestionNumber) event instead.
+         */
+        _this.onGetQuestionNo = _this.onGetQuestionNumber;
+        /**
+         * An event that is raised before the survey calculates a page number. Handle this event to modify page numbers.
+         *
+         * This event is raised only if the [`showPageNumbers`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#showPageNumbers) property is enabled.
+         *
+         * For information on event handler parameters, refer to descriptions within the interface.
+         * @see onGetQuestionTitle
+         * @see questionStartIndex
+         */
+        _this.onGetPageNumber = _this.addEvent();
         /**
          * An event that is raised before the survey displays progress text. Handle this event to change the progress text in code.
          * @see showProgressBar
@@ -39583,7 +39746,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
             _this.updateBackgroundImageStyle();
         });
         _this.registerPropertyChangedHandlers(["showPrevButton", "showCompleteButton"], function () { _this.updateButtonsVisibility(); });
-        _this.onGetQuestionNo.onCallbacksChanged = function () {
+        _this.onGetQuestionNumber.onCallbacksChanged = function () {
             _this.resetVisibleIndexes();
         };
         _this.onProgressText.onCallbacksChanged = function () {
@@ -41639,17 +41802,25 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         return options.title;
     };
     SurveyModel.prototype.getUpdatedQuestionNo = function (question, no) {
-        if (this.onGetQuestionNo.isEmpty)
+        if (this.onGetQuestionNumber.isEmpty)
             return no;
-        var options = { question: question, no: no };
-        this.onGetQuestionNo.fire(this, options);
-        return options.no;
+        var options = { question: question, number: no, no: no };
+        this.onGetQuestionNumber.fire(this, options);
+        return options.no === no ? options.number : options.no;
+    };
+    SurveyModel.prototype.getUpdatedPageNo = function (page, no) {
+        if (this.onGetPageNumber.isEmpty)
+            return no;
+        var options = { page: page, number: no };
+        this.onGetPageNumber.fire(this, options);
+        return options.number;
     };
     Object.defineProperty(SurveyModel.prototype, "showPageNumbers", {
         /**
          * Specifies whether page titles contain page numbers.
          *
          * [View Demo](https://surveyjs.io/form-library/examples/how-to-number-pages-and-questions/ (linkStyle))
+         * @see onGetPageNumber
          */
         get: function () {
             return this.getPropertyValue("showPageNumbers");
@@ -41676,6 +41847,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
          * [View Demo](https://surveyjs.io/form-library/examples/how-to-number-pages-and-questions/ (linkStyle))
          *
          * If you want to hide the number of an individual question, enable its [`hideNumber`](https://surveyjs.io/form-library/documentation/api-reference/question#hideNumber) property.
+         * @see onGetQuestionNumber
          */
         get: function () {
             return this.getPropertyValue("showQuestionNumbers");
@@ -47010,7 +47182,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
                 }
             }
             else if (this.state === "running" && isStrCiEqual(layoutElement.id, this.progressBarComponentName)) {
-                if (this.questionsOnPageMode != "singlePage") {
+                if (this.questionsOnPageMode != "singlePage" || this.progressBarType == "questions") {
                     var headerLayoutElement = this.findLayoutElement("advanced-header");
                     var advHeader = headerLayoutElement && headerLayoutElement.data;
                     var isBelowHeader = !advHeader || advHeader.hasBackground;
@@ -50871,7 +51043,7 @@ var popup_dropdown_view_model_PopupDropdownViewModel = /** @class */ (function (
             var heightValues = [height, DomWindowHelper.getInnerHeight() * 0.9, (_c = DomWindowHelper.getVisualViewport()) === null || _c === void 0 ? void 0 : _c.height];
             height = Math.ceil(Math.min.apply(Math, heightValues.filter(function (each) { return typeof each === "number"; })));
             verticalPosition = PopupUtils.updateVerticalPosition(targetElementRect, height, this.model.horizontalPosition, this.model.verticalPosition, area.height);
-            actualHorizontalPosition = PopupUtils.updateHorizontalPosition(targetElementRect, width, this.model.horizontalPosition, area.width);
+            actualHorizontalPosition = PopupUtils.updateHorizontalPosition(targetElementRect, width, actualHorizontalPosition, area.width);
         }
         this.popupDirection = PopupUtils.calculatePopupDirection(verticalPosition, actualHorizontalPosition);
         var pos = PopupUtils.calculatePosition(targetElementRect, height, width + marginLeft + marginRight, verticalPosition, actualHorizontalPosition, this.model.positionMode);
@@ -52536,7 +52708,7 @@ var question_matrix_MatrixCells = /** @class */ (function (_super) {
         }
         return res;
     };
-    MatrixCells.prototype.setJson = function (value) {
+    MatrixCells.prototype.setJson = function (value, isLoading) {
         var _this = this;
         this.values = {};
         if (!!value) {
@@ -54191,6 +54363,7 @@ var question_text_QuestionTextModel = /** @class */ (function (_super) {
         this.dateValidationMessage = this.isDateInputType && !!event.target ? event.target.validationMessage : undefined;
     };
     QuestionTextModel.prototype.onBlurCore = function (event) {
+        this.updateDateValidationMessage(event);
         this.updateValueOnEvent(event);
         this.updateRemainingCharacterCounter(event.target.value);
         _super.prototype.onBlurCore.call(this, event);
@@ -56254,6 +56427,22 @@ var question_checkbox_QuestionCheckboxModel = /** @class */ (function (_super) {
         }
         return false;
     };
+    QuestionCheckboxModel.prototype.convertFuncValuetoQuestionValue = function (val) {
+        var _this = this;
+        if (!!this.valuePropertyName && Array.isArray(val) && val.length > 0) {
+            var res_1 = [];
+            val.forEach(function (item) {
+                var isObj = typeof item === "object";
+                var obj = isObj ? item : {};
+                if (!isObj) {
+                    obj[_this.valuePropertyName] = item;
+                }
+                res_1.push(obj);
+            });
+            val = res_1;
+        }
+        return _super.prototype.convertDefaultValue.call(this, val);
+    };
     QuestionCheckboxModel.prototype.getRealValue = function (val) {
         if (!val)
             return val;
@@ -59384,10 +59573,19 @@ var question_file_QuestionFileModelBase = /** @class */ (function (_super) {
     QuestionFileModelBase.prototype.onChangeQuestionValue = function (newValue) {
         _super.prototype.onChangeQuestionValue.call(this, newValue);
         this.stateChanged(this.isEmpty() ? "empty" : "loaded");
-        if (!this.isLoadingFromJson) {
-            this.loadPreview(newValue);
-        }
     };
+    QuestionFileModelBase.prototype.getIsQuestionReady = function () {
+        return _super.prototype.getIsQuestionReady.call(this) && !this.isFileLoading;
+    };
+    Object.defineProperty(QuestionFileModelBase.prototype, "isFileLoading", {
+        get: function () { return this.isFileLoadingValue; },
+        set: function (val) {
+            this.isFileLoadingValue = val;
+            this.updateIsReady();
+        },
+        enumerable: false,
+        configurable: true
+    });
     question_file_decorate([
         jsonobject_property()
     ], QuestionFileModelBase.prototype, "isUploading", void 0);
@@ -59610,15 +59808,6 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(QuestionFileModel.prototype, "isFileLoading", {
-        get: function () { return this.isFileLoadingValue; },
-        set: function (val) {
-            this.isFileLoadingValue = val;
-            this.updateIsReady();
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(QuestionFileModel.prototype, "fileNavigatorVisible", {
         get: function () {
             var isUploading = this.isUploading;
@@ -59801,6 +59990,12 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
     QuestionFileModel.prototype.getType = function () {
         return "file";
     };
+    QuestionFileModel.prototype.onChangeQuestionValue = function (newValue) {
+        _super.prototype.onChangeQuestionValue.call(this, newValue);
+        if (!this.isLoadingFromJson) {
+            this.loadPreview(newValue);
+        }
+    };
     Object.defineProperty(QuestionFileModel.prototype, "showPreview", {
         /**
          * Disable this property only to implement a custom preview.
@@ -60264,9 +60459,6 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
             this._previewLoader.load(newValues);
         }
     };
-    QuestionFileModel.prototype.getIsQuestionReady = function () {
-        return _super.prototype.getIsQuestionReady.call(this) && !this.isFileLoading;
-    };
     QuestionFileModel.prototype.allFilesOk = function (files) {
         var _this = this;
         var errorLength = this.errors ? this.errors.length : 0;
@@ -61011,8 +61203,8 @@ var question_rating_RenderedRatingItem = /** @class */ (function (_super) {
 
 var RatingItemValue = /** @class */ (function (_super) {
     question_rating_extends(RatingItemValue, _super);
-    function RatingItemValue(value, description) {
-        var _this = _super.call(this, value) || this;
+    function RatingItemValue(value, text, description) {
+        var _this = _super.call(this, value, text) || this;
         _this.description = description;
         return _this;
     }
@@ -61378,7 +61570,7 @@ var question_rating_QuestionRatingModel = /** @class */ (function (_super) {
         if (value === this.rateMax || index === settings.ratingMaximumRateValueCount) {
             description = this.maxRateDescription && this.locMaxRateDescription;
         }
-        var newItem = new RatingItemValue(value, description);
+        var newItem = new RatingItemValue(value, item.text, description);
         newItem.locOwner = item.locOwner;
         newItem.ownerPropertyName = item.ownerPropertyName;
         return newItem;
@@ -64077,9 +64269,11 @@ var question_signaturepad_QuestionSignaturePadModel = /** @class */ (function (_
     function QuestionSignaturePadModel(name) {
         var _this = _super.call(this, name) || this;
         _this.valueIsUpdatingInternally = false;
+        _this._loadedData = undefined;
         _this.updateValueHandler = function () {
+            _this._loadedData = undefined;
             _this.scaleCanvas(false, true);
-            _this.refreshCanvas();
+            _this.loadPreview(_this.value);
         };
         return _this;
     }
@@ -64150,15 +64344,14 @@ var question_signaturepad_QuestionSignaturePadModel = /** @class */ (function (_
             this.signaturePad.minWidth = this.penMinWidth * scale;
             this.signaturePad.maxWidth = this.penMaxWidth * scale;
             canvas.getContext("2d").scale(1 / scale, 1 / scale);
-            if (refresh)
-                this.refreshCanvas();
+            if (refresh) {
+                this.loadPreview(this.value);
+            }
         }
     };
-    QuestionSignaturePadModel.prototype.fromDataUrl = function (data) {
-        this.signaturePad.fromDataURL(data, { width: this.canvas.width * this.scale, height: this.canvas.height * this.scale });
-    };
     QuestionSignaturePadModel.prototype.fromUrl = function (url) {
         var _this = this;
+        this.isFileLoading = true;
         var img = new Image();
         img.crossOrigin = "anonymous";
         img.src = url;
@@ -64167,41 +64360,65 @@ var question_signaturepad_QuestionSignaturePadModel = /** @class */ (function (_
             ctx.drawImage(img, 0, 0);
             var dataURL = _this.canvas.toDataURL(_this.getFormat());
             _this.fromDataUrl(dataURL);
+            _this.isFileLoading = false;
         };
     };
-    QuestionSignaturePadModel.prototype.refreshCanvas = function () {
-        if (!this.signaturePad || !this.canvas)
-            return;
-        if (!this.value) {
-            this.canvas.getContext("2d").clearRect(0, 0, this.canvas.width * this.scale, this.canvas.height * this.scale);
-            this.signaturePad.clear();
+    QuestionSignaturePadModel.prototype.fromDataUrl = function (data) {
+        this._loadedData = data;
+        if (this.signaturePad) {
+            this.signaturePad.fromDataURL(data, { width: this.canvas.width * this.scale, height: this.canvas.height * this.scale });
+        }
+    };
+    Object.defineProperty(QuestionSignaturePadModel.prototype, "loadedData", {
+        get: function () {
+            return this._loadedData;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    QuestionSignaturePadModel.prototype.loadPreview = function (newValue) {
+        var _this = this;
+        if (!newValue) {
+            if (this.signaturePad && this.canvas) {
+                this.canvas.getContext("2d").clearRect(0, 0, this.canvas.width * this.scale, this.canvas.height * this.scale);
+                this.signaturePad.clear();
+            }
             this.valueWasChangedFromLastUpload = false;
+            return;
+        }
+        if (this.storeDataAsText) {
+            this.fromDataUrl(newValue);
         }
         else {
-            if (this.storeDataAsText) {
-                this.fromDataUrl(this.value);
+            if (this.loadedData) {
+                this.fromDataUrl(this.loadedData);
             }
             else {
-                this.fromUrl(this.value);
+                var newValues = !!newValue ? [newValue] : [];
+                if (!!this._previewLoader) {
+                    this._previewLoader.dispose();
+                }
+                this.isFileLoading = true;
+                this._previewLoader = new FileLoader(this, function (status, loaded) {
+                    if (status === "success" && loaded && loaded.length > 0 && loaded[0].content) {
+                        _this.fromDataUrl(loaded[0].content);
+                    }
+                    else if (status === "skipped") {
+                        _this.fromUrl(newValue);
+                    }
+                    _this.isFileLoading = false;
+                    _this._previewLoader.dispose();
+                    _this._previewLoader = undefined;
+                });
+                this._previewLoader.load(newValues);
             }
         }
     };
-    QuestionSignaturePadModel.prototype.loadPreview = function (newValue) {
-        var _this = this;
-        if (!this.storeDataAsText) {
-            var newValues = !!newValue ? [newValue] : [];
-            if (!!this._previewLoader) {
-                this._previewLoader.dispose();
-            }
-            this.isFileLoading = true;
-            this._previewLoader = new FileLoader(this, function (status, loaded) {
-                _this.isFileLoading = false;
-                if (loaded && loaded.length > 0 && loaded[0].content && status === "success")
-                    _this.fromDataUrl(loaded[0].content);
-                _this._previewLoader.dispose();
-                _this._previewLoader = undefined;
-            });
-            this._previewLoader.load(newValues);
+    QuestionSignaturePadModel.prototype.onChangeQuestionValue = function (newValue) {
+        _super.prototype.onChangeQuestionValue.call(this, newValue);
+        if (!this.isLoadingFromJson) {
+            this._loadedData = undefined;
+            this.loadPreview(newValue);
         }
     };
     QuestionSignaturePadModel.prototype.onSurveyLoad = function () {
@@ -64244,7 +64461,7 @@ var question_signaturepad_QuestionSignaturePadModel = /** @class */ (function (_
         this.updateValueHandler();
         this.readOnlyChangedCallback();
         var propertyChangedHandler = function (sender, options) {
-            if (options.name === "signatureWidth" || options.name === "signatureHeight" || options.name === "value") {
+            if (options.name === "signatureWidth" || options.name === "signatureHeight") {
                 if (!_this.valueIsUpdatingInternally)
                     _this.updateValueHandler();
             }
@@ -64464,7 +64681,8 @@ var question_signaturepad_QuestionSignaturePadModel = /** @class */ (function (_
     QuestionSignaturePadModel.prototype.clearValue = function (keepComment) {
         this.valueWasChangedFromLastUpload = false;
         _super.prototype.clearValue.call(this, keepComment);
-        this.refreshCanvas();
+        this._loadedData = undefined;
+        this.loadPreview(this.value);
     };
     QuestionSignaturePadModel.prototype.endLoadingFromJson = function () {
         _super.prototype.endLoadingFromJson.call(this);
@@ -66669,7 +66887,6 @@ var question_paneldynamic_QuestionPanelDynamicModel = /** @class */ (function (_
         if (!loc)
             return;
         loc.localizationName = (this.isReadOnly || !this.allowAddPanel) ? "noEntriesReadonlyText" : "noEntriesText";
-        loc.strChanged();
     };
     QuestionPanelDynamicModel.prototype.onSurveyLoad = function () {
         this.template.readOnly = this.isReadOnly;
@@ -70592,8 +70809,8 @@ Serializer.addClass("currencymask", [
 
 var Version;
 var ReleaseDate;
-Version = "" + "1.12.7";
-ReleaseDate = "" + "2024-10-23";
+Version = "" + "1.12.8";
+ReleaseDate = "" + "2024-10-31";
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         var str = "survey-core has version '" + Version + "' and " + libraryName
@@ -71373,7 +71590,7 @@ var defaultStandardCss = {
     matrixdynamic: {
         root: "sv_q_matrix_dynamic",
         button: "sv_matrix_dynamic_button",
-        buttonAdd: "",
+        buttonAdd: "sv_matrix_dynamic_button--add",
         buttonRemove: "",
         iconAdd: "",
         iconRemove: "",
@@ -71394,7 +71611,8 @@ var defaultStandardCss = {
         emptyRowsSection: "sv_matrix_empty_rows_section",
         emptyRowsText: "sv_matrix_empty_rows_text",
         emptyRowsButton: "",
-        ghostRow: "sv-matrix-row--drag-drop-ghost-mod"
+        ghostRow: "sv-matrix-row--drag-drop-ghost-mod",
+        draggedRow: "sv-matrixdynamic-dragged-row"
     },
     paneldynamic: {
         root: "sv_panel_dynamic",
@@ -71934,7 +72152,8 @@ var modernCss = {
         emptyRowsSection: "sv-table__empty--rows--section",
         emptyRowsText: "sv-table__empty--rows--text",
         emptyRowsButton: "",
-        ghostRow: "sv-matrix-row--drag-drop-ghost-mod"
+        ghostRow: "sv-matrix-row--drag-drop-ghost-mod",
+        draggedRow: "sv-matrixdynamic-dragged-row",
     },
     rating: {
         root: "sv-rating",