survey-react 1.12.4 → 1.12.6

package/survey.react.js

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.12.4
+ * surveyjs - Survey JavaScript library v1.12.6
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -962,9 +962,9 @@ module.exports = "<svg viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\
 
 /***/ "./src/entries/react.ts":
 /*!********************************************!*\
-  !*** ./src/entries/react.ts + 282 modules ***!
+  !*** ./src/entries/react.ts + 284 modules ***!
   \********************************************/
-/*! exports provided: Version, ReleaseDate, checkLibraryVersion, setLicenseKey, slk, hasLicense, settings, Helpers, AnswerCountValidator, EmailValidator, NumericValidator, RegexValidator, SurveyValidator, TextValidator, ValidatorResult, ExpressionValidator, ValidatorRunner, ItemValue, Base, Event, EventBase, ArrayChanges, ComputedUpdater, SurveyError, SurveyElementCore, SurveyElement, DragTypeOverMeEnum, CalculatedValue, CustomError, AnswerRequiredError, OneAnswerRequiredError, RequreNumericError, ExceedSizeError, LocalizableString, LocalizableStrings, HtmlConditionItem, UrlConditionItem, ChoicesRestful, ChoicesRestfull, FunctionFactory, registerFunction, ConditionRunner, ExpressionRunner, ExpressionExecutor, Operand, Const, BinaryOperand, Variable, FunctionOperand, ArrayOperand, UnaryOperand, ConditionsParser, ProcessValue, JsonError, JsonIncorrectTypeError, JsonMetadata, JsonMetadataClass, JsonMissingTypeError, JsonMissingTypeErrorBase, JsonObject, JsonObjectProperty, JsonRequiredPropertyError, JsonUnknownPropertyError, Serializer, property, propertyArray, MatrixDropdownCell, MatrixDropdownRowModelBase, QuestionMatrixDropdownModelBase, MatrixDropdownColumn, matrixDropdownColumnTypes, QuestionMatrixDropdownRenderedCell, QuestionMatrixDropdownRenderedRow, QuestionMatrixDropdownRenderedErrorRow, QuestionMatrixDropdownRenderedTable, MatrixDropdownRowModel, QuestionMatrixDropdownModel, MatrixDynamicRowModel, QuestionMatrixDynamicModel, MatrixRowModel, MatrixCells, QuestionMatrixModel, QuestionMatrixBaseModel, MultipleTextItemModel, MultipleTextCell, MultipleTextErrorCell, MutlipleTextErrorRow, MutlipleTextRow, QuestionMultipleTextModel, MultipleTextEditorModel, PanelModel, PanelModelBase, QuestionRowModel, FlowPanelModel, PageModel, DefaultTitleModel, Question, QuestionNonValue, QuestionEmptyModel, QuestionCheckboxBase, QuestionSelectBase, QuestionCheckboxModel, QuestionTagboxModel, QuestionRankingModel, QuestionCommentModel, QuestionDropdownModel, QuestionFactory, ElementFactory, QuestionFileModel, QuestionHtmlModel, QuestionRadiogroupModel, QuestionRatingModel, RenderedRatingItem, QuestionExpressionModel, QuestionTextBase, CharacterCounter, QuestionTextModel, QuestionBooleanModel, QuestionImagePickerModel, ImageItemValue, QuestionImageModel, QuestionSignaturePadModel, QuestionPanelDynamicModel, QuestionPanelDynamicItem, SurveyTimer, SurveyTimerModel, tryFocusPage, createTOCListModel, getTocRootCss, TOCModel, SurveyProgressModel, ProgressButtons, ProgressButtonsResponsivityManager, SurveyModel, SurveyTrigger, SurveyTriggerComplete, SurveyTriggerSetValue, SurveyTriggerVisible, SurveyTriggerCopyValue, SurveyTriggerRunExpression, SurveyTriggerSkip, Trigger, PopupSurveyModel, SurveyWindowModel, TextPreProcessor, Notifier, Cover, CoverCell, dxSurveyService, englishStrings, surveyLocalization, surveyStrings, QuestionCustomWidget, CustomWidgetCollection, QuestionCustomModel, QuestionCompositeModel, ComponentQuestionJSON, ComponentCollection, ListModel, MultiSelectListModel, PopupModel, createDialogOptions, PopupBaseViewModel, PopupDropdownViewModel, PopupModalViewModel, createPopupViewModel, createPopupModalViewModel, DropdownListModel, DropdownMultiSelectListModel, QuestionButtonGroupModel, ButtonGroupItemModel, ButtonGroupItemValue, IsMobile, IsTouch, _setIsTouch, confirmAction, confirmActionAsync, detectIEOrEdge, doKey2ClickUp, doKey2ClickDown, doKey2ClickBlur, loadFileFromBase64, increaseHeightByContent, createSvg, chooseFiles, sanitizeEditableContent, prepareElementForVerticalAnimation, cleanHtmlElementAfterAnimation, classesToSelector, InputMaskBase, InputMaskPattern, InputMaskNumeric, InputMaskDateTime, InputMaskCurrency, CssClassBuilder, TextAreaModel, surveyCss, defaultV2Css, defaultV2ThemeName, DragDropCore, DragDropChoices, DragDropRankingSelectToRank, StylesManager, defaultStandardCss, modernCss, SvgIconRegistry, SvgRegistry, SvgBundleViewModel, RendererFactory, ResponsivityManager, VerticalResponsivityManager, unwrap, getOriginalEvent, getElement, createDropdownActionModel, createDropdownActionModelAdvanced, createPopupModelWithListModel, getActionDropdownButtonTarget, BaseAction, Action, ActionDropdownViewModel, AnimationUtils, AnimationPropertyUtils, AnimationGroupUtils, AnimationProperty, AnimationBoolean, AnimationGroup, AnimationTab, AdaptiveActionContainer, defaultActionBarCss, ActionContainer, DragOrClickHelper, Model, bootstrapThemeName, bootstrapThemeColors, bootstrapThemeCssRules, bootstrapMaterialThemeName, bootstrapMaterialThemeColors, bootstrapMaterialThemeCssRules, defaultBootstrapCss, defaultBootstrapMaterialCss, Survey, attachKey2click, ReactSurveyElementsWrapper, SurveyNavigationBase, SurveyTimerPanel, SurveyPage, SurveyRow, SurveyPanel, SurveyFlowPanel, SurveyQuestion, SurveyElementErrors, SurveyQuestionAndErrorsCell, ReactSurveyElement, SurveyElementBase, SurveyQuestionElementBase, SurveyQuestionCommentItem, SurveyQuestionComment, SurveyQuestionCheckbox, SurveyQuestionCheckboxItem, SurveyQuestionRanking, SurveyQuestionRankingItem, SurveyQuestionRankingItemContent, RatingItem, RatingItemStar, RatingItemSmiley, RatingDropdownItem, TagboxFilterString, SurveyQuestionOptionItem, SurveyQuestionDropdownBase, SurveyQuestionDropdown, SurveyQuestionTagboxItem, SurveyQuestionTagbox, SurveyQuestionDropdownSelect, SurveyQuestionMatrix, SurveyQuestionMatrixRow, SurveyQuestionMatrixCell, SurveyQuestionHtml, SurveyQuestionFile, SurveyFileChooseButton, SurveyFilePreview, SurveyQuestionMultipleText, SurveyQuestionRadiogroup, SurveyQuestionRadioItem, SurveyQuestionText, SurveyQuestionBoolean, SurveyQuestionBooleanCheckbox, SurveyQuestionBooleanRadio, SurveyQuestionEmpty, SurveyQuestionMatrixDropdownCell, SurveyQuestionMatrixDropdownBase, SurveyQuestionMatrixDropdown, SurveyQuestionMatrixDynamic, SurveyQuestionMatrixDynamicAddButton, SurveyQuestionPanelDynamic, SurveyProgress, SurveyProgressButtons, SurveyProgressToc, SurveyQuestionRating, SurveyQuestionRatingDropdown, SurveyQuestionExpression, PopupSurvey, SurveyWindow, ReactQuestionFactory, ReactElementFactory, SurveyQuestionImagePicker, SurveyQuestionImage, SurveyQuestionSignaturePad, SurveyQuestionButtonGroup, SurveyQuestionCustom, SurveyQuestionComposite, Popup, ListItemContent, ListItemGroup, List, TitleActions, TitleElement, SurveyActionBar, LogoImage, SurveyHeader, SvgIcon, SurveyQuestionMatrixDynamicRemoveButton, SurveyQuestionMatrixDetailButton, SurveyQuestionMatrixDynamicDragDropIcon, SurveyQuestionPanelDynamicAddButton, SurveyQuestionPanelDynamicRemoveButton, SurveyQuestionPanelDynamicPrevButton, SurveyQuestionPanelDynamicNextButton, SurveyQuestionPanelDynamicProgressText, SurveyNavigationButton, QuestionErrorComponent, MatrixRow, Skeleton, NotifierComponent, ComponentsContainer, CharacterCounterComponent, HeaderMobile, HeaderCell, Header, SurveyLocStringViewer, SurveyLocStringEditor, LoadingIndicatorComponent, SvgBundleComponent */
+/*! exports provided: Version, ReleaseDate, checkLibraryVersion, setLicenseKey, slk, hasLicense, settings, Helpers, AnswerCountValidator, EmailValidator, NumericValidator, RegexValidator, SurveyValidator, TextValidator, ValidatorResult, ExpressionValidator, ValidatorRunner, ItemValue, Base, Event, EventBase, ArrayChanges, ComputedUpdater, SurveyError, SurveyElementCore, SurveyElement, DragTypeOverMeEnum, CalculatedValue, CustomError, AnswerRequiredError, OneAnswerRequiredError, RequreNumericError, ExceedSizeError, LocalizableString, LocalizableStrings, HtmlConditionItem, UrlConditionItem, ChoicesRestful, ChoicesRestfull, FunctionFactory, registerFunction, ConditionRunner, ExpressionRunner, ExpressionExecutor, Operand, Const, BinaryOperand, Variable, FunctionOperand, ArrayOperand, UnaryOperand, ConditionsParser, ProcessValue, JsonError, JsonIncorrectTypeError, JsonMetadata, JsonMetadataClass, JsonMissingTypeError, JsonMissingTypeErrorBase, JsonObject, JsonObjectProperty, JsonRequiredPropertyError, JsonUnknownPropertyError, Serializer, property, propertyArray, MatrixDropdownCell, MatrixDropdownRowModelBase, QuestionMatrixDropdownModelBase, MatrixDropdownColumn, matrixDropdownColumnTypes, QuestionMatrixDropdownRenderedCell, QuestionMatrixDropdownRenderedRow, QuestionMatrixDropdownRenderedErrorRow, QuestionMatrixDropdownRenderedTable, MatrixDropdownRowModel, QuestionMatrixDropdownModel, MatrixDynamicRowModel, QuestionMatrixDynamicModel, MatrixRowModel, MatrixCells, QuestionMatrixModel, QuestionMatrixBaseModel, MultipleTextItemModel, MultipleTextCell, MultipleTextErrorCell, MutlipleTextErrorRow, MutlipleTextRow, QuestionMultipleTextModel, MultipleTextEditorModel, PanelModel, PanelModelBase, QuestionRowModel, FlowPanelModel, PageModel, DefaultTitleModel, Question, QuestionNonValue, QuestionEmptyModel, QuestionCheckboxBase, QuestionSelectBase, QuestionCheckboxModel, QuestionTagboxModel, QuestionRankingModel, QuestionCommentModel, QuestionDropdownModel, QuestionFactory, ElementFactory, QuestionFileModel, QuestionFilePage, QuestionHtmlModel, QuestionRadiogroupModel, QuestionRatingModel, RenderedRatingItem, QuestionExpressionModel, QuestionTextBase, CharacterCounter, QuestionTextModel, QuestionBooleanModel, QuestionImagePickerModel, ImageItemValue, QuestionImageModel, QuestionSignaturePadModel, QuestionPanelDynamicModel, QuestionPanelDynamicItem, SurveyTimer, SurveyTimerModel, tryFocusPage, createTOCListModel, getTocRootCss, TOCModel, SurveyProgressModel, ProgressButtons, ProgressButtonsResponsivityManager, SurveyModel, SurveyTrigger, SurveyTriggerComplete, SurveyTriggerSetValue, SurveyTriggerVisible, SurveyTriggerCopyValue, SurveyTriggerRunExpression, SurveyTriggerSkip, Trigger, PopupSurveyModel, SurveyWindowModel, TextPreProcessor, Notifier, Cover, CoverCell, dxSurveyService, englishStrings, surveyLocalization, surveyStrings, QuestionCustomWidget, CustomWidgetCollection, QuestionCustomModel, QuestionCompositeModel, ComponentQuestionJSON, ComponentCollection, ListModel, MultiSelectListModel, PopupModel, createDialogOptions, PopupBaseViewModel, PopupDropdownViewModel, PopupModalViewModel, createPopupViewModel, createPopupModalViewModel, DropdownListModel, DropdownMultiSelectListModel, QuestionButtonGroupModel, ButtonGroupItemModel, ButtonGroupItemValue, IsMobile, IsTouch, _setIsTouch, confirmAction, confirmActionAsync, detectIEOrEdge, doKey2ClickUp, doKey2ClickDown, doKey2ClickBlur, loadFileFromBase64, increaseHeightByContent, createSvg, chooseFiles, sanitizeEditableContent, prepareElementForVerticalAnimation, cleanHtmlElementAfterAnimation, classesToSelector, InputMaskBase, InputMaskPattern, InputMaskNumeric, InputMaskDateTime, InputMaskCurrency, CssClassBuilder, TextAreaModel, surveyCss, defaultV2Css, defaultV2ThemeName, DragDropCore, DragDropChoices, DragDropRankingSelectToRank, StylesManager, defaultStandardCss, modernCss, SvgIconRegistry, SvgRegistry, SvgBundleViewModel, RendererFactory, ResponsivityManager, VerticalResponsivityManager, unwrap, getOriginalEvent, getElement, createDropdownActionModel, createDropdownActionModelAdvanced, createPopupModelWithListModel, getActionDropdownButtonTarget, BaseAction, Action, ActionDropdownViewModel, AnimationUtils, AnimationPropertyUtils, AnimationGroupUtils, AnimationProperty, AnimationBoolean, AnimationGroup, AnimationTab, AdaptiveActionContainer, defaultActionBarCss, ActionContainer, DragOrClickHelper, Model, bootstrapThemeName, bootstrapThemeColors, bootstrapThemeCssRules, bootstrapMaterialThemeName, bootstrapMaterialThemeColors, bootstrapMaterialThemeCssRules, defaultBootstrapCss, defaultBootstrapMaterialCss, Survey, attachKey2click, ReactSurveyElementsWrapper, SurveyNavigationBase, SurveyTimerPanel, SurveyPage, SurveyRow, SurveyPanel, SurveyFlowPanel, SurveyQuestion, SurveyElementErrors, SurveyQuestionAndErrorsCell, ReactSurveyElement, SurveyElementBase, SurveyQuestionElementBase, SurveyQuestionCommentItem, SurveyQuestionComment, SurveyQuestionCheckbox, SurveyQuestionCheckboxItem, SurveyQuestionRanking, SurveyQuestionRankingItem, SurveyQuestionRankingItemContent, RatingItem, RatingItemStar, RatingItemSmiley, RatingDropdownItem, TagboxFilterString, SurveyQuestionOptionItem, SurveyQuestionDropdownBase, SurveyQuestionDropdown, SurveyQuestionTagboxItem, SurveyQuestionTagbox, SurveyQuestionDropdownSelect, SurveyQuestionMatrix, SurveyQuestionMatrixRow, SurveyQuestionMatrixCell, SurveyQuestionHtml, SurveyQuestionFile, SurveyFileChooseButton, SurveyFilePreview, SurveyQuestionMultipleText, SurveyQuestionRadiogroup, SurveyQuestionRadioItem, SurveyQuestionText, SurveyQuestionBoolean, SurveyQuestionBooleanCheckbox, SurveyQuestionBooleanRadio, SurveyQuestionEmpty, SurveyQuestionMatrixDropdownCell, SurveyQuestionMatrixDropdownBase, SurveyQuestionMatrixDropdown, SurveyQuestionMatrixDynamic, SurveyQuestionMatrixDynamicAddButton, SurveyQuestionPanelDynamic, SurveyProgress, SurveyProgressButtons, SurveyProgressToc, SurveyQuestionRating, SurveyQuestionRatingDropdown, SurveyQuestionExpression, PopupSurvey, SurveyWindow, ReactQuestionFactory, ReactElementFactory, SurveyQuestionImagePicker, SurveyQuestionImage, SurveyQuestionSignaturePad, SurveyQuestionButtonGroup, SurveyQuestionCustom, SurveyQuestionComposite, Popup, ListItemContent, ListItemGroup, List, TitleActions, TitleElement, SurveyActionBar, LogoImage, SurveyHeader, SvgIcon, SurveyQuestionMatrixDynamicRemoveButton, SurveyQuestionMatrixDetailButton, SurveyQuestionMatrixDynamicDragDropIcon, SurveyQuestionPanelDynamicAddButton, SurveyQuestionPanelDynamicRemoveButton, SurveyQuestionPanelDynamicPrevButton, SurveyQuestionPanelDynamicNextButton, SurveyQuestionPanelDynamicProgressText, SurveyNavigationButton, QuestionErrorComponent, MatrixRow, Skeleton, NotifierComponent, ComponentsContainer, CharacterCounterComponent, HeaderMobile, HeaderCell, Header, SurveyLocStringViewer, SurveyLocStringEditor, LoadingIndicatorComponent, SvgBundleComponent */
 /*! ModuleConcatenation bailout: Cannot concat with external {"root":"React","commonjs2":"react","commonjs":"react","amd":"react"} (<- Module is not an ECMAScript module) */
 /*! ModuleConcatenation bailout: Cannot concat with external {"root":"ReactDOM","commonjs2":"react-dom","commonjs":"react-dom","amd":"react-dom"} (<- Module is not an ECMAScript module) */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -1083,6 +1083,7 @@ __webpack_require__.d(__webpack_exports__, "QuestionDropdownModel", function() {
 __webpack_require__.d(__webpack_exports__, "QuestionFactory", function() { return /* reexport */ questionfactory_QuestionFactory; });
 __webpack_require__.d(__webpack_exports__, "ElementFactory", function() { return /* reexport */ questionfactory_ElementFactory; });
 __webpack_require__.d(__webpack_exports__, "QuestionFileModel", function() { return /* reexport */ question_file_QuestionFileModel; });
+__webpack_require__.d(__webpack_exports__, "QuestionFilePage", function() { return /* reexport */ question_file_QuestionFilePage; });
 __webpack_require__.d(__webpack_exports__, "QuestionHtmlModel", function() { return /* reexport */ question_html_QuestionHtmlModel; });
 __webpack_require__.d(__webpack_exports__, "QuestionRadiogroupModel", function() { return /* reexport */ question_radiogroup_QuestionRadiogroupModel; });
 __webpack_require__.d(__webpack_exports__, "QuestionRatingModel", function() { return /* reexport */ question_rating_QuestionRatingModel; });
@@ -2473,8 +2474,10 @@ var jsonobject_JsonObjectProperty = /** @class */ (function () {
         return this.getValue(obj);
     };
     JsonObjectProperty.prototype.getValue = function (obj) {
-        if (this.onGetValue)
+        if (this.onGetValue) {
+            obj = this.getOriginalObj(obj);
             return this.onGetValue(obj);
+        }
         if (this.serializationProperty && !!obj[this.serializationProperty])
             return obj[this.serializationProperty].getJson();
         return obj[this.name];
@@ -2501,6 +2504,7 @@ var jsonobject_JsonObjectProperty = /** @class */ (function () {
     };
     JsonObjectProperty.prototype.setValue = function (obj, value, jsonConv) {
         if (this.onSetValue) {
+            obj = this.getOriginalObj(obj);
             this.onSetValue(obj, value, jsonConv);
         }
         else {
@@ -2589,7 +2593,7 @@ var jsonobject_JsonObjectProperty = /** @class */ (function () {
     };
     JsonObjectProperty.prototype.isVisible = function (layout, obj) {
         if (obj === void 0) { obj = null; }
-        var isLayout = !this.layout || this.layout == layout;
+        var isLayout = !this.layout || !layout || this.layout === layout;
         if (!this.visible || !isLayout)
             return false;
         if (!!this.visibleIf && !!obj) {
@@ -3119,6 +3123,9 @@ var jsonobject_JsonMetadataClass = /** @class */ (function () {
             if (propInfo.readOnly === true) {
                 prop.readOnly = true;
             }
+            if (propInfo.availableInMatrixColumn === true) {
+                prop.availableInMatrixColumn = true;
+            }
             if (propInfo.choices) {
                 var choicesFunc = typeof propInfo.choices === "function" ? propInfo.choices : null;
                 var choicesValue = typeof propInfo.choices !== "function" ? propInfo.choices : null;
@@ -9254,8 +9261,8 @@ var base_Base = /** @class */ (function () {
         this.isCreating = true;
         this.animationAllowedLock = 0;
         //remove when knockout obsolete
-        this.supportOnElementRenderedEvent = true;
-        this.onElementRenderedEventEnabled = false;
+        this.supportOnElementRerenderedEvent = true;
+        this.onElementRerenderedEventEnabled = false;
         this._onElementRerendered = new EventBase();
         this.bindingsValue = new base_Bindings(this);
         CustomPropertiesCollection.createProperties(this);
@@ -10192,7 +10199,7 @@ var base_Base = /** @class */ (function () {
         configurable: true
     });
     Base.prototype.getIsAnimationAllowed = function () {
-        return settings.animationEnabled && this.animationAllowedLock >= 0 && !this.isLoadingFromJson && !this.isDisposed && (!!this.onElementRerendered || !this.supportOnElementRenderedEvent);
+        return settings.animationEnabled && this.animationAllowedLock >= 0 && !this.isLoadingFromJson && !this.isDisposed && (!!this.onElementRerendered || !this.supportOnElementRerenderedEvent);
     };
     Base.prototype.blockAnimations = function () {
         this.animationAllowedLock--;
@@ -10200,17 +10207,17 @@ var base_Base = /** @class */ (function () {
     Base.prototype.releaseAnimations = function () {
         this.animationAllowedLock++;
     };
-    Base.prototype.enableOnElementRenderedEvent = function () {
-        this.onElementRenderedEventEnabled = true;
+    Base.prototype.enableOnElementRerenderedEvent = function () {
+        this.onElementRerenderedEventEnabled = true;
     };
-    Base.prototype.disableOnElementRenderedEvent = function () {
+    Base.prototype.disableOnElementRerenderedEvent = function () {
         var _a;
         (_a = this.onElementRerendered) === null || _a === void 0 ? void 0 : _a.fire(this, { isCancel: true });
-        this.onElementRenderedEventEnabled = false;
+        this.onElementRerenderedEventEnabled = false;
     };
     Object.defineProperty(Base.prototype, "onElementRerendered", {
         get: function () {
-            return this.supportOnElementRenderedEvent && this.onElementRenderedEventEnabled ? this._onElementRerendered : undefined;
+            return this.supportOnElementRerenderedEvent && this.onElementRerenderedEventEnabled ? this._onElementRerendered : undefined;
         },
         enumerable: false,
         configurable: true
@@ -10223,66 +10230,6 @@ var base_Base = /** @class */ (function () {
     return Base;
 }());
 
-var RenderingCompletedAwaiter = /** @class */ (function () {
-    function RenderingCompletedAwaiter(_elements, _renderedHandler, waitingTimeout) {
-        var _this = this;
-        if (waitingTimeout === void 0) { waitingTimeout = 100; }
-        this._elements = _elements;
-        this._renderedHandler = _renderedHandler;
-        this._elementsToRenderCount = 0;
-        this._elementsToRenderTimer = undefined;
-        this._elementRenderedHandler = function (s, o) {
-            var _a;
-            (_a = s.onElementRerendered) === null || _a === void 0 ? void 0 : _a.remove(_this._elementRenderedHandler);
-            _this._elementsToRenderCount--;
-            if (_this._elementsToRenderCount <= 0) {
-                _this.visibleElementsRendered();
-            }
-        };
-        this._elements.forEach(function (element) {
-            if (element.onElementRerendered) {
-                element.onElementRerendered.add(_this._elementRenderedHandler);
-                _this._elementsToRenderCount++;
-            }
-        });
-        if (this._elementsToRenderCount > 0) {
-            this._elementsToRenderTimer = setTimeout(function () {
-                if (_this._elementsToRenderCount > 0) {
-                    _this.visibleElementsRendered();
-                }
-            }, waitingTimeout);
-        }
-        else {
-            this.visibleElementsRendered();
-        }
-    }
-    RenderingCompletedAwaiter.prototype.stopWaitingForElementsRendering = function () {
-        var _this = this;
-        if (this._elementsToRenderTimer) {
-            clearTimeout(this._elementsToRenderTimer);
-            this._elementsToRenderTimer = undefined;
-        }
-        this._elements.forEach(function (element) {
-            var _a;
-            (_a = element.onElementRerendered) === null || _a === void 0 ? void 0 : _a.remove(_this._elementRenderedHandler);
-        });
-        this._elementsToRenderCount = 0;
-    };
-    RenderingCompletedAwaiter.prototype.visibleElementsRendered = function () {
-        var renderedHandler = this._renderedHandler;
-        this.dispose();
-        if (typeof renderedHandler == "function") {
-            renderedHandler();
-        }
-    };
-    RenderingCompletedAwaiter.prototype.dispose = function () {
-        this.stopWaitingForElementsRendering();
-        this._elements = undefined;
-        this._renderedHandler = undefined;
-    };
-    return RenderingCompletedAwaiter;
-}());
-
 var ArrayChanges = /** @class */ (function () {
     function ArrayChanges(index, deleteCount, itemsToAdd, deletedItems) {
         this.index = index;
@@ -10462,7 +10409,9 @@ var responsivity_manager_ResponsivityManager = /** @class */ (function () {
         var _items = this.container.querySelectorAll(this.itemsSelector);
         (_items || []).forEach(function (item, index) {
             var currentAction = actions[index];
-            _this.calcActionDimensions(currentAction, item);
+            if (!!currentAction) {
+                _this.calcActionDimensions(currentAction, item);
+            }
         });
     };
     ResponsivityManager.prototype.calcActionDimensions = function (currentAction, item) {
@@ -13022,6 +12971,7 @@ var survey_element_SurveyElement = /** @class */ (function (_super) {
                 }
             }
         }, function () { return _this.renderedIsExpanded; });
+        _this.onAfterRenderElement = _this.addEvent();
         _this.name = name;
         _this.createNewArray("errors");
         _this.createNewArray("titleActions");
@@ -13051,16 +13001,7 @@ var survey_element_SurveyElement = /** @class */ (function (_super) {
         }
         return info;
     };
-    SurveyElement.ScrollElementToTop = function (elementId, scrollIfVisible, scrollIntoViewOptions, doneCallback) {
-        var root = settings.environment.root;
-        if (!elementId || typeof root === "undefined")
-            return false;
-        var el = root.getElementById(elementId);
-        return SurveyElement.ScrollElementToViewCore(el, false, scrollIfVisible, scrollIntoViewOptions, doneCallback);
-    };
-    SurveyElement.ScrollElementToViewCore = function (el, checkLeft, scrollIfVisible, scrollIntoViewOptions, doneCallback) {
-        if (!el || !el.scrollIntoView)
-            return false;
+    SurveyElement.IsNeedScrollIntoView = function (el, checkLeft, scrollIfVisible) {
         var elTop = scrollIfVisible ? -1 : el.getBoundingClientRect().top;
         var needScroll = elTop < 0;
         var elLeft = -1;
@@ -13076,20 +13017,48 @@ var survey_element_SurveyElement = /** @class */ (function (_super) {
                 needScroll = width > 0 && width < elLeft;
             }
         }
-        if (needScroll) {
-            el.scrollIntoView(scrollIntoViewOptions);
-            if (typeof doneCallback === "function") {
-                var currPageXOffset_1 = window.pageXOffset;
-                var currPageYOffset_1 = window.pageYOffset;
-                var scrollDone = setInterval(function () {
-                    if (currPageXOffset_1 == window.pageXOffset && currPageYOffset_1 == window.pageYOffset) {
-                        clearInterval(scrollDone);
+        return needScroll;
+    };
+    SurveyElement.ScrollIntoView = function (el, scrollIntoViewOptions, doneCallback) {
+        el.scrollIntoView(scrollIntoViewOptions);
+        if (typeof doneCallback === "function") {
+            var lastPos_1 = null;
+            var same_1 = 0;
+            var checkPos_1 = function () {
+                var newPos = el.getBoundingClientRect().top;
+                if (newPos === lastPos_1) {
+                    if (same_1++ > 2) {
                         doneCallback();
+                        return;
                     }
-                    currPageXOffset_1 = window.pageXOffset;
-                    currPageYOffset_1 = window.pageYOffset;
-                }, 25);
-            }
+                }
+                else {
+                    lastPos_1 = newPos;
+                    same_1 = 0;
+                }
+                requestAnimationFrame(checkPos_1);
+            };
+            DomWindowHelper.requestAnimationFrame(checkPos_1);
+        }
+    };
+    SurveyElement.ScrollElementToTop = function (elementId, scrollIfVisible, scrollIntoViewOptions, doneCallback) {
+        var root = settings.environment.root;
+        if (!elementId || typeof root === "undefined")
+            return false;
+        var el = root.getElementById(elementId);
+        return SurveyElement.ScrollElementToViewCore(el, false, scrollIfVisible, scrollIntoViewOptions, doneCallback);
+    };
+    SurveyElement.ScrollElementToViewCore = function (el, checkLeft, scrollIfVisible, scrollIntoViewOptions, doneCallback) {
+        if (!el || !el.scrollIntoView) {
+            doneCallback && doneCallback();
+            return false;
+        }
+        var needScroll = SurveyElement.IsNeedScrollIntoView(el, checkLeft, scrollIfVisible);
+        if (needScroll) {
+            SurveyElement.ScrollIntoView(el, scrollIntoViewOptions, doneCallback);
+        }
+        else {
+            doneCallback && doneCallback();
         }
         return needScroll;
     };
@@ -13839,7 +13808,7 @@ var survey_element_SurveyElement = /** @class */ (function (_super) {
     };
     Object.defineProperty(SurveyElement.prototype, "isDefaultV2Theme", {
         get: function () {
-            return this.survey && this.survey.getCss().root == "sd-root-modern";
+            return this.survey && this.survey.getCss().root.indexOf("sd-root-modern") !== -1;
         },
         enumerable: false,
         configurable: true
@@ -14236,12 +14205,16 @@ var survey_element_SurveyElement = /** @class */ (function (_super) {
     SurveyElement.prototype.getIsAnimationAllowed = function () {
         return _super.prototype.getIsAnimationAllowed.call(this) && !!this.survey && !this.survey["isEndLoadingFromJson"];
     };
+    SurveyElement.prototype.afterRenderCore = function (element) {
+        this.onAfterRenderElement.fire(this, { htmlElement: element });
+    };
     SurveyElement.prototype.dispose = function () {
         _super.prototype.dispose.call(this);
         if (this.titleToolbarValue) {
             this.titleToolbarValue.dispose();
         }
     };
+    // TODO V2: get rid of this flag
     SurveyElement.CreateDisabledDesignElements = false;
     survey_element_decorate([
         jsonobject_property({ defaultValue: null })
@@ -14274,6 +14247,66 @@ var survey_element_SurveyElement = /** @class */ (function (_super) {
     return SurveyElement;
 }(survey_element_SurveyElementCore));
 
+var RenderingCompletedAwaiter = /** @class */ (function () {
+    function RenderingCompletedAwaiter(_elements, _renderedHandler, waitingTimeout) {
+        var _this = this;
+        if (waitingTimeout === void 0) { waitingTimeout = 100; }
+        this._elements = _elements;
+        this._renderedHandler = _renderedHandler;
+        this._elementsToRenderCount = 0;
+        this._elementsToRenderTimer = undefined;
+        this._elementRenderedHandler = function (s, o) {
+            var _a;
+            (_a = s.onAfterRenderElement) === null || _a === void 0 ? void 0 : _a.remove(_this._elementRenderedHandler);
+            _this._elementsToRenderCount--;
+            if (_this._elementsToRenderCount <= 0) {
+                _this.visibleElementsRendered();
+            }
+        };
+        this._elements.forEach(function (element) {
+            if (element.onAfterRenderElement) {
+                element.onAfterRenderElement.add(_this._elementRenderedHandler);
+                _this._elementsToRenderCount++;
+            }
+        });
+        if (this._elementsToRenderCount > 0) {
+            this._elementsToRenderTimer = setTimeout(function () {
+                if (_this._elementsToRenderCount > 0) {
+                    _this.visibleElementsRendered();
+                }
+            }, waitingTimeout);
+        }
+        else {
+            this.visibleElementsRendered();
+        }
+    }
+    RenderingCompletedAwaiter.prototype.stopWaitingForElementsRendering = function () {
+        var _this = this;
+        if (this._elementsToRenderTimer) {
+            clearTimeout(this._elementsToRenderTimer);
+            this._elementsToRenderTimer = undefined;
+        }
+        this._elements.forEach(function (element) {
+            var _a;
+            (_a = element.onAfterRenderElement) === null || _a === void 0 ? void 0 : _a.remove(_this._elementRenderedHandler);
+        });
+        this._elementsToRenderCount = 0;
+    };
+    RenderingCompletedAwaiter.prototype.visibleElementsRendered = function () {
+        var renderedHandler = this._renderedHandler;
+        this.dispose();
+        if (typeof renderedHandler == "function") {
+            renderedHandler();
+        }
+    };
+    RenderingCompletedAwaiter.prototype.dispose = function () {
+        this.stopWaitingForElementsRendering();
+        this._elements = undefined;
+        this._renderedHandler = undefined;
+    };
+    return RenderingCompletedAwaiter;
+}());
+
 
 // CONCATENATED MODULE: ./packages/survey-core/src/localizablestring.ts
 
@@ -16750,6 +16783,11 @@ var validator_SurveyValidator = /** @class */ (function (_super) {
         _this.createLocalizableString("text", _this, true);
         return _this;
     }
+    Object.defineProperty(SurveyValidator.prototype, "isValidator", {
+        get: function () { return true; },
+        enumerable: false,
+        configurable: true
+    });
     SurveyValidator.prototype.getSurvey = function (live) {
         if (live === void 0) { live = false; }
         return !!this.errorOwner && !!this.errorOwner["getSurvey"]
@@ -17608,16 +17646,21 @@ var text_area_TextAreaModel = /** @class */ (function () {
         this.onPropertyChangedCallback = function () {
             if (_this.element) {
                 _this.element.value = _this.getTextValue();
-                if (_this.autoGrow) {
-                    increaseHeightByContent(_this.element);
-                }
+                _this.updateElement();
             }
         };
         this.question.registerFunctionOnPropertyValueChanged(this.options.propertyName, this.onPropertyChangedCallback, "__textarea");
     }
+    TextAreaModel.prototype.updateElement = function () {
+        var _this = this;
+        if (this.element && this.autoGrow) {
+            setTimeout(function () { return increaseHeightByContent(_this.element); }, 1);
+        }
+    };
     TextAreaModel.prototype.setElement = function (element) {
         if (!!element) {
             this.element = element;
+            this.updateElement();
         }
     };
     TextAreaModel.prototype.getTextValue = function () {
@@ -18887,7 +18930,8 @@ var question_Question = /** @class */ (function (_super) {
         }
         this.checkForResponsiveness(el);
     };
-    Question.prototype.afterRenderCore = function (el) {
+    Question.prototype.afterRenderCore = function (element) {
+        _super.prototype.afterRenderCore.call(this, element);
     };
     Question.prototype.getCommentElementsId = function () {
         return [this.commentId];
@@ -19222,6 +19266,7 @@ var question_Question = /** @class */ (function (_super) {
      * @param onError Pass `true` if you want to focus an input field with the first validation error. Default value: `false` (focuses the first input field). Applies to question types with multiple input fields.
      */
     Question.prototype.focus = function (onError, scrollIfVisible) {
+        var _this = this;
         if (onError === void 0) { onError = false; }
         if (this.isDesignMode || !this.isVisible || !this.survey)
             return;
@@ -19231,16 +19276,17 @@ var question_Question = /** @class */ (function (_super) {
             this.survey.focusQuestionByInstance(this, onError);
         }
         else {
-            this.focuscore(onError, scrollIfVisible);
-        }
-    };
-    Question.prototype.focuscore = function (onError, scrollIfVisible) {
-        if (onError === void 0) { onError = false; }
-        if (!!this.survey) {
-            this.expandAllParents();
-            this.survey.scrollElementToTop(this, this, null, this.id, scrollIfVisible);
+            if (!!this.survey) {
+                this.expandAllParents();
+                var scrollOptions = this.survey["isSmoothScrollEnabled"] ? { behavior: "smooth" } : undefined;
+                this.survey.scrollElementToTop(this, this, null, this.id, scrollIfVisible, scrollOptions, undefined, function () {
+                    _this.focusInputElement(onError);
+                });
+            }
+            else {
+                this.focusInputElement(onError);
+            }
         }
-        this.focusInputElement(onError);
     };
     Question.prototype.focusInputElement = function (onError) {
         var id = !onError ? this.getFirstInputElementId() : this.getFirstErrorInputElementId();
@@ -20767,9 +20813,12 @@ var question_Question = /** @class */ (function (_super) {
             if (this.isValueEmpty(value) && helpers_Helpers.isNumber(this[propName])) {
                 value = 0;
             }
-            this[propName] = value;
+            this.updateBindingProp(propName, value);
         }
     };
+    Question.prototype.updateBindingProp = function (propName, value) {
+        this[propName] = value;
+    };
     Question.prototype.getComponentName = function () {
         return RendererFactory.Instance.getRendererByQuestion(this);
     };
@@ -27871,7 +27920,7 @@ var MatrixDropdownRowTextProcessor = /** @class */ (function (_super) {
             textValue.value = this.row.rowIndex;
             return true;
         }
-        if (textValue.name == question_matrixdropdownbase_MatrixDropdownRowModelBase.RowValueVariableName) {
+        if ([question_matrixdropdownbase_MatrixDropdownRowModelBase.RowValueVariableName, question_matrixdropdownbase_MatrixDropdownRowModelBase.RowNameVariableName].indexOf(textValue.name) > -1) {
             textValue.isExists = true;
             textValue.value = this.row.rowName;
             return true;
@@ -28105,11 +28154,12 @@ var question_matrixdropdownbase_MatrixDropdownRowModelBase = /** @class */ (func
     MatrixDropdownRowModelBase.prototype.applyRowVariablesToValues = function (res, rowIndex) {
         res[MatrixDropdownRowModelBase.IndexVariableName] = rowIndex;
         res[MatrixDropdownRowModelBase.RowValueVariableName] = this.rowName;
+        res[MatrixDropdownRowModelBase.RowNameVariableName] = this.rowName;
     };
     MatrixDropdownRowModelBase.prototype.runCondition = function (values, properties, rowsVisibleIf) {
-        if (!!this.data) {
-            values[MatrixDropdownRowModelBase.OwnerVariableName] = this.data.getFilteredData();
-        }
+        if (!this.data)
+            return;
+        values[MatrixDropdownRowModelBase.OwnerVariableName] = this.data.getFilteredData();
         var rowIndex = this.rowIndex;
         this.applyRowVariablesToValues(values, rowIndex);
         var newProps = helpers_Helpers.createCopy(properties);
@@ -28520,11 +28570,14 @@ var question_matrixdropdownbase_MatrixDropdownRowModelBase = /** @class */ (func
     };
     Object.defineProperty(MatrixDropdownRowModelBase.prototype, "rowIndex", {
         get: function () {
-            return !!this.data ? this.data.getRowIndex(this) + 1 : -1;
+            return this.getRowIndex();
         },
         enumerable: false,
         configurable: true
     });
+    MatrixDropdownRowModelBase.prototype.getRowIndex = function () {
+        return !!this.data ? this.data.getRowIndex(this) + 1 : -1;
+    };
     Object.defineProperty(MatrixDropdownRowModelBase.prototype, "editingObj", {
         get: function () {
             return this.editingObjValue;
@@ -28562,6 +28615,7 @@ var question_matrixdropdownbase_MatrixDropdownRowModelBase = /** @class */ (func
     MatrixDropdownRowModelBase.OwnerVariableName = "self";
     MatrixDropdownRowModelBase.IndexVariableName = "rowIndex";
     MatrixDropdownRowModelBase.RowValueVariableName = "rowValue";
+    MatrixDropdownRowModelBase.RowNameVariableName = "rowName";
     MatrixDropdownRowModelBase.idCounter = 1;
     return MatrixDropdownRowModelBase;
 }());
@@ -29225,9 +29279,9 @@ var question_matrixdropdownbase_QuestionMatrixDropdownModelBase = /** @class */
         return !!question ? question.getConditionJson(operator) : null;
     };
     QuestionMatrixDropdownModelBase.prototype.clearIncorrectValues = function () {
-        var rows = this.visibleRows;
-        if (!rows)
+        if (!Array.isArray(this.visibleRows))
             return;
+        var rows = this.generatedVisibleRows;
         for (var i = 0; i < rows.length; i++) {
             rows[i].clearIncorrectValues(this.getRowValue(i));
         }
@@ -29632,13 +29686,13 @@ var question_matrixdropdownbase_QuestionMatrixDropdownModelBase = /** @class */
      * @see setRowValue
      */
     QuestionMatrixDropdownModelBase.prototype.getRowValue = function (rowIndex) {
-        if (rowIndex < 0)
+        if (rowIndex < 0 || !Array.isArray(this.visibleRows))
             return null;
-        var visRows = this.visibleRows;
-        if (rowIndex >= visRows.length)
+        var rows = this.generatedVisibleRows;
+        if (rowIndex >= rows.length)
             return null;
         var newValue = this.createNewValue();
-        return this.getRowValueCore(visRows[rowIndex], newValue);
+        return this.getRowValueCore(rows[rowIndex], newValue);
     };
     QuestionMatrixDropdownModelBase.prototype.checkIfValueInRowDuplicated = function (checkedRow, cellQuestion) {
         if (!this.generatedVisibleRows)
@@ -30207,7 +30261,14 @@ var question_matrixdropdownbase_QuestionMatrixDropdownModelBase = /** @class */
     });
     Object.defineProperty(QuestionMatrixDropdownModelBase.prototype, "hasInvisibleRows", {
         get: function () {
-            return !!this.visibleRowsArray && this.visibleRowsArray.length !== this.generatedVisibleRows.length;
+            var rows = this.generatedVisibleRows;
+            if (!Array.isArray(rows))
+                return false;
+            for (var i = 0; i < rows.length; i++) {
+                if (!rows[i].isVisible)
+                    return true;
+            }
+            return false;
         },
         enumerable: false,
         configurable: true
@@ -30283,9 +30344,9 @@ var question_matrixdropdownbase_QuestionMatrixDropdownModelBase = /** @class */
         return { value: newValue, rowValue: rowValue };
     };
     QuestionMatrixDropdownModelBase.prototype.getRowIndex = function (row) {
-        if (!this.generatedVisibleRows)
+        if (!Array.isArray(this.generatedVisibleRows))
             return -1;
-        return this.visibleRows.indexOf(row);
+        return this.generatedVisibleRows.indexOf(row);
     };
     QuestionMatrixDropdownModelBase.prototype.getElementsInDesign = function (includeHidden) {
         if (includeHidden === void 0) { includeHidden = false; }
@@ -30418,7 +30479,7 @@ var question_matrixdropdownbase_QuestionMatrixDropdownModelBase = /** @class */
     };
     QuestionMatrixDropdownModelBase.prototype.clearInvisibleValuesInRows = function () {
         var _a;
-        if (this.isEmpty() || !this.isRowsFiltered)
+        if (this.isEmpty() || !this.isRowsFiltered())
             return;
         var sharedQuestions = ((_a = this.survey) === null || _a === void 0 ? void 0 : _a.questionsByValueName(this.getValueName())) || [];
         if (sharedQuestions.length < 2) {
@@ -30683,17 +30744,17 @@ var question_matrixdropdown_QuestionMatrixDropdownModel = /** @class */ (functio
         if (!rows)
             return res;
         for (var i = 0; i < rows.length; i++) {
-            var rowValue = rows[i].rowName;
-            var val = value[rowValue];
+            var rowName = rows[i].rowName;
+            var val = value[rowName];
             if (!val)
                 continue;
             if (keysAsText) {
-                var displayRowValue = itemvalue_ItemValue.getTextOrHtmlByValue(this.rows, rowValue);
+                var displayRowValue = itemvalue_ItemValue.getTextOrHtmlByValue(this.rows, rowName);
                 if (!!displayRowValue) {
-                    rowValue = displayRowValue;
+                    rowName = displayRowValue;
                 }
             }
-            res[rowValue] = this.getRowDisplayValue(keysAsText, rows[i], val);
+            res[rowName] = this.getRowDisplayValue(keysAsText, rows[i], val);
         }
         return res;
     };
@@ -30748,11 +30809,11 @@ var question_matrixdropdown_QuestionMatrixDropdownModel = /** @class */ (functio
         }
         _super.prototype.clearGeneratedRows.call(this);
     };
-    QuestionMatrixDropdownModel.prototype.getRowValueForCreation = function (val, rowValue) {
-        var res = val[rowValue];
+    QuestionMatrixDropdownModel.prototype.getRowValueForCreation = function (val, rowName) {
+        var res = val[rowName];
         if (!res)
             return res;
-        var names = this.defaultValuesInRows[rowValue];
+        var names = this.defaultValuesInRows[rowName];
         if (!Array.isArray(names) || names.length === 0)
             return res;
         names.forEach(function (name) {
@@ -30799,8 +30860,8 @@ var question_matrixdropdown_QuestionMatrixDropdownModel = /** @class */ (functio
             val = {};
         for (var i = 0; i < this.rows.length; i++) {
             var row = this.rows[i];
-            var rowValue = val[row.value];
-            this.updateProgressInfoByRow(res, !!rowValue ? rowValue : {});
+            var rowName = val[row.value];
+            this.updateProgressInfoByRow(res, !!rowName ? rowName : {});
         }
     };
     return QuestionMatrixDropdownModel;
@@ -31634,6 +31695,10 @@ var MatrixDynamicRowModel = /** @class */ (function (_super) {
         _this.buildCells(value);
         return _this;
     }
+    MatrixDynamicRowModel.prototype.getRowIndex = function () {
+        var res = _super.prototype.getRowIndex.call(this);
+        return res > 0 ? res : this.index + 1;
+    };
     Object.defineProperty(MatrixDynamicRowModel.prototype, "rowName", {
         get: function () {
             return this.id;
@@ -31698,10 +31763,10 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
         };
         _this.createLocalizableString("removeRowText", _this, false, "removeRow");
         _this.createLocalizableString("emptyRowsText", _this, false, true);
-        _this.registerPropertyChangedHandlers(["hideColumnsIfEmpty", "allowAddRows"], function () {
-            _this.updateShowTableAndAddRow();
-        });
+        _this.registerPropertyChangedHandlers(["hideColumnsIfEmpty", "allowAddRows"], function () { _this.updateShowTableAndAddRow(); });
         _this.registerPropertyChangedHandlers(["allowRowsDragAndDrop", "isReadOnly", "lockedRowCount"], function () { _this.resetRenderedTable(); });
+        _this.registerPropertyChangedHandlers(["minRowCount"], function () { _this.onMinRowCountChanged(); });
+        _this.registerPropertyChangedHandlers(["maxRowCount"], function () { _this.onMaxRowCountChanged(); });
         _this.dragOrClickHelper = new dragOrClickHelper_DragOrClickHelper(_this.startDragMatrixRow);
         return _this;
     }
@@ -31809,7 +31874,7 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
         return (_super.prototype.isDefaultValueEmpty.call(this) && this.isValueEmpty(this.defaultRowValue));
     };
     QuestionMatrixDynamicModel.prototype.valueFromData = function (val) {
-        if (this.minRowCount < 1)
+        if (this.minRowCount < 1 || this.isEmpty())
             return _super.prototype.valueFromData.call(this, val);
         if (!Array.isArray(val))
             val = [];
@@ -31863,6 +31928,7 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
             return this.rowCountValue;
         },
         set: function (val) {
+            val = helpers_Helpers.getNumber(val);
             if (val < 0 || val > settings.matrix.maxRowCount)
                 return;
             this.setRowCountValueFromData = false;
@@ -31895,6 +31961,23 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
         enumerable: false,
         configurable: true
     });
+    QuestionMatrixDynamicModel.prototype.updateBindingProp = function (propName, value) {
+        _super.prototype.updateBindingProp.call(this, propName, value);
+        var rows = this.generatedVisibleRows;
+        if (propName !== "rowCount" || !Array.isArray(rows))
+            return;
+        var val = this.getUnbindValue(this.value) || [];
+        if (val.length < rows.length) {
+            var hasValue = false;
+            for (var i = val.length; i < rows.length; i++) {
+                hasValue || (hasValue = !rows[i].isEmpty);
+                val.push(rows[i].value || {});
+            }
+            if (hasValue) {
+                this.value = val;
+            }
+        }
+    };
     QuestionMatrixDynamicModel.prototype.updateProgressInfoByValues = function (res) {
         var val = this.value;
         if (!Array.isArray(val))
@@ -31979,14 +32062,19 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
             if (val < 0)
                 val = 0;
             this.setPropertyValue("minRowCount", val);
-            if (val > this.maxRowCount)
-                this.maxRowCount = val;
-            if (this.rowCount < val)
-                this.rowCount = val;
         },
         enumerable: false,
         configurable: true
     });
+    QuestionMatrixDynamicModel.prototype.onMinRowCountChanged = function () {
+        var val = this.minRowCount;
+        if (val > this.maxRowCount)
+            this.maxRowCount = val;
+        if (this.initialRowCount < val)
+            this.initialRowCount = val;
+        if (this.rowCount < val)
+            this.rowCount = val;
+    };
     Object.defineProperty(QuestionMatrixDynamicModel.prototype, "maxRowCount", {
         /**
          * A maximum number of rows in the matrix. Users cannot add new rows if `rowCount` equals `maxRowCount`.
@@ -32007,14 +32095,17 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
             if (val == this.maxRowCount)
                 return;
             this.setPropertyValue("maxRowCount", val);
-            if (val < this.minRowCount)
-                this.minRowCount = val;
-            if (this.rowCount > val)
-                this.rowCount = val;
         },
         enumerable: false,
         configurable: true
     });
+    QuestionMatrixDynamicModel.prototype.onMaxRowCountChanged = function () {
+        var val = this.maxRowCount;
+        if (val < this.minRowCount)
+            this.minRowCount = val;
+        if (this.rowCount > val)
+            this.rowCount = val;
+    };
     Object.defineProperty(QuestionMatrixDynamicModel.prototype, "allowAddRows", {
         /**
          * Specifies whether users are allowed to add new rows.
@@ -32109,6 +32200,8 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
         this.addRow(true);
     };
     QuestionMatrixDynamicModel.prototype.getQuestionToFocusOnAddingRow = function () {
+        if (this.visibleRows.length === 0)
+            return null;
         var row = this.visibleRows[this.visibleRows.length - 1];
         for (var i = 0; i < row.cells.length; i++) {
             var q = row.cells[i].question;
@@ -32186,8 +32279,9 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
         }
         if (this.data) {
             this.runCellsCondition(this.getDataFilteredValues(), this.getDataFilteredProperties());
-            if (this.isValueEmpty(defaultValue)) {
-                var row = this.visibleRows[this.rowCount - 1];
+            var rows = this.visibleRows;
+            if (this.isValueEmpty(defaultValue) && rows.length > 0) {
+                var row = rows[rows.length - 1];
                 if (!this.isValueEmpty(row.value)) {
                     if (!newValue) {
                         newValue = this.createNewValue();
@@ -32201,8 +32295,10 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
             }
         }
         if (this.survey) {
-            if (prevRowCount + 1 == this.rowCount) {
-                this.survey.matrixRowAdded(this, this.visibleRows[this.visibleRows.length - 1]);
+            var rows = this.visibleRows;
+            if (prevRowCount + 1 == this.rowCount && rows.length > 0) {
+                var row = rows[rows.length - 1];
+                this.survey.matrixRowAdded(this, row);
                 this.onRowsChanged();
             }
         }
@@ -32636,6 +32732,8 @@ var question_matrixdynamic_QuestionMatrixDynamicModel = /** @class */ (function
         return result;
     };
     QuestionMatrixDynamicModel.prototype.deleteRowValue = function (newValue, row) {
+        if (!Array.isArray(newValue))
+            return newValue;
         var isEmpty = true;
         for (var i = 0; i < newValue.length; i++) {
             if (this.isObject(newValue[i]) && Object.keys(newValue[i]).length > 0) {
@@ -33477,6 +33575,7 @@ var defaultV2Css = {
         changeCameraButton: "sd-file__change-camera-button",
         takePictureButton: "sd-file__take-picture-button",
         loadingIndicator: "sd-file__loading-indicator",
+        page: "sd-file__page"
     },
     signaturepad: {
         mainRoot: "sd-element sd-question sd-question--signature sd-row__question",
@@ -33807,7 +33906,8 @@ var surveytimer_SurveyTimer = /** @class */ (function () {
     function SurveyTimer() {
         this.listenerCounter = 0;
         this.timerId = -1;
-        this.onTimer = new EventBase();
+        this.onTimerTick = new EventBase();
+        this.onTimer = this.onTimerTick;
     }
     Object.defineProperty(SurveyTimer, "instance", {
         get: function () {
@@ -33823,7 +33923,7 @@ var surveytimer_SurveyTimer = /** @class */ (function () {
         var _this = this;
         if (func === void 0) { func = null; }
         if (func) {
-            this.onTimer.add(func);
+            this.onTimerTick.add(func);
         }
         this.prevTimeInMs = surveyTimerFunctions.now();
         if (this.timerId < 0) {
@@ -33836,7 +33936,7 @@ var surveytimer_SurveyTimer = /** @class */ (function () {
     SurveyTimer.prototype.stop = function (func) {
         if (func === void 0) { func = null; }
         if (func) {
-            this.onTimer.remove(func);
+            this.onTimerTick.remove(func);
         }
         this.listenerCounter--;
         if (this.listenerCounter == 0 && this.timerId > -1) {
@@ -33846,7 +33946,7 @@ var surveytimer_SurveyTimer = /** @class */ (function () {
     };
     SurveyTimer.prototype.doTimer = function () {
         var _this = this;
-        if (this.onTimer.isEmpty || this.listenerCounter == 0) {
+        if (this.onTimerTick.isEmpty || this.listenerCounter == 0) {
             this.timerId = -1;
         }
         if (this.timerId < 0)
@@ -33858,7 +33958,7 @@ var surveytimer_SurveyTimer = /** @class */ (function () {
             seconds = 1;
         }
         var prevItem = this.timerId;
-        this.onTimer.fire(this, { seconds: seconds });
+        this.onTimerTick.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)
@@ -33958,8 +34058,8 @@ var surveyTimerModel_SurveyTimerModel = /** @class */ (function (_super) {
         }
         this.spent = this.spent + seconds;
         this.update();
-        if (this.onTimer) {
-            this.onTimer(page);
+        if (this.onTimerTick) {
+            this.onTimerTick(page);
         }
     };
     SurveyTimerModel.prototype.updateProgress = function () {
@@ -34350,7 +34450,7 @@ var header_Cover = /** @class */ (function (_super) {
                 return this.height ? Math.max(this.height, this.actualHeight + 40) + "px" : undefined;
             }
             if (this.survey && this.survey.isMobile) {
-                return this.mobileHeight ? Math.max(this.mobileHeight, this.actualHeight + 40) + "px" : undefined;
+                return this.mobileHeight ? Math.max(this.mobileHeight, this.actualHeight) + "px" : undefined;
             }
             return undefined;
         },
@@ -34431,13 +34531,19 @@ var header_Cover = /** @class */ (function (_super) {
     };
     Cover.prototype.processResponsiveness = function (width) {
         if (this.survey && this.survey.rootElement) {
-            var logoEl = this.survey.rootElement.querySelectorAll(".sv-header__logo")[0];
-            var titleEl = this.survey.rootElement.querySelectorAll(".sv-header__title")[0];
-            var descriptionEl = this.survey.rootElement.querySelectorAll(".sv-header__description")[0];
-            var logoHeight = logoEl ? logoEl.getBoundingClientRect().height : 0;
-            var titleHeight = titleEl ? titleEl.getBoundingClientRect().height : 0;
-            var descriptionHeight = descriptionEl ? descriptionEl.getBoundingClientRect().height : 0;
-            this.actualHeight = this.calculateActualHeight(logoHeight, titleHeight, descriptionHeight);
+            if (!this.survey.isMobile) {
+                var logoEl = this.survey.rootElement.querySelectorAll(".sv-header__logo")[0];
+                var titleEl = this.survey.rootElement.querySelectorAll(".sv-header__title")[0];
+                var descriptionEl = this.survey.rootElement.querySelectorAll(".sv-header__description")[0];
+                var logoHeight = logoEl ? logoEl.getBoundingClientRect().height : 0;
+                var titleHeight = titleEl ? titleEl.getBoundingClientRect().height : 0;
+                var descriptionHeight = descriptionEl ? descriptionEl.getBoundingClientRect().height : 0;
+                this.actualHeight = this.calculateActualHeight(logoHeight, titleHeight, descriptionHeight);
+            }
+            else {
+                var headerContainer = this.survey.rootElement.querySelectorAll(".sv-header > div")[0];
+                this.actualHeight = headerContainer ? headerContainer.getBoundingClientRect().height : 0;
+            }
         }
     };
     Object.defineProperty(Cover.prototype, "hasBackground", {
@@ -35710,7 +35816,7 @@ var panel_PanelModelBase = /** @class */ (function (_super) {
     PanelModelBase.prototype.getValue = function () {
         var data = {};
         this.collectValues(data, 0);
-        return data;
+        return helpers_Helpers.getUnbindValue(data);
     };
     PanelModelBase.prototype.collectValues = function (data, level) {
         var elements = this.elements;
@@ -37107,6 +37213,9 @@ var panel_PanelModelBase = /** @class */ (function (_super) {
         }
         return this.layoutColumns.slice(0, tailIndex + 1);
     };
+    PanelModelBase.prototype.afterRender = function (el) {
+        this.afterRenderCore(el);
+    };
     PanelModelBase.prototype.dispose = function () {
         _super.prototype.dispose.call(this);
         if (this.rows) {
@@ -37579,6 +37688,11 @@ var panel_PanelModel = /** @class */ (function (_super) {
     PanelModel.prototype.getContainerCss = function () {
         return this.getCssRoot(this.cssClasses.panel);
     };
+    PanelModel.prototype.afterRenderCore = function (element) {
+        var _a;
+        _super.prototype.afterRenderCore.call(this, element);
+        (_a = this.survey) === null || _a === void 0 ? void 0 : _a.afterRenderPanel(this, element);
+    };
     return PanelModel;
 }(panel_PanelModelBase));
 
@@ -37932,7 +38046,7 @@ var page_PageModel = /** @class */ (function (_super) {
         _this.hasShownValue = false;
         /**
          * A time period that a respondent has spent on this page so far; measured in seconds. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
-         * @see maxTimeToFinish
+         * @see timeLimit
          */
         _this.timeSpent = 0;
         _this.createLocalizableString("navigationDescription", _this, true);
@@ -38219,12 +38333,6 @@ var page_PageModel = /** @class */ (function (_super) {
             this.survey.scrollElementToTop(this, null, this, this.id);
         }
     };
-    // public get timeSpent(): number {
-    //   return this.getPropertyValue("timeSpent", 0);
-    // }
-    // public set timeSpent(val: number) {
-    //   this.setPropertyValue("timeSpent", val);
-    // }
     /**
      * Returns a list of all panels on this page.
      * @param visibleOnly A Boolean value that specifies whether to include only visible panels.
@@ -38242,28 +38350,42 @@ var page_PageModel = /** @class */ (function (_super) {
         if (includingDesignTime === void 0) { includingDesignTime = false; }
         return this.getAllPanels(visibleOnly, includingDesignTime);
     };
-    Object.defineProperty(PageModel.prototype, "maxTimeToFinish", {
+    Object.defineProperty(PageModel.prototype, "timeLimit", {
         /**
          * A time period that a respondent has to complete this page; measured in seconds. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
          *
-         * A negative value or 0 sets an unlimited time period.
+         * Default value: 0 (time is unlimited)
          *
-         * Alternatively, you can use the `SurveyModel`'s [`maxTimeToFinishPage`](https://surveyjs.io/form-library/documentation/surveymodel#maxTimeToFinishPage) property to specify identical time periods for all survey pages.
+         * Alternatively, you can use the `SurveyModel`'s [`timeLimitPerPage`](https://surveyjs.io/form-library/documentation/surveymodel#timeLimitPerPage) property to specify identical time periods for all survey pages.
          * @see timeSpent
          */
         get: function () {
-            return this.getPropertyValue("maxTimeToFinish", 0);
+            return this.getPropertyValue("timeLimit", 0);
         },
         set: function (val) {
-            this.setPropertyValue("maxTimeToFinish", val);
+            this.setPropertyValue("timeLimit", val);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(PageModel.prototype, "maxTimeToFinish", {
+        /**
+         * Obsolete. Use the [`timeLimit`](https://surveyjs.io/form-library/documentation/api-reference/page-model#timeLimit) property instead.
+         * @deprecated
+         */
+        get: function () {
+            return this.timeLimit;
+        },
+        set: function (val) {
+            this.timeLimit = val;
         },
         enumerable: false,
         configurable: true
     });
     PageModel.prototype.getMaxTimeToFinish = function () {
-        if (this.maxTimeToFinish !== 0)
-            return this.maxTimeToFinish;
-        var res = !!this.survey ? this.survey.maxTimeToFinishPage : 0;
+        if (this.timeLimit !== 0)
+            return this.timeLimit;
+        var res = !!this.survey ? this.survey.timeLimitPerPage : 0;
         return res > 0 ? res : 0;
     };
     PageModel.prototype.onNumChanged = function (value) { };
@@ -38305,7 +38427,7 @@ Serializer.addClass("page", [
         default: "inherit",
         choices: ["inherit", "show", "hide"],
     },
-    { name: "maxTimeToFinish:number", default: 0, minValue: 0 },
+    { name: "timeLimit:number", alternativeName: "maxTimeToFinish", default: 0, minValue: 0 },
     {
         name: "navigationTitle",
         visibleIf: function (obj) {
@@ -39331,12 +39453,18 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         * An event that is raised every second while the timer is running.
         *
         * Use the [`timeSpent`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timeSpent) property to find out how many seconds have elapsed.
-        * @see maxTimeToFinish
-        * @see maxTimeToFinishPage
-        * @see showTimerPanel
+        * @see timeLimit
+        * @see timeLimitPerPage
+        * @see showTimer
+        * @see timerLocation
         * @see startTimer
         */
-        _this.onTimer = _this.addEvent();
+        _this.onTimerTick = _this.addEvent();
+        /**
+         * Obsolete. Use the [`onTimerTick`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#onTimerTick) event instead.
+         * @deprecated
+         */
+        _this.onTimer = _this.onTimerTick;
         _this.onTimerPanelInfoText = _this.addEvent();
         /**
          * An event that is raised after an item value is changed in a panel within a [Dynamic Panel](https://surveyjs.io/form-library/examples/questiontype-paneldynamic/) question.
@@ -39433,6 +39561,18 @@ var survey_SurveyModel = /** @class */ (function (_super) {
          */
         _this.jsonErrors = null;
         _this.cssValue = null;
+        /**
+         * Specifies whether the [Complete page](https://surveyjs.io/form-library/documentation/design-survey/create-a-multi-page-survey#complete-page) should display the [survey header](https://surveyjs.io/form-library/examples/brand-your-survey-header/).
+         *
+         * Possible values:
+         *
+         * - `true` - Displays the survey header on the Complete page.
+         * - `false` - Hides the header when users reach the Complete page.
+         * - `"auto"` (default) - Displays a header with the basic view, but hides a header with the advanced view (see the [`headerView`](https://surveyjs.io/form-library/documentation/api-reference/itheme#headerView) property description).
+         *
+         * > This property cannot be specified in the survey JSON schema. Use dot notation to specify it.
+         */
+        _this.showHeaderOnCompletePage = "auto";
         _this._isLazyRenderingSuspended = false;
         /**
          * Specifies whether to hide validation errors thrown by the Required validation in the UI.
@@ -39464,6 +39604,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         _this.isNavigationButtonPressed = false;
         _this.mouseDownPage = null;
         _this.isCalculatingProgressText = false;
+        _this.isSmoothScrollEnabled = false;
         /**
          * An event that is raised when the survey's width or height is changed.
          */
@@ -39509,7 +39650,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         _this.createLocalizableString("editText", _this, false, true);
         _this.createLocalizableString("questionTitleTemplate", _this, true);
         _this.timerModelValue = new surveyTimerModel_SurveyTimerModel(_this);
-        _this.timerModelValue.onTimer = function (page) {
+        _this.timerModelValue.onTimerTick = function (page) {
             _this.doTimer(page);
         };
         _this.createNewArray("pages", function (value) {
@@ -39886,7 +40027,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
     Object.defineProperty(SurveyModel.prototype, "bodyCss", {
         get: function () {
             return new CssClassBuilder().append(this.css.body)
-                .append(this.css.bodyWithTimer, this.showTimerPanel != "none" && this.state === "running")
+                .append(this.css.bodyWithTimer, this.showTimer && this.state === "running")
                 .append(this.css.body + "--" + this.calculatedWidthMode).toString();
         },
         enumerable: false,
@@ -44513,7 +44654,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         this.onGetMatrixRowActions.fire(this, options);
         return options.actions;
     };
-    SurveyModel.prototype.scrollElementToTop = function (element, question, page, id, scrollIfVisible, scrollIntoViewOptions, passedRootElement) {
+    SurveyModel.prototype.scrollElementToTop = function (element, question, page, id, scrollIfVisible, scrollIntoViewOptions, passedRootElement, onScolledCallback) {
         var _this = this;
         var options = {
             element: element,
@@ -44525,7 +44666,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         this.onScrollingElementToTop.fire(this, options);
         if (!options.cancel) {
             var elementPage_1 = this.getPageByElement(element);
-            if (this.isLazyRendering) {
+            if (this.isLazyRendering && !!elementPage_1) {
                 var elementsToRenderBefore = 1;
                 var rootElement = settings.environment.rootElement;
                 var surveyRootElement = this.rootElement || passedRootElement || rootElement;
@@ -44537,11 +44678,12 @@ var survey_SurveyModel = /** @class */ (function (_super) {
                     survey_element_SurveyElement.ScrollElementToTop(options.elementId, scrollIfVisible, scrollIntoViewOptions, function () {
                         _this.releaseLazyRendering();
                         activateLazyRenderingChecks(elementPage_1.id);
+                        onScolledCallback && onScolledCallback();
                     });
                 }, elementsToRenderBefore);
             }
             else {
-                survey_element_SurveyElement.ScrollElementToTop(options.elementId, scrollIfVisible, scrollIntoViewOptions);
+                survey_element_SurveyElement.ScrollElementToTop(options.elementId, scrollIfVisible, scrollIntoViewOptions, onScolledCallback);
             }
         }
     };
@@ -46289,64 +46431,117 @@ var survey_SurveyModel = /** @class */ (function (_super) {
     };
     Object.defineProperty(SurveyModel.prototype, "showTimerPanel", {
         /**
-         * Displays the timer panel and specifies its position. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
+         * Obsolete. Use the [`showTimer`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#showTimer) and [`timerLocation`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timerLocation) properties instead.
+         * @deprecated
+         */
+        get: function () {
+            if (!this.showTimer)
+                return "none";
+            return this.timerLocation;
+        },
+        set: function (val) {
+            this.showTimer = val !== "none";
+            if (this.showTimer) {
+                this.timerLocation = val;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyModel.prototype, "showTimer", {
+        /**
+         * Specifies the timer's visibility. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
          *
-         * Possible values:
+         * Default value: `false`
          *
-         * - `"top"` - Displays the timer panel at the top of the survey.
-         * - `"bottom"` - Displays the timer panel at the bottom of the survey.
-         * - `"none"` (default) - Hides the timer panel.
+         * If you set this property to `true`, the timer starts automatically when the survey begins. To specify time limits, use the [`timeLimit`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timeLimit) and [`timeLimitPerPage`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timeLimitPerPage) properties.
          *
-         * If the timer panel is displayed, the timer starts automatically when the survey begins. To specify time limits, use the [`maxTimeToFinish`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#maxTimeToFinish) and [`maxTimeToFinishPage`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#maxTimeToFinishPage) properties.
+         * The timer displays information about time spent on an individual page and the entire survey. If you want to display only the page timer or the survey timer, set the [`timerInfoMode`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timerInfoMode) property to `"page"` or `"survey"`.
          *
-         * The timer panel displays information about time spent on an individual page and the entire survey. If you want to display only the page timer or the survey timer, set the [`showTimerPanelMode`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#showTimerPanelMode) property to `"page"` or `"survey"`.
-         * @see startTimer
-         * @see stopTimer
+         * You can enable the timer without displaying it. In this case, you need to specify the required time limits and use the [`startTimer()`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#startTimer) and [`stopTimer()`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#stopTimer) methods to control the timer.
+         * @see timerLocation
          * @see timeSpent
-         * @see onTimer
+         * @see onTimerTick
          */
         get: function () {
-            return this.getPropertyValue("showTimerPanel");
+            return this.getPropertyValue("showTimer");
         },
         set: function (val) {
-            this.setPropertyValue("showTimerPanel", val);
+            this.setPropertyValue("showTimer", val);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyModel.prototype, "timerLocation", {
+        /**
+         * Specifies the timer's position relative to the survey. Applies only if the [`showTimer`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#showTimer) property is set to `true`.
+         *
+         * Possible values:
+         *
+         * - `"top"` (default) - Displays the timer at the top of the survey.
+         * - `"bottom"` - Displays the timer at the bottom of the survey.
+         * @see onTimerTick
+         */
+        get: function () {
+            return this.getPropertyValue("timerLocation");
+        },
+        set: function (val) {
+            this.setPropertyValue("timerLocation", val);
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(SurveyModel.prototype, "isTimerPanelShowingOnTop", {
         get: function () {
-            return this.showTimerPanel == "top";
+            return this.showTimer && this.timerLocation === "top";
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(SurveyModel.prototype, "isTimerPanelShowingOnBottom", {
         get: function () {
-            return this.showTimerPanel == "bottom";
+            return this.showTimer && this.timerLocation === "bottom";
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(SurveyModel.prototype, "showTimerPanelMode", {
+    Object.defineProperty(SurveyModel.prototype, "timerInfoMode", {
         /**
-         * Specifies whether the timer panel displays timers for the current page, the entire survey, or both. Applies only if the timer panel is [visible](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#showTimerPanel).
+         * Specifies whether the timer panel displays timers for the current page, the entire survey, or both. Applies only if the timer panel is [visible](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#showTimer).
          *
          * Possible values:
          *
          * - `"survey"` - Displays only the survey timer.
          * - `"page"` - Displays only the page timer.
-         * - `"all"` (default) - Displays both the survey and page timers.
+         * - `"combined"` (default) - Displays both the survey and page timers.
          * @see timeSpent
-         * @see onTimer
+         * @see onTimerTick
          * @see startTimer
          * @see stopTimer
          */
         get: function () {
-            return this.getPropertyValue("showTimerPanelMode");
+            return this.getTimerInfoVal(this.getPropertyValue("timerInfoMode"));
+        },
+        set: function (val) {
+            this.setPropertyValue("timerInfoMode", val);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    SurveyModel.prototype.getTimerInfoVal = function (val) {
+        return val === "all" ? "combined" : val;
+    };
+    Object.defineProperty(SurveyModel.prototype, "showTimerPanelMode", {
+        /**
+         * Obsolete. Use the [`timerInfoMode`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timerInfoMode) property instead.
+         * @deprecated
+         */
+        get: function () {
+            var res = this.timerInfoMode;
+            return res === "combined" ? "all" : res;
         },
         set: function (val) {
-            this.setPropertyValue("showTimerPanelMode", val);
+            this.timerInfoMode = this.getTimerInfoVal(val);
         },
         enumerable: false,
         configurable: true
@@ -46465,11 +46660,11 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         var pageSpent = page.timeSpent;
         var surveySpent = this.timeSpent;
         var pageLimitSec = page.getMaxTimeToFinish();
-        var surveyLimit = this.maxTimeToFinish;
-        if (this.showTimerPanelMode == "page") {
+        var surveyLimit = this.timeLimit;
+        if (this.timerInfoMode == "page") {
             return { spent: pageSpent, limit: pageLimitSec };
         }
-        if (this.showTimerPanelMode == "survey") {
+        if (this.timerInfoMode == "survey") {
             return { spent: surveySpent, limit: surveyLimit };
         }
         else {
@@ -46495,16 +46690,16 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         var surveySpent = this.getDisplayTime(this.timeSpent);
         var pageLimitSec = page.getMaxTimeToFinish();
         var pageLimit = this.getDisplayTime(pageLimitSec);
-        var surveyLimit = this.getDisplayTime(this.maxTimeToFinish);
-        if (this.showTimerPanelMode == "page")
+        var surveyLimit = this.getDisplayTime(this.timeLimit);
+        if (this.timerInfoMode == "page")
             return this.getTimerInfoPageText(page, pageSpent, pageLimit);
-        if (this.showTimerPanelMode == "survey")
+        if (this.timerInfoMode == "survey")
             return this.getTimerInfoSurveyText(surveySpent, surveyLimit);
-        if (this.showTimerPanelMode == "all") {
-            if (pageLimitSec <= 0 && this.maxTimeToFinish <= 0) {
+        if (this.timerInfoMode == "combined") {
+            if (pageLimitSec <= 0 && this.timeLimit <= 0) {
                 return this.getLocalizationFormatString("timerSpentAll", pageSpent, surveySpent);
             }
-            if (pageLimitSec > 0 && this.maxTimeToFinish > 0) {
+            if (pageLimitSec > 0 && this.timeLimit > 0) {
                 return this.getLocalizationFormatString("timerLimitAll", pageSpent, pageLimit, surveySpent, surveyLimit);
             }
             var pageText = this.getTimerInfoPageText(page, pageSpent, pageLimit);
@@ -46519,7 +46714,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
             : this.getLocalizationFormatString("timerSpentPage", pageSpent, pageLimit);
     };
     SurveyModel.prototype.getTimerInfoSurveyText = function (surveySpent, surveyLimit) {
-        var strName = this.maxTimeToFinish > 0 ? "timerLimitSurvey" : "timerSpentSurvey";
+        var strName = this.timeLimit > 0 ? "timerLimitSurvey" : "timerSpentSurvey";
         return this.getLocalizationFormatString(strName, surveySpent, surveyLimit);
     };
     SurveyModel.prototype.getDisplayClockTime = function (val) {
@@ -46555,10 +46750,10 @@ var survey_SurveyModel = /** @class */ (function (_super) {
     /**
      * Starts a timer that calculates how many seconds a respondent has spent on the survey. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
      * @see stopTimer
-     * @see maxTimeToFinish
-     * @see maxTimeToFinishPage
+     * @see timeLimit
+     * @see timeLimitPerPage
      * @see timeSpent
-     * @see onTimer
+     * @see onTimerTick
      */
     SurveyModel.prototype.startTimer = function () {
         if (this.isEditMode) {
@@ -46566,17 +46761,17 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         }
     };
     SurveyModel.prototype.startTimerFromUI = function () {
-        if (this.showTimerPanel != "none" && this.state === "running") {
+        if (this.showTimer && this.state === "running") {
             this.startTimer();
         }
     };
     /**
      * Stops the timer. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
      * @see startTimer
-     * @see maxTimeToFinish
-     * @see maxTimeToFinishPage
+     * @see timeLimit
+     * @see timeLimitPerPage
      * @see timeSpent
-     * @see onTimer
+     * @see onTimerTick
      */
     SurveyModel.prototype.stopTimer = function () {
         this.timerModel.stop();
@@ -46588,8 +46783,8 @@ var survey_SurveyModel = /** @class */ (function (_super) {
          * Assign a number to this property if you need to start the quiz timer from a specific time (for instance, if you want to continue an interrupted quiz).
          *
          * You can also find out how many seconds a respondent has spent on an individual survey page. To do this, use the [`timeSpent`](https://surveyjs.io/form-library/documentation/api-reference/page-model#timeSpent) property of a [`PageModel`](https://surveyjs.io/form-library/documentation/api-reference/page-model) object.
-         * @see maxTimeToFinish
-         * @see maxTimeToFinishPage
+         * @see timeLimit
+         * @see timeLimitPerPage
          * @see startTimer
          */
         get: function () { return this.timerModel.spent; },
@@ -46597,52 +46792,80 @@ var survey_SurveyModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(SurveyModel.prototype, "maxTimeToFinish", {
+    Object.defineProperty(SurveyModel.prototype, "timeLimit", {
         /**
          * A time period that a respondent has to complete the survey; measured in seconds. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
          *
-         * A negative value or 0 sets an unlimited time period.
+         * Default value: 0 (time is unlimited)
          *
          * [View Demo](https://surveyjs.io/form-library/examples/make-quiz-javascript/ (linkStyle))
-         * @see maxTimeToFinishPage
+         * @see timeLimitPerPage
          * @see startTimer
          * @see timeSpent
          */
         get: function () {
-            return this.getPropertyValue("maxTimeToFinish", 0);
+            return this.getPropertyValue("timeLimit", 0);
         },
         set: function (val) {
-            this.setPropertyValue("maxTimeToFinish", val);
+            this.setPropertyValue("timeLimit", val);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(SurveyModel.prototype, "maxTimeToFinishPage", {
+    Object.defineProperty(SurveyModel.prototype, "maxTimeToFinish", {
+        /**
+         * Obsolete. Use the [`timeLimit`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timeLimit) property instead.
+         * @deprecated
+         */
+        get: function () {
+            return this.timeLimit;
+        },
+        set: function (val) {
+            this.timeLimit = val;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyModel.prototype, "timeLimitPerPage", {
         /**
          * A time period that a respondent has to complete each survey page; measured in seconds. Applies only to [quiz surveys](https://surveyjs.io/form-library/documentation/design-survey-create-a-quiz).
          *
-         * A negative value or 0 sets an unlimited time period.
+         * Default value: 0 (time is unlimited)
          *
-         * You can also use `PageModel`'s [`maxTimeToFinish`](https://surveyjs.io/form-library/documentation/api-reference/page-model#maxTimeToFinish) property to specify a time period for an individual survey page.
+         * You can also use `PageModel`'s [`timeLimit`](https://surveyjs.io/form-library/documentation/api-reference/page-model#timeLimit) property to specify a time period for an individual survey page.
          *
          * [View Demo](https://surveyjs.io/form-library/examples/make-quiz-javascript/ (linkStyle))
-         * @see maxTimeToFinish
+         * @see timeLimit
          * @see startTimer
          * @see timeSpent
          */
         get: function () {
-            return this.getPropertyValue("maxTimeToFinishPage", 0);
+            return this.getPropertyValue("timeLimitPerPage", 0);
         },
         set: function (val) {
-            this.setPropertyValue("maxTimeToFinishPage", val);
+            this.setPropertyValue("timeLimitPerPage", val);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyModel.prototype, "maxTimeToFinishPage", {
+        /**
+         * Obsolete. Use the [`timeLimitPerPage`](https://surveyjs.io/form-library/documentation/api-reference/survey-data-model#timeLimitPerPage) property instead.
+         * @deprecated
+         */
+        get: function () {
+            return this.timeLimitPerPage;
+        },
+        set: function (val) {
+            this.timeLimitPerPage = val;
         },
         enumerable: false,
         configurable: true
     });
     SurveyModel.prototype.doTimer = function (page) {
-        this.onTimer.fire(this, {});
-        if (this.maxTimeToFinish > 0 && this.maxTimeToFinish <= this.timeSpent) {
-            this.timeSpent = this.maxTimeToFinish;
+        this.onTimerTick.fire(this, {});
+        if (this.timeLimit > 0 && this.timeLimit <= this.timeSpent) {
+            this.timeSpent = this.timeLimit;
             this.completeLastPage();
         }
         if (page) {
@@ -46950,7 +47173,7 @@ var survey_SurveyModel = /** @class */ (function (_super) {
                 }
             }
             else if (isStrCiEqual(layoutElement.id, "advanced-header")) {
-                if ((this.state === "running" || this.state === "starting") && layoutElement.container === container) {
+                if ((this.state === "running" || this.state === "starting" || (this.showHeaderOnCompletePage === true && this.state === "completed")) && layoutElement.container === container) {
                     containerLayoutElements.push(layoutElement);
                 }
             }
@@ -47474,18 +47697,13 @@ Serializer.addClass("survey", [
         default: "noPreview",
         choices: ["noPreview", "showAllQuestions", "showAnsweredQuestions"],
     },
-    { name: "maxTimeToFinish:number", default: 0, minValue: 0 },
-    { name: "maxTimeToFinishPage:number", default: 0, minValue: 0 },
-    {
-        name: "showTimerPanel",
-        default: "none",
-        choices: ["none", "top", "bottom"],
-    },
-    {
-        name: "showTimerPanelMode",
-        default: "all",
-        choices: ["page", "survey", "all"],
-    },
+    { name: "showTimer:boolean" },
+    { name: "timeLimit:number", alternativeName: "maxTimeToFinish", default: 0, minValue: 0, enableIf: function (obj) { return obj.showTimer; } },
+    { name: "timeLimitPerPage:number", alternativeName: "maxTimeToFinishPage", default: 0, minValue: 0, enableIf: function (obj) { return obj.showTimer; } },
+    { name: "timerLocation", default: "top", choices: ["top", "bottom"], enableIf: function (obj) { return obj.showTimer; } },
+    { name: "timerInfoMode", alternativeName: "showTimerPanelMode",
+        default: "combined", choices: ["page", "survey", "combined"], enableIf: function (obj) { return obj.showTimer; } },
+    { name: "showTimerPanel", visible: false, isSerializable: false },
     {
         name: "widthMode",
         default: "auto",
@@ -47538,6 +47756,7 @@ var question_baseselect_decorate = (undefined && undefined.__decorate) || functi
 
 
 
+
 /**
  * A base class for multiple-choice question types ([Checkboxes](https://surveyjs.io/form-library/documentation/questioncheckboxmodel), [Dropdown](https://surveyjs.io/form-library/documentation/questiondropdownmodel), [Radio Button Group](https://surveyjs.io/form-library/documentation/questionradiogroupmodel), etc.).
  */
@@ -48176,6 +48395,9 @@ var question_baseselect_QuestionSelectBase = /** @class */ (function (_super) {
         return this.otherValueCore;
     };
     QuestionSelectBase.prototype.selectOtherValueFromComment = function (val) {
+        if (val) {
+            this.prevIsOtherSelected = true;
+        }
         this.value = val ? this.otherItem.value : undefined;
     };
     QuestionSelectBase.prototype.setQuestionComment = function (newValue) {
@@ -49768,24 +49990,8 @@ var question_baseselect_QuestionSelectBase = /** @class */ (function (_super) {
     QuestionSelectBase.prototype.getItemEnabled = function (item) {
         return !this.isDisabledAttr && item.isEnabled;
     };
-    QuestionSelectBase.prototype.afterRender = function (el) {
-        _super.prototype.afterRender.call(this, el);
-        this.rootElement = el;
-    };
-    QuestionSelectBase.prototype.beforeDestroyQuestionElement = function (el) {
-        _super.prototype.beforeDestroyQuestionElement.call(this, el);
-        this.rootElement = undefined;
-    };
     QuestionSelectBase.prototype.focusOtherComment = function () {
-        var _this = this;
-        if (!!this.rootElement) {
-            setTimeout(function () {
-                var commentEl = _this.rootElement.querySelector("textarea");
-                if (!!commentEl) {
-                    commentEl.focus();
-                }
-            }, 10);
-        }
+        survey_element_SurveyElement.FocusElement(this.otherId);
     };
     QuestionSelectBase.prototype.onValueChanged = function () {
         _super.prototype.onValueChanged.call(this);
@@ -53554,7 +53760,7 @@ var question_text_QuestionTextModel = /** @class */ (function (_super) {
         return inputMask;
     };
     QuestionTextModel.prototype.isTextValue = function () {
-        return ["text", "number", "password"].indexOf(this.inputType) > -1;
+        return this.isDateInputType || ["text", "number", "password"].indexOf(this.inputType) > -1;
     };
     QuestionTextModel.prototype.getType = function () {
         return "text";
@@ -53898,7 +54104,7 @@ var question_text_QuestionTextModel = /** @class */ (function (_super) {
         if (!this.isMinMaxType)
             return true;
         var isValid = !this.isValueLessMin && !this.isValueGreaterMax;
-        if (this.inputType === "number" && !!this.survey &&
+        if ((!isValid || this.errors.length > 0) && !!this.survey &&
             (this.survey.isValidateOnValueChanging || this.survey.isValidateOnValueChanged)) {
             this.hasErrors();
         }
@@ -54028,11 +54234,6 @@ var question_text_QuestionTextModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    QuestionTextModel.prototype.canRunValidators = function (isOnValueChanged) {
-        return (this.errors.length > 0 ||
-            !isOnValueChanged ||
-            this.supportGoNextPageError());
-    };
     QuestionTextModel.prototype.setNewValue = function (newValue) {
         newValue = this.correctValueType(newValue);
         if (!!newValue) {
@@ -58710,7 +58911,6 @@ var question_comment_extends = (undefined && undefined.__extends) || (function (
 
 
 
-
 /**
  * A class that describes the Long Text question type.
  *
@@ -58840,8 +59040,12 @@ var question_comment_QuestionCommentModel = /** @class */ (function (_super) {
     Object.defineProperty(QuestionCommentModel.prototype, "renderedAllowResize", {
         get: function () {
             var res = this.allowResize;
-            var allowResize = res === undefined && this.survey ? this.survey.allowResizeComment : !!res;
-            return allowResize && !this.isPreviewStyle && !this.isReadOnlyStyle;
+            if (res === undefined && this.survey) {
+                return this.survey.allowResizeComment;
+            }
+            else {
+                return !!res;
+            }
         },
         enumerable: false,
         configurable: true
@@ -58859,15 +59063,8 @@ var question_comment_QuestionCommentModel = /** @class */ (function (_super) {
     QuestionCommentModel.prototype.afterRenderQuestionElement = function (el) {
         var root = settings.environment.root;
         this.element = root.getElementById(this.inputId) || el;
-        this.updateElement();
         _super.prototype.afterRenderQuestionElement.call(this, el);
     };
-    QuestionCommentModel.prototype.updateElement = function () {
-        var _this_1 = this;
-        if (this.element && this.renderedAutoGrow) {
-            setTimeout(function () { return increaseHeightByContent(_this_1.element); }, 1);
-        }
-    };
     QuestionCommentModel.prototype.beforeDestroyQuestionElement = function (el) {
         _super.prototype.beforeDestroyQuestionElement.call(this, el);
         this.element = undefined;
@@ -58875,8 +59072,6 @@ var question_comment_QuestionCommentModel = /** @class */ (function (_super) {
     QuestionCommentModel.prototype.onInput = function (event) {
         if (this.isInputTextUpdate)
             this.value = event.target.value;
-        else
-            this.updateElement();
         this.updateRemainingCharacterCounter(event.target.value);
     };
     QuestionCommentModel.prototype.onBlurCore = function (event) {
@@ -58889,15 +59084,6 @@ var question_comment_QuestionCommentModel = /** @class */ (function (_super) {
             event.stopPropagation();
         }
     };
-    QuestionCommentModel.prototype.setQuestionValue = function (newValue, updateIsAnswered) {
-        if (updateIsAnswered === void 0) { updateIsAnswered = true; }
-        _super.prototype.setQuestionValue.call(this, newValue, updateIsAnswered);
-        this.updateElement();
-    };
-    QuestionCommentModel.prototype.onValueChanged = function () {
-        _super.prototype.onValueChanged.call(this);
-        this.updateElement();
-    };
     QuestionCommentModel.prototype.setNewValue = function (newValue) {
         if (!this.acceptCarriageReturn && !!newValue) {
             // eslint-disable-next-line no-control-regex
@@ -59175,6 +59361,7 @@ var question_file_decorate = (undefined && undefined.__decorate) || function (de
 
 
 
+
 function dataUrl2File(dataUrl, fileName, type) {
     var str = atob(dataUrl.split(",")[1]);
     var buffer = new Uint8Array(str.split("").map(function (c) { return c.charCodeAt(0); })).buffer;
@@ -59316,6 +59503,32 @@ var question_file_QuestionFileModelBase = /** @class */ (function (_super) {
     return QuestionFileModelBase;
 }(question_Question));
 
+var question_file_QuestionFilePage = /** @class */ (function (_super) {
+    question_file_extends(QuestionFilePage, _super);
+    function QuestionFilePage(question, index) {
+        var _this = _super.call(this) || this;
+        _this.question = question;
+        _this.index = index;
+        _this.id = QuestionFilePage.getId();
+        return _this;
+    }
+    QuestionFilePage.getId = function () {
+        return "sv_sfp_" + QuestionFilePage.pageCounter++;
+    };
+    Object.defineProperty(QuestionFilePage.prototype, "css", {
+        get: function () {
+            return this.question.cssClasses.page;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    QuestionFilePage.pageCounter = 0;
+    question_file_decorate([
+        propertyArray({})
+    ], QuestionFilePage.prototype, "items", void 0);
+    return QuestionFilePage;
+}(base_Base));
+
 /**
  * A class that describes the File Upload question type.
  *
@@ -59329,6 +59542,10 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
         _this.fileNavigator = new container_ActionContainer();
         _this.canFlipCameraValue = undefined;
         _this.prevPreviewLength = 0;
+        _this._renderedPages = [];
+        _this.pagesAnimation = new AnimationTab(_this.getPagesAnimationOptions(), function (val) {
+            _this._renderedPages = val;
+        }, function () { return _this.renderedPages; });
         _this.calcAvailableItemsCount = function (availableWidth, itemWidth, gap) {
             var itemsCount = Math.floor(availableWidth / (itemWidth + gap));
             if ((itemsCount + 1) * (itemWidth + gap) - gap <= availableWidth)
@@ -59407,6 +59624,7 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
             id: "prevPage",
             iconSize: 16,
             action: function () {
+                _this.navigationDirection = "left";
                 _this.indexToShow = _this.previewValue.length && ((_this.indexToShow - 1 + _this.pagesCount) % _this.pagesCount) || 0;
                 _this.fileIndexAction.title = _this.getFileIndexCaption();
             }
@@ -59415,6 +59633,7 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
             id: "nextPage",
             iconSize: 16,
             action: function () {
+                _this.navigationDirection = "right";
                 _this.indexToShow = _this.previewValue.length && ((_this.indexToShow + 1) % _this.pagesCount) || 0;
                 _this.fileIndexAction.title = _this.getFileIndexCaption();
             }
@@ -59490,6 +59709,13 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
         _this.fileNavigator.actions = [_this.prevFileAction, _this.fileIndexAction, _this.nextFileAction];
         return _this;
     }
+    Object.defineProperty(QuestionFileModel.prototype, "supportFileNavigator", {
+        get: function () {
+            return this.isDefaultV2Theme;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(QuestionFileModel.prototype, "isFileLoading", {
         get: function () { return this.isFileLoadingValue; },
         set: function (val) {
@@ -59623,15 +59849,42 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
         return this.getLocalizationFormatString("indexText", this.indexToShow + 1, this.pagesCount);
     };
     QuestionFileModel.prototype.updateFileNavigator = function () {
+        this.updatePages();
+        this.navigationDirection = undefined;
         this.indexToShow = this.previewValue.length && ((this.indexToShow + this.pagesCount) % this.pagesCount) || 0;
         this.fileIndexAction.title = this.getFileIndexCaption();
     };
+    QuestionFileModel.prototype.updateRenderedPages = function () {
+        if (this.pages && this.pages[this.indexToShow]) {
+            this.renderedPages = [this.pages[this.indexToShow]];
+        }
+    };
+    QuestionFileModel.prototype.updatePages = function () {
+        var _this = this;
+        this.blockAnimations();
+        var currentPage;
+        this.pages = [];
+        this.renderedPages = [];
+        this.previewValue.forEach(function (val, index) {
+            if (index % _this.pageSize == 0) {
+                currentPage = new question_file_QuestionFilePage(_this, _this.pages.length);
+                _this.pages.push(currentPage);
+            }
+            currentPage.items.push(val);
+        });
+        this.releaseAnimations();
+        this.updateRenderedPages();
+    };
     QuestionFileModel.prototype.previewValueChanged = function () {
         var _this = this;
+        this.navigationDirection = undefined;
         if (this.previewValue.length !== this.prevPreviewLength) {
             if (this.previewValue.length > 0) {
                 if (this.prevPreviewLength > this.previewValue.length) {
-                    this.indexToShow = this.indexToShow >= this.pagesCount && this.indexToShow > 0 ? this.pagesCount - 1 : this.indexToShow;
+                    if (this.indexToShow >= this.pagesCount && this.indexToShow > 0) {
+                        this.indexToShow = this.pagesCount - 1;
+                        this.navigationDirection = "left-delete";
+                    }
                 }
                 else {
                     this.indexToShow = Math.floor(this.prevPreviewLength / this.pageSize);
@@ -59641,6 +59894,7 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
                 this.indexToShow = 0;
             }
         }
+        this.updatePages();
         this.fileIndexAction.title = this.getFileIndexCaption();
         this.containsMultiplyFiles = this.previewValue.length > 1;
         if (this.previewValue.length > 0 && !this.calculatedGapBetweenItems && !this.calculatedItemWidth) {
@@ -59650,11 +59904,6 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
         }
         this.prevPreviewLength = this.previewValue.length;
     };
-    QuestionFileModel.prototype.isPreviewVisible = function (index) {
-        var isFileNavigatorVisible = this.fileNavigatorVisible;
-        var isPreviewVisible = (this.indexToShow * this.pageSize <= index && index < (this.indexToShow + 1) * this.pageSize);
-        return !isFileNavigatorVisible || isPreviewVisible;
-    };
     QuestionFileModel.prototype.getType = function () {
         return "file";
     };
@@ -60100,6 +60349,7 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
                     content: content,
                 });
             });
+            this.previewValueChanged();
         }
         else {
             if (!!this._previewLoader) {
@@ -60119,7 +60369,6 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
             });
             this._previewLoader.load(newValues);
         }
-        this.previewValueChanged();
     };
     QuestionFileModel.prototype.getIsQuestionReady = function () {
         return _super.prototype.getIsQuestionReady.call(this) && !this.isFileLoading;
@@ -60263,6 +60512,46 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
     QuestionFileModel.prototype.getFileListSelector = function () {
         return classesToSelector(this.cssClasses.fileList);
     };
+    Object.defineProperty(QuestionFileModel.prototype, "renderedPages", {
+        get: function () {
+            return this._renderedPages;
+        },
+        set: function (val) {
+            this.pagesAnimation.sync(val);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    QuestionFileModel.prototype.getPagesAnimationOptions = function () {
+        var _this = this;
+        return {
+            getEnterOptions: function (page) {
+                var pageClass = _this.cssClasses.page;
+                return { cssClass: pageClass ? new CssClassBuilder()
+                        .append(pageClass + "--enter-from-left", _this.navigationDirection == "left" || _this.navigationDirection == "left-delete")
+                        .append(pageClass + "--enter-from-right", _this.navigationDirection == "right").toString() : ""
+                };
+            },
+            getLeaveOptions: function (page) {
+                var pageClass = _this.cssClasses.page;
+                return {
+                    cssClass: pageClass ? new CssClassBuilder()
+                        .append(pageClass + "--leave-to-left", _this.navigationDirection == "right")
+                        .append(pageClass + "--leave-to-right", _this.navigationDirection == "left").toString() : ""
+                };
+            },
+            getAnimatedElement: function (page) {
+                var _a;
+                return (_a = _this.rootElement) === null || _a === void 0 ? void 0 : _a.querySelector("#" + page.id);
+            },
+            isAnimationEnabled: function () {
+                return _this.animationAllowed && !!_this.rootElement;
+            },
+            getRerenderEvent: function () {
+                return _this.onElementRerendered;
+            }
+        };
+    };
     QuestionFileModel.prototype.triggerResponsiveness = function (hard) {
         if (hard) {
             this.calculatedGapBetweenItems = undefined;
@@ -60271,17 +60560,19 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
         _super.prototype.triggerResponsiveness.call(this);
     };
     QuestionFileModel.prototype.processResponsiveness = function (_, availableWidth) {
-        var _this = this;
         this._width = availableWidth;
         if (this.rootElement) {
             if ((!this.calculatedGapBetweenItems || !this.calculatedItemWidth) && this.allowMultiple) {
                 var fileListSelector = this.getFileListSelector();
                 var fileListElement = fileListSelector ? this.rootElement.querySelector(this.getFileListSelector()) : undefined;
                 if (fileListElement) {
-                    this.calculatedGapBetweenItems = Math.ceil(Number.parseFloat(DomDocumentHelper.getComputedStyle(fileListElement).gap));
-                    var firstVisibleItem = Array.from(fileListElement.children).filter(function (_, index) { return _this.isPreviewVisible(index); })[0];
-                    if (firstVisibleItem) {
-                        this.calculatedItemWidth = Math.ceil(Number.parseFloat(DomDocumentHelper.getComputedStyle(firstVisibleItem).width));
+                    var visiblePage = fileListElement.querySelector(classesToSelector(this.cssClasses.page));
+                    if (visiblePage) {
+                        var firstVisibleItem = visiblePage.querySelector(classesToSelector(this.cssClasses.previewItem));
+                        this.calculatedGapBetweenItems = Math.ceil(Number.parseFloat(DomDocumentHelper.getComputedStyle(visiblePage).gap));
+                        if (firstVisibleItem) {
+                            this.calculatedItemWidth = Math.ceil(Number.parseFloat(DomDocumentHelper.getComputedStyle(firstVisibleItem).width));
+                        }
                     }
                 }
             }
@@ -60334,7 +60625,12 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
         propertyArray({})
     ], QuestionFileModel.prototype, "previewValue", void 0);
     question_file_decorate([
-        jsonobject_property({ defaultValue: 0 })
+        propertyArray({})
+    ], QuestionFileModel.prototype, "pages", void 0);
+    question_file_decorate([
+        jsonobject_property({ defaultValue: 0, onSet: function (val, target) {
+                target.updateRenderedPages();
+            } })
     ], QuestionFileModel.prototype, "indexToShow", void 0);
     question_file_decorate([
         jsonobject_property({
@@ -60398,6 +60694,9 @@ var question_file_QuestionFileModel = /** @class */ (function (_super) {
     question_file_decorate([
         jsonobject_property()
     ], QuestionFileModel.prototype, "locRenderedPlaceholderValue", void 0);
+    question_file_decorate([
+        propertyArray()
+    ], QuestionFileModel.prototype, "_renderedPages", void 0);
     return QuestionFileModel;
 }(question_file_QuestionFileModelBase));
 
@@ -66381,9 +66680,8 @@ var question_paneldynamic_QuestionPanelDynamicModel = /** @class */ (function (_
             : null;
     };
     QuestionPanelDynamicModel.prototype.addConditionObjectsByContext = function (objects, context) {
-        var hasContext = !!context
-            ? context === true || this.template.questions.indexOf(context) > -1
-            : false;
+        var contextQ = !!(context === null || context === void 0 ? void 0 : context.isValidator) ? context.errorOwner : context;
+        var hasContext = !!context && (context === true || this.template.questions.indexOf(contextQ) > -1);
         var panelObjs = new Array();
         var questions = this.template.questions;
         for (var i = 0; i < questions.length; i++) {
@@ -70384,8 +70682,8 @@ Serializer.addClass("currencymask", [
 
 var Version;
 var ReleaseDate;
-Version = "" + "1.12.4";
-ReleaseDate = "" + "2024-10-01";
+Version = "" + "1.12.6";
+ReleaseDate = "" + "2024-10-15";
 function checkLibraryVersion(ver, libraryName) {
     if (Version != ver) {
         var str = "survey-core has version '" + Version + "' and " + libraryName
@@ -80366,7 +80664,7 @@ var reactquestion_element_SurveyElementBase = /** @class */ (function (_super) {
     SurveyElementBase.prototype.makeBaseElementsReact = function () {
         var els = this.getStateElements();
         for (var i = 0; i < els.length; i++) {
-            els[i].enableOnElementRenderedEvent();
+            els[i].enableOnElementRerenderedEvent();
             this.makeBaseElementReact(els[i]);
         }
     };
@@ -80378,7 +80676,7 @@ var reactquestion_element_SurveyElementBase = /** @class */ (function (_super) {
     };
     SurveyElementBase.prototype.disableStateElementsRerenderEvent = function (els) {
         els.forEach(function (el) {
-            el.disableOnElementRenderedEvent();
+            el.disableOnElementRerenderedEvent();
         });
     };
     SurveyElementBase.prototype.getStateElements = function () {
@@ -80965,7 +81263,7 @@ var panel_base_SurveyPanelBase = /** @class */ (function (_super) {
         var el = this.rootRef.current;
         if (el && this.survey) {
             if (this.panelBase.isPanel) {
-                this.survey.afterRenderPanel(this.panelBase, el);
+                this.panelBase.afterRender(el);
             }
             else {
                 this.survey.afterRenderPage(el);
@@ -81341,6 +81639,12 @@ var popup_PopupContainer = /** @class */ (function (_super) {
                 _this.model.clickOutside(e);
             }, onKeyDown: this.handleKeydown }, container));
     };
+    PopupContainer.prototype.componentDidMount = function () {
+        _super.prototype.componentDidMount.call(this);
+        if (this.model.isVisible) {
+            this.model.updateOnShowing();
+        }
+    };
     return PopupContainer;
 }(reactquestion_element_SurveyElementBase));
 
@@ -81371,12 +81675,26 @@ function showDialog(dialogOptions, rootElement) {
     var popupViewModel = createPopupModalViewModel(dialogOptions, rootElement);
     var onVisibilityChangedCallback = function (_, options) {
         if (!options.isVisible) {
-            external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default.a.unmountComponentAtNode(popupViewModel.container);
+            if (typeof external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default.a.createRoot == "function") {
+                if (!!root) {
+                    root.unmount();
+                }
+            }
+            else {
+                external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default.a.unmountComponentAtNode(popupViewModel.container);
+            }
             popupViewModel.dispose();
         }
     };
     popupViewModel.onVisibilityChanged.add(onVisibilityChangedCallback);
-    external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default.a.render(external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(popup_PopupContainer, { model: popupViewModel }), popupViewModel.container);
+    var root;
+    if (typeof external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default.a.createRoot == "function") {
+        root = external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default.a.createRoot(popupViewModel.container);
+        root.render(external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(popup_PopupContainer, { model: popupViewModel }));
+    }
+    else {
+        external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default.a.render(external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(popup_PopupContainer, { model: popupViewModel }), popupViewModel.container);
+    }
     popupViewModel.model.isVisible = true;
     return popupViewModel;
 }
@@ -81407,9 +81725,7 @@ var action_bar_item_dropdown_extends = (undefined && undefined.__extends) || (fu
 var action_bar_item_dropdown_SurveyActionBarItemDropdown = /** @class */ (function (_super) {
     action_bar_item_dropdown_extends(SurveyActionBarItemDropdown, _super);
     function SurveyActionBarItemDropdown(props) {
-        var _this = _super.call(this, props) || this;
-        _this.viewModel = new ActionDropdownViewModel(_this.item);
-        return _this;
+        return _super.call(this, props) || this;
     }
     SurveyActionBarItemDropdown.prototype.renderInnerButton = function () {
         var button = _super.prototype.renderInnerButton.call(this);
@@ -81417,6 +81733,9 @@ var action_bar_item_dropdown_SurveyActionBarItemDropdown = /** @class */ (functi
             button,
             external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(popup_Popup, { model: this.item.popupModel, getTarget: getActionDropdownButtonTarget })));
     };
+    SurveyActionBarItemDropdown.prototype.componentDidMount = function () {
+        this.viewModel = new ActionDropdownViewModel(this.item);
+    };
     SurveyActionBarItemDropdown.prototype.componentWillUnmount = function () {
         _super.prototype.componentWillUnmount.call(this);
         this.viewModel.dispose();
@@ -81807,9 +82126,6 @@ var text_area_TextAreaComponent = /** @class */ (function (_super) {
         var _this = this;
         return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("textarea", { id: this.viewModel.id, className: this.viewModel.className, ref: function (textarea) { return (_this.viewModel.setElement(textarea)); }, disabled: this.viewModel.isDisabledAttr, readOnly: this.viewModel.isReadOnlyAttr, rows: this.viewModel.rows, cols: this.viewModel.cols, placeholder: this.viewModel.placeholder, maxLength: this.viewModel.maxLength, defaultValue: this.initialValue, onChange: function (event) { _this.viewModel.onTextAreaInput(event); }, onFocus: function (event) { _this.viewModel.onTextAreaFocus(event); }, onBlur: function (event) { _this.viewModel.onTextAreaBlur(event); }, onKeyDown: function (event) { _this.viewModel.onTextAreaKeyDown(event); }, "aria-required": this.viewModel.ariaRequired, "aria-label": this.viewModel.ariaLabel, "aria-labelledby": this.viewModel.ariaLabelledBy, "aria-describedby": this.viewModel.ariaDescribedBy, "aria-invalid": this.viewModel.ariaInvalid, "aria-errormessage": this.viewModel.ariaErrormessage, style: { resize: this.viewModel.question.resizeStyle } }));
     };
-    TextAreaComponent.prototype.componentWillUnmount = function () {
-        this.viewModel.dispose();
-    };
     return TextAreaComponent;
 }(reactquestion_element_SurveyElementBase));
 
@@ -82824,6 +83140,7 @@ var reactSurvey_Survey = /** @class */ (function (_super) {
             if (!!el)
                 this.survey.afterRenderSurvey(el);
             this.survey.startTimerFromUI();
+            this.setSurveyEvents();
         }
     };
     Survey.prototype.shouldComponentUpdate = function (nextProps, nextState) {
@@ -82980,7 +83297,6 @@ var reactSurvey_Survey = /** @class */ (function (_super) {
         if (!!newProps.css) {
             this.survey.css = this.css;
         }
-        this.setSurveyEvents();
     };
     Survey.prototype.isModelJSONChanged = function (newProps) {
         if (!!newProps["model"]) {
@@ -84284,6 +84600,10 @@ var dropdown_item_SurveyQuestionOptionItem = /** @class */ (function (_super) {
         _super.prototype.componentDidUpdate.call(this, prevProps, prevState);
         this.setupModel();
     };
+    SurveyQuestionOptionItem.prototype.componentDidMount = function () {
+        _super.prototype.componentDidMount.call(this);
+        this.setupModel();
+    };
     SurveyQuestionOptionItem.prototype.componentWillUnmount = function () {
         _super.prototype.componentWillUnmount.call(this);
         if (!!this.item) {
@@ -85193,6 +85513,120 @@ ReactQuestionFactory.Instance.registerQuestion("file", function (props) {
     return external_root_React_commonjs2_react_commonjs_react_amd_react_["createElement"](reactquestion_file_SurveyQuestionFile, props);
 });
 
+// CONCATENATED MODULE: ./packages/survey-react-ui/src/components/file/file-item.tsx
+var file_item_extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+
+var file_item_SurveyFileItem = /** @class */ (function (_super) {
+    file_item_extends(SurveyFileItem, _super);
+    function SurveyFileItem() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(SurveyFileItem.prototype, "question", {
+        get: function () {
+            return this.props.question;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyFileItem.prototype, "item", {
+        get: function () {
+            return this.props.item;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    SurveyFileItem.prototype.renderFileSign = function (className, val) {
+        var _this = this;
+        if (!className || !val.name)
+            return null;
+        return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: className },
+            external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("a", { href: val.content, onClick: function (event) {
+                    _this.question.doDownloadFile(event, val);
+                }, title: val.name, download: val.name, style: { width: this.question.imageWidth } }, val.name)));
+    };
+    SurveyFileItem.prototype.renderElement = function () {
+        var _this = this;
+        var val = this.item;
+        return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("span", { className: this.question.cssClasses.previewItem, onClick: function (event) { return _this.question.doDownloadFileFromContainer(event); } },
+            this.renderFileSign(this.question.cssClasses.fileSign, val),
+            external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: this.question.getImageWrapperCss(val) },
+                this.question.canPreviewImage(val) ? (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("img", { src: val.content, style: { height: this.question.imageHeight, width: this.question.imageWidth }, alt: "File preview" })) : (this.question.cssClasses.defaultImage ? (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(svg_icon_SvgIcon, { iconName: this.question.cssClasses.defaultImageIconId, size: "auto", className: this.question.cssClasses.defaultImage })) : null),
+                val.name && !this.question.isReadOnly ? (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: this.question.getRemoveButtonCss(), onClick: function (event) { return _this.question.doRemoveFile(val, event); } },
+                    external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("span", { className: this.question.cssClasses.removeFile }, this.question.removeFileCaption),
+                    (this.question.cssClasses.removeFileSvgIconId) ?
+                        (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(svg_icon_SvgIcon, { title: this.question.removeFileCaption, iconName: this.question.cssClasses.removeFileSvgIconId, size: "auto", className: this.question.cssClasses.removeFileSvg })) : null)) : null),
+            this.renderFileSign(this.question.cssClasses.fileSignBottom, val)));
+    };
+    SurveyFileItem.prototype.canRender = function () {
+        return this.question.showPreviewContainer;
+    };
+    return SurveyFileItem;
+}(reactquestion_element_SurveyElementBase));
+
+
+// CONCATENATED MODULE: ./packages/survey-react-ui/src/components/file/file-page.tsx
+var file_page_extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+
+var file_page_SurveyFilePage = /** @class */ (function (_super) {
+    file_page_extends(SurveyFilePage, _super);
+    function SurveyFilePage() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(SurveyFilePage.prototype, "question", {
+        get: function () {
+            return this.props.question;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyFilePage.prototype, "page", {
+        get: function () {
+            return this.props.page;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    SurveyFilePage.prototype.renderElement = function () {
+        var _this = this;
+        var items = this.page.items.map(function (item, index) { return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(file_item_SurveyFileItem, { item: item, question: _this.question, key: index })); });
+        return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: this.page.css, id: this.page.id }, items));
+    };
+    return SurveyFilePage;
+}(reactquestion_element_SurveyElementBase));
+
+
 // CONCATENATED MODULE: ./packages/survey-react-ui/src/components/file/file-preview.tsx
 var file_preview_extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -85213,6 +85647,7 @@ var file_preview_extends = (undefined && undefined.__extends) || (function () {
 
 
 
+
 var file_preview_SurveyFilePreview = /** @class */ (function (_super) {
     file_preview_extends(SurveyFilePreview, _super);
     function SurveyFilePreview() {
@@ -85236,20 +85671,9 @@ var file_preview_SurveyFilePreview = /** @class */ (function (_super) {
     };
     SurveyFilePreview.prototype.renderElement = function () {
         var _this = this;
-        var previews = this.question.previewValue.map(function (val, index) {
-            if (!val)
-                return null;
-            return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("span", { key: _this.question.inputId + "_" + index, className: _this.question.cssClasses.previewItem, onClick: function (event) { return _this.question.doDownloadFileFromContainer(event); }, style: { display: _this.question.isPreviewVisible(index) ? undefined : "none" } },
-                _this.renderFileSign(_this.question.cssClasses.fileSign, val),
-                external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: _this.question.getImageWrapperCss(val) },
-                    _this.question.canPreviewImage(val) ? (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("img", { src: val.content, style: { height: _this.question.imageHeight, width: _this.question.imageWidth }, alt: "File preview" })) : (_this.question.cssClasses.defaultImage ? (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(svg_icon_SvgIcon, { iconName: _this.question.cssClasses.defaultImageIconId, size: "auto", className: _this.question.cssClasses.defaultImage })) : null),
-                    val.name && !_this.question.isReadOnly ? (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: _this.question.getRemoveButtonCss(), onClick: function (event) { return _this.question.doRemoveFile(val, event); } },
-                        external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("span", { className: _this.question.cssClasses.removeFile }, _this.question.removeFileCaption),
-                        (_this.question.cssClasses.removeFileSvgIconId) ?
-                            (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(svg_icon_SvgIcon, { title: _this.question.removeFileCaption, iconName: _this.question.cssClasses.removeFileSvgIconId, size: "auto", className: _this.question.cssClasses.removeFileSvg })) : null)) : null),
-                _this.renderFileSign(_this.question.cssClasses.fileSignBottom, val)));
-        });
-        return external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: this.question.cssClasses.fileList || undefined }, previews);
+        var content = this.question.supportFileNavigator ? this.question.renderedPages.map(function (page, index) { return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(file_page_SurveyFilePage, { page: page, question: _this.question, key: page.id })); })
+            : this.question.previewValue.map(function (item, index) { return (external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement(file_item_SurveyFileItem, { item: item, question: _this.question, key: index })); });
+        return external_root_React_commonjs2_react_commonjs_react_amd_react_default.a.createElement("div", { className: this.question.cssClasses.fileList || undefined }, content);
     };
     SurveyFilePreview.prototype.canRender = function () {
         return this.question.showPreviewContainer;