survey-react 1.10.3 → 1.10.4

package/modern.css

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.10.3
+ * surveyjs - Survey JavaScript library v1.10.4
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/modern.min.css

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.10.3
+ * surveyjs - Survey JavaScript library v1.10.4
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "survey-react",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "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.css

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.10.3
+ * surveyjs - Survey JavaScript library v1.10.4
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/survey.min.css

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.10.3
+ * surveyjs - Survey JavaScript library v1.10.4
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */

package/survey.react.d.ts

@@ -3926,7 +3926,6 @@ declare module "question_file" {
         private onChange;
         protected onChangeQuestionValue(newValue: any): void;
         protected calcCssClasses(css: any): any;
-        updateElementCss(reNew?: boolean): void;
         onSurveyLoad(): void;
         protected needResponsiveness(): boolean;
         protected supportResponsiveness(): boolean;
@@ -5889,6 +5888,7 @@ declare module "question_matrixdynamic" {
         private lastDeletedRow;
         private getInsertedDeletedIndex;
         private isEditingObjectValueChanged;
+        updateValueFromSurvey(newValue: any, clearData?: boolean): void;
         protected onBeforeValueChanged(val: any): void;
         protected createNewValue(): any;
         protected deleteRowValue(newValue: any, row: MatrixDropdownRowModelBase): any;
@@ -15734,6 +15734,7 @@ declare module "settings" {
          * A separator used in a shorthand notation that specifies a value and display text for an [`ItemValue`](https://surveyjs.io/form-library/documentation/api-reference/itemvalue) object: `"value|text"`.
          *
          * Default value: `"|"`
+         * @see [settings.choicesSeparator](https://surveyjs.io/form-library/documentation/api-reference/settings#choicesSeparator)
          */
         itemValueSeparator: string;
         /**
@@ -15884,6 +15885,13 @@ declare module "settings" {
             dontKnowItem: number[];
             otherItem: number[];
         };
+        /**
+         * One or several characters used to separate choice options in a list.
+         *
+         * Default value: `", "`
+         * @see [settings.itemValueSeparator](https://surveyjs.io/form-library/documentation/api-reference/settings#itemValueSeparator)
+         */
+        choicesSeparator: string;
         /**
          * A list of supported validators by question type.
          */
@@ -17512,6 +17520,8 @@ declare module "question_rating" {
         * @see rateType
         */
         displayMode: "dropdown" | "buttons" | "auto";
+        private updateRenderAsBasedOnDisplayMode;
+        onSurveyLoad(): void;
         /**
         * Specifies the alignment of [`minRateDescription`](https://surveyjs.io/form-library/documentation/api-reference/rating-scale-question-model#minRateDescription) and [`maxRateDescription`](https://surveyjs.io/form-library/documentation/api-reference/rating-scale-question-model#maxRateDescription) texts.
         *
@@ -18227,6 +18237,7 @@ declare module "mask/mask_numeric" {
          */
         max: number;
         private calccaretPosition;
+        private numericalCompositionIsEmpty;
         displayNumber(parsedNumber: INumericalComposition, insertThousandsSeparator?: boolean, matchWholeMask?: boolean): string;
         convertNumber(parsedNumber: INumericalComposition): number;
         validateNumber(number: INumericalComposition, matchWholeMask: boolean): boolean;
@@ -18387,7 +18398,7 @@ declare module "entries/chunks/model" {
     export { AnswerCountValidator, EmailValidator, NumericValidator, RegexValidator, SurveyValidator, TextValidator, ValidatorResult, ExpressionValidator, ValidatorRunner } from "validator";
     export { ItemValue } from "itemvalue";
     export { Base, Event, EventBase, ArrayChanges, ComputedUpdater } from "base";
-    export { ISurvey, ISurveyElement, IElement, IQuestion, IPage, IPanel, ISurveyData, ITitleOwner, ISurveyLayoutElement, IPlainDataOptions as IPlainData, IShortcutText, ILoadFromJSONOptions } from "base-interfaces";
+    export { ISurvey, ISurveyElement, IElement, IQuestion, IPage, IPanel, ISurveyData, ITitleOwner, ISurveyLayoutElement, IPlainDataOptions as IPlainData, IShortcutText, ILoadFromJSONOptions, ISaveToJSONOptions, HorizontalAlignment, VerticalAlignment } from "base-interfaces";
     export { SurveyError } from "survey-error";
     export { SurveyElementCore, SurveyElement, DragTypeOverMeEnum } from "survey-element";
     export { CalculatedValue } from "calculatedValue";

package/survey.react.js

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.10.3
+ * surveyjs - Survey JavaScript library v1.10.4
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -3970,13 +3970,18 @@ var ProcessValue = /** @class */ (function () {
     };
     ProcessValue.prototype.isAnyKeyChanged = function (keys, usedNames) {
         for (var i = 0; i < usedNames.length; i++) {
-            var name = usedNames[i];
-            if (keys.hasOwnProperty(name))
+            var name_1 = usedNames[i];
+            if (!name_1)
+                continue;
+            var lowerName = name_1.toLowerCase();
+            if (keys.hasOwnProperty(name_1))
+                return true;
+            if (name_1 !== lowerName && keys.hasOwnProperty(lowerName))
                 return true;
-            var firstName = this.getFirstName(name);
+            var firstName = this.getFirstName(name_1);
             if (!keys.hasOwnProperty(firstName))
                 continue;
-            if (name === firstName)
+            if (name_1 === firstName)
                 return true;
             var keyValue = keys[firstName];
             if (keyValue == undefined)
@@ -3986,9 +3991,9 @@ var ProcessValue = /** @class */ (function () {
                 return true;
             var v = {};
             v[firstName] = keyValue["oldValue"];
-            var oldValue = this.getValue(name, v);
+            var oldValue = this.getValue(name_1, v);
             v[firstName] = keyValue["newValue"];
-            var newValue = this.getValue(name, v);
+            var newValue = this.getValue(name_1, v);
             if (!_helpers__WEBPACK_IMPORTED_MODULE_0__["Helpers"].isTwoValueEquals(oldValue, newValue, false, false, false))
                 return true;
         }
@@ -7315,10 +7320,9 @@ var DragDropDOMAdapter = /** @class */ (function () {
         var pageY = event.pageY;
         var clientX = event.clientX;
         var clientY = event.clientY;
-        if (!!this.fitToContainer) {
-            rootElementX -= rootElementScrollLeft;
-            rootElementY -= rootElementScrollTop;
-        }
+        //https://github.com/surveyjs/survey-creator/issues/5484
+        rootElementX -= rootElementScrollLeft;
+        rootElementY -= rootElementScrollTop;
         var shortcutBottomCoordinate = this.getShortcutBottomCoordinate(clientY, shortcutHeight, shortcutYOffset);
         var shortcutRightCoordinate = this.getShortcutRightCoordinate(clientX, shortcutWidth, shortcutXOffset);
         if (shortcutRightCoordinate >= documentRight) { // right boundary
@@ -9820,8 +9824,8 @@ __webpack_require__.r(__webpack_exports__);
 
 var Version;
 var ReleaseDate;
-Version = "" + "1.10.3";
-ReleaseDate = "" + "2024-05-07";
+Version = "" + "1.10.4";
+ReleaseDate = "" + "2024-05-15";
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         var str = "survey-core has version '" + Version + "' and " + libraryName
@@ -16531,6 +16535,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./helpers */ "./src/helpers.ts");
 /* harmony import */ var _settings__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./settings */ "./src/settings.ts");
 /* harmony import */ var _console_warnings__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./console-warnings */ "./src/console-warnings.ts");
+/* harmony import */ var _conditions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./conditions */ "./src/conditions.ts");
+
 
 
 
@@ -16653,7 +16659,7 @@ function avg(params) {
 }
 FunctionFactory.Instance.register("avg", avg);
 function getInArrayParams(params) {
-    if (params.length != 2)
+    if (params.length < 2 || params.length > 3)
         return null;
     var arr = params[0];
     if (!arr)
@@ -16663,16 +16669,22 @@ function getInArrayParams(params) {
     var name = params[1];
     if (typeof name !== "string" && !(name instanceof String))
         return null;
-    return { data: arr, name: name };
+    var expression = params.length === 3 ? params[2] : undefined;
+    if (typeof expression !== "string" && !(expression instanceof String)) {
+        expression = undefined;
+    }
+    return { data: arr, name: name, expression: expression };
 }
 function convertToNumber(val) {
     if (typeof val === "string")
         return _helpers__WEBPACK_IMPORTED_MODULE_0__["Helpers"].isNumber(val) ? _helpers__WEBPACK_IMPORTED_MODULE_0__["Helpers"].getNumber(val) : undefined;
     return val;
 }
-function processItemInArray(item, name, res, func, needToConvert) {
+function processItemInArray(item, name, res, func, needToConvert, condition) {
     if (!item || _helpers__WEBPACK_IMPORTED_MODULE_0__["Helpers"].isValueEmpty(item[name]))
         return res;
+    if (condition && !condition.run(item))
+        return res;
     var val = needToConvert ? convertToNumber(item[name]) : 1;
     return func(res, val);
 }
@@ -16681,15 +16693,19 @@ function calcInArray(params, func, needToConvert) {
     var v = getInArrayParams(params);
     if (!v)
         return undefined;
+    var condition = !!v.expression ? new _conditions__WEBPACK_IMPORTED_MODULE_3__["ConditionRunner"](v.expression) : undefined;
+    if (condition && condition.isAsync) {
+        condition = undefined;
+    }
     var res = undefined;
     if (Array.isArray(v.data)) {
         for (var i = 0; i < v.data.length; i++) {
-            res = processItemInArray(v.data[i], v.name, res, func, needToConvert);
+            res = processItemInArray(v.data[i], v.name, res, func, needToConvert, condition);
         }
     }
     else {
         for (var key in v.data) {
-            res = processItemInArray(v.data[key], v.name, res, func, needToConvert);
+            res = processItemInArray(v.data[key], v.name, res, func, needToConvert, condition);
         }
     }
     return res;
@@ -31467,6 +31483,9 @@ var InputMaskNumeric = /** @class */ (function (_super) {
         }
         return result;
     };
+    InputMaskNumeric.prototype.numericalCompositionIsEmpty = function (number) {
+        return !number.integralPart && !number.fractionalPart;
+    };
     InputMaskNumeric.prototype.displayNumber = function (parsedNumber, insertThousandsSeparator, matchWholeMask) {
         if (insertThousandsSeparator === void 0) { insertThousandsSeparator = true; }
         if (matchWholeMask === void 0) { matchWholeMask = false; }
@@ -31571,6 +31590,8 @@ var InputMaskNumeric = /** @class */ (function (_super) {
     };
     InputMaskNumeric.prototype.getNumberUnmaskedValue = function (str) {
         var parsedNumber = this.parseNumber(str);
+        if (this.numericalCompositionIsEmpty(parsedNumber))
+            return undefined;
         return this.convertNumber(parsedNumber);
     };
     InputMaskNumeric.prototype.getTextAlignment = function () {
@@ -42990,7 +43011,7 @@ var QuestionSelectBase = /** @class */ (function (_super) {
                 }
             }
         }
-        return strs.join(", ");
+        return strs.join(_settings__WEBPACK_IMPORTED_MODULE_9__["settings"].choicesSeparator);
     };
     QuestionSelectBase.prototype.getItemDisplayValue = function (item, val) {
         if (item === this.otherItem) {
@@ -48471,7 +48492,7 @@ var QuestionFileModel = /** @class */ (function (_super) {
         _super.prototype.updateElementCssCore.call(this, cssClasses);
         this.prevFileAction.iconName = this.cssClasses.leftIconId;
         this.nextFileAction.iconName = this.cssClasses.rightIconId;
-        //this.mobileFileNavigator.cssClasses = this.survey.getCss().actionBar;
+        this.updateCurrentMode();
     };
     QuestionFileModel.prototype.getFileIndexCaption = function () {
         return this.getLocalizationFormatString("indexText", this.indexToShow + 1, this.pagesCount);
@@ -49113,11 +49134,6 @@ var QuestionFileModel = /** @class */ (function (_super) {
         this.actionsContainer.containerCss = classes.actionsContainer;
         return classes;
     };
-    //todo remove in v2
-    QuestionFileModel.prototype.updateElementCss = function (reNew) {
-        _super.prototype.updateElementCss.call(this, reNew);
-        this.updateCurrentMode();
-    };
     QuestionFileModel.prototype.onSurveyLoad = function () {
         _super.prototype.onSurveyLoad.call(this);
         this.updateCurrentMode();
@@ -49523,7 +49539,7 @@ var __decorate = (undefined && undefined.__decorate) || function (decorators, ta
 
 
 
-var youtubeTags = ["youtube.com", "youtu.be"];
+var youtubeDomains = ["www.youtube.com", "m.youtube.com", "youtube.com", "youtu.be"];
 var videoSuffics = [".mp4", ".mov", ".wmv", ".flv", ".avi", ".mkv"];
 var youtubeUrl = "https://www.youtube.com/";
 var youtubeEmbed = "embed";
@@ -49531,8 +49547,9 @@ function isUrlYoutubeVideo(url) {
     if (!url)
         return false;
     url = url.toLowerCase();
-    for (var i = 0; i < youtubeTags.length; i++) {
-        if (url.indexOf(youtubeTags[i]) !== -1)
+    url = url.replace(/^https?:\/\//, "");
+    for (var i = 0; i < youtubeDomains.length; i++) {
+        if (url.indexOf(youtubeDomains[i] + "/") === 0)
             return true;
     }
     return false;
@@ -49548,7 +49565,7 @@ var QuestionImageModel = /** @class */ (function (_super) {
         var _this = _super.call(this, name) || this;
         var locImageLink = _this.createLocalizableString("imageLink", _this, false);
         locImageLink.onGetTextCallback = function (text) {
-            return getCorrectImageLink(text);
+            return getCorrectImageLink(text, _this.contentMode == "youtube");
         };
         _this.createLocalizableString("altText", _this, false);
         _this.registerPropertyChangedHandlers(["contentMode", "imageLink"], function () { return _this.calculateRenderedMode(); });
@@ -49780,9 +49797,10 @@ var QuestionImageModel = /** @class */ (function (_super) {
     return QuestionImageModel;
 }(_questionnonvalue__WEBPACK_IMPORTED_MODULE_0__["QuestionNonValue"]));
 
-function getCorrectImageLink(val) {
+function getCorrectImageLink(val, isYouTube) {
     if (!val || !isUrlYoutubeVideo(val))
-        return val;
+        return isYouTube ? "" : val;
+    //if(!val || !isUrlYoutubeVideo(val)) return val;
     var res = val.toLocaleLowerCase();
     if (res.indexOf(youtubeEmbed) > -1)
         return val;
@@ -54479,9 +54497,9 @@ var MatrixDropdownColumn = /** @class */ (function (_super) {
          * @see isRequired
          * @see readOnly
          */
-        get: function () { return this.getPropertyValue("visible"); },
+        get: function () { return this.templateQuestion.visible; },
         set: function (val) {
-            this.setPropertyValue("visible", val);
+            this.templateQuestion.visible = val;
         },
         enumerable: false,
         configurable: true
@@ -56529,7 +56547,7 @@ var QuestionMatrixDropdownRenderedTable = /** @class */ (function (_super) {
     QuestionMatrixDropdownRenderedTable.prototype.getMultipleColumnChoices = function (column) {
         var choices = column.templateQuestion.choices;
         if (!!choices && Array.isArray(choices) && choices.length == 0)
-            return this.matrix.choices;
+            return [].concat(this.matrix.choices, column.getVisibleMultipleChoices());
         choices = column.getVisibleMultipleChoices();
         if (!choices || !Array.isArray(choices))
             return null;
@@ -56709,11 +56727,11 @@ var QuestionMatrixDynamicModel = /** @class */ (function (_super) {
     function QuestionMatrixDynamicModel(name) {
         var _this = _super.call(this, name) || this;
         _this.rowCounter = 0;
-        _this.initialRowCount = 2;
         _this.setRowCountValueFromData = false;
         _this.startDragMatrixRow = function (event, currentTarget) {
             _this.dragDropMatrixRows.startDrag(event, _this.draggedRow, _this, event.target);
         };
+        _this.initialRowCount = _this.getDefaultPropertyValue("rowCount");
         _this.createLocalizableString("confirmDeleteText", _this, false, "confirmDelete");
         var locAddRowText = _this.createLocalizableString("addRowText", _this);
         locAddRowText.onGetTextCallback = function (text) {
@@ -57590,6 +57608,12 @@ var QuestionMatrixDynamicModel = /** @class */ (function (_super) {
         this.setPropertyValueDirectly("rowCount", val.length);
         return true;
     };
+    QuestionMatrixDynamicModel.prototype.updateValueFromSurvey = function (newValue, clearData) {
+        if (clearData === void 0) { clearData = false; }
+        this.setRowCountValueFromData = true;
+        _super.prototype.updateValueFromSurvey.call(this, newValue, clearData);
+        this.setRowCountValueFromData = false;
+    };
     QuestionMatrixDynamicModel.prototype.onBeforeValueChanged = function (val) {
         if (!val || !Array.isArray(val))
             return;
@@ -63023,6 +63047,9 @@ var QuestionRatingModel = /** @class */ (function (_super) {
         _this.registerFunctionOnPropertiesValueChanged(["rateColorMode", "scaleColorMode"], function () {
             _this.updateColors(_this.survey.themeVariables);
         });
+        _this.registerFunctionOnPropertiesValueChanged(["displayMode"], function () {
+            _this.updateRenderAsBasedOnDisplayMode(true);
+        });
         _this.registerSychProperties(["autoGenerate"], function () {
             if (!_this.autoGenerate && _this.rateValues.length === 0) {
                 _this.setPropertyValue("rateValues", _this.visibleRateValues);
@@ -63438,6 +63465,27 @@ var QuestionRatingModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    QuestionRatingModel.prototype.updateRenderAsBasedOnDisplayMode = function (isOnChange) {
+        if (this.isDesignMode) {
+            if (isOnChange || this.renderAs === "dropdown") {
+                this.renderAs = "default";
+            }
+        }
+        else {
+            if (isOnChange || this.displayMode !== "auto") {
+                this.renderAs = this.displayMode === "dropdown" ? "dropdown" : "default";
+            }
+        }
+    };
+    QuestionRatingModel.prototype.onSurveyLoad = function () {
+        _super.prototype.onSurveyLoad.call(this);
+        if (this.renderAs === "dropdown" && this.displayMode === "auto") {
+            this.displayMode = this.renderAs;
+        }
+        else {
+            this.updateRenderAsBasedOnDisplayMode();
+        }
+    };
     Object.defineProperty(QuestionRatingModel.prototype, "rateDisplayMode", {
         get: function () {
             return this.rateType;
@@ -63847,6 +63895,7 @@ var QuestionRatingModel = /** @class */ (function (_super) {
         if (!this.survey)
             return;
         this.updateColors(this.survey.themeVariables);
+        this.updateRenderAsBasedOnDisplayMode();
     };
     QuestionRatingModel.prototype.dispose = function () {
         _super.prototype.dispose.call(this);
@@ -63877,18 +63926,7 @@ var QuestionRatingModel = /** @class */ (function (_super) {
         Object(_jsonobject__WEBPACK_IMPORTED_MODULE_2__["property"])()
     ], QuestionRatingModel.prototype, "displayRateDescriptionsAsExtremeItems", void 0);
     __decorate([
-        Object(_jsonobject__WEBPACK_IMPORTED_MODULE_2__["property"])({
-            onSet: function (val, target) {
-                if (!target.isDesignMode) {
-                    if (val === "dropdown") {
-                        target.renderAs = "dropdown";
-                    }
-                    else {
-                        target.renderAs = "default";
-                    }
-                }
-            }
-        })
+        Object(_jsonobject__WEBPACK_IMPORTED_MODULE_2__["property"])()
     ], QuestionRatingModel.prototype, "displayMode", void 0);
     __decorate([
         Object(_jsonobject__WEBPACK_IMPORTED_MODULE_2__["property"])()
@@ -77015,6 +77053,7 @@ var settings = {
      * A separator used in a shorthand notation that specifies a value and display text for an [`ItemValue`](https://surveyjs.io/form-library/documentation/api-reference/itemvalue) object: `"value|text"`.
      *
      * Default value: `"|"`
+     * @see [settings.choicesSeparator](https://surveyjs.io/form-library/documentation/api-reference/settings#choicesSeparator)
      */
     itemValueSeparator: "|",
     /**
@@ -77169,6 +77208,13 @@ var settings = {
         dontKnowItem: [3],
         otherItem: [4]
     },
+    /**
+     * One or several characters used to separate choice options in a list.
+     *
+     * Default value: `", "`
+     * @see [settings.itemValueSeparator](https://surveyjs.io/form-library/documentation/api-reference/settings#itemValueSeparator)
+     */
+    choicesSeparator: ", ",
     /**
      * A list of supported validators by question type.
      */
@@ -79161,7 +79207,7 @@ var SurveyElement = /** @class */ (function (_super) {
         configurable: true
     });
     SurveyElement.prototype.getIsAnimationAllowed = function () {
-        return _super.prototype.getIsAnimationAllowed.call(this) && !!this.survey;
+        return _super.prototype.getIsAnimationAllowed.call(this) && !!this.survey && !this.survey["isEndLoadingFromJson"];
     };
     SurveyElement.prototype.dispose = function () {
         _super.prototype.dispose.call(this);
@@ -86211,14 +86257,20 @@ var SurveyModel = /** @class */ (function (_super) {
     SurveyModel.prototype.setVariable = function (name, newValue) {
         if (!name)
             return;
+        var oldValue = this.getVariable(name);
         if (!!this.valuesHash) {
             delete this.valuesHash[name];
         }
         name = name.toLowerCase();
         this.variablesHash[name] = newValue;
         this.notifyElementsOnAnyValueOrVariableChanged(name);
-        this.runConditionOnValueChanged(name, newValue);
-        this.onVariableChanged.fire(this, { name: name, value: newValue });
+        if (!_helpers__WEBPACK_IMPORTED_MODULE_0__["Helpers"].isTwoValueEquals(oldValue, newValue)) {
+            this.runConditionOnValueChanged(name, newValue);
+            var triggerKeys = {};
+            triggerKeys[name] = { newValue: newValue, oldValue: oldValue };
+            this.checkTriggers(triggerKeys, false, false, name);
+            this.onVariableChanged.fire(this, { name: name, value: newValue });
+        }
     };
     /**
      * Returns the names of all variables in the survey.
@@ -86384,7 +86436,10 @@ var SurveyModel = /** @class */ (function (_super) {
             return;
         if (this.checkIsCurrentPageHasErrors(false))
             return;
+        var curPage = this.currentPage;
         var goNextPage = function () {
+            if (curPage !== _this.currentPage)
+                return;
             if (!_this.isLastPage) {
                 _this.nextPage();
             }
@@ -87373,32 +87428,34 @@ var SurveyModel = /** @class */ (function (_super) {
                 }
             }
             else if (this.state === "running" && isStrCiEqual(layoutElement.id, this.progressBarComponentName)) {
-                var headerLayoutElement = this.findLayoutElement("advanced-header");
-                var advHeader = headerLayoutElement && headerLayoutElement.data;
-                var isBelowHeader = !advHeader || advHeader.hasBackground;
-                if (isStrCiEqual(this.showProgressBar, "aboveHeader")) {
-                    isBelowHeader = false;
-                }
-                if (isStrCiEqual(this.showProgressBar, "belowHeader")) {
-                    isBelowHeader = true;
-                }
-                if (container === "header" && !isBelowHeader) {
-                    layoutElement.index = -150;
-                    if (this.isShowProgressBarOnTop && !this.isShowStartingPage) {
-                        containerLayoutElements.push(layoutElement);
+                if (this.questionsOnPageMode != "singlePage") {
+                    var headerLayoutElement = this.findLayoutElement("advanced-header");
+                    var advHeader = headerLayoutElement && headerLayoutElement.data;
+                    var isBelowHeader = !advHeader || advHeader.hasBackground;
+                    if (isStrCiEqual(this.showProgressBar, "aboveHeader")) {
+                        isBelowHeader = false;
                     }
-                }
-                if (container === "center" && isBelowHeader) {
-                    if (!!layoutElement.index) {
-                        delete layoutElement.index;
+                    if (isStrCiEqual(this.showProgressBar, "belowHeader")) {
+                        isBelowHeader = true;
                     }
-                    if (this.isShowProgressBarOnTop && !this.isShowStartingPage) {
-                        containerLayoutElements.push(layoutElement);
+                    if (container === "header" && !isBelowHeader) {
+                        layoutElement.index = -150;
+                        if (this.isShowProgressBarOnTop && !this.isShowStartingPage) {
+                            containerLayoutElements.push(layoutElement);
+                        }
                     }
-                }
-                if (container === "footer") {
-                    if (this.isShowProgressBarOnBottom && !this.isShowStartingPage) {
-                        containerLayoutElements.push(layoutElement);
+                    if (container === "center" && isBelowHeader) {
+                        if (!!layoutElement.index) {
+                            delete layoutElement.index;
+                        }
+                        if (this.isShowProgressBarOnTop && !this.isShowStartingPage) {
+                            containerLayoutElements.push(layoutElement);
+                        }
+                    }
+                    if (container === "footer") {
+                        if (this.isShowProgressBarOnBottom && !this.isShowStartingPage) {
+                            containerLayoutElements.push(layoutElement);
+                        }
                     }
                 }
             }