survey-react 1.11.6 → 1.11.7

package/survey.react.js

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.11.6
+ * surveyjs - Survey JavaScript library v1.11.7
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -2298,6 +2298,8 @@ var Base = /** @class */ (function () {
         if (!prop || prop.isCustom && this.isCreating)
             return undefined;
         var dValue = prop.defaultValue;
+        if (!!prop.defaultValueFunc)
+            return dValue;
         if (!this.isPropertyEmpty(dValue) && !Array.isArray(dValue))
             return dValue;
         var locStr = this.localizableStrings ? this.localizableStrings[name] : undefined;
@@ -9953,8 +9955,8 @@ __webpack_require__.r(__webpack_exports__);
 
 var Version;
 var ReleaseDate;
-Version = "" + "1.11.6";
-ReleaseDate = "" + "2024-07-10";
+Version = "" + "1.11.7";
+ReleaseDate = "" + "2024-07-16";
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         var str = "survey-core has version '" + Version + "' and " + libraryName
@@ -19785,7 +19787,7 @@ var JsonObjectProperty = /** @class */ (function () {
         }
         if (this.isLocalizable)
             return value === null || value === undefined;
-        return ((value === false && (this.type == "boolean" || this.type == "switch")) ||
+        return ((value === false && (this.type == "boolean" || this.type == "switch") && !this.defaultValueFunc) ||
             value === "" || _helpers__WEBPACK_IMPORTED_MODULE_2__["Helpers"].isValueEmpty(value));
     };
     JsonObjectProperty.prototype.getSerializableValue = function (obj) {
@@ -30799,6 +30801,10 @@ var InputElementAdapter = /** @class */ (function () {
                 event.preventDefault();
             }
         };
+        this.changeHandler = function (event) {
+            var result = _this.inputMaskInstance.processInput({ prevValue: "", insertedChars: event.target.value, selectionStart: 0, selectionEnd: 0 });
+            _this.inputElement.value = result.value;
+        };
         var _value = value;
         if (_value === null || _value === undefined) {
             _value = "";
@@ -30832,6 +30838,7 @@ var InputElementAdapter = /** @class */ (function () {
             this.inputElement.addEventListener("beforeinput", this.beforeInputHandler);
             this.inputElement.addEventListener("click", this.clickHandler);
             this.inputElement.addEventListener("focus", this.clickHandler);
+            this.inputElement.addEventListener("change", this.changeHandler);
         }
     };
     InputElementAdapter.prototype.removeInputEventListener = function () {
@@ -30839,6 +30846,7 @@ var InputElementAdapter = /** @class */ (function () {
             this.inputElement.removeEventListener("beforeinput", this.beforeInputHandler);
             this.inputElement.removeEventListener("click", this.clickHandler);
             this.inputElement.removeEventListener("focus", this.clickHandler);
+            this.inputElement.removeEventListener("change", this.changeHandler);
         }
     };
     InputElementAdapter.prototype.dispose = function () {
@@ -32932,6 +32940,12 @@ var PageModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    PageModel.prototype.getMaxTimeToFinish = function () {
+        if (this.maxTimeToFinish !== 0)
+            return this.maxTimeToFinish;
+        var res = !!this.survey ? this.survey.maxTimeToFinishPage : 0;
+        return res > 0 ? res : 0;
+    };
     PageModel.prototype.onNumChanged = function (value) { };
     PageModel.prototype.onVisibleChanged = function () {
         if (this.isRandomizing)
@@ -34017,6 +34031,23 @@ var PanelModelBase = /** @class */ (function (_super) {
             this.parent.validateContainerOnly();
         }
     };
+    PanelModelBase.prototype.onQuestionValueChanged = function (el) {
+        var index = this.questions.indexOf(el);
+        if (index < 0)
+            return;
+        var dif = 5;
+        var max = this.questions.length - 1;
+        var start = index - dif > 0 ? index - dif : 0;
+        var end = index + dif < max ? index + dif : max;
+        for (var i = start; i <= end; i++) {
+            if (i === index)
+                continue;
+            var q = this.questions[i];
+            if (q.errors.length > 0 && q.validate(false)) {
+                q.validate(true);
+            }
+        }
+    };
     PanelModelBase.prototype.hasErrorsInPanels = function (rec) {
         var errors = [];
         this.hasRequiredError(rec, errors);
@@ -39426,8 +39457,12 @@ var Question = /** @class */ (function (_super) {
     Object.defineProperty(Question.prototype, "titleWidth", {
         get: function () {
             if (this.getTitleLocation() === "left") {
-                if (!!this.parent)
-                    return this.parent.getQuestionTitleWidth();
+                if (!!this.parent) {
+                    var width = this.parent.getQuestionTitleWidth();
+                    if (width && !isNaN(width))
+                        width = width + "px";
+                    return width;
+                }
             }
             return undefined;
         },
@@ -40569,14 +40604,23 @@ var Question = /** @class */ (function (_super) {
     Question.prototype.getFilteredName = function () { return this.getValueName(); };
     Object.defineProperty(Question.prototype, "valueForSurvey", {
         get: function () {
-            if (!!this.valueToDataCallback) {
-                return this.valueToDataCallback(this.value);
-            }
-            return this.value;
+            return this.valueForSurveyCore(this.value);
         },
         enumerable: false,
         configurable: true
     });
+    Question.prototype.valueForSurveyCore = function (val) {
+        if (!!this.valueToDataCallback) {
+            return this.valueToDataCallback(val);
+        }
+        return val;
+    };
+    Question.prototype.valueFromDataCore = function (val) {
+        if (!!this.valueFromDataCallback) {
+            return this.valueFromDataCallback(val);
+        }
+        return val;
+    };
     /**
      * Sets the question's `value` and `comment` properties to `undefined`.
      * @see value
@@ -41398,6 +41442,9 @@ var Question = /** @class */ (function (_super) {
             this.updateQuestionCss();
         }
         this.isOldAnswered = undefined;
+        if (this.parent) {
+            this.parent.onQuestionValueChanged(this);
+        }
     };
     Question.prototype.checkIsValueCorrect = function (val) {
         var res = this.isValueEmpty(val, !this.allowSpaceAsAnswer) || this.isNewValueCorrect(val);
@@ -41483,9 +41530,7 @@ var Question = /** @class */ (function (_super) {
         var _this = this;
         if (clearData === void 0) { clearData = false; }
         newValue = this.getUnbindValue(newValue);
-        if (!!this.valueFromDataCallback) {
-            newValue = this.valueFromDataCallback(newValue);
-        }
+        newValue = this.valueFromDataCore(newValue);
         if (!this.checkIsValueCorrect(newValue))
             return;
         var isEmpty = this.isValueEmpty(newValue);
@@ -44672,6 +44717,8 @@ _jsonobject__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addClass("selectbase", [
             return !obj.choicesFromQuestion;
         },
     },
+    { name: "defaultValue:value", visibleIf: function (obj) { return !obj.choicesFromQuestion; }, dependsOn: "choicesFromQuestion" },
+    { name: "correctAnswer:value", visibleIf: function (obj) { return !obj.choicesFromQuestion; }, dependsOn: "choicesFromQuestion" },
     { name: "separateSpecialChoices:boolean", visible: false },
     { name: "showOtherItem:boolean", alternativeName: "hasOther" },
     { name: "showNoneItem:boolean", alternativeName: "hasNone" },
@@ -44731,8 +44778,7 @@ _jsonobject__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addClass("selectbase", [
         default: "default",
         choices: ["default", true, false],
         visible: false,
-    },
-    // { name: "itemComponent", visible: false }
+    }
 ], null, "question");
 _jsonobject__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addClass("checkboxbase", [
     {
@@ -46389,7 +46435,7 @@ var QuestionCommentModel = /** @class */ (function (_super) {
          * @see allowResize
          */
         get: function () {
-            return this.getPropertyValue("autoGrow") || (this.survey && this.survey.autoGrowComment);
+            return this.getPropertyValue("autoGrow");
         },
         set: function (val) {
             this.setPropertyValue("autoGrow", val);
@@ -46397,9 +46443,16 @@ var QuestionCommentModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(QuestionCommentModel.prototype, "renderedAutoGrow", {
+        get: function () {
+            var autoGrow = this.autoGrow;
+            return autoGrow === undefined && this.survey ? this.survey.autoGrowComment : !!autoGrow;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(QuestionCommentModel.prototype, "allowResize", {
         /**
-         * Specifies whether to display a resize handle for the comment area.
          *
          * Default value: `true` (inherited from `SurveyModel`'s [`allowResizeComment`](https://surveyjs.io/form-library/documentation/surveymodel#allowResizeComment) property)
          * @see autoGrow
@@ -46415,7 +46468,9 @@ var QuestionCommentModel = /** @class */ (function (_super) {
     });
     Object.defineProperty(QuestionCommentModel.prototype, "renderedAllowResize", {
         get: function () {
-            return this.allowResize && (this.survey && this.survey.allowResizeComment) && !this.isPreviewStyle && !this.isReadOnlyStyle;
+            var res = this.allowResize;
+            var allowResize = res === undefined && this.survey ? this.survey.allowResizeComment : !!res;
+            return allowResize && !this.isPreviewStyle && !this.isReadOnlyStyle;
         },
         enumerable: false,
         configurable: true
@@ -46438,7 +46493,7 @@ var QuestionCommentModel = /** @class */ (function (_super) {
     };
     QuestionCommentModel.prototype.updateElement = function () {
         var _this = this;
-        if (this.element && this.autoGrow) {
+        if (this.element && this.renderedAutoGrow) {
             setTimeout(function () { return Object(_utils_utils__WEBPACK_IMPORTED_MODULE_3__["increaseHeightByContent"])(_this.element); }, 1);
         }
     };
@@ -46499,8 +46554,8 @@ _jsonobject__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addClass("comment", [
         default: "default",
         choices: ["default", "onBlur", "onTyping"],
     },
-    { name: "autoGrow:boolean" },
-    { name: "allowResize:boolean", default: true },
+    { name: "autoGrow:boolean", defaultFunc: function () { return undefined; } },
+    { name: "allowResize:boolean", defaultFunc: function () { return undefined; } },
     { name: "acceptCarriageReturn:boolean", default: true, visible: false }
 ], function () {
     return new QuestionCommentModel("");
@@ -47028,6 +47083,9 @@ var QuestionCustomModelBase = /** @class */ (function (_super) {
     QuestionCustomModelBase.prototype.validateContainerOnly = function () {
         // do nothing
     };
+    QuestionCustomModelBase.prototype.onQuestionValueChanged = function (el) {
+        // do nothing
+    };
     QuestionCustomModelBase.prototype.getQuestionErrorLocation = function () {
         return this.getErrorLocation();
     };
@@ -53648,6 +53706,9 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    QuestionMatrixDropdownModelBase.prototype.isSelectCellType = function () {
+        return _jsonobject__WEBPACK_IMPORTED_MODULE_0__["Serializer"].isDescendantOf(this.cellType, "selectbase");
+    };
     QuestionMatrixDropdownModelBase.prototype.updateColumnsCellType = function () {
         for (var i = 0; i < this.columns.length; i++) {
             this.columns[i].defaultCellTypeChanged();
@@ -53802,13 +53863,17 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
                 break;
             columnName = path[i] + columnName;
         }
+        var question = undefined;
         var column = this.getColumnByName(columnName);
-        if (!column)
-            return null;
-        var question = column.createCellQuestion(null);
-        if (!question)
-            return null;
-        return question.getConditionJson(operator);
+        if (!!column) {
+            question = column.createCellQuestion(null);
+        }
+        else {
+            if (this.detailPanelMode !== "none") {
+                question = this.detailPanel.getQuestionByName(columnName);
+            }
+        }
+        return !!question ? question.getConditionJson(operator) : null;
     };
     QuestionMatrixDropdownModelBase.prototype.clearIncorrectValues = function () {
         var rows = this.visibleRows;
@@ -54287,7 +54352,11 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
         return questionPlainData;
     };
     QuestionMatrixDropdownModelBase.prototype.addConditionObjectsByContext = function (objects, context) {
-        var hasColumnContext = !!context && this.columns.indexOf(context) > -1;
+        var rowElements = [].concat(this.columns);
+        if (this.detailPanelMode !== "none") {
+            rowElements = rowElements.concat(this.detailPanel.questions);
+        }
+        var hasColumnContext = !!context && rowElements.indexOf(context) > -1;
         var hasContext = context === true || hasColumnContext;
         var rowsIndeces = this.getConditionObjectsRowIndeces();
         if (hasContext) {
@@ -54303,13 +54372,13 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
             var dot = hasQuestionPrefix && index === -1 ? "." : "";
             var prefixName = (hasQuestionPrefix ? this.getValueName() : "") + dot + rowName + ".";
             var prefixTitle = (hasQuestionPrefix ? this.processedTitle : "") + dot + rowText + ".";
-            for (var j = 0; j < this.columns.length; j++) {
-                var column = this.columns[j];
-                if (index === -1 && context === column)
+            for (var j = 0; j < rowElements.length; j++) {
+                var rowElement = rowElements[j];
+                if (index === -1 && context === rowElement)
                     continue;
                 var obj = {
-                    name: prefixName + column.name,
-                    text: prefixTitle + column.fullTitle,
+                    name: prefixName + rowElement.name,
+                    text: prefixTitle + rowElement.fullTitle,
                     question: this
                 };
                 if (index === -1 && context === true) {
@@ -54376,9 +54445,11 @@ var QuestionMatrixDropdownModelBase = /** @class */ (function (_super) {
             var col = this.columns[i];
             if (!col.templateQuestion.hasInput)
                 continue;
+            var hasValue = !_helpers__WEBPACK_IMPORTED_MODULE_2__["Helpers"].isValueEmpty(rowValue[col.name]);
+            if (!hasValue && !!col.templateQuestion.visibleIf)
+                continue;
             res.questionCount += 1;
             res.requiredQuestionCount += col.isRequired;
-            var hasValue = !_helpers__WEBPACK_IMPORTED_MODULE_2__["Helpers"].isValueEmpty(rowValue[col.name]);
             res.answeredQuestionCount += hasValue ? 1 : 0;
             res.requiredAnsweredQuestionCount += hasValue && col.isRequired ? 1 : 0;
         }
@@ -55016,6 +55087,7 @@ _jsonobject__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addClass("matrixdropdownb
     { name: "horizontalScroll:boolean", visible: false, },
     {
         name: "choices:itemvalue[]", uniqueProperty: "value",
+        visibleIf: function (obj) { return obj.isSelectCellType(); }
     },
     { name: "placeholder", alternativeName: "optionsCaption", serializationProperty: "locPlaceholder" },
     {
@@ -59640,6 +59712,9 @@ var QuestionMultipleTextModel = /** @class */ (function (_super) {
     QuestionMultipleTextModel.prototype.validateContainerOnly = function () {
         // do nothing
     };
+    QuestionMultipleTextModel.prototype.onQuestionValueChanged = function (el) {
+        // do nothing
+    };
     QuestionMultipleTextModel.prototype.getItemLabelCss = function (item) {
         return new _utils_cssClassBuilder__WEBPACK_IMPORTED_MODULE_7__["CssClassBuilder"]()
             .append(this.cssClasses.itemLabel)
@@ -63074,7 +63149,7 @@ var QuestionRankingModel = /** @class */ (function (_super) {
         _this.domNode = null;
         _this.onVisibleChoicesChanged = function () {
             _super.prototype.onVisibleChoicesChanged.call(_this);
-            if (_this.carryForwardStartUnranked && !_this.isValueSetByUser && !_this.selectToRankEnabled) {
+            if (_this.carryForwardStartUnranked && !_this.isValueSetByUser && !_this.selectToRankEnabled && !_this.defaultValue) {
                 _this.value = [];
             }
             // ranking question with only one choice doesn't make sense
@@ -66379,6 +66454,24 @@ var QuestionTextModel = /** @class */ (function (_super) {
             this._inputValue = this.maskInstance.getMaskedValue(this.value);
         }
     };
+    QuestionTextModel.prototype.hasToConvertToUTC = function (val) {
+        return _settings__WEBPACK_IMPORTED_MODULE_6__["settings"].storeUtcDates && this.isDateTimeLocaleType() && !!val;
+    };
+    QuestionTextModel.prototype.valueForSurveyCore = function (val) {
+        if (this.hasToConvertToUTC(val)) {
+            val = new Date(val).toISOString();
+        }
+        return _super.prototype.valueForSurveyCore.call(this, val);
+    };
+    QuestionTextModel.prototype.valueFromDataCore = function (val) {
+        if (this.hasToConvertToUTC(val)) {
+            var d = new Date(val);
+            var locale_d = new Date(d.getTime() - d.getTimezoneOffset() * 60 * 1000);
+            var res = locale_d.toISOString();
+            val = res.substring(0, res.length - 2);
+        }
+        return _super.prototype.valueFromDataCore.call(this, val);
+    };
     QuestionTextModel.prototype.onCheckForErrors = function (errors, isOnValueChanged) {
         var _this = this;
         _super.prototype.onCheckForErrors.call(this, errors, isOnValueChanged);
@@ -66450,11 +66543,14 @@ var QuestionTextModel = /** @class */ (function (_super) {
     });
     Object.defineProperty(QuestionTextModel.prototype, "isDateInputType", {
         get: function () {
-            return this.inputType === "date" || this.inputType === "datetime-local";
+            return this.inputType === "date" || this.isDateTimeLocaleType();
         },
         enumerable: false,
         configurable: true
     });
+    QuestionTextModel.prototype.isDateTimeLocaleType = function () {
+        return this.inputType === "datetime-local";
+    };
     QuestionTextModel.prototype.getCalculatedMinMax = function (minMax) {
         if (this.isValueEmpty(minMax))
             return minMax;
@@ -66506,11 +66602,10 @@ var QuestionTextModel = /** @class */ (function (_super) {
         return this.maskTypeIsEmpty ? _super.prototype.getIsInputTextUpdate.call(this) : false;
     };
     QuestionTextModel.prototype.supportGoNextPageAutomatic = function () {
-        return !this.getIsInputTextUpdate() &&
-            ["date", "datetime-local"].indexOf(this.inputType) < 0;
+        return !this.getIsInputTextUpdate() && !this.isDateInputType;
     };
     QuestionTextModel.prototype.supportGoNextPageError = function () {
-        return ["date", "datetime-local"].indexOf(this.inputType) < 0;
+        return !this.isDateInputType;
     };
     Object.defineProperty(QuestionTextModel.prototype, "dataList", {
         /**
@@ -66551,9 +66646,13 @@ var QuestionTextModel = /** @class */ (function (_super) {
     QuestionTextModel.prototype.correctValueType = function (newValue) {
         if (!newValue)
             return newValue;
-        if (this.inputType == "number" || this.inputType == "range") {
+        if (this.inputType === "number" || this.inputType === "range") {
             return _helpers__WEBPACK_IMPORTED_MODULE_3__["Helpers"].isNumber(newValue) ? _helpers__WEBPACK_IMPORTED_MODULE_3__["Helpers"].getNumber(newValue) : "";
         }
+        if (this.inputType === "month") {
+            var d = new Date(newValue);
+            return d.getFullYear() + "-" + (d.getMonth() + 1);
+        }
         return newValue;
     };
     QuestionTextModel.prototype.hasPlaceholder = function () {
@@ -74723,7 +74822,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _reactquestion_factory__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./reactquestion_factory */ "./src/react/reactquestion_factory.tsx");
 /* harmony import */ var _components_loading_indicator__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./components/loading-indicator */ "./src/react/components/loading-indicator.tsx");
 /* harmony import */ var _components_action_bar_action_bar_item__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./components/action-bar/action-bar-item */ "./src/react/components/action-bar/action-bar-item.tsx");
-/* harmony import */ var _entries_react_ui_model__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../entries/react-ui-model */ "./src/entries/react-ui-model.ts");
+/* harmony import */ var _element_factory__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./element-factory */ "./src/react/element-factory.tsx");
+/* harmony import */ var _components_file_file_choose_button__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./components/file/file-choose-button */ "./src/react/components/file/file-choose-button.tsx");
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -74747,6 +74847,8 @@ var __extends = (undefined && undefined.__extends) || (function () {
 
 
 
+
+// import { ReactElementFactory, SurveyFileChooseButton } from "../entries/react-ui-model";
 var SurveyQuestionFile = /** @class */ (function (_super) {
     __extends(SurveyQuestionFile, _super);
     function SurveyQuestionFile(props) {
@@ -74804,7 +74906,7 @@ var SurveyQuestionFile = /** @class */ (function (_super) {
                 noFileChosen)));
     };
     SurveyQuestionFile.prototype.renderChooseButton = function () {
-        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_entries_react_ui_model__WEBPACK_IMPORTED_MODULE_7__["SurveyFileChooseButton"], { data: { question: this.question } });
+        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_components_file_file_choose_button__WEBPACK_IMPORTED_MODULE_8__["SurveyFileChooseButton"], { data: { question: this.question } });
     };
     SurveyQuestionFile.prototype.renderClearButton = function (className) {
         return !this.question.isUploading ? (react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("button", { type: "button", onClick: this.question.doClean, className: className },
@@ -74812,7 +74914,7 @@ var SurveyQuestionFile = /** @class */ (function (_super) {
             (!!this.question.cssClasses.removeButtonIconId) ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_components_svg_icon_svg_icon__WEBPACK_IMPORTED_MODULE_2__["SvgIcon"], { iconName: this.question.cssClasses.removeButtonIconId, size: "auto", title: this.question.clearButtonCaption }) : null)) : null;
     };
     SurveyQuestionFile.prototype.renderPreview = function () {
-        return _entries_react_ui_model__WEBPACK_IMPORTED_MODULE_7__["ReactElementFactory"].Instance.createElement("sv-file-preview", { question: this.question });
+        return _element_factory__WEBPACK_IMPORTED_MODULE_7__["ReactElementFactory"].Instance.createElement("sv-file-preview", { question: this.question });
     };
     SurveyQuestionFile.prototype.renderLoadingIndicator = function () {
         return react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", { className: this.question.cssClasses.loadingIndicator },
@@ -78543,7 +78645,8 @@ var settings = {
             "a": /[a-zA-Z]/,
             "#": /[a-zA-Z0-9]/
         }
-    }
+    },
+    storeUtcDates: false
 };
 
 
@@ -84265,7 +84368,9 @@ var SurveyModel = /** @class */ (function (_super) {
     });
     SurveyModel.prototype.updateActivePage = function () {
         var newPage = this.isShowStartingPage ? this.startedPage : this.currentPage;
-        this.setPropertyValue("activePage", newPage);
+        if (newPage !== this.activePage) {
+            this.setPropertyValue("activePage", newPage);
+        }
     };
     SurveyModel.prototype.onStateAndCurrentPageChanged = function () {
         this.updateActivePage();
@@ -85484,7 +85589,7 @@ var SurveyModel = /** @class */ (function (_super) {
         if (this.isFirstPage || !this.showPrevButton || this.state !== "running")
             return false;
         var page = this.visiblePages[this.currentPageNo - 1];
-        return this.getPageMaxTimeToFinish(page) <= 0;
+        return page && page.getMaxTimeToFinish() <= 0;
     };
     SurveyModel.prototype.calcIsShowNextButton = function () {
         return this.state === "running" && !this.isLastPage && !this.canBeCompletedByTrigger;
@@ -87138,19 +87243,19 @@ var SurveyModel = /** @class */ (function (_super) {
         this.onLoadingSurveyFromService();
         if (clientId) {
             this.createSurveyService().getSurveyJsonAndIsCompleted(this.surveyId, this.clientId, function (success, json, isCompleted, response) {
-                self.isLoading = false;
                 if (success) {
                     self.isCompletedBefore = isCompleted == "completed";
                     self.loadSurveyFromServiceJson(json);
                 }
+                self.isLoading = false;
             });
         }
         else {
             this.createSurveyService().loadSurvey(this.surveyId, function (success, result, response) {
-                self.isLoading = false;
                 if (success) {
                     self.loadSurveyFromServiceJson(result);
                 }
+                self.isLoading = false;
             });
         }
     };
@@ -88254,7 +88359,7 @@ var SurveyModel = /** @class */ (function (_super) {
             return { spent: 0, limit: 0 };
         var pageSpent = page.timeSpent;
         var surveySpent = this.timeSpent;
-        var pageLimitSec = this.getPageMaxTimeToFinish(page);
+        var pageLimitSec = page.getMaxTimeToFinish();
         var surveyLimit = this.maxTimeToFinish;
         if (this.showTimerPanelMode == "page") {
             return { spent: pageSpent, limit: pageLimitSec };
@@ -88283,7 +88388,7 @@ var SurveyModel = /** @class */ (function (_super) {
             return "";
         var pageSpent = this.getDisplayTime(page.timeSpent);
         var surveySpent = this.getDisplayTime(this.timeSpent);
-        var pageLimitSec = this.getPageMaxTimeToFinish(page);
+        var pageLimitSec = page.getMaxTimeToFinish();
         var pageLimit = this.getDisplayTime(pageLimitSec);
         var surveyLimit = this.getDisplayTime(this.maxTimeToFinish);
         if (this.showTimerPanelMode == "page")
@@ -88304,7 +88409,7 @@ var SurveyModel = /** @class */ (function (_super) {
         return "";
     };
     SurveyModel.prototype.getTimerInfoPageText = function (page, pageSpent, pageLimit) {
-        return this.getPageMaxTimeToFinish(page) > 0
+        return !!page && page.getMaxTimeToFinish() > 0
             ? this.getLocalizationFormatString("timerLimitPage", pageSpent, pageLimit)
             : this.getLocalizationFormatString("timerSpentPage", pageSpent, pageLimit);
     };
@@ -88429,20 +88534,14 @@ var SurveyModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    SurveyModel.prototype.getPageMaxTimeToFinish = function (page) {
-        if (!page || page.maxTimeToFinish < 0)
-            return 0;
-        return page.maxTimeToFinish > 0
-            ? page.maxTimeToFinish
-            : this.maxTimeToFinishPage;
-    };
     SurveyModel.prototype.doTimer = function (page) {
         this.onTimer.fire(this, {});
-        if (this.maxTimeToFinish > 0 && this.maxTimeToFinish == this.timeSpent) {
+        if (this.maxTimeToFinish > 0 && this.maxTimeToFinish <= this.timeSpent) {
+            this.timeSpent = this.maxTimeToFinish;
             this.completeLastPage();
         }
         if (page) {
-            var pageLimit = this.getPageMaxTimeToFinish(page);
+            var pageLimit = page.getMaxTimeToFinish();
             if (pageLimit > 0 && pageLimit == page.timeSpent) {
                 if (this.isLastPage) {
                     this.completeLastPage();
@@ -88825,10 +88924,21 @@ var SurveyModel = /** @class */ (function (_super) {
             this.disposeCallback();
         }
     };
+    // private _lastScrollTop = 0;
+    SurveyModel.prototype._isElementShouldBeSticky = function (selector) {
+        if (!selector)
+            return false;
+        var topStickyContainer = this.rootElement.querySelector(selector);
+        if (!!topStickyContainer) {
+            // const scrollDirection = this.rootElement.scrollTop > this._lastScrollTop ? "down" : "up";
+            // this._lastScrollTop = this.rootElement.scrollTop;
+            return this.rootElement.scrollTop > 0 && topStickyContainer.getBoundingClientRect().y <= this.rootElement.getBoundingClientRect().y;
+        }
+        return false;
+    };
     SurveyModel.prototype.onScroll = function () {
         if (!!this.rootElement) {
-            var topStickyContainer = this.rootElement.querySelector(".sv-components-container-center");
-            if (!!topStickyContainer && topStickyContainer.getBoundingClientRect().y <= this.rootElement.getBoundingClientRect().y) {
+            if (this._isElementShouldBeSticky(".sv-components-container-center")) {
                 this.rootElement.classList && this.rootElement.classList.add("sv-root--sticky-top");
             }
             else {
@@ -89571,7 +89681,7 @@ var SurveyTimerModel = /** @class */ (function (_super) {
         this.survey.onCurrentPageChanged.add(function () {
             _this.update();
         });
-        this.timerFunc = function () { _this.doTimer(); };
+        this.timerFunc = function (sender, options) { _this.doTimer(options.seconds); };
         this.setIsRunning(true);
         this.update();
         _surveytimer__WEBPACK_IMPORTED_MODULE_1__["SurveyTimer"].instance.start(this.timerFunc);
@@ -89596,12 +89706,16 @@ var SurveyTimerModel = /** @class */ (function (_super) {
         this.updateText();
         this.updateProgress();
     };
-    SurveyTimerModel.prototype.doTimer = function () {
+    SurveyTimerModel.prototype.doTimer = function (seconds) {
         var page = this.survey.currentPage;
         if (page) {
-            page.timeSpent = page.timeSpent + 1;
+            var pageMaxTime = page.getMaxTimeToFinish();
+            if (pageMaxTime > 0 && pageMaxTime < page.timeSpent + seconds) {
+                seconds = pageMaxTime - page.timeSpent;
+            }
+            page.timeSpent = page.timeSpent + seconds;
         }
-        this.spent = this.spent + 1;
+        this.spent = this.spent + seconds;
         this.update();
         if (this.onTimer) {
             this.onTimer(page);
@@ -89887,13 +90001,14 @@ var surveyTimerFunctions = {
         else {
             return setTimeout(func, delay);
         }
-    }
+    },
+    now: function () { return Date.now(); }
 };
 var SurveyTimer = /** @class */ (function () {
     function SurveyTimer() {
         this.listenerCounter = 0;
         this.timerId = -1;
-        this.onTimer = new _base__WEBPACK_IMPORTED_MODULE_0__["Event"]();
+        this.onTimer = new _base__WEBPACK_IMPORTED_MODULE_0__["EventBase"]();
     }
     Object.defineProperty(SurveyTimer, "instance", {
         get: function () {
@@ -89911,6 +90026,7 @@ var SurveyTimer = /** @class */ (function () {
         if (func) {
             this.onTimer.add(func);
         }
+        this.prevTimeInMs = surveyTimerFunctions.now();
         if (this.timerId < 0) {
             this.timerId = surveyTimerFunctions.setTimeout(function () {
                 _this.doTimer();
@@ -89936,8 +90052,14 @@ var SurveyTimer = /** @class */ (function () {
         }
         if (this.timerId < 0)
             return;
+        var newTimer = surveyTimerFunctions.now();
+        var seconds = Math.floor((newTimer - this.prevTimeInMs) / 1000);
+        this.prevTimeInMs = newTimer;
+        if (seconds < 0) {
+            seconds = 1;
+        }
         var prevItem = this.timerId;
-        this.onTimer.fire(this, {});
+        this.onTimer.fire(this, { seconds: seconds });
         //We have to check that we have the same timerId
         //It could be changed during events execution and it will lead to double timer events
         if (prevItem !== this.timerId)
@@ -92477,7 +92599,7 @@ function navigateToUrl(url) {
     var location = _global_variables_utils__WEBPACK_IMPORTED_MODULE_3__["DomWindowHelper"].getLocation();
     if (!url || !location)
         return;
-    location.href = url;
+    location.href = encodeURIComponent(url);
 }
 function wrapUrlForBackgroundImage(url) {
     return !!url ? ["url(", url, ")"].join("") : "";