survey-react-ui 1.9.126 → 1.9.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "survey-react-ui",
-  "version": "1.9.126",
+  "version": "1.9.127",
   "description": "survey.js is a JavaScript Survey Library. It is a modern way to add a survey to your website. It uses JSON for survey metadata and results.",
   "keywords": [
     "Survey",

package/survey-react-ui.js

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.9.126
+ * surveyjs - Survey JavaScript library v1.9.127
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -561,8 +561,8 @@ var Base = /** @class */ (function () {
      * Returns a JSON object that corresponds to the current SurveyJS object.
      * @see fromJSON
      */
-    Base.prototype.toJSON = function () {
-        return new _jsonobject__WEBPACK_IMPORTED_MODULE_2__["JsonObject"]().toJsonObject(this);
+    Base.prototype.toJSON = function (options) {
+        return new _jsonobject__WEBPACK_IMPORTED_MODULE_2__["JsonObject"]().toJsonObject(this, options);
     };
     /**
      * Assigns a new configuration to the current SurveyJS object. This configuration is taken from a passed JSON object.
@@ -2620,7 +2620,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-Object(survey_core__WEBPACK_IMPORTED_MODULE_2__["checkLibraryVersion"])("" + "1.9.126", "survey-react-ui");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_2__["checkLibraryVersion"])("" + "1.9.127", "survey-react-ui");
 
 
 /***/ }),
@@ -7235,6 +7235,27 @@ var Helpers = /** @class */ (function () {
         }
         return val;
     };
+    Helpers.compareVerions = function (ver1, ver2) {
+        if (!ver1 && !ver2)
+            return 0;
+        var ver1Ar = ver1.split(".");
+        var ver2Ar = ver2.split(".");
+        var len1 = ver1Ar.length;
+        var len2 = ver2Ar.length;
+        for (var i = 0; i < len1 && i < len2; i++) {
+            var str1 = ver1Ar[i];
+            var str2 = ver2Ar[i];
+            if (str1.length === str2.length) {
+                if (str1 !== str2) {
+                    return str1 < str2 ? -1 : 1;
+                }
+            }
+            else {
+                return str1.length < str2.length ? -1 : 1;
+            }
+        }
+        return len1 === len2 ? 0 : (len1 < len2 ? -1 : 1);
+    };
     return Helpers;
 }());
 
@@ -7694,6 +7715,21 @@ var JsonObjectProperty = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    JsonObjectProperty.prototype.isAvailableInVersion = function (ver) {
+        if (!!this.alternativeName)
+            return true;
+        return this.isAvailableInVersionCore(ver);
+    };
+    JsonObjectProperty.prototype.getSerializedName = function (ver) {
+        if (!this.alternativeName)
+            return this.name;
+        return this.isAvailableInVersionCore(ver) ? this.name : this.alternativeName;
+    };
+    JsonObjectProperty.prototype.isAvailableInVersionCore = function (ver) {
+        if (!ver || !this.version)
+            return true;
+        return _helpers__WEBPACK_IMPORTED_MODULE_2__["Helpers"].compareVerions(this.version, ver) <= 0;
+    };
     Object.defineProperty(JsonObjectProperty.prototype, "isLocalizable", {
         get: function () {
             return this.isLocalizableValue != null ? this.isLocalizableValue : false;
@@ -7774,6 +7810,7 @@ var JsonObjectProperty = /** @class */ (function () {
         "className",
         "alternativeName",
         "layout",
+        "version",
         "classNamePart",
         "baseClassName",
         "defaultValue",
@@ -8222,6 +8259,9 @@ var JsonMetadataClass = /** @class */ (function () {
             if (propInfo.layout) {
                 prop.layout = propInfo.layout;
             }
+            if (propInfo.version) {
+                prop.version = propInfo.version;
+            }
             if (propInfo.dependsOn) {
                 this.addDependsOnProperties(prop, propInfo.dependsOn);
             }
@@ -8366,36 +8406,54 @@ var JsonMetadata = /** @class */ (function () {
     JsonMetadata.prototype.getPropertiesByObj = function (obj) {
         if (!obj || !obj.getType)
             return [];
-        var res = {};
         var props = this.getProperties(obj.getType());
-        for (var i = 0; i < props.length; i++) {
-            res[props[i].name] = props[i];
-        }
-        var dynamicProps = !!obj.getDynamicType
-            ? this.getProperties(obj.getDynamicType())
-            : null;
-        if (dynamicProps && dynamicProps.length > 0) {
-            for (var i = 0; i < dynamicProps.length; i++) {
-                var dProp = dynamicProps[i];
-                if (!!res[dProp.name])
-                    continue;
-                res[dProp.name] = dProp;
+        var dynamicProps = this.getDynamicPropertiesByObj(obj);
+        return [].concat(props).concat(dynamicProps);
+    };
+    JsonMetadata.prototype.addDynamicPropertiesIntoObj = function (dest, src, props) {
+        var _this = this;
+        props.forEach(function (prop) {
+            _this.addDynamicPropertyIntoObj(dest, src, prop.name, false);
+            if (prop.serializationProperty) {
+                _this.addDynamicPropertyIntoObj(dest, src, prop.serializationProperty, true);
             }
+            if (prop.alternativeName) {
+                _this.addDynamicPropertyIntoObj(dest, src, prop.alternativeName, false);
+            }
+        });
+    };
+    JsonMetadata.prototype.addDynamicPropertyIntoObj = function (dest, src, propName, isReadOnly) {
+        var desc = {
+            configurable: true,
+            get: function () {
+                return src[propName];
+            },
+        };
+        if (!isReadOnly) {
+            desc["set"] = function (v) {
+                src[propName] = v;
+            };
         }
-        return Object.keys(res).map(function (key) { return res[key]; });
+        Object.defineProperty(dest, propName, desc);
     };
     JsonMetadata.prototype.getDynamicPropertiesByObj = function (obj, dynamicType) {
         if (dynamicType === void 0) { dynamicType = null; }
-        if (!obj || !obj.getType || (!obj.getDynamicType && !dynamicType))
+        if (!obj || !obj.getType)
+            return [];
+        if (!!obj.getDynamicProperties)
+            return obj.getDynamicProperties();
+        if (!obj.getDynamicType && !dynamicType)
             return [];
-        var objType = obj.getType();
         var dType = !!dynamicType ? dynamicType : obj.getDynamicType();
-        if (!dType)
+        return this.getDynamicPropertiesByTypes(obj.getType(), dType);
+    };
+    JsonMetadata.prototype.getDynamicPropertiesByTypes = function (objType, dynamicType, invalidNames) {
+        if (!dynamicType)
             return [];
-        var cacheType = dType + "-" + objType;
+        var cacheType = dynamicType + "-" + objType;
         if (this.dynamicPropsCache[cacheType])
             return this.dynamicPropsCache[cacheType];
-        var dynamicProps = this.getProperties(dType);
+        var dynamicProps = this.getProperties(dynamicType);
         if (!dynamicProps || dynamicProps.length == 0)
             return [];
         var hash = {};
@@ -8404,9 +8462,11 @@ var JsonMetadata = /** @class */ (function () {
             hash[props[i].name] = props[i];
         }
         var res = [];
-        for (var i = 0; i < dynamicProps.length; i++) {
-            var dProp = dynamicProps[i];
-            if (!hash[dProp.name]) {
+        if (!invalidNames)
+            invalidNames = [];
+        for (var i_1 = 0; i_1 < dynamicProps.length; i_1++) {
+            var dProp = dynamicProps[i_1];
+            if (!hash[dProp.name] && invalidNames.indexOf(dProp.name) < 0) {
                 res.push(dProp);
             }
         }
@@ -8901,9 +8961,8 @@ var JsonObject = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    JsonObject.prototype.toJsonObject = function (obj, storeDefaults) {
-        if (storeDefaults === void 0) { storeDefaults = false; }
-        return this.toJsonObjectCore(obj, null, storeDefaults);
+    JsonObject.prototype.toJsonObject = function (obj, options) {
+        return this.toJsonObjectCore(obj, null, options);
     };
     JsonObject.prototype.toObject = function (jsonObj, obj, options) {
         this.toObjectCore(jsonObj, obj, options);
@@ -8952,8 +9011,7 @@ var JsonObject = /** @class */ (function () {
             obj.endLoadingFromJson();
         }
     };
-    JsonObject.prototype.toJsonObjectCore = function (obj, property, storeDefaults) {
-        if (storeDefaults === void 0) { storeDefaults = false; }
+    JsonObject.prototype.toJsonObjectCore = function (obj, property, options) {
         if (!obj || !obj.getType)
             return obj;
         if (typeof obj.getData === "function")
@@ -8962,61 +9020,67 @@ var JsonObject = /** @class */ (function () {
         if (property != null && !property.className) {
             result[JsonObject.typePropertyName] = property.getObjType(obj.getType());
         }
-        this.propertiesToJson(obj, Serializer.getProperties(obj.getType()), result, storeDefaults);
-        this.propertiesToJson(obj, this.getDynamicProperties(obj), result, storeDefaults);
+        var storeDefaults = options === true;
+        if (!options || options === true) {
+            options = {};
+        }
+        if (storeDefaults) {
+            options.storeDefaults = storeDefaults;
+        }
+        this.propertiesToJson(obj, Serializer.getProperties(obj.getType()), result, options);
+        this.propertiesToJson(obj, this.getDynamicProperties(obj), result, options);
         return result;
     };
     JsonObject.prototype.getDynamicProperties = function (obj) {
         return Serializer.getDynamicPropertiesByObj(obj);
     };
-    JsonObject.prototype.addDynamicProperties = function (obj, jsonObj, properties) {
-        if (!obj.getDynamicPropertyName)
-            return properties;
-        var dynamicPropName = obj.getDynamicPropertyName();
-        if (!dynamicPropName)
-            return properties;
-        if (jsonObj[dynamicPropName]) {
-            obj[dynamicPropName] = jsonObj[dynamicPropName];
-        }
-        var dynamicProperties = this.getDynamicProperties(obj);
-        var res = [];
-        for (var i = 0; i < properties.length; i++) {
-            res.push(properties[i]);
-        }
-        for (var i = 0; i < dynamicProperties.length; i++) {
-            res.push(dynamicProperties[i]);
+    JsonObject.prototype.addDynamicProperties = function (obj, jsonObj, props) {
+        if (!obj.getDynamicPropertyName && !obj.getDynamicProperties)
+            return props;
+        if (obj.getDynamicPropertyName) {
+            var dynamicPropName = obj.getDynamicPropertyName();
+            if (!dynamicPropName)
+                return props;
+            if (dynamicPropName && jsonObj[dynamicPropName]) {
+                obj[dynamicPropName] = jsonObj[dynamicPropName];
+            }
         }
-        return res;
+        var dynamicProps = this.getDynamicProperties(obj);
+        return dynamicProps.length === 0 ? props : [].concat(props).concat(dynamicProps);
     };
-    JsonObject.prototype.propertiesToJson = function (obj, properties, json, storeDefaults) {
-        if (storeDefaults === void 0) { storeDefaults = false; }
+    JsonObject.prototype.propertiesToJson = function (obj, properties, json, options) {
         for (var i = 0; i < properties.length; i++) {
-            this.valueToJson(obj, json, properties[i], storeDefaults);
+            this.valueToJson(obj, json, properties[i], options);
         }
     };
-    JsonObject.prototype.valueToJson = function (obj, result, property, storeDefaults) {
-        if (storeDefaults === void 0) { storeDefaults = false; }
-        if (property.isSerializable === false ||
-            (property.isLightSerializable === false && this.lightSerializing))
+    JsonObject.prototype.valueToJson = function (obj, result, prop, options) {
+        if (!options)
+            options = {};
+        if (prop.isSerializable === false || (prop.isLightSerializable === false && this.lightSerializing))
+            return;
+        if (options.version && !prop.isAvailableInVersion(options.version))
             return;
-        var value = property.getSerializableValue(obj);
-        if (!storeDefaults && property.isDefaultValueByObj(obj, value))
+        var value = prop.getSerializableValue(obj);
+        if (!options.storeDefaults && prop.isDefaultValueByObj(obj, value))
             return;
         if (this.isValueArray(value)) {
             var arrValue = [];
             for (var i = 0; i < value.length; i++) {
-                arrValue.push(this.toJsonObjectCore(value[i], property, storeDefaults));
+                arrValue.push(this.toJsonObjectCore(value[i], prop, options));
             }
             value = arrValue.length > 0 ? arrValue : null;
         }
         else {
-            value = this.toJsonObjectCore(value, property, storeDefaults);
+            value = this.toJsonObjectCore(value, prop, options);
         }
+        if (value === undefined || value === null)
+            return;
+        var name = prop.getSerializedName(options.version);
         var hasValue = typeof obj["getPropertyValue"] === "function" &&
-            obj["getPropertyValue"](property.name, null) !== null;
-        if ((storeDefaults && hasValue) || !property.isDefaultValueByObj(obj, value)) {
-            if (!Serializer.onSerializingProperty || !Serializer.onSerializingProperty(obj, property, value, result)) {
-                result[property.name] = value;
+            obj["getPropertyValue"](name, null) !== null;
+        if ((options.storeDefaults && hasValue) || !prop.isDefaultValueByObj(obj, value)) {
+            if (!Serializer.onSerializingProperty || !Serializer.onSerializingProperty(obj, prop, value, result)) {
+                result[name] = this.removePosOnValueToJson(prop, value);
             }
         }
     };
@@ -9056,6 +9120,14 @@ var JsonObject = /** @class */ (function () {
             }
         }
     };
+    JsonObject.prototype.removePosOnValueToJson = function (property, value) {
+        if (!property.isCustom || !value)
+            return value;
+        if (!!value[JsonObject.positionPropertyName]) {
+            delete value[JsonObject.positionPropertyName];
+        }
+        return value;
+    };
     JsonObject.prototype.removePos = function (property, value) {
         if (!property || !property.type || property.type.indexOf("value") < 0)
             return;
@@ -10176,7 +10248,7 @@ var SurveyQuestionBoolean = /** @class */ (function (_super) {
             react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("label", { className: itemClass, onClick: this.handleOnClick },
                 react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("input", { ref: this.checkRef, type: "checkbox", name: this.question.name, value: this.question.booleanValue === null
                         ? ""
-                        : this.question.booleanValue, id: this.question.inputId, className: cssClasses.control, disabled: this.isDisplayMode, checked: this.question.booleanValue || false, onChange: this.handleOnChange, "aria-required": this.question.ariaRequired, "aria-label": this.question.ariaLabel, "aria-invalid": this.question.ariaInvalid, "aria-describedby": this.question.ariaDescribedBy }),
+                        : this.question.booleanValue, id: this.question.inputId, className: cssClasses.control, disabled: this.isDisplayMode, checked: this.question.booleanValue || false, onChange: this.handleOnChange, role: this.question.a11y_input_ariaRole, "aria-required": this.question.a11y_input_ariaRequired, "aria-label": this.question.a11y_input_ariaLabel, "aria-labelledby": this.question.a11y_input_ariaLabelledBy, "aria-invalid": this.question.a11y_input_ariaInvalid, "aria-describedby": this.question.a11y_input_ariaDescribedBy }),
                 react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", { className: cssClasses.sliderGhost, onClick: function (event) { return _this.handleOnLabelClick(event, false); } },
                     react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", { className: this.question.getLabelCss(false) }, this.renderLocString(this.question.locLabelFalse))),
                 react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", { className: cssClasses.switch, onClick: this.handleOnSwitchClick },
@@ -19506,7 +19578,7 @@ var SurveyQuestionSignaturePad = /** @class */ (function (_super) {
             react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", { className: cssClasses.placeholder, style: { display: this.question.needShowPlaceholder() ? "" : "none" } }, this.renderLocString(this.question.locPlaceholder)),
             react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", null,
                 this.renderBackgroundImage(),
-                react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("canvas", { tabIndex: 0, className: this.question.cssClasses.canvas, onBlur: this.question.onBlur })),
+                react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("canvas", { tabIndex: -1, className: this.question.cssClasses.canvas, onBlur: this.question.onBlur })),
             clearButton,
             loadingIndicator));
     };
@@ -20413,8 +20485,8 @@ var settings = {
      * @param message A message to be displayed in the confirm dialog window.
      * @param callback A callback function that should be called with `true` if a user confirms an action or `false` otherwise.
      */
-    confirmActionAsync: function (message, callback, applyTitle) {
-        return Object(_utils_utils__WEBPACK_IMPORTED_MODULE_0__["showConfirmDialog"])(message, callback, applyTitle);
+    confirmActionAsync: function (message, callback, applyTitle, locale) {
+        return Object(_utils_utils__WEBPACK_IMPORTED_MODULE_0__["showConfirmDialog"])(message, callback, applyTitle, locale);
     },
     /**
      * A minimum width value for all survey elements.
@@ -21022,7 +21094,7 @@ function confirmAction(message) {
         return _settings__WEBPACK_IMPORTED_MODULE_1__["settings"].confirmActionFunc(message);
     return confirm(message);
 }
-function confirmActionAsync(message, funcOnYes, funcOnNo) {
+function confirmActionAsync(message, funcOnYes, funcOnNo, locale) {
     var callbackFunc = function (res) {
         if (res)
             funcOnYes();
@@ -21030,7 +21102,7 @@ function confirmActionAsync(message, funcOnYes, funcOnNo) {
             funcOnNo();
     };
     if (!!_settings__WEBPACK_IMPORTED_MODULE_1__["settings"] && !!_settings__WEBPACK_IMPORTED_MODULE_1__["settings"].confirmActionAsync) {
-        if (_settings__WEBPACK_IMPORTED_MODULE_1__["settings"].confirmActionAsync(message, callbackFunc))
+        if (_settings__WEBPACK_IMPORTED_MODULE_1__["settings"].confirmActionAsync(message, callbackFunc, undefined, locale))
             return;
     }
     callbackFunc(confirmAction(message));
@@ -21379,7 +21451,7 @@ var Logger = /** @class */ (function () {
     return Logger;
 }());
 
-function showConfirmDialog(message, callback, applyTitle) {
+function showConfirmDialog(message, callback, applyTitle, locale) {
     var locStr = new _localizablestring__WEBPACK_IMPORTED_MODULE_0__["LocalizableString"](undefined);
     var popupViewModel = _settings__WEBPACK_IMPORTED_MODULE_1__["settings"].showDialog({
         componentName: "sv-string-viewer",
@@ -21400,9 +21472,9 @@ function showConfirmDialog(message, callback, applyTitle) {
     var toolbar = popupViewModel.footerToolbar;
     var applyBtn = toolbar.getActionById("apply");
     var cancelBtn = toolbar.getActionById("cancel");
-    cancelBtn.title = _surveyStrings__WEBPACK_IMPORTED_MODULE_2__["surveyLocalization"].getString("cancel");
+    cancelBtn.title = _surveyStrings__WEBPACK_IMPORTED_MODULE_2__["surveyLocalization"].getString("cancel", locale);
     cancelBtn.innerCss = "sv-popup__body-footer-item sv-popup__button sd-btn sd-btn--small";
-    applyBtn.title = applyTitle || _surveyStrings__WEBPACK_IMPORTED_MODULE_2__["surveyLocalization"].getString("ok");
+    applyBtn.title = applyTitle || _surveyStrings__WEBPACK_IMPORTED_MODULE_2__["surveyLocalization"].getString("ok", locale);
     applyBtn.innerCss = "sv-popup__body-footer-item sv-popup__button sv-popup__button--danger sd-btn sd-btn--small sd-btn--danger";
     popupViewModel.width = "452px";
     return true;