devextreme 21.2.6 → 21.2.8

package/dist/js/dx.all.debug.js

@@ -1,7 +1,7 @@
 /*!
  * DevExtreme (dx.all.debug.js)
- * Version: 21.2.6
- * Build date: Tue Mar 01 2022
+ * Version: 21.2.8
+ * Build date: Tue Jun 07 2022
  *
  * Copyright (c) 2012 - 2022 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -4565,7 +4565,7 @@
                     E0103: "validationCallback of an asynchronous rule should return a jQuery or a native promise",
                     E0110: "Unknown validation group is detected",
                     E0120: "Adapter for a DevExpressValidator component cannot be configured",
-                    E0121: "The 'customItem' field of the 'onCustomItemCreating' function's parameter should contain a custom item or Promise that is resolved after the item is created.",
+                    E0121: "The 'customItem' parameter of the 'onCustomItemCreating' function is empty or contains invalid data. Assign a custom object or a Promise that is resolved after the item is created.",
                     W0000: "'{0}' is deprecated in {1}. {2}",
                     W0001: "{0} - '{1}' option is deprecated in {2}. {3}",
                     W0002: "{0} - '{1}' method is deprecated in {2}. {3}",
@@ -11188,7 +11188,7 @@
               \*************************************************************/
             function(__unused_webpack_module, exports) {
                 exports.version = void 0;
-                exports.version = "21.2.6"
+                exports.version = "21.2.8"
             },
         67403:
             /*!********************************************************************!*\
@@ -19245,12 +19245,8 @@
                     }
                     var target = e.target;
                     var $target = (0, _renderer.default)(target);
-                    var isDropDown = $target.is(".dx-dropdownlist-popup-wrapper *, .dx-dropdownlist-popup-wrapper");
                     var isContentEditable = (null === target || void 0 === target ? void 0 : target.isContentEditable) || (null === target || void 0 === target ? void 0 : target.hasAttribute("contenteditable"));
                     var touchInEditable = $target.is("input, textarea, select") || isContentEditable;
-                    if ($target.is(".dx-skip-gesture-event *, .dx-skip-gesture-event") && !isDropDown) {
-                        return true
-                    }
                     if (isDxMouseWheelEvent(e)) {
                         var isTextArea = $target.is("textarea") && $target.hasClass("dx-texteditor-input");
                         if (isTextArea || isContentEditable) {
@@ -25471,6 +25467,7 @@
                 });
                 var obj;
                 var _version = __webpack_require__( /*! ../../core/utils/version */ 58020);
+                var _utils = __webpack_require__( /*! ./utils */ 45994);
                 if (_knockout.default) {
                     var originalKOCleanExternalData = _knockout.default.utils.domNodeDisposal.cleanExternalData;
                     ! function() {
@@ -25491,8 +25488,10 @@
                         }));
                         _knockout.default.utils.domNodeDisposal.cleanExternalData = function(node) {
                             node.cleanedByKo = true;
-                            if (!node.cleanedByJquery) {
-                                (0, _element_data.cleanData)([node])
+                            if ((0, _utils.getClosestNodeWithKoCreation)(node)) {
+                                if (!node.cleanedByJquery) {
+                                    (0, _element_data.cleanData)([node])
+                                }
                             }
                         }
                     }();
@@ -25934,17 +25933,33 @@
               !*** ./artifacts/transpiled-renovation-npm/integration/knockout/utils.js ***!
               \***************************************************************************/
             function(__unused_webpack_module, exports, __webpack_require__) {
-                exports.getClosestNodeWithContext = void 0;
-                var _knockout = (obj = __webpack_require__( /*! knockout */ 76130), obj && obj.__esModule ? obj : {
-                    default: obj
-                });
-                var obj;
+                exports.getClosestNodeWithKoCreation = exports.getClosestNodeWithContext = void 0;
+                var _knockout = _interopRequireDefault(__webpack_require__( /*! knockout */ 76130));
+                var _renderer = _interopRequireDefault(__webpack_require__( /*! ../../core/renderer */ 68374));
+
+                function _interopRequireDefault(obj) {
+                    return obj && obj.__esModule ? obj : {
+                        default: obj
+                    }
+                }
                 exports.getClosestNodeWithContext = function getClosestNodeWithContext(node) {
                     var context = _knockout.default.contextFor(node);
                     if (!context && node.parentNode) {
                         return getClosestNodeWithContext(node.parentNode)
                     }
                     return node
+                };
+                exports.getClosestNodeWithKoCreation = function getClosestNodeWithKoCreation(node) {
+                    var $el = (0, _renderer.default)(node);
+                    var data = $el.data();
+                    var hasFlag = data && data.dxKoCreation;
+                    if (hasFlag) {
+                        return node
+                    }
+                    if (node.parentNode) {
+                        return getClosestNodeWithKoCreation(node.parentNode)
+                    }
+                    return null
                 }
             },
         24935:
@@ -27506,8 +27521,8 @@
                         "dxDateBox-simulatedDataPickerTitleDate": "Select date",
                         "dxDateBox-simulatedDataPickerTitleDateTime": "Select date and time",
                         "dxDateBox-validation-datetime": "Value must be a date or time",
-                        "dxFileUploader-selectFile": "Select file",
-                        "dxFileUploader-dropFile": "or Drop file here",
+                        "dxFileUploader-selectFile": "Select a file",
+                        "dxFileUploader-dropFile": "or Drop a file here",
                         "dxFileUploader-bytes": "bytes",
                         "dxFileUploader-kb": "kb",
                         "dxFileUploader-Mb": "Mb",
@@ -27946,7 +27961,7 @@
                         "dxDiagram-dialogInsertShapeImageTitle": "Insert Image",
                         "dxDiagram-dialogEditShapeImageTitle": "Change Image",
                         "dxDiagram-dialogEditShapeImageSelectButton": "Select image",
-                        "dxDiagram-dialogEditShapeImageLabelText": "or drop file here",
+                        "dxDiagram-dialogEditShapeImageLabelText": "or drop a file here",
                         "dxDiagram-uiExport": "Export",
                         "dxDiagram-uiProperties": "Properties",
                         "dxDiagram-uiSettings": "Settings",
@@ -29400,7 +29415,7 @@
                             var year = date.getFullYear();
                             var recognizableAsTwentyCentury = String(year).length < 3;
                             var temporaryYearValue = recognizableAsTwentyCentury ? year + 400 : year;
-                            var utcDate = new Date(Date.UTC(temporaryYearValue, date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds()));
+                            var utcDate = new Date(Date.UTC(temporaryYearValue, date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds()));
                             if (recognizableAsTwentyCentury) {
                                 utcDate.setFullYear(year)
                             }
@@ -32553,9 +32568,10 @@
                     _proto._optionChanged = function(option) {
                         var fullName = option.fullName,
                             name = option.name,
+                            previousValue = option.previousValue,
                             value = option.value;
                         (0, _update_props_immutable.updatePropsImmutable)(this._props, this.option(), name, fullName);
-                        if (this._propsInfo.templates.includes(name)) {
+                        if (this._propsInfo.templates.includes(name) && value !== previousValue) {
                             this._componentTemplates[name] = this._createTemplateComponent(value)
                         }
                         if (name && this._getActionConfigsFull()[name]) {
@@ -32677,7 +32693,7 @@
                                     var name = _ref7.name,
                                         value = _ref7.value;
                                     var updatedAttributes = result;
-                                    updatedAttributes[name] = value;
+                                    updatedAttributes[name] = "" === value ? "true" : value;
                                     return updatedAttributes
                                 }), {});
                                 this._elementAttr = attrs;
@@ -34875,7 +34891,6 @@
                     var widget = (0, _inferno.normalizeProps)((0, _inferno.createVNode)(1, "div", viewModel.cssClasses, viewModel.props.children, 0, _extends({}, viewModel.attributes, {
                         tabIndex: viewModel.tabIndex,
                         title: viewModel.props.hint,
-                        hidden: !viewModel.props.visible,
                         style: (0, _inferno2.normalizeStyles)(viewModel.styles)
                     }), null, viewModel.widgetElementRef));
                     return viewModel.shouldRenderConfigProvider ? (0, _inferno.createComponentVNode)(2, _config_provider.ConfigProvider, {
@@ -41908,8 +41923,10 @@
                     };
                     _proto.getConvertedDateByOffsets = function(date, clientOffset, targetOffset, isBack) {
                         var direction = isBack ? -1 : 1;
-                        var utcDate = date.getTime() - direction * clientOffset * _date.default.dateToMilliseconds("hour");
-                        return new Date(utcDate + direction * targetOffset * _date.default.dateToMilliseconds("hour"))
+                        var resultDate = new Date(date);
+                        resultDate.setMinutes(resultDate.getMinutes() - direction * (60 * clientOffset));
+                        resultDate.setMinutes(resultDate.getMinutes() + direction * (60 * targetOffset));
+                        return new Date(resultDate)
                     };
                     _proto.getClientOffset = function(date) {
                         return this.options.getClientOffset(date)
@@ -55761,9 +55778,14 @@
                         } else if (transparency < 1) {
                             transparency = transparency.toFixed(2)
                         }
+                        var previousTransparency = this._alphaChannelInput.option("value");
                         transparency = Math.max(transparency, 0);
                         transparency = Math.min(transparency, 1);
-                        this._alphaChannelInput.option("value", transparency)
+                        if (transparency === previousTransparency) {
+                            this._updateByDrag = false
+                        } else {
+                            this._alphaChannelInput.option("value", transparency)
+                        }
                     },
                     _placeAlphaChannelHandle: function() {
                         var left = this._alphaChannelScaleWorkWidth * (1 - this._currentColor.a);
@@ -55777,9 +55799,14 @@
                         })
                     },
                     applyColor: function() {
+                        var previousValue = this.option("value");
                         var colorValue = this.option("editAlphaChannel") ? this._makeRgba(this._currentColor) : this._currentColor.toHex();
                         this._makeTransparentBackground(this._$currentColor, this._currentColor);
-                        this.option("value", colorValue)
+                        if (colorValue === previousValue) {
+                            this._updateByDrag = false
+                        } else {
+                            this.option("value", colorValue)
+                        }
                     },
                     cancelColor: function() {
                         this._initColorAndOpacity();
@@ -56251,6 +56278,9 @@
                         var $holder = submenuContainer || this._itemContainer();
                         $wrapper = (0, _renderer.default)("<div>");
                         $wrapper.appendTo($holder).addClass("dx-submenu").css("visibility", submenuContainer ? "hidden" : "visible");
+                        if (!$wrapper.parent().hasClass("dx-overlay-content")) {
+                            this._addCustomCssClass($wrapper)
+                        }
                         var $itemsContainer = _MenuBase.prototype._renderContainer.call(this, $wrapper);
                         if (submenuContainer) {
                             return $itemsContainer
@@ -56474,11 +56504,11 @@
                         if ($itemElement.context === $submenu.context && "visible" === $submenu.css("visibility")) {
                             return
                         }
+                        this._updateSelectedItemOnClick(actionArgs);
                         var notCloseMenuOnItemClick = itemData && false === itemData.closeMenuOnClick;
                         if (!itemData || itemData.disabled || notCloseMenuOnItemClick) {
                             return
                         }
-                        this._updateSelectedItemOnClick(actionArgs);
                         if (0 === $submenu.length) {
                             var $prevSubmenu = (0, _renderer.default)($itemElement.parents(".".concat("dx-submenu"))[0]);
                             this._hideSubmenu($prevSubmenu);
@@ -56921,7 +56951,6 @@
                     _proto._initActions = function() {};
                     _proto._initMarkup = function() {
                         _HierarchicalCollecti.prototype._initMarkup.call(this);
-                        this._addCustomCssClass(this.$element());
                         this.option("useInkRipple") && this._renderInkRipple()
                     };
                     _proto._renderInkRipple = function() {
@@ -58844,15 +58873,16 @@
                                     }
                                     return true
                                 },
-                                _getGroupPath: function(group) {
-                                    var groupPath = [group.key];
-                                    var items = group.items;
-                                    while (items && items[0]) {
+                                _getGroupPath: function(groupItem, groupCount) {
+                                    var groupPath = [];
+                                    var items = [groupItem];
+                                    while (items && items[0] && groupCount) {
                                         var item = items[0];
                                         if (void 0 !== item.key) {
                                             groupPath.push(item.key)
                                         }
-                                        items = item.items
+                                        items = item.items;
+                                        groupCount--
                                     }
                                     return groupPath
                                 },
@@ -58889,7 +58919,7 @@
                                         if (!data || 0 === data.length || !(0, _type.isDefined)(data[0].key) || -1 === data[0].key) {
                                             return deferred.resolve(-1).promise()
                                         }
-                                        var groupPath = that._getGroupPath(data[0]);
+                                        var groupPath = that._getGroupPath(data[0], group.length);
                                         that._expandGroupByPath(that, groupPath, 0).done((function() {
                                             that._calculateExpandedRowGlobalIndex(deferred, key, groupPath, group)
                                         })).fail(deferred.reject)
@@ -59974,7 +60004,10 @@
                             appendCollapsedPath(data[i].items, path.slice(1), groups.slice(1), collapsedGroup, offset)
                         }
                         if (options.collapsedItemsCount && options.extra && options.extra.totalCount >= 0) {
-                            options.extra.totalCount += options.collapsedItemsCount
+                            if (!options.extra._totalCountWasIncreasedByCollapsedItems) {
+                                options.extra.totalCount += options.collapsedItemsCount;
+                                options.extra._totalCountWasIncreasedByCollapsedItems = true
+                            }
                         }
                         callBase(options);
                         if (groupCount) {
@@ -61022,6 +61055,13 @@
                             this.render()
                         }
                     },
+                    _createRow: function(row) {
+                        var $row = this.callBase.apply(this, arguments);
+                        if ("totalFooter" === row.rowType) {
+                            $row.addClass("dx-footer-row")
+                        }
+                        return $row
+                    },
                     getHeight: function() {
                         return this.getElementHeight()
                     },
@@ -66980,7 +67020,6 @@
                 var _uiDiagram = _interopRequireDefault(__webpack_require__( /*! ./ui.diagram.menu_helper */ 20261));
                 var _diagram2 = _interopRequireDefault(__webpack_require__( /*! ./diagram.bar */ 50984));
                 var _diagram3 = __webpack_require__( /*! ./diagram.importer */ 348);
-                var _window = __webpack_require__( /*! ../../core/utils/window */ 58201);
 
                 function _interopRequireDefault(obj) {
                     return obj && obj.__esModule ? obj : {
@@ -67030,7 +67069,7 @@
                         this._contextMenuInstance = this._createComponent($contextMenu, DiagramContextMenu, {
                             isTouchBarMode: this._isTouchBarMode(),
                             cssClass: this._isTouchBarMode() ? "dx-diagram-touchbar" : _uiDiagram.default.getContextMenuCssClass(),
-                            closeOnOutsideClick: false,
+                            hideOnOutsideClick: false,
                             showEvent: "",
                             focusStateEnabled: false,
                             items: this._commands,
@@ -67095,23 +67134,12 @@
                     };
                     _proto._hide = function() {
                         this._$contextMenuTargetElement.hide();
-                        this._contextMenuInstance.hide();
-                        delete this._isTouchMode
+                        this._contextMenuInstance.hide()
                     };
                     _proto._isTouchBarMode = function() {
-                        if (void 0 !== this._isTouchMode) {
-                            return this._isTouchMode
-                        }
                         var _getDiagram = (0, _diagram3.getDiagram)(),
                             Browser = _getDiagram.Browser;
-                        if (Browser.TouchUI) {
-                            return true
-                        }
-                        if (!(0, _window.hasWindow)()) {
-                            return false
-                        }
-                        var window = (0, _window.getWindow)();
-                        return window.navigator && window.navigator.maxTouchPoints > 0
+                        return Browser.TouchUI
                     };
                     _proto._onItemClick = function(itemData) {
                         var processed = false;
@@ -67369,7 +67397,7 @@
                             popoverClass += " dx-diagram-touch-context-toolbox"
                         }
                         this._popoverInstance = this._createComponent($popoverElement, _popover.default, {
-                            closeOnOutsideClick: false,
+                            hideOnOutsideClick: false,
                             container: this.$element()
                         });
                         this._popoverInstance.$element().addClass(popoverClass)
@@ -67377,14 +67405,7 @@
                     _proto._isTouchMode = function() {
                         var _getDiagram = (0, _diagram.getDiagram)(),
                             Browser = _getDiagram.Browser;
-                        if (Browser.TouchUI) {
-                            return true
-                        }
-                        if (!(0, _window.hasWindow)()) {
-                            return false
-                        }
-                        var window = (0, _window.getWindow)();
-                        return window.navigator && window.navigator.maxTouchPoints > 0
+                        return Browser.TouchUI
                     };
                     _proto._show = function(x, y, side, category, callback) {
                         this._popoverInstance.hide();
@@ -68298,8 +68319,7 @@
                                     shapeIconCountInRow: _this5.option("toolbox.shapeIconsPerRow"),
                                     shapeIconAttributes: {
                                         "data-toggle": e.dataToggle
-                                    },
-                                    toolboxClass: "dx-overlay-content"
+                                    }
                                 })
                             },
                             onFilterChanged: function(e) {
@@ -69237,9 +69257,8 @@
                         this._executeDiagramCommand(DiagramCommand.Fullscreen, fullscreen);
                         this.toggleFullscreenLock--
                     };
-                    _proto._onShowContextMenu = function(x, y, isTouchMode, selection) {
+                    _proto._onShowContextMenu = function(x, y, selection) {
                         if (this._contextMenu) {
-                            this._contextMenu._isTouchMode = isTouchMode;
                             this._contextMenu._show(x, y, selection)
                         }
                     };
@@ -69714,21 +69733,15 @@
                         }
                     };
                     _proto._raiseToolboxDragStart = function() {
-                        if (this._toolbox) {
-                            this._toolbox._raiseToolboxDragStart();
-                            if (this.isMobileScreenSize()) {
-                                this._toolbox.hide();
-                                this._toolboxDragHidden = true
-                            }
+                        if (this._toolbox && this.isMobileScreenSize()) {
+                            this._toolbox.hide();
+                            this._toolboxDragHidden = true
                         }
                     };
                     _proto._raiseToolboxDragEnd = function() {
-                        if (this._toolbox) {
-                            this._toolbox._raiseToolboxDragEnd();
-                            if (this._toolboxDragHidden) {
-                                this._toolbox.show();
-                                delete this._toolboxDragHidden
-                            }
+                        if (this._toolbox && this._toolboxDragHidden) {
+                            this._toolbox.show();
+                            delete this._toolboxDragHidden
                         }
                     };
                     _proto._raiseTextInputStart = function() {
@@ -70067,7 +70080,7 @@
                         }
                     };
                     _proto._optionChanged = function(args) {
-                        if (this.optionsUpdateBar.isUpdateLocked()) {
+                        if (!this.optionsUpdateBar || this.optionsUpdateBar.isUpdateLocked()) {
                             return
                         }
                         this.optionsUpdateBar.beginUpdate();
@@ -70815,6 +70828,7 @@
                         var options = {
                             direction: "both",
                             bounceEnabled: false,
+                            scrollByContent: false,
                             onScroll: function(_ref) {
                                 var scrollOffset = _ref.scrollOffset;
                                 _this._raiseOnScroll(scrollOffset.left, scrollOffset.top)
@@ -71210,7 +71224,7 @@
                                 target: widget.$element(),
                                 cssClass: _uiDiagram2.default.getContextMenuCssClass(),
                                 showEvent: "",
-                                closeOnOutsideClick: function(e) {
+                                hideOnOutsideClick: function(e) {
                                     return !isTouchMode && 0 === (0, _renderer.default)(e.target).closest(widget._contextMenu._dropDownButtonElement).length
                                 },
                                 focusStateEnabled: false,
@@ -71260,14 +71274,7 @@
                     _proto._isTouchMode = function() {
                         var _getDiagram = (0, _diagram2.getDiagram)(),
                             Browser = _getDiagram.Browser;
-                        if (Browser.TouchUI) {
-                            return true
-                        }
-                        if (!(0, _window.hasWindow)()) {
-                            return false
-                        }
-                        var window = (0, _window.getWindow)();
-                        return window.navigator && window.navigator.maxTouchPoints > 0
+                        return Browser.TouchUI
                     };
                     _proto._onContextMenuInitialized = function(widget, item, rootWidget) {
                         this._contextMenuList.push(widget);
@@ -71754,14 +71761,25 @@
                         })
                     };
                     _proto._renderScrollView = function($parent) {
+                        var _this2 = this;
                         var $scrollViewWrapper = (0, _renderer.default)("<div>").appendTo($parent);
                         this._scrollView = this._createComponent($scrollViewWrapper, _scroll_view.default);
+                        var _moveIsAllowed = this._scrollView._moveIsAllowed.bind(this._scrollView);
+                        this._scrollView._moveIsAllowed = function(e) {
+                            for (var i = 0; i < _this2._toolboxes.length; i++) {
+                                var $element = _this2._toolboxes[i];
+                                if ((0, _renderer.default)($element).children(".dxdi-tb-start-drag-flag").length) {
+                                    return false
+                                }
+                            }
+                            return _moveIsAllowed(e)
+                        };
                         var $accordion = (0, _renderer.default)("<div>").appendTo(this._scrollView.content());
                         this._updateElementWidth($accordion);
                         this._renderAccordion($accordion)
                     };
                     _proto._getAccordionDataSource = function() {
-                        var _this2 = this;
+                        var _this3 = this;
                         var result = [];
                         var toolboxGroups = this.option("toolboxGroups");
                         for (var i = 0; i < toolboxGroups.length; i++) {
@@ -71775,21 +71793,21 @@
                                 shapes: toolboxGroups[i].shapes,
                                 onTemplate: function(widget, $element, data) {
                                     var $toolboxElement = (0, _renderer.default)($element);
-                                    _this2._onShapeCategoryRenderedAction({
+                                    _this3._onShapeCategoryRenderedAction({
                                         category: data.category,
                                         displayMode: data.displayMode,
                                         dataToggle: "shape-toolbox-tooltip",
                                         shapes: data.shapes,
                                         $element: $toolboxElement
                                     });
-                                    _this2._toolboxes.push($toolboxElement);
-                                    if ("" !== _this2._filterText) {
-                                        _this2._onFilterChangedAction({
-                                            text: _this2._filterText,
-                                            filteringToolboxes: _this2._toolboxes.length - 1
+                                    _this3._toolboxes.push($toolboxElement);
+                                    if ("" !== _this3._filterText) {
+                                        _this3._onFilterChangedAction({
+                                            text: _this3._filterText,
+                                            filteringToolboxes: _this3._toolboxes.length - 1
                                         })
                                     }
-                                    _this2._createTooltips($toolboxElement)
+                                    _this3._createTooltips($toolboxElement)
                                 }
                             };
                             result.push(groupObj)
@@ -71797,7 +71815,7 @@
                         return result
                     };
                     _proto._createTooltips = function($toolboxElement) {
-                        var _this3 = this;
+                        var _this4 = this;
                         if (this._isTouchMode()) {
                             return
                         }
@@ -71808,7 +71826,7 @@
                             var title = $target.attr("title");
                             if (title) {
                                 var $tooltip = (0, _renderer.default)("<div>").text(title).appendTo($container);
-                                _this3._createComponent($tooltip, _tooltip.default, {
+                                _this4._createComponent($tooltip, _tooltip.default, {
                                     target: $target.get(0),
                                     showEvent: "mouseenter",
                                     hideEvent: "mouseleave",
@@ -71834,17 +71852,10 @@
                     _proto._isTouchMode = function() {
                         var _getDiagram = (0, _diagram.getDiagram)(),
                             Browser = _getDiagram.Browser;
-                        if (Browser.TouchUI) {
-                            return true
-                        }
-                        if (!(0, _window.hasWindow)()) {
-                            return false
-                        }
-                        var window = (0, _window.getWindow)();
-                        return window.navigator && window.navigator.maxTouchPoints > 0
+                        return Browser.TouchUI
                     };
                     _proto._renderAccordion = function($container) {
-                        var _this4 = this;
+                        var _this5 = this;
                         this._accordion = this._createComponent($container, _accordion.default, {
                             multiple: true,
                             animationDuration: 0,
@@ -71856,10 +71867,10 @@
                             dataSource: this._getAccordionDataSource(),
                             disabled: this.option("disabled"),
                             itemTemplate: function(data, index, $element) {
-                                data.onTemplate(_this4, $element, data)
+                                data.onTemplate(_this5, $element, data)
                             },
                             onSelectionChanged: function(e) {
-                                _this4._updateScrollAnimateSubscription(e.component)
+                                _this5._updateScrollAnimateSubscription(e.component)
                             },
                             onContentReady: function(e) {
                                 e.component.option("selectedItems", []);
@@ -71874,25 +71885,19 @@
                                 if (items.length && void 0 === items[0].expanded) {
                                     e.component.expandItem(0)
                                 }
-                                _this4._updateScrollAnimateSubscription(e.component)
+                                _this5._updateScrollAnimateSubscription(e.component)
                             }
                         })
                     };
                     _proto._updateScrollAnimateSubscription = function(component) {
-                        var _this5 = this;
+                        var _this6 = this;
                         component._deferredAnimate = new _deferred.Deferred;
                         component._deferredAnimate.done((function() {
-                            _this5.updateMaxHeight();
-                            _this5._scrollView.update();
-                            _this5._updateScrollAnimateSubscription(component)
+                            _this6.updateMaxHeight();
+                            _this6._scrollView.update();
+                            _this6._updateScrollAnimateSubscription(component)
                         }))
                     };
-                    _proto._raiseToolboxDragStart = function() {
-                        this._scrollView.$element().addClass("dx-skip-gesture-event")
-                    };
-                    _proto._raiseToolboxDragEnd = function() {
-                        this._scrollView.$element().removeClass("dx-skip-gesture-event")
-                    };
                     _proto._onInputChanged = function(text) {
                         this._filterText = text;
                         this._onFilterChangedAction({
@@ -71909,10 +71914,10 @@
                         this._onInputChanged(this._filterText)
                     };
                     _proto.updateTooltips = function() {
-                        var _this6 = this;
+                        var _this7 = this;
                         this._toolboxes.forEach((function($element) {
                             var $tooltipContainer = (0, _renderer.default)($element);
-                            _this6._createTooltips($tooltipContainer)
+                            _this7._createTooltips($tooltipContainer)
                         }))
                     };
                     _proto._createOnShapeCategoryRenderedAction = function() {
@@ -72225,6 +72230,21 @@
                         default: obj
                     }
                 }
+
+                function _extends() {
+                    _extends = Object.assign || function(target) {
+                        for (var i = 1; i < arguments.length; i++) {
+                            var source = arguments[i];
+                            for (var key in source) {
+                                if (Object.prototype.hasOwnProperty.call(source, key)) {
+                                    target[key] = source[key]
+                                }
+                            }
+                        }
+                        return target
+                    };
+                    return _extends.apply(this, arguments)
+                }
                 var window = (0, _window.getWindow)();
                 var DRAGGABLE = "dxDraggable";
                 var DRAGSTART_EVENT_NAME = (0, _index.addNamespace)(_drag.start, DRAGGABLE);
@@ -72290,7 +72310,7 @@
                         return !!this._scrollSpeed
                     };
                     _proto.isScrollable = function($element) {
-                        return ("auto" === $element.css(this._overFlowAttr) || $element.hasClass("dx-scrollable-container")) && $element.prop(this._scrollSizeProp) > ("width" === this._sizeAttr ? (0, _size.getWidth)($element) : (0, _size.getHeight)($element))
+                        return ("auto" === $element.css(this._overFlowAttr) || $element.hasClass("dx-scrollable-container")) && $element.prop(this._scrollSizeProp) > Math.ceil("width" === this._sizeAttr ? (0, _size.getWidth)($element) : (0, _size.getHeight)($element))
                     };
                     _proto._trySetScrollable = function(element, mousePosition) {
                         var $element = (0, _renderer.default)(element);
@@ -72692,6 +72712,9 @@
                             dragElement: $dragElement.get(0),
                             initialOffset: isFixedPosition && initialOffset
                         }));
+                        this._getAction("onDraggableElementShown")(_extends({}, dragStartArgs, {
+                            dragElement: $dragElement
+                        }));
                         var $area = this._getArea();
                         var areaOffset = this._getAreaOffset($area);
                         var boundOffset = this._getBoundOffset();
@@ -72940,6 +72963,7 @@
                             case "onDrop":
                             case "onDragEnter":
                             case "onDragLeave":
+                            case "onDraggableElementShown":
                                 this["_" + name + "Action"] = this._createActionByOption(name);
                                 break;
                             case "dragTemplate":
@@ -73235,13 +73259,13 @@
                         this._refreshOpenedStateModeClass();
                         this._refreshRevealModeClass();
                         this._renderShader();
+                        this._refreshPositionClass();
                         this._whenPanelContentRendered = new _deferred.Deferred;
                         this._strategy.renderPanelContent(this._whenPanelContentRendered);
                         this._strategy.onPanelContentRendered();
                         this._renderViewContent();
                         _events_engine.default.off(this._$viewContentWrapper, _click.name);
                         _events_engine.default.on(this._$viewContentWrapper, _click.name, this._viewContentWrapperClickHandler.bind(this));
-                        this._refreshPositionClass();
                         this._refreshWrapperChildrenOrder()
                     },
                     _render: function() {
@@ -74604,7 +74628,15 @@
                     },
                     _buttonGroupOptions: function() {
                         var _this2 = this;
-                        var buttonTemplate = this.option("splitButton") || !this.option("showArrowIcon") ? "content" : function(_ref4, buttonContent) {
+                        var _this$option = this.option(),
+                            splitButton = _this$option.splitButton,
+                            showArrowIcon = _this$option.showArrowIcon,
+                            focusStateEnabled = _this$option.focusStateEnabled,
+                            hoverStateEnabled = _this$option.hoverStateEnabled,
+                            stylingMode = _this$option.stylingMode,
+                            accessKey = _this$option.accessKey,
+                            tabIndex = _this$option.tabIndex;
+                        var buttonTemplate = splitButton || !showArrowIcon ? "content" : function(_ref4, buttonContent) {
                             var text = _ref4.text,
                                 icon = _ref4.icon;
                             var $firstIcon = (0, _icon.getImageContainer)(icon);
@@ -74614,18 +74646,19 @@
                         };
                         return (0, _extend.extend)({
                             items: this._getButtonGroupItems(),
-                            focusStateEnabled: this.option("focusStateEnabled"),
-                            hoverStateEnabled: this.option("hoverStateEnabled"),
                             onItemClick: this._buttonGroupItemClick.bind(this),
                             width: "100%",
                             height: "100%",
-                            stylingMode: this.option("stylingMode"),
                             selectionMode: "none",
-                            tabIndex: this.option("tabIndex"),
                             onKeyboardHandled: function(e) {
                                 return _this2._keyboardHandler(e)
                             },
-                            buttonTemplate: buttonTemplate
+                            buttonTemplate: buttonTemplate,
+                            focusStateEnabled: focusStateEnabled,
+                            hoverStateEnabled: hoverStateEnabled,
+                            stylingMode: stylingMode,
+                            accessKey: accessKey,
+                            tabIndex: tabIndex
                         }, this._options.cache("buttonGroupOptions"))
                     },
                     _renderPopupContent: function() {
@@ -75389,7 +75422,8 @@
                         promise.always(this._renderField.bind(this))
                     },
                     _renderTemplatedField: function(fieldTemplate, data) {
-                        var _this = this;
+                        var _this$_fieldRenderQue, _this = this;
+                        this._fieldRenderQueueLength = (null !== (_this$_fieldRenderQue = this._fieldRenderQueueLength) && void 0 !== _this$_fieldRenderQue ? _this$_fieldRenderQue : 0) + 1;
                         var isFocused = (0, _selectors.focused)(this._input());
                         var $container = this._$container;
                         this._detachKeyboardEvents();
@@ -75402,6 +75436,10 @@
                             model: data,
                             container: (0, _element.getPublicElement)($templateWrapper),
                             onRendered: function() {
+                                _this._fieldRenderQueueLength--;
+                                if (0 !== _this._fieldRenderQueueLength) {
+                                    return
+                                }
                                 var $input = _this._input();
                                 if (!$input.length) {
                                     throw _ui.default.Error("E1010")
@@ -76094,16 +76132,7 @@
                         this._popup.$wrapper().addClass(this._popupWrapperClass());
                         var $popupContent = this._popup.$content();
                         _events_engine.default.off($popupContent, "mouseup");
-                        _events_engine.default.on($popupContent, "mouseup", this._saveFocusOnWidget.bind(this));
-                        var that = this;
-                        this._popup.on({
-                            shown: function() {
-                                that.$element().addClass("dx-skip-gesture-event")
-                            },
-                            hidden: function() {
-                                that.$element().removeClass("dx-skip-gesture-event")
-                            }
-                        })
+                        _events_engine.default.on($popupContent, "mouseup", this._saveFocusOnWidget.bind(this))
                     },
                     _updateCustomBoundaryContainer: function() {
                         var customContainer = this.option("dropDownOptions.container");
@@ -77658,6 +77687,7 @@
                 var _extend = __webpack_require__( /*! ../../core/utils/extend */ 13306);
                 var _common = __webpack_require__( /*! ../../core/utils/common */ 20576);
                 var _type = __webpack_require__( /*! ../../core/utils/type */ 35922);
+                var _guid = _interopRequireDefault(__webpack_require__( /*! ../../core/guid */ 73176));
 
                 function _interopRequireDefault(obj) {
                     return obj && obj.__esModule ? obj : {
@@ -77740,6 +77770,7 @@
                         this._rootDirectoryInfo = this._createRootDirectoryInfo(options.rootText);
                         this._currentDirectoryInfo = this._rootDirectoryInfo;
                         this._defaultIconMap = this._createDefaultIconMap();
+                        this.startSingleLoad();
                         this._setSecurityController();
                         this._setProvider(options.fileProvider);
                         this._initialize()
@@ -77922,6 +77953,10 @@
                         if (parentDirectoryInfo.itemsLoaded) {
                             return (new _deferred.Deferred).resolve(parentDirectoryInfo.items).promise()
                         }
+                        if (this._singleOperationLockId && parentDirectoryInfo.itemsSingleLoadErrorId === this._singleOperationLockId) {
+                            this._changeDirectoryOnError(parentDirectoryInfo, skipNavigationOnError, true);
+                            return (new _deferred.Deferred).reject().promise()
+                        }
                         var dirKey = parentDirectoryInfo.getInternalKey();
                         var loadItemsDeferred = this._loadedItems[dirKey];
                         if (loadItemsDeferred) {
@@ -77934,6 +77969,11 @@
                             }));
                             parentDirectoryInfo.itemsLoaded = true;
                             return parentDirectoryInfo.items
+                        }), (function() {
+                            if (_this5._singleOperationLockId && parentDirectoryInfo.itemsSingleLoadErrorId !== _this5._singleOperationLockId) {
+                                parentDirectoryInfo.itemsSingleLoadErrorId = _this5._singleOperationLockId
+                            }
+                            return []
                         }));
                         this._loadedItems[dirKey] = loadItemsDeferred;
                         loadItemsDeferred.always((function() {
@@ -78025,14 +78065,16 @@
                                 itemPath: (0, _utils.pathCombine)(destinationDirectory.fileItem.path, itemInfo.fileItem.name)
                             };
                             _this9._editingEvents.onItemMoved(args)
-                        }), (function() {
-                            destinationDirectory = _this9._getActualDirectoryInfo(destinationDirectory);
+                        }), (function(needChangeCurrentDirectory) {
+                            if (needChangeCurrentDirectory) {
+                                destinationDirectory = _this9._getActualDirectoryInfo(destinationDirectory);
+                                _this9._resetDirectoryState(destinationDirectory);
+                                _this9.setCurrentDirectory(destinationDirectory);
+                                destinationDirectory.expanded = true
+                            }
                             itemInfos.forEach((function(itemInfo) {
                                 return _this9._resetDirectoryState(itemInfo.parentDirectory, true)
-                            }));
-                            _this9._resetDirectoryState(destinationDirectory);
-                            _this9.setCurrentDirectory(destinationDirectory);
-                            destinationDirectory.expanded = true
+                            }))
                         }))
                     };
                     _proto.copyItems = function(itemInfos, destinationDirectory) {
@@ -78052,11 +78094,13 @@
                                 itemPath: (0, _utils.pathCombine)(destinationDirectory.fileItem.path, itemInfo.fileItem.name)
                             };
                             _this10._editingEvents.onItemCopied(args)
-                        }), (function() {
-                            destinationDirectory = _this10._getActualDirectoryInfo(destinationDirectory);
-                            _this10._resetDirectoryState(destinationDirectory);
-                            _this10.setCurrentDirectory(destinationDirectory);
-                            destinationDirectory.expanded = true
+                        }), (function(needChangeCurrentDirectory) {
+                            if (needChangeCurrentDirectory) {
+                                destinationDirectory = _this10._getActualDirectoryInfo(destinationDirectory);
+                                _this10._resetDirectoryState(destinationDirectory);
+                                _this10.setCurrentDirectory(destinationDirectory);
+                                destinationDirectory.expanded = true
+                            }
                         }))
                     };
                     _proto.deleteItems = function(itemInfos) {
@@ -78158,6 +78202,11 @@
                     };
                     _proto._handleItemLoadError = function(parentDirectoryInfo, errorInfo, skipNavigationOnError) {
                         parentDirectoryInfo = this._getActualDirectoryInfo(parentDirectoryInfo);
+                        this._raiseGetItemsError(parentDirectoryInfo, errorInfo);
+                        this._changeDirectoryOnError(parentDirectoryInfo, skipNavigationOnError);
+                        return (new _deferred.Deferred).reject().promise()
+                    };
+                    _proto._raiseGetItemsError = function(parentDirectoryInfo, errorInfo) {
                         var actionInfo = this._createEditActionInfo("getItems", parentDirectoryInfo, parentDirectoryInfo);
                         this._raiseEditActionStarting(actionInfo);
                         this._raiseEditActionResultAcquired(actionInfo);
@@ -78166,16 +78215,21 @@
                             errorText: errorInfo.errorText,
                             fileItem: parentDirectoryInfo.fileItem,
                             index: 0
-                        });
-                        this._resetDirectoryState(parentDirectoryInfo);
-                        parentDirectoryInfo.expanded = false;
+                        })
+                    };
+                    _proto._changeDirectoryOnError = function(dirInfo, skipNavigationOnError, isActualDirectoryRequired) {
+                        if (isActualDirectoryRequired) {
+                            dirInfo = this._getActualDirectoryInfo(dirInfo)
+                        }
+                        this._resetDirectoryState(dirInfo);
+                        dirInfo.expanded = false;
                         if (!skipNavigationOnError) {
-                            this.setCurrentDirectory(parentDirectoryInfo.parentDirectory)
+                            this.setCurrentDirectory(dirInfo.parentDirectory)
                         }
-                        return (new _deferred.Deferred).reject().promise()
                     };
                     _proto._processEditAction = function(actionInfo, beforeAction, action, afterAction, completeAction) {
                         var _this15 = this;
+                        var isAnyOperationSuccessful = false;
                         this._raiseEditActionStarting(actionInfo);
                         var actionResult = actionInfo.itemInfos.map((function(itemInfo, itemIndex) {
                             return _this15._processBeforeItemEditAction(beforeAction, itemInfo).then((function() {
@@ -78191,11 +78245,12 @@
                         actionInfo.singleRequest = 1 === actionResult.length;
                         this._raiseEditActionResultAcquired(actionInfo);
                         return (0, _uiFile_manager.whenSome)(actionResult, (function(info) {
-                            return _this15._raiseCompleteEditActionItem(actionInfo, info)
+                            isAnyOperationSuccessful = true;
+                            _this15._raiseCompleteEditActionItem(actionInfo, info)
                         }), (function(errorInfo) {
                             return _this15._raiseEditActionItemError(actionInfo, errorInfo)
                         })).then((function() {
-                            completeAction();
+                            completeAction(isAnyOperationSuccessful);
                             _this15._raiseCompleteEditAction(actionInfo)
                         }))
                     };
@@ -78272,6 +78327,12 @@
                             return _this16._refreshDeferred = _this16._refreshInternal()
                         }), "refresh")
                     };
+                    _proto.startSingleLoad = function() {
+                        this._singleOperationLockId = (new _guid.default).toString()
+                    };
+                    _proto.endSingleLoad = function() {
+                        delete this._singleOperationLockId
+                    };
                     _proto._refreshInternal = function() {
                         var _this17 = this;
                         var cachedRootInfo = {
@@ -78499,7 +78560,7 @@
                     };
                     _proto._tryCallAction = function(actionName) {
                         var args = Array.prototype.slice.call(arguments, 1);
-                        if (this._options[actionName]) {
+                        if (this._isInitialized && this._options[actionName]) {
                             var _this$_options;
                             (_this$_options = this._options)[actionName].apply(_this$_options, _toConsumableArray(args))
                         }
@@ -81700,7 +81761,6 @@
                         _FileManagerItemListB.prototype._initMarkup.call(this)
                     };
                     _proto._createFilesView = function() {
-                        var _this2 = this;
                         var $filesView = (0, _renderer.default)("<div>").appendTo(this.$element());
                         var selectionMode = this._isMultipleSelectionMode() ? "multiple" : "none";
                         this._filesView = this._createComponent($filesView, _ui.default, {
@@ -81730,15 +81790,11 @@
                             onContextMenuPreparing: this._onContextMenuPreparing.bind(this),
                             onSelectionChanged: this._onFilesViewSelectionChanged.bind(this),
                             onFocusedRowChanged: this._onFilesViewFocusedRowChanged.bind(this),
-                            onOptionChanged: this._onFilesViewOptionChanged.bind(this),
-                            onContentReady: function() {
-                                var _this2$_refreshDeferr;
-                                return null === (_this2$_refreshDeferr = _this2._refreshDeferred) || void 0 === _this2$_refreshDeferr ? void 0 : _this2$_refreshDeferr.resolve()
-                            }
+                            onOptionChanged: this._onFilesViewOptionChanged.bind(this)
                         })
                     };
                     _proto._createColumns = function() {
-                        var _this3 = this;
+                        var _this2 = this;
                         var columns = this.option("detailColumns");
                         columns = columns.slice(0);
                         columns = columns.map((function(column) {
@@ -81748,7 +81804,7 @@
                                     dataField: column
                                 }
                             }
-                            return _this3._getPreparedColumn(extendedItem)
+                            return _this2._getPreparedColumn(extendedItem)
                         }));
                         var customizeDetailColumns = this.option("customizeDetailColumns");
                         if ((0, _type.isFunction)(customizeDetailColumns)) {
@@ -81758,7 +81814,7 @@
                             dataField: "isParentFolder"
                         }));
                         columns.forEach((function(column) {
-                            return _this3._updateColumnDataField(column)
+                            return _this2._updateColumnDataField(column)
                         }));
                         return columns
                     };
@@ -81847,7 +81903,7 @@
                         return selectedRowKeys.length >= selectableItemsCount ? true : void 0
                     };
                     _proto._onEditorPreparing = function(_ref2) {
-                        var _this4 = this;
+                        var _this3 = this;
                         var component = _ref2.component,
                             command = _ref2.command,
                             row = _ref2.row,
@@ -81863,11 +81919,11 @@
                         } else if ("headerRow" === parentType) {
                             editorOptions.onInitialized = function(_ref3) {
                                 var component = _ref3.component;
-                                _this4._selectAllCheckBox = component
+                                _this3._selectAllCheckBox = component
                             };
                             editorOptions.value = this._isAllItemsSelected();
                             editorOptions.onValueChanged = function(args) {
-                                return _this4._onSelectAllCheckBoxValueChanged(args)
+                                return _this3._onSelectAllCheckBoxValueChanged(args)
                             }
                         }
                     };
@@ -81977,14 +82033,14 @@
                         this._getItemThumbnailContainer(cellInfo.data).appendTo(container)
                     };
                     _proto._createNameColumnCell = function(container, cellInfo) {
-                        var _this5 = this;
+                        var _this4 = this;
                         var $button = (0, _renderer.default)("<div>");
                         var $name = (0, _renderer.default)("<span>").text(cellInfo.data.fileItem.name).addClass("dx-filemanager-details-item-name");
                         var $wrapper = (0, _renderer.default)("<div>").append($name, $button).addClass("dx-filemanager-details-item-name-wrapper");
                         (0, _renderer.default)(container).append($wrapper);
                         this._createComponent($button, _uiFile_manager3.default, {
                             onClick: function(e) {
-                                return _this5._onFileItemActionButtonClick(e)
+                                return _this4._onFileItemActionButtonClick(e)
                             }
                         })
                     };
@@ -82181,7 +82237,8 @@
                             onSelectionChanged: this._createActionByOption("onSelectionChanged"),
                             onFocusedItemChanged: this._createActionByOption("onFocusedItemChanged"),
                             onSelectedItemOpened: this._createActionByOption("onSelectedItemOpened"),
-                            onContextMenuShowing: this._createActionByOption("onContextMenuShowing")
+                            onContextMenuShowing: this._createActionByOption("onContextMenuShowing"),
+                            onItemListDataLoaded: this._createActionByOption("onItemListDataLoaded")
                         }
                     };
                     _proto._getDefaultOptions = function() {
@@ -82221,6 +82278,7 @@
                             case "onSelectionChanged":
                             case "onFocusedItemChanged":
                             case "onContextMenuShowing":
+                            case "onItemListDataLoaded":
                                 this._actions[name] = this._createActionByOption(name);
                                 break;
                             default:
@@ -82237,6 +82295,8 @@
                             var parentDirectoryItem = _this._findParentDirectoryItem(itemInfos);
                             _this._hasParentDirectoryItem = !!parentDirectoryItem;
                             _this._parentDirectoryItemKey = parentDirectoryItem ? parentDirectoryItem.fileItem.key : null
+                        })).always((function() {
+                            _this._onDataLoaded()
                         }))
                     };
                     _proto._getItemsInternal = function() {
@@ -82263,6 +82323,14 @@
                     _proto._raiseContextMenuShowing = function(e) {
                         this._actions.onContextMenuShowing(e)
                     };
+                    _proto._raiseItemListDataLoaded = function() {
+                        this._actions.onItemListDataLoaded()
+                    };
+                    _proto._onDataLoaded = function() {
+                        var _this$_refreshDeferre;
+                        this._raiseItemListDataLoaded();
+                        null === (_this$_refreshDeferre = this._refreshDeferred) || void 0 === _this$_refreshDeferre ? void 0 : _this$_refreshDeferre.resolve()
+                    };
                     _proto._tryRaiseSelectionChanged = function(_ref) {
                         var _this2 = this;
                         var selectedItemInfos = _ref.selectedItemInfos,
@@ -82472,7 +82540,6 @@
                         this._createItemList()
                     };
                     _proto._createItemList = function() {
-                        var _this = this;
                         var selectionMode = this._isMultipleSelectionMode() ? "multiple" : "single";
                         var $itemListContainer = (0, _renderer.default)("<div>").appendTo(this.$element());
                         this._itemList = this._createComponent($itemListContainer, _uiFile_managerItems_listThumbnails.default, {
@@ -82488,11 +82555,7 @@
                             itemThumbnailTemplate: this._getItemThumbnailContainer.bind(this),
                             getTooltipText: this._getTooltipText.bind(this),
                             onSelectionChanged: this._onItemListSelectionChanged.bind(this),
-                            onFocusedItemChanged: this._onItemListFocusedItemChanged.bind(this),
-                            onContentReady: function() {
-                                var _this$_refreshDeferre;
-                                return null === (_this$_refreshDeferre = _this._refreshDeferred) || void 0 === _this$_refreshDeferre ? void 0 : _this$_refreshDeferre.resolve()
-                            }
+                            onFocusedItemChanged: this._onItemListFocusedItemChanged.bind(this)
                         })
                     };
                     _proto._onContextMenu = function(e) {
@@ -83267,6 +83330,7 @@
                         this._initActions();
                         this._providerUpdateDeferred = null;
                         this._lockCurrentPathProcessing = false;
+                        this._wasRendered = false;
                         this._controller = new _file_items_controller.default({
                             currentPath: this.option("currentPath"),
                             currentPathKeys: this.option("currentPathKeys"),
@@ -83288,8 +83352,14 @@
                         this._lockSelectionProcessing = false;
                         this._lockFocusedItemProcessing = false;
                         this._itemKeyToFocus = void 0;
+                        this._loadedWidgets = [];
                         this._commandManager = new _uiFile_manager2.FileManagerCommandManager(this.option("permissions"));
                         this.$element().addClass("dx-filemanager");
+                        if (this._wasRendered) {
+                            this._prepareToLoad()
+                        } else {
+                            this._wasRendered = true
+                        }
                         this._createNotificationControl();
                         this._initCommandManager()
                     };
@@ -83384,6 +83454,9 @@
                             onDirectoryClick: function(_ref2) {
                                 var itemData = _ref2.itemData;
                                 return _this5._setCurrentDirectory(itemData)
+                            },
+                            onItemListDataLoaded: function() {
+                                return _this5._tryEndLoading(VIEW_AREAS_folders)
                             }
                         });
                         this._filesTreeView.updateCurrentDirectory()
@@ -83408,6 +83481,9 @@
                             onContextMenuShowing: function(e) {
                                 return _this6._onContextMenuShowing(VIEW_AREAS_items, e)
                             },
+                            onItemListItemsLoaded: function() {
+                                return _this6._tryEndLoading(VIEW_AREAS_items)
+                            },
                             getItemThumbnail: this._getItemThumbnailInfo.bind(this),
                             customizeDetailColumns: this.option("customizeDetailColumns"),
                             detailColumns: this.option("itemView.details.columns")
@@ -83510,10 +83586,24 @@
                     };
                     _proto._refreshAndShowProgress = function() {
                         var _this10 = this;
+                        this._prepareToLoad();
                         return (0, _deferred.when)(this._notificationControl.tryShowProgressPanel(), this._controller.refresh()).then((function() {
                             return _this10._filesTreeView.refresh()
                         }))
                     };
+                    _proto._isAllWidgetsLoaded = function() {
+                        return 2 === this._loadedWidgets.length && -1 !== this._loadedWidgets.indexOf(VIEW_AREAS_folders) && -1 !== this._loadedWidgets.indexOf(VIEW_AREAS_items)
+                    };
+                    _proto._tryEndLoading = function(area) {
+                        this._loadedWidgets.push(area);
+                        if (this._isAllWidgetsLoaded()) {
+                            this._controller.endSingleLoad()
+                        }
+                    };
+                    _proto._prepareToLoad = function() {
+                        this._loadedWidgets = [];
+                        this._controller.startSingleLoad()
+                    };
                     _proto._updateToolbar = function(selectedItems) {
                         var items = selectedItems || this._getSelectedItemInfos();
                         this._toolbar.option("contextItems", (0, _common.ensureDefined)(items, []))
@@ -86749,6 +86839,10 @@
                                 this._updateReadOnlyState();
                                 _Editor.prototype._optionChanged.call(this, args);
                                 break;
+                            case "disabled":
+                                this._updateInputLabelText();
+                                _Editor.prototype._optionChanged.call(this, args);
+                                break;
                             case "selectButtonText":
                                 this._selectButton.option("text", value);
                                 break;
@@ -87297,7 +87391,7 @@
                             var result = uploadFile(file.value, (function(loadedBytes) {
                                 var arg = {
                                     loaded: loadedBytes,
-                                    total: file.size
+                                    total: file.value.size
                                 };
                                 _this20._handleProgress(file, arg)
                             }));
@@ -94158,6 +94252,7 @@
                         if (!this.infoMap[name]) {
                             return
                         }
+                        var isRefresh = this._popupInstance._isVisible() && this._dialogInfo && this._dialogInfo instanceof this.infoMap[name];
                         this._dialogInfo = new this.infoMap[name](parameters, this._apply.bind(this), this.hide.bind(this), editingOptions);
                         this._popupInstance.option({
                             showTitle: !!this._dialogInfo.getTitle(),
@@ -94167,7 +94262,9 @@
                             height: this._dialogInfo.getHeight(),
                             contentTemplate: this._dialogInfo.getContentTemplate()
                         });
-                        this._popupInstance.show()
+                        if (!isRefresh) {
+                            this._popupInstance.show()
+                        }
                     };
                     _proto.hide = function() {
                         this._popupInstance.hide();
@@ -94732,8 +94829,9 @@
                         var format = null === column || void 0 === column ? void 0 : column.format;
                         var value = _uiGrid_core.default.getDisplayValue(column, data[field], data, "data");
                         if ((0, _type.isDefined)(format)) {
-                            if ((0, _type.isDate)(value)) {
-                                return _date.default.format(value, format)
+                            if ("date" === (null === column || void 0 === column ? void 0 : column.dataType) || "datetime" === (null === column || void 0 === column ? void 0 : column.dataType)) {
+                                var date = (0, _type.isDate)(value) ? value : new Date(value);
+                                return _date.default.format(date, format)
                             }
                             if ((0, _type.isNumeric)(value)) {
                                 return _number.default.format(value, format)
@@ -95304,11 +95402,14 @@
                         this._actionsManager.raiseUpdatedAction("tasks", mappedData, data.id)
                     };
                     _proto._onParentTasksRecalculated = function(data) {
+                        var _this7 = this;
                         if (!this.isSieving) {
-                            var _this$_ganttTreeList3;
                             var setters = _uiGantt6.GanttHelper.compileSettersByOption(this.option("tasks"));
                             var treeDataSource = this._customFieldsManager.appendCustomFields(data.map(_uiGantt6.GanttHelper.prepareSetterMapHandler(setters)));
-                            null === (_this$_ganttTreeList3 = this._ganttTreeList) || void 0 === _this$_ganttTreeList3 ? void 0 : _this$_ganttTreeList3.setOption("dataSource", treeDataSource)
+                            setTimeout((function() {
+                                var _this7$_ganttTreeList;
+                                return null === (_this7$_ganttTreeList = _this7._ganttTreeList) || void 0 === _this7$_ganttTreeList ? void 0 : _this7$_ganttTreeList.setDataSource(treeDataSource)
+                            }))
                         }
                         this.isSieving = false
                     };
@@ -95433,7 +95534,7 @@
                         }
                     };
                     _proto._changeExpandAll = function(expanded, level, rowKey) {
-                        var _promise, _this7 = this;
+                        var _promise, _this8 = this;
                         var allExpandableNodes = [];
                         var nodesToExpand = [];
                         this._treeList.forEachNode((function(node) {
@@ -95455,7 +95556,7 @@
                                 expanded = node.level < level
                             }
                             previous[node.key] = expanded;
-                            var action = expanded ? _this7._treeList.expandRow : _this7._treeList.collapseRow;
+                            var action = expanded ? _this8._treeList.expandRow : _this8._treeList.collapseRow;
                             var isLast = index === allExpandableNodes.length - 1;
                             if (isLast) {
                                 promise = action(node.key)
@@ -95465,19 +95566,19 @@
                             return previous
                         }), {});
                         null === (_promise = promise) || void 0 === _promise ? void 0 : _promise.then((function() {
-                            _this7._ganttView._ganttViewCore.applyTasksExpandedState(state);
-                            _this7._sizeHelper.adjustHeight();
-                            delete _this7._lockRowExpandEvent
+                            _this8._ganttView._ganttViewCore.applyTasksExpandedState(state);
+                            _this8._sizeHelper.adjustHeight();
+                            delete _this8._lockRowExpandEvent
                         }))
                     };
                     _proto.getTaskResources = function(key) {
-                        var _this8 = this;
+                        var _this9 = this;
                         if (!(0, _type.isDefined)(key)) {
                             return null
                         }
                         var coreData = this._ganttView._ganttViewCore.getTaskResources(key);
                         return coreData.map((function(r) {
-                            return _this8._mappingHelper.convertCoreToMappedData("resources", r)
+                            return _this9._mappingHelper.convertCoreToMappedData("resources", r)
                         }))
                     };
                     _proto.getVisibleTaskKeys = function() {
@@ -95581,7 +95682,7 @@
                         return this._exportToPdf(options)
                     };
                     _proto._exportToPdf = function(options) {
-                        var _fullOptions$pdfDocum, _fullOptions$docCreat, _window$jspdf$jsPDF, _window$jspdf, _fullOptions$format, _this9 = this;
+                        var _fullOptions$pdfDocum, _fullOptions$docCreat, _window$jspdf$jsPDF, _window$jspdf, _fullOptions$format, _this10 = this;
                         this._exportHelper.reset();
                         var fullOptions = (0, _extend.extend)({}, options);
                         if (fullOptions.createDocumentMethod) {
@@ -95591,16 +95692,16 @@
                         null !== (_fullOptions$docCreat = fullOptions.docCreateMethod) && void 0 !== _fullOptions$docCreat ? _fullOptions$docCreat : fullOptions.docCreateMethod = null !== (_window$jspdf$jsPDF = null === (_window$jspdf = window.jspdf) || void 0 === _window$jspdf ? void 0 : _window$jspdf.jsPDF) && void 0 !== _window$jspdf$jsPDF ? _window$jspdf$jsPDF : window.jsPDF;
                         null !== (_fullOptions$format = fullOptions.format) && void 0 !== _fullOptions$format ? _fullOptions$format : fullOptions.format = "a4";
                         return new Promise((function(resolve) {
-                            var _this9$_ganttView;
-                            var doc = null === (_this9$_ganttView = _this9._ganttView) || void 0 === _this9$_ganttView ? void 0 : _this9$_ganttView._ganttViewCore.exportToPdf(fullOptions);
+                            var _this10$_ganttView;
+                            var doc = null === (_this10$_ganttView = _this10._ganttView) || void 0 === _this10$_ganttView ? void 0 : _this10$_ganttView._ganttViewCore.exportToPdf(fullOptions);
                             resolve(doc)
                         }))
                     };
                     _proto.refresh = function() {
-                        var _this10 = this;
+                        var _this11 = this;
                         return new Promise((function(resolve, reject) {
                             try {
-                                _this10._refreshGantt();
+                                _this11._refreshGantt();
                                 resolve()
                             } catch (e) {
                                 reject(e.message)
@@ -95643,7 +95744,7 @@
                         return (0, _extend.extend)(_Widget.prototype._getDefaultOptions.call(this), _uiGantt6.GanttHelper.getDefaultOptions())
                     };
                     _proto._optionChanged = function(args) {
-                        var _this$_ganttTreeList4, _this$_sizeHelper, _this$_ganttTreeList5, _this$_actionsManager, _this$_actionsManager2, _this$_actionsManager3, _this$_actionsManager4, _this$_actionsManager5, _this$_actionsManager6, _this$_actionsManager7, _this$_actionsManager8, _this$_actionsManager9, _this$_actionsManager10, _this$_actionsManager11, _this$_actionsManager12, _this$_actionsManager13, _this$_actionsManager14, _this$_actionsManager15, _this$_actionsManager16, _this$_actionsManager17, _this$_actionsManager18, _this$_actionsManager19, _this$_actionsManager20, _this$_actionsManager21, _this$_actionsManager22, _this$_actionsManager23, _this$_actionsManager24, _this$_actionsManager25, _this$_actionsManager26, _this$_ganttTreeList6, _this$_ganttTreeList7, _this$_ganttTemplates, _this$_ganttTemplates2, _this$_ganttTemplates3, _this$_ganttTemplates4, _this$_ganttTreeList8, _this$_sizeHelper2, _this$_sizeHelper3, _this$_ganttTreeList9, _this$_ganttTreeList10, _this$_ganttTreeList11;
+                        var _this$_ganttTreeList3, _this$_sizeHelper, _this$_ganttTreeList4, _this$_actionsManager, _this$_actionsManager2, _this$_actionsManager3, _this$_actionsManager4, _this$_actionsManager5, _this$_actionsManager6, _this$_actionsManager7, _this$_actionsManager8, _this$_actionsManager9, _this$_actionsManager10, _this$_actionsManager11, _this$_actionsManager12, _this$_actionsManager13, _this$_actionsManager14, _this$_actionsManager15, _this$_actionsManager16, _this$_actionsManager17, _this$_actionsManager18, _this$_actionsManager19, _this$_actionsManager20, _this$_actionsManager21, _this$_actionsManager22, _this$_actionsManager23, _this$_actionsManager24, _this$_actionsManager25, _this$_actionsManager26, _this$_ganttTreeList5, _this$_ganttTreeList6, _this$_ganttTemplates, _this$_ganttTemplates2, _this$_ganttTemplates3, _this$_ganttTemplates4, _this$_ganttTreeList7, _this$_sizeHelper2, _this$_sizeHelper3, _this$_ganttTreeList8, _this$_ganttTreeList9, _this$_ganttTreeList10;
                         switch (args.name) {
                             case "tasks":
                                 this._refreshDataSource("tasks");
@@ -95658,7 +95759,7 @@
                                 this._refreshDataSource("resourceAssignments");
                                 break;
                             case "columns":
-                                null === (_this$_ganttTreeList4 = this._ganttTreeList) || void 0 === _this$_ganttTreeList4 ? void 0 : _this$_ganttTreeList4.setOption("columns", this._ganttTreeList.getColumns());
+                                null === (_this$_ganttTreeList3 = this._ganttTreeList) || void 0 === _this$_ganttTreeList3 ? void 0 : _this$_ganttTreeList3.setOption("columns", this._ganttTreeList.getColumns());
                                 break;
                             case "taskListWidth":
                                 null === (_this$_sizeHelper = this._sizeHelper) || void 0 === _this$_sizeHelper ? void 0 : _this$_sizeHelper.setInnerElementsWidth();
@@ -95682,7 +95783,7 @@
                                 this._setGanttViewOption("endDateRange", args.value);
                                 break;
                             case "selectedRowKey":
-                                null === (_this$_ganttTreeList5 = this._ganttTreeList) || void 0 === _this$_ganttTreeList5 ? void 0 : _this$_ganttTreeList5.selectRows(_uiGantt6.GanttHelper.getArrayFromOneElement(args.value));
+                                null === (_this$_ganttTreeList4 = this._ganttTreeList) || void 0 === _this$_ganttTreeList4 ? void 0 : _this$_ganttTreeList4.selectRows(_uiGantt6.GanttHelper.getArrayFromOneElement(args.value));
                                 break;
                             case "onSelectionChanged":
                                 null === (_this$_actionsManager = this._actionsManager) || void 0 === _this$_actionsManager ? void 0 : _this$_actionsManager.createSelectionChangedAction();
@@ -95763,11 +95864,11 @@
                                 null === (_this$_actionsManager26 = this._actionsManager) || void 0 === _this$_actionsManager26 ? void 0 : _this$_actionsManager26.createContextMenuPreparingAction();
                                 break;
                             case "allowSelection":
-                                null === (_this$_ganttTreeList6 = this._ganttTreeList) || void 0 === _this$_ganttTreeList6 ? void 0 : _this$_ganttTreeList6.setOption("selection.mode", _uiGantt6.GanttHelper.getSelectionMode(args.value));
+                                null === (_this$_ganttTreeList5 = this._ganttTreeList) || void 0 === _this$_ganttTreeList5 ? void 0 : _this$_ganttTreeList5.setOption("selection.mode", _uiGantt6.GanttHelper.getSelectionMode(args.value));
                                 this._setGanttViewOption("allowSelection", args.value);
                                 break;
                             case "showRowLines":
-                                null === (_this$_ganttTreeList7 = this._ganttTreeList) || void 0 === _this$_ganttTreeList7 ? void 0 : _this$_ganttTreeList7.setOption("showRowLines", args.value);
+                                null === (_this$_ganttTreeList6 = this._ganttTreeList) || void 0 === _this$_ganttTreeList6 ? void 0 : _this$_ganttTreeList6.setOption("showRowLines", args.value);
                                 this._setGanttViewOption("showRowLines", args.value);
                                 break;
                             case "stripLines":
@@ -95804,7 +95905,7 @@
                                 this._setGanttViewOption("taskContentTemplate", null === (_this$_ganttTemplates4 = this._ganttTemplatesManager) || void 0 === _this$_ganttTemplates4 ? void 0 : _this$_ganttTemplates4.getTaskContentTemplateFunc(args.value));
                                 break;
                             case "rootValue":
-                                null === (_this$_ganttTreeList8 = this._ganttTreeList) || void 0 === _this$_ganttTreeList8 ? void 0 : _this$_ganttTreeList8.setOption("rootValue", args.value);
+                                null === (_this$_ganttTreeList7 = this._ganttTreeList) || void 0 === _this$_ganttTreeList7 ? void 0 : _this$_ganttTreeList7.setOption("rootValue", args.value);
                                 break;
                             case "width":
                                 _Widget.prototype._optionChanged.call(this, args);
@@ -95815,13 +95916,13 @@
                                 null === (_this$_sizeHelper3 = this._sizeHelper) || void 0 === _this$_sizeHelper3 ? void 0 : _this$_sizeHelper3.setGanttHeight((0, _size.getHeight)(this._$element));
                                 break;
                             case "sorting":
-                                null === (_this$_ganttTreeList9 = this._ganttTreeList) || void 0 === _this$_ganttTreeList9 ? void 0 : _this$_ganttTreeList9.setOption("sorting", this.option(args.name));
+                                null === (_this$_ganttTreeList8 = this._ganttTreeList) || void 0 === _this$_ganttTreeList8 ? void 0 : _this$_ganttTreeList8.setOption("sorting", this.option(args.name));
                                 break;
                             case "filterRow":
-                                null === (_this$_ganttTreeList10 = this._ganttTreeList) || void 0 === _this$_ganttTreeList10 ? void 0 : _this$_ganttTreeList10.setOption("filterRow", this.option(args.name));
+                                null === (_this$_ganttTreeList9 = this._ganttTreeList) || void 0 === _this$_ganttTreeList9 ? void 0 : _this$_ganttTreeList9.setOption("filterRow", this.option(args.name));
                                 break;
                             case "headerFilter":
-                                null === (_this$_ganttTreeList11 = this._ganttTreeList) || void 0 === _this$_ganttTreeList11 ? void 0 : _this$_ganttTreeList11.setOption("headerFilter", this.option(args.name));
+                                null === (_this$_ganttTreeList10 = this._ganttTreeList) || void 0 === _this$_ganttTreeList10 ? void 0 : _this$_ganttTreeList10.setOption("headerFilter", this.option(args.name));
                                 break;
                             default:
                                 _Widget.prototype._optionChanged.call(this, args)
@@ -96294,6 +96395,8 @@
                 var _position = __webpack_require__( /*! ../../core/utils/position */ 37518);
                 var _type = __webpack_require__( /*! ../../core/utils/type */ 35922);
                 var _uiGantt = __webpack_require__( /*! ./ui.gantt.helper */ 30631);
+                var _data_source = __webpack_require__( /*! ../../data/data_source/data_source */ 85273);
+                var _array_store = _interopRequireDefault(__webpack_require__( /*! ../../data/array_store */ 26562));
 
                 function _interopRequireDefault(obj) {
                     return obj && obj.__esModule ? obj : {
@@ -96312,7 +96415,7 @@
                             keyExpr = _this$_gantt$option.keyExpr,
                             parentIdExpr = _this$_gantt$option.parentIdExpr;
                         this._treeList = this._gantt._createComponent(this._$treeList, _tree_list.default, {
-                            dataSource: this._gantt._tasksRaw,
+                            dataSource: this.createDataSource(this._gantt._tasksRaw),
                             keyExpr: keyExpr,
                             parentIdExpr: parentIdExpr,
                             columns: this.getColumns(),
@@ -96475,13 +96578,21 @@
                         var forceCustomData = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : false;
                         var expandedRowKeys = this.getOption("expandedRowKeys");
                         if (!this._skipUpdateTreeListDataSource() || forceUpdate) {
-                            this.setOption("dataSource", data)
+                            this.setDataSource(data)
                         } else if (forceCustomData) {
                             var _data = this._treeList.option("dataSource");
                             this._gantt._onParentTasksRecalculated(_data)
                         }
                         this.setOption("expandedRowKeys", expandedRowKeys)
                     };
+                    _proto.setDataSource = function(data) {
+                        this.setOption("dataSource", this.createDataSource(data))
+                    };
+                    _proto.createDataSource = function(data) {
+                        return data && new _data_source.DataSource({
+                            store: new _array_store.default(data)
+                        })
+                    };
                     _proto.onRowClick = function(e) {
                         this._gantt._actionsManager.raiseTaskClickAction(e.key, e.event)
                     };
@@ -99590,16 +99701,15 @@
                     },
                     _getElasticScrollTop: function(e) {
                         var elasticScrollTop = 0;
-                        var scrollbarWidth = this.getScrollbarWidth(true);
                         if (e.scrollOffset.top < 0) {
                             elasticScrollTop = -e.scrollOffset.top
                         } else if (e.reachedBottom) {
-                            var scrollableContent = this._findContentElement();
+                            var $scrollableContent = (0, _renderer.default)(this._findContentElement());
                             var $scrollableContainer = (0, _renderer.default)(e.component.container());
-                            var maxScrollTop = Math.max((0, _size.getHeight)(scrollableContent) + scrollbarWidth - (0, _size.getHeight)($scrollableContainer), 0);
+                            var maxScrollTop = Math.max($scrollableContent.get(0).clientHeight - $scrollableContainer.get(0).clientHeight, 0);
                             elasticScrollTop = maxScrollTop - e.scrollOffset.top
                         }
-                        return elasticScrollTop
+                        return Math.floor(elasticScrollTop)
                     },
                     _applyElasticScrolling: function(e) {
                         if (this._fixedTableElement) {
@@ -100856,12 +100966,6 @@
                                     if ("name" === optionName || "allowEditing" === optionName) {
                                         that._checkColumns()
                                     }
-                                    fullOptionName && fireOptionChanged(that, {
-                                        fullOptionName: fullOptionName,
-                                        optionName: optionName,
-                                        value: value,
-                                        prevValue: prevValue
-                                    });
                                     if (!(0, _type.isDefined)(prevValue) && !(0, _type.isDefined)(value) && 0 !== optionName.indexOf("buffer")) {
                                         notFireEvent = true
                                     }
@@ -100884,6 +100988,12 @@
                                     } else {
                                         resetColumnsCache(that)
                                     }
+                                    fullOptionName && fireOptionChanged(that, {
+                                        fullOptionName: fullOptionName,
+                                        optionName: optionName,
+                                        value: value,
+                                        prevValue: prevValue
+                                    })
                                 }
                             };
 
@@ -101238,7 +101348,8 @@
                                             }
                                             return this.updateColumns(dataSource, forceApplying)
                                         } else {
-                                            this._dataSourceApplied = false
+                                            this._dataSourceApplied = false;
+                                            updateIndexes(this)
                                         }
                                     } else if (isDataSourceLoaded && !this.isAllDataTypesDefined(true) && this.updateColumnDataTypes(dataSource)) {
                                         updateColumnChanges(this, "columns");
@@ -101435,6 +101546,7 @@
                                     }))[0];
                                     var isFixedFirstGroupColumn = firstGroupColumn && firstGroupColumn.fixed;
                                     var isColumnFixing = this._isColumnFixing();
+                                    var rtlEnabled = this.option("rtlEnabled");
                                     if (expandColumns.length) {
                                         expandColumn = this.columnOption("command:expand")
                                     }
@@ -101444,7 +101556,8 @@
                                             minWidth: null,
                                             cellTemplate: !(0, _type.isDefined)(column.groupIndex) ? column.cellTemplate : null,
                                             headerCellTemplate: null,
-                                            fixed: !(0, _type.isDefined)(column.groupIndex) || !isFixedFirstGroupColumn ? isColumnFixing : true
+                                            fixed: !(0, _type.isDefined)(column.groupIndex) || !isFixedFirstGroupColumn ? isColumnFixing : true,
+                                            fixedPosition: rtlEnabled ? "right" : "left"
                                         }, expandColumn, {
                                             index: column.index,
                                             type: column.type || "groupExpand"
@@ -102311,7 +102424,7 @@
                                                     if ("number" === this.dataType) {
                                                         if ((0, _type.isString)(text) && this.format) {
                                                             result = function(text, format) {
-                                                                var parsedValue = _number.default.parse(text, format);
+                                                                var parsedValue = _number.default.parse(text);
                                                                 if ((0, _type.isNumeric)(parsedValue)) {
                                                                     var formattedValue = _number.default.format(parsedValue, format);
                                                                     var formattedValueWithDefaultFormat = _number.default.format(parsedValue, "decimal");
@@ -103171,20 +103284,18 @@
                     },
                     _updateColumnsWidthIfNeeded: function(posX) {
                         var deltaX;
-                        var needUpdate = false;
-                        var nextCellWidth;
+                        var needUpdate;
+                        var contentWidth = this._rowsView.contentWidth();
                         var resizingInfo = this._resizingInfo;
                         var columnsController = this._columnsController;
                         var visibleColumns = columnsController.getVisibleColumns();
                         var columnsSeparatorWidth = this._columnsSeparatorView.width();
-                        var contentWidth = this._rowsView.contentWidth();
                         var isNextColumnMode = isNextColumnResizingMode(this);
                         var adaptColumnWidthByRatio = isNextColumnMode && this.option("adaptColumnWidthByRatio") && !this.option("columnAutoWidth");
-                        var minWidth;
-                        var nextColumn;
-                        var cellWidth;
                         var rtlEnabled = this.option("rtlEnabled");
                         var isRtlParentStyle = this._isRtlParentStyle();
+                        var column = visibleColumns[resizingInfo.currentColumnIndex];
+                        var nextColumn = visibleColumns[resizingInfo.nextColumnIndex];
 
                         function isPercentWidth(width) {
                             return (0, _type.isString)(width) && "%" === width.slice(-1)
@@ -103209,16 +103320,38 @@
                         if ((isNextColumnMode || isRtlParentStyle) && rtlEnabled) {
                             deltaX = -deltaX
                         }
-                        cellWidth = resizingInfo.currentColumnWidth + deltaX;
-                        var column = visibleColumns[resizingInfo.currentColumnIndex];
-                        minWidth = column && column.minWidth || columnsSeparatorWidth;
-                        needUpdate = cellWidth >= minWidth;
-                        if (isNextColumnMode) {
-                            nextCellWidth = resizingInfo.nextColumnWidth - deltaX;
-                            nextColumn = visibleColumns[resizingInfo.nextColumnIndex];
-                            minWidth = nextColumn && nextColumn.minWidth || columnsSeparatorWidth;
-                            needUpdate = needUpdate && nextCellWidth >= minWidth
-                        }
+                        var _calculateCellWidths = function(delta) {
+                                var nextMinWidth;
+                                var nextCellWidth;
+                                var needCorrectionNextCellWidth;
+                                var cellWidth = resizingInfo.currentColumnWidth + delta;
+                                var minWidth = column && column.minWidth || columnsSeparatorWidth;
+                                var result = {};
+                                if (cellWidth >= minWidth) {
+                                    result.cellWidth = cellWidth
+                                } else {
+                                    result.cellWidth = minWidth;
+                                    needCorrectionNextCellWidth = true
+                                }
+                                if (isNextColumnMode) {
+                                    nextCellWidth = resizingInfo.nextColumnWidth - delta;
+                                    nextMinWidth = nextColumn && nextColumn.minWidth || columnsSeparatorWidth;
+                                    if (nextCellWidth >= nextMinWidth) {
+                                        if (needCorrectionNextCellWidth) {
+                                            result.nextCellWidth = resizingInfo.nextColumnWidth - (delta + minWidth - cellWidth)
+                                        } else {
+                                            result.nextCellWidth = nextCellWidth
+                                        }
+                                    } else {
+                                        result.nextCellWidth = nextMinWidth;
+                                        result.cellWidth = resizingInfo.currentColumnWidth + (delta - nextMinWidth + nextCellWidth)
+                                    }
+                                }
+                                return result
+                            }(deltaX),
+                            cellWidth = _calculateCellWidths.cellWidth,
+                            nextCellWidth = _calculateCellWidths.nextCellWidth;
+                        needUpdate = column.width !== cellWidth;
                         if (needUpdate) {
                             columnsController.beginUpdate();
                             cellWidth = Math.floor(cellWidth);
@@ -104072,9 +104205,10 @@
                     _getBodies: function(tableElement) {
                         return (0, _renderer.default)(tableElement).children("tbody").not(".dx-header").not(".dx-footer")
                     },
-                    _wrapRowIfNeed: function($table, $row) {
+                    _wrapRowIfNeed: function($table, $row, isRefreshing) {
                         var hasDataRowTemplate = this.option().rowTemplate || this.option("dataRowTemplate");
-                        var $tBodies = hasDataRowTemplate && this._getBodies(this._tableElement || $table);
+                        var $tableElement = isRefreshing ? $table || this._tableElement : this._tableElement || $table;
+                        var $tBodies = hasDataRowTemplate && this._getBodies($tableElement);
                         if ($tBodies && $tBodies.filter(".dx-row").length) {
                             var $tbody = (0, _renderer.default)("<tbody>").addClass($row.attr("class"));
                             this.setAria("role", "presentation", $tbody);
@@ -104207,7 +104341,10 @@
                         var cellOptions = this._getCellOptions(options);
                         if (options.columnIndices) {
                             if (options.row.cells) {
-                                options.row.cells[cellOptions.columnIndex] = cellOptions
+                                var cellIndex = options.row.cells.findIndex((function(cell) {
+                                    return cell.columnIndex === cellOptions.columnIndex
+                                }));
+                                options.row.cells[cellIndex] = cellOptions
                             }
                         } else {
                             options.row.cells.push(cellOptions)
@@ -104480,9 +104617,7 @@
                                             var cell = void 0;
                                             var visibleIndex = this.getVisibleColumnIndex(i, rowIndex);
                                             if (row.classList.contains("dx-group-row")) {
-                                                if (1 !== visibleIndex) {
-                                                    cell = row.querySelector("td[aria-colindex='".concat(visibleIndex + 1, "']"))
-                                                }
+                                                cell = row.querySelector("td[aria-colindex='".concat(visibleIndex + 1, "']:not(.").concat("dx-group-cell", ")"))
                                             } else {
                                                 cell = row.cells[visibleIndex]
                                             }
@@ -104662,7 +104797,7 @@
                             var view = that.getView(this);
                             $element = view && view.element();
                             if ($element && ($element.is($targetElement) || $element.find($targetElement).length)) {
-                                var _rowOptions$cells;
+                                var _rowOptions$cells, _rowOptions$cells$col;
                                 $targetCellElement = $targetElement.closest(".dx-row > td, .dx-row > tr");
                                 $targetRowElement = $targetCellElement.parent();
                                 var rowIndex = view.getRowIndex($targetRowElement);
@@ -104675,7 +104810,7 @@
                                     rowIndex: rowIndex,
                                     row: view._getRows()[rowIndex],
                                     columnIndex: columnIndex,
-                                    column: null === rowOptions || void 0 === rowOptions ? void 0 : null === (_rowOptions$cells = rowOptions.cells) || void 0 === _rowOptions$cells ? void 0 : _rowOptions$cells[columnIndex].column
+                                    column: null === rowOptions || void 0 === rowOptions ? void 0 : null === (_rowOptions$cells = rowOptions.cells) || void 0 === _rowOptions$cells ? void 0 : null === (_rowOptions$cells$col = _rowOptions$cells[columnIndex]) || void 0 === _rowOptions$cells$col ? void 0 : _rowOptions$cells$col.column
                                 };
                                 options.items = view.getContextMenuItems && view.getContextMenuItems(options);
                                 that.executeAction("onContextMenuPreparing", options);
@@ -104788,8 +104923,10 @@
                                             that.option("paging." + optionName, value);
                                             that._skipProcessingPagingChange = false;
                                             var pageIndex = dataSource.pageIndex();
+                                            that._isPaging = "pageIndex" === optionName;
                                             return dataSource["pageIndex" === optionName ? "load" : "reload"]().done((function() {
-                                                return that.pageChanged.fire(pageIndex)
+                                                that._isPaging = false;
+                                                that.pageChanged.fire(pageIndex)
                                             }))
                                         }
                                         return (0, _deferred.Deferred)().resolve().promise()
@@ -104805,6 +104942,7 @@
                                     that._items = [];
                                     that._cachedProcessedItems = null;
                                     that._columnsController = that.getController("columns");
+                                    that._isPaging = false;
                                     that._currentOperationTypes = null;
                                     that._dataChangedHandler = function(e) {
                                         that._currentOperationTypes = _this._dataSource.operationTypes();
@@ -104851,27 +104989,33 @@
                                     this._items = [];
                                     this._refreshDataSource()
                                 },
-                                optionChanged: function(args) {
-                                    var that = this;
-                                    var dataSource;
-
-                                    function handled() {
-                                        args.handled = true
-                                    }
-                                    if ("dataSource" === args.name && args.name === args.fullName && (args.value === args.previousValue || that.option("columns") && Array.isArray(args.value) && Array.isArray(args.previousValue))) {
+                                _handleDataSourceChange: function(args) {
+                                    if (args.value === args.previousValue || this.option("columns") && Array.isArray(args.value) && Array.isArray(args.previousValue)) {
                                         var _this$_dataSource;
                                         var isValueChanged = args.value !== args.previousValue;
                                         if (isValueChanged) {
-                                            var store = that.store();
+                                            var store = this.store();
                                             if (store) {
                                                 store._array = args.value
                                             }
                                         }
-                                        handled();
                                         var isParasiteChange = Array.isArray(args.value) && !isValueChanged && (null === (_this$_dataSource = this._dataSource) || void 0 === _this$_dataSource ? void 0 : _this$_dataSource.isLoading());
                                         if (!isParasiteChange) {
-                                            that.refresh(that.option("repaintChangesOnly"))
+                                            this.refresh(this.option("repaintChangesOnly"))
                                         }
+                                        return true
+                                    }
+                                    return false
+                                },
+                                optionChanged: function(args) {
+                                    var that = this;
+                                    var dataSource;
+
+                                    function handled() {
+                                        args.handled = true
+                                    }
+                                    if ("dataSource" === args.name && args.name === args.fullName && this._handleDataSourceChange(args)) {
+                                        handled();
                                         return
                                     }
                                     switch (args.name) {
@@ -105011,10 +105155,12 @@
                                             }
                                         }
                                         if (!that._needApplyFilter && !_uiGrid_core2.default.checkChanges(optionNames, ["width", "visibleWidth", "filterValue", "bufferedFilterValue", "selectedFilterOperation", "filterValues", "filterType"])) {
-                                            that._columnsController.columnsChanged.add((function updateItemsHandler() {
+                                            that._columnsController.columnsChanged.add((function updateItemsHandler(change) {
+                                                var _change$changeTypes;
                                                 that._columnsController.columnsChanged.remove(updateItemsHandler);
                                                 that.updateItems({
-                                                    virtualColumnsScrolling: e.changeTypes.virtualColumnsScrolling
+                                                    repaintChangesOnly: false,
+                                                    virtualColumnsScrolling: null === change || void 0 === change ? void 0 : null === (_change$changeTypes = change.changeTypes) || void 0 === _change$changeTypes ? void 0 : _change$changeTypes.virtualColumnsScrolling
                                                 })
                                             }))
                                         }
@@ -105524,7 +105670,8 @@
                                 updateItems: function(change, isDataChanged) {
                                     change = change || {};
                                     if (void 0 !== this._repaintChangesOnly) {
-                                        change.repaintChangesOnly = change.repaintChangesOnly || this._repaintChangesOnly;
+                                        var _change$repaintChange;
+                                        change.repaintChangesOnly = null !== (_change$repaintChange = change.repaintChangesOnly) && void 0 !== _change$repaintChange ? _change$repaintChange : this._repaintChangesOnly;
                                         change.needUpdateDimensions = change.needUpdateDimensions || this._needUpdateDimensions
                                     } else if (change.changes) {
                                         change.repaintChangesOnly = this.option("repaintChangesOnly")
@@ -106082,7 +106229,8 @@
                                         }
                                         for (var i = 0; void 0 === take ? items[i + skip] : i < take; i++) {
                                             var childCacheItem = items[i + skip];
-                                            var item = getGroupItemFromCache(childCacheItem, groupCount - 1, skips.slice(1), takes.slice(1));
+                                            var isLast = i + 1 === take;
+                                            var item = getGroupItemFromCache(childCacheItem, groupCount - 1, 0 === i ? skips.slice(1) : [], isLast ? takes.slice(1) : []);
                                             if (void 0 !== item) {
                                                 result.items.push(item)
                                             } else {
@@ -106304,7 +106452,8 @@
                             var cachedData = this._cachedData;
                             if (options.storeLoadOptions.filter && !options.remoteOperations.filtering || options.storeLoadOptions.sort && !options.remoteOperations.sorting) {
                                 options.remoteOperations = {
-                                    filtering: options.remoteOperations.filtering
+                                    filtering: options.remoteOperations.filtering,
+                                    summary: options.remoteOperations.summary
                                 }
                             }
                             if (operationTypes.fullReload) {
@@ -106588,8 +106737,11 @@
                         isLastPage: function() {
                             return this._isLastPage
                         },
+                        _dataSourceTotalCount: function() {
+                            return this._dataSource.totalCount()
+                        },
                         totalCount: function() {
-                            return parseInt((this._currentTotalCount || this._dataSource.totalCount()) + this._totalCountCorrection)
+                            return parseInt((this._currentTotalCount || this._dataSourceTotalCount()) + this._totalCountCorrection)
                         },
                         totalCountCorrection: function() {
                             return this._totalCountCorrection
@@ -107279,11 +107431,11 @@
                         publicMethods: function() {
                             return ["addRow", "deleteRow", "undeleteRow", "editRow", "saveEditData", "cancelEditData", "hasEditData"]
                         },
-                        refresh: function(isPageChanged) {
+                        refresh: function() {
                             if (!(0, _type.isDefined)(this._pageIndex)) {
                                 return
                             }
-                            this._refreshCore(isPageChanged)
+                            this._refreshCore.apply(this, arguments)
                         },
                         _refreshCore: _common.noop,
                         isEditing: function() {
@@ -107314,7 +107466,7 @@
                         getEditFormRowIndex: function() {
                             return -1
                         },
-                        _isEditRowByIndex: function(rowIndex) {
+                        isEditRowByIndex: function(rowIndex) {
                             var key = this._dataController.getKeyByRowIndex(rowIndex);
                             var isKeyEqual = (0, _type.isDefined)(key) && (0, _common.equalByValue)(this.option(_uiGrid_core3.EDITING_EDITROWKEY_OPTION_NAME), key);
                             if (isKeyEqual) {
@@ -107323,7 +107475,7 @@
                             return isKeyEqual
                         },
                         isEditCell: function(visibleRowIndex, columnIndex) {
-                            return this._isEditRowByIndex(visibleRowIndex) && this._getVisibleEditColumnIndex() === columnIndex
+                            return this.isEditRowByIndex(visibleRowIndex) && this._getVisibleEditColumnIndex() === columnIndex
                         },
                         getPopupContent: _common.noop,
                         _isProcessedItem: function(item) {
@@ -107559,7 +107711,9 @@
                             };
                             var oldEditRowIndex = this._getVisibleEditRowIndex();
                             var deferred = new _deferred.Deferred;
-                            this.refresh();
+                            this.refresh({
+                                allowCancelEditing: true
+                            });
                             if (!this._allowRowAdding()) {
                                 (0, _deferred.when)(this._navigateToNewRow(oldEditRowIndex)).done(deferred.resolve).fail(deferred.reject);
                                 return deferred.promise()
@@ -107757,13 +107911,14 @@
                         _editRowFromOptionChanged: function(rowIndex, oldRowIndex) {
                             var rowIndices = [oldRowIndex, rowIndex];
                             this._beforeUpdateItems(rowIndices, rowIndex, oldRowIndex);
-                            this._editRowFromOptionChangedCore(rowIndices, rowIndex, oldRowIndex)
+                            this._editRowFromOptionChangedCore(rowIndices, rowIndex)
                         },
-                        _editRowFromOptionChangedCore: function(rowIndices, rowIndex, oldRowIndex) {
+                        _editRowFromOptionChangedCore: function(rowIndices, rowIndex, preventRendering) {
                             this._needFocusEditor = true;
                             this._dataController.updateItems({
                                 changeType: "update",
-                                rowIndices: rowIndices
+                                rowIndices: rowIndices,
+                                cancel: preventRendering
                             })
                         },
                         _focusEditorIfNeed: _common.noop,
@@ -108356,7 +108511,9 @@
                             var dataController = this._dataController;
                             if (dataController && this._pageIndex !== dataController.pageIndex()) {
                                 if ("refresh" === changeType) {
-                                    this.refresh(true)
+                                    this.refresh({
+                                        isPageChanged: true
+                                    })
                                 }
                                 this._pageIndex = dataController.pageIndex()
                             }
@@ -108843,6 +109000,35 @@
                                         return true
                                     }
                                     return this.callBase.apply(this, arguments)
+                                },
+                                _handleDataSourceChange: function(args) {
+                                    var _this32 = this;
+                                    var result = this.callBase(args);
+                                    var changes = this.option("editing.changes");
+                                    var dataSource = args.value;
+                                    if (Array.isArray(dataSource) && changes.length) {
+                                        var dataSourceKeys = dataSource.map((function(item) {
+                                            return _this32.keyOf(item)
+                                        }));
+                                        var newChanges = changes.filter((function(change) {
+                                            return "insert" === change.type || dataSourceKeys.some((function(key) {
+                                                return (0, _common.equalByValue)(change.key, key)
+                                            }))
+                                        }));
+                                        if (newChanges.length !== changes.length) {
+                                            this.option("editing.changes", newChanges)
+                                        }
+                                        var editRowKey = this.option("editing.editRowKey");
+                                        var isEditNewItem = newChanges.find((function(change) {
+                                            return "insert" === change.type && (0, _common.equalByValue)(editRowKey, change.key)
+                                        }));
+                                        if (!isEditNewItem && dataSourceKeys.every((function(key) {
+                                                return !(0, _common.equalByValue)(editRowKey, key)
+                                            }))) {
+                                            this.option("editing.editRowKey", null)
+                                        }
+                                    }
+                                    return result
                                 }
                             }
                         },
@@ -108929,9 +109115,9 @@
                                     }
                                 },
                                 _rowPointerDown: function(e) {
-                                    var _this32 = this;
+                                    var _this33 = this;
                                     this._pointerDownTimeout = setTimeout((function() {
-                                        _this32._editCellByClick(e, "down")
+                                        _this33._editCellByClick(e, "down")
                                     }))
                                 },
                                 _rowClick: function(e) {
@@ -109080,12 +109266,18 @@
                                             var event = e.event;
                                             var $target = (0, _renderer.default)(event.target);
                                             var targetComponent = event[_uiGrid_core.TARGET_COMPONENT_NAME];
+                                            var component = this.component;
                                             if ($pointerDownTarget && $pointerDownTarget.is("input") && !$pointerDownTarget.is($target)) {
                                                 return
                                             }
 
                                             function checkEditorPopup($element) {
-                                                return $element && !!$element.closest(".".concat("dx-dropdowneditor-overlay")).length
+                                                if (!$element) {
+                                                    return false
+                                                }
+                                                var $dropDownEditorOverlay = $element.closest(".".concat("dx-dropdowneditor-overlay"));
+                                                var $componentElement = component.$element();
+                                                return $dropDownEditorOverlay.length > 0 && 0 === $componentElement.closest($dropDownEditorOverlay).length
                                             }
                                             if (this.isCellOrBatchEditMode() && !this._editCellInProgress) {
                                                 var isEditorPopup = checkEditorPopup($target) || checkEditorPopup(null === targetComponent || void 0 === targetComponent ? void 0 : targetComponent.$element());
@@ -109429,7 +109621,9 @@
                                         this.callBase.apply(this, arguments)
                                     }
                                 },
-                                _refreshCore: function(isPageChanged) {
+                                _refreshCore: function(params) {
+                                    var _ref3 = null !== params && void 0 !== params ? params : {},
+                                        isPageChanged = _ref3.isPageChanged;
                                     var needResetIndexes = this.isBatchEditMode() || isPageChanged && "virtual" !== this.option("scrolling.mode");
                                     if (this.isCellOrBatchEditMode()) {
                                         if (needResetIndexes) {
@@ -109548,9 +109742,9 @@
                                     }
                                     return this.callBase.apply(this, arguments)
                                 },
-                                _processDataItemCore: function(item, _ref3) {
-                                    var data = _ref3.data,
-                                        type = _ref3.type;
+                                _processDataItemCore: function(item, _ref4) {
+                                    var data = _ref4.data,
+                                        type = _ref4.type;
                                     if (this.isBatchEditMode() && "remove" === type) {
                                         item.data = (0, _array_utils.createObjectWithChanges)(item.data, data)
                                     }
@@ -109749,7 +109943,8 @@
                                     if (this.isPopupEditMode()) {
                                         if (this.option("repaintChangesOnly")) {
                                             var _row$update;
-                                            null === (_row$update = row.update) || void 0 === _row$update ? void 0 : _row$update.call(row, row)
+                                            null === (_row$update = row.update) || void 0 === _row$update ? void 0 : _row$update.call(row, row);
+                                            this._rowsView.renderDelayedTemplates()
                                         } else if (editForm) {
                                             this._updateEditFormDeferred = (new _deferred.Deferred).done((function() {
                                                 return editForm.repaint()
@@ -109807,6 +110002,7 @@
                                     var row = this.component.getVisibleRows()[rowIndex];
                                     var templateOptions = {
                                         row: row,
+                                        values: row.values,
                                         rowType: row.rowType,
                                         key: row.key,
                                         rowIndex: rowIndex
@@ -110038,6 +110234,7 @@
                                         }
                                         _this6._editForm.on("contentReady", (function() {
                                             var _this6$_editPopup;
+                                            _this6._rowsView.renderDelayedTemplates();
                                             null === (_this6$_editPopup = _this6._editPopup) || void 0 === _this6$_editPopup ? void 0 : _this6$_editPopup.repaint()
                                         }))
                                     }
@@ -110063,11 +110260,11 @@
                                     }
                                     this.callBase.apply(this, arguments)
                                 },
-                                _editRowFromOptionChangedCore: function(rowIndices, rowIndex, oldRowIndex) {
-                                    if (this.isPopupEditMode()) {
+                                _editRowFromOptionChangedCore: function(rowIndices, rowIndex) {
+                                    var isPopupEditMode = this.isPopupEditMode();
+                                    this.callBase(rowIndices, rowIndex, isPopupEditMode);
+                                    if (isPopupEditMode) {
                                         this._showEditPopup(rowIndex)
-                                    } else {
-                                        this.callBase.apply(this, arguments)
                                     }
                                 }
                             },
@@ -110178,7 +110375,7 @@
                                     return this.callBase.apply(this, arguments)
                                 },
                                 isEditRow: function(rowIndex) {
-                                    return this.isRowBasedEditMode() && this._isEditRowByIndex(rowIndex)
+                                    return this.isRowBasedEditMode() && this.isEditRowByIndex(rowIndex)
                                 },
                                 _cancelSaving: function() {
                                     if (this.isRowBasedEditMode()) {
@@ -110188,9 +110385,15 @@
                                     }
                                     this.callBase.apply(this, arguments)
                                 },
-                                _refreshCore: function() {
+                                _refreshCore: function(params) {
+                                    var _ref = null !== params && void 0 !== params ? params : {},
+                                        allowCancelEditing = _ref.allowCancelEditing;
                                     if (this.isRowBasedEditMode()) {
-                                        this.init()
+                                        var hasUpdateChanges = this.getChanges().filter((function(it) {
+                                            return "update" === it.type
+                                        })).length > 0;
+                                        this.init();
+                                        allowCancelEditing && hasUpdateChanges && this._cancelEditDataCore()
                                     }
                                     this.callBase.apply(this, arguments)
                                 },
@@ -110285,7 +110488,8 @@
                     _getFocusedElement: function($dataGridElement) {
                         var rowSelector = this.option("focusedRowEnabled") ? "tr[tabindex]:focus" : "tr[tabindex]:not(.dx-data-row):focus";
                         var focusedElementSelector = "td[tabindex]:focus, ".concat(rowSelector, ", input:focus, textarea:focus, .dx-lookup-field:focus, .dx-checkbox:focus, .dx-switch:focus, .dx-dropdownbutton .dx-buttongroup:focus");
-                        return $dataGridElement.find(focusedElementSelector)
+                        var $focusedElement = $dataGridElement.find(focusedElementSelector);
+                        return this.elementIsInsideGrid($focusedElement) && $focusedElement
                     },
                     _getFocusCellSelector: function() {
                         return ".dx-row > td"
@@ -110297,7 +110501,7 @@
                         var hideBorders;
                         if ($dataGridElement) {
                             $focus = this._getFocusedElement($dataGridElement);
-                            if ($focus.length) {
+                            if ($focus && $focus.length) {
                                 if (!$focus.hasClass("dx-cell-focus-disabled") && !$focus.hasClass("dx-row")) {
                                     $focusCell = $focus.closest(this._getFocusCellSelector() + ", .dx-cell-focus-disabled");
                                     hideBorders = $focusCell.get(0) !== $focus.get(0) && $focusCell.hasClass("dx-editor-inline-block");
@@ -111386,7 +111590,7 @@
                             var $editorContainer;
                             var $editorRangeElements;
                             var $menu;
-                            if (_uiGrid_core2.default.checkChanges(optionNames, ["filterValue", "bufferedFilterValue", "selectedFilterOperation", "bufferedSelectedFilterOperation"]) && void 0 !== e.columnIndex) {
+                            if (_uiGrid_core2.default.checkChanges(optionNames, ["filterValue", "bufferedFilterValue", "selectedFilterOperation", "bufferedSelectedFilterOperation", "filterValues", "filterType"]) && void 0 !== e.columnIndex) {
                                 var visibleIndex = this._columnsController.getVisibleIndex(e.columnIndex);
                                 var column = this._columnsController.columnOption(e.columnIndex);
                                 $cell = this._getCellElement(this.element().find("." + this.addWidgetPrefix("filter-row")).index(), visibleIndex) || (0, _renderer.default)();
@@ -112618,17 +112822,21 @@
                         var focusedRowIndex = that._dataController.getRowIndexByKey(change.focusedRowKey);
                         var rowsView = that.getView("rowsView");
                         var $tableElement;
+                        var $mainRow;
                         (0, _iterator.each)(rowsView.getTableElements(), (function(index, element) {
                             var isMainTable = 0 === index;
                             $tableElement = (0, _renderer.default)(element);
                             that._clearPreviousFocusedRow($tableElement, focusedRowIndex);
-                            that._prepareFocusedRow({
+                            var $row = that._prepareFocusedRow({
                                 changedItem: that._dataController.getVisibleRows()[focusedRowIndex],
                                 $tableElement: $tableElement,
-                                focusedRowIndex: focusedRowIndex,
-                                isMainTable: isMainTable
-                            })
-                        }))
+                                focusedRowIndex: focusedRowIndex
+                            });
+                            if (isMainTable) {
+                                $mainRow = $row
+                            }
+                        }));
+                        $mainRow && rowsView.scrollToElementVertically($mainRow)
                     },
                     _clearPreviousFocusedRow: function($tableElement, focusedRowIndex) {
                         var _this4 = this;
@@ -112649,14 +112857,10 @@
                         if (changedItem && ("data" === changedItem.rowType || "group" === changedItem.rowType)) {
                             var focusedRowIndex = options.focusedRowIndex;
                             var $tableElement = options.$tableElement;
-                            var isMainTable = options.isMainTable;
                             var tabIndex = this.option("tabindex") || 0;
                             var rowsView = this.getView("rowsView");
                             $row = (0, _renderer.default)(rowsView._getRowElements($tableElement).eq(focusedRowIndex));
-                            $row.addClass("dx-row-focused").attr("tabindex", tabIndex);
-                            if (isMainTable) {
-                                rowsView.scrollToElementVertically($row)
-                            }
+                            $row.addClass("dx-row-focused").attr("tabindex", tabIndex)
                         }
                         return $row
                     }
@@ -114703,6 +114907,22 @@
                         default: obj
                     }
                 }
+
+                function _extends() {
+                    _extends = Object.assign || function(target) {
+                        for (var i = 1; i < arguments.length; i++) {
+                            var source = arguments[i];
+                            for (var key in source) {
+                                if (Object.prototype.hasOwnProperty.call(source, key)) {
+                                    target[key] = source[key]
+                                }
+                            }
+                        }
+                        return target
+                    };
+                    return _extends.apply(this, arguments)
+                }
+                var DEFAULT_TOOLBAR_ITEM_NAMES = ["addRowButton", "applyFilterButton", "columnChooserButton", "exportButton", "groupPanel", "revertButton", "saveButton", "searchPanel"];
                 var HeaderPanel = _uiGrid_core.ColumnsView.inherit({
                     _getToolbarItems: function() {
                         return []
@@ -114739,6 +114959,11 @@
                         return options.toolbarOptions
                     },
                     _normalizeToolbarItems: function(defaultItems, userItems) {
+                        defaultItems.forEach((function(button) {
+                            if (!DEFAULT_TOOLBAR_ITEM_NAMES.includes(button.name)) {
+                                throw new Error("Default toolbar item '".concat(button.name, "' is not added to DEFAULT_TOOLBAR_ITEM_NAMES"))
+                            }
+                        }));
                         var defaultProps = {
                             location: "after"
                         };
@@ -114754,18 +114979,18 @@
                             defaultButtonsByNames[button.name] = button
                         }));
                         var normalizedItems = userItems.map((function(button) {
-                            var needHideButton = false;
                             if ((0, _type.isString)(button)) {
                                 button = {
                                     name: button
-                                };
-                                needHideButton = true
+                                }
                             }
                             if ((0, _type.isDefined)(button.name)) {
                                 if ((0, _type.isDefined)(defaultButtonsByNames[button.name])) {
                                     button = (0, _extend.extend)(true, {}, defaultButtonsByNames[button.name], button)
-                                } else if (needHideButton) {
-                                    button.visible = false
+                                } else if (DEFAULT_TOOLBAR_ITEM_NAMES.includes(button.name)) {
+                                    button = _extends({}, button, {
+                                        visible: false
+                                    })
                                 }
                             }
                             return (0, _extend.extend)(true, {}, defaultProps, button)
@@ -114960,6 +115185,7 @@
                 }
                 var INTERACTIVE_ELEMENTS_SELECTOR = "input:not([type='hidden']), textarea, a, select, button, [tabindex], .dx-checkbox";
                 var NON_FOCUSABLE_ELEMENTS_SELECTOR = "".concat(INTERACTIVE_ELEMENTS_SELECTOR, ", .dx-dropdowneditor-icon");
+                var FUNCTIONAL_KEYS = ["shift", "control", "alt"];
 
                 function isGroupRow($row) {
                     return $row && $row.hasClass("dx-group-row")
@@ -115051,7 +115277,7 @@
                             _this2._initKeyDownHandler();
                             _this2._setRowsViewAttributes();
                             if (isFocusedViewCorrect && isFocusedElementCorrect) {
-                                needUpdateFocus = _this2._isNeedFocus ? !isAppend : _this2._isHiddenFocus && isFullUpdate;
+                                needUpdateFocus = _this2._isNeedFocus ? !isAppend : _this2._isHiddenFocus && isFullUpdate && !(null !== e && void 0 !== e && e.virtualColumnsScrolling);
                                 needUpdateFocus && _this2._updateFocus(true)
                             }
                         }))
@@ -115132,15 +115358,17 @@
                     },
                     _keyDownHandler: function(e) {
                         var needStopPropagation = true;
+                        this._isNeedFocus = true;
+                        this._isNeedScroll = true;
                         var isHandled = this._processOnKeyDown(e);
                         var isEditing = this._editingController.isEditing();
                         var originalEvent = e.originalEvent;
                         if (originalEvent.isDefaultPrevented()) {
+                            this._isNeedFocus = false;
+                            this._isNeedScroll = false;
                             return
                         }
-                        this._isNeedFocus = true;
-                        this._isNeedScroll = true;
-                        this._updateFocusedCellPositionByTarget(originalEvent.target);
+                        FUNCTIONAL_KEYS.indexOf(e.keyName) < 0 && this._updateFocusedCellPositionByTarget(originalEvent.target);
                         if (!isHandled) {
                             switch (e.keyName) {
                                 case "leftArrow":
@@ -115163,8 +115391,7 @@
                                     isHandled = true;
                                     break;
                                 case "space":
-                                    this._spaceKeyHandler(e, isEditing);
-                                    isHandled = true;
+                                    isHandled = this._spaceKeyHandler(e, isEditing);
                                     break;
                                 case "A":
                                     if ((0, _index.isCommandKeyPressed)(e.originalEvent)) {
@@ -115253,14 +115480,16 @@
                         }
                     },
                     _upDownKeysHandler: function(eventArgs, isEditing) {
+                        var _this$_editingControl, _this$_editingControl2;
                         var rowIndex = this._focusedCellPosition.rowIndex;
                         var visibleRowIndex = this.getVisibleRowIndex();
                         var $row = this._focusedView && this._focusedView.getRow(visibleRowIndex);
                         var $event = eventArgs.originalEvent;
                         var isUpArrow = "upArrow" === eventArgs.keyName;
                         var dataSource = this._dataController.dataSource();
+                        var isRowEditingInCurrentRow = null === (_this$_editingControl = this._editingController) || void 0 === _this$_editingControl ? void 0 : null === (_this$_editingControl2 = _this$_editingControl.isEditRowByIndex) || void 0 === _this$_editingControl2 ? void 0 : _this$_editingControl2.call(_this$_editingControl, visibleRowIndex);
                         var isEditingNavigationMode = this._isFastEditingStarted();
-                        var allowNavigate = (!isEditing || isEditingNavigationMode) && $row && !isDetailRow($row);
+                        var allowNavigate = (!isRowEditingInCurrentRow || !isEditing || isEditingNavigationMode) && $row && !isDetailRow($row);
                         if (allowNavigate) {
                             isEditingNavigationMode && this._closeEditCell();
                             if (!this._navigateNextCell($event, eventArgs.keyName)) {
@@ -115304,10 +115533,12 @@
                                     shift: eventArgs.shift,
                                     control: eventArgs.ctrl
                                 });
-                                eventArgs.originalEvent.preventDefault()
+                                eventArgs.originalEvent.preventDefault();
+                                return true
                             }
+                            return false
                         } else {
-                            this._beginFastEditing(eventArgs.originalEvent)
+                            return this._beginFastEditing(eventArgs.originalEvent)
                         }
                     },
                     _ctrlAKeyHandler: function(eventArgs, isEditing) {
@@ -115862,9 +116093,6 @@
                                     $cell = _this6._getNextCell(direction)
                                 }
                                 if (isElementDefined($cell)) {
-                                    if (isRenderView && !isEditing && _this6._checkCellOverlapped($cell)) {
-                                        return
-                                    }
                                     if ($cell.is("td") || $cell.hasClass(_this6.addWidgetPrefix("edit-form-item"))) {
                                         var isCommandCell = $cell.is("[class^=dx-command]");
                                         var $focusedElementInsideCell = $cell.find(":focus");
@@ -115887,19 +116115,6 @@
                             }
                         }))
                     },
-                    _checkCellOverlapped: function($cell) {
-                        var cellOffset = $cell.offset();
-                        var hasScrollable = this.component.getScrollable && this.component.getScrollable();
-                        var isOverlapped = false;
-                        if (hasScrollable) {
-                            if (cellOffset.left < 0) {
-                                isOverlapped = (0, _size.getWidth)($cell) + cellOffset.left <= 0
-                            } else if (cellOffset.top < 0) {
-                                isOverlapped = (0, _size.getHeight)($cell) + cellOffset.top <= 0
-                            }
-                        }
-                        return isOverlapped
-                    },
                     _getFocusedCell: function() {
                         return (0, _renderer.default)(this._getCell(this._focusedCellPosition))
                     },
@@ -116548,12 +116763,12 @@
                         })
                     },
                     _isInsideEditForm: function(element) {
-                        return (0, _renderer.default)(element).closest("." + this.addWidgetPrefix("edit-form")).length > 0
+                        var $editForm = (0, _renderer.default)(element).closest("." + this.addWidgetPrefix("edit-form"));
+                        return $editForm.length && this.elementIsInsideGrid($editForm)
                     },
                     _isMasterDetailCell: function(element) {
                         var $masterDetailCell = (0, _renderer.default)(element).closest(".dx-master-detail-cell");
-                        var $masterDetailGrid = $masterDetailCell.closest("." + this.getWidgetContainerClass()).parent();
-                        return $masterDetailCell.length && $masterDetailGrid.is(this.component.$element())
+                        return $masterDetailCell.length && this.elementIsInsideGrid($masterDetailCell)
                     },
                     _processNextCellInMasterDetail: function($nextCell) {
                         if (!this._isInsideEditForm($nextCell) && $nextCell) {
@@ -116867,7 +117082,8 @@
                                     var result = this.items().length - 1;
                                     var virtualItemsCount = this.virtualItemsCount();
                                     if (virtualItemsCount) {
-                                        result += virtualItemsCount.begin + virtualItemsCount.end
+                                        var rowIndexOffset = this.getRowIndexOffset();
+                                        result += rowIndexOffset + virtualItemsCount.end
                                     }
                                     return result
                                 }
@@ -117337,6 +117553,10 @@
                     getWidgetContainerClass: function() {
                         var containerName = "dxDataGrid" === this.component.NAME ? null : "container";
                         return this.addWidgetPrefix(containerName)
+                    },
+                    elementIsInsideGrid: function($element) {
+                        var $gridElement = $element.closest("." + this.getWidgetContainerClass()).parent();
+                        return $gridElement.is(this.component.$element())
                     }
                 });
                 var Controller = ModuleItem;
@@ -117585,7 +117805,7 @@
                         var dataController = this.getController("data");
                         dataController.changed.add((function(e) {
                             if (e && e.repaintChangesOnly) {
-                                var pager = _this._getPager();
+                                var pager = _this._pager;
                                 if (pager) {
                                     pager.option({
                                         pageIndex: getPageIndex(dataController),
@@ -117598,14 +117818,11 @@
                                     _this.render()
                                 }
                             } else if (!e || "update" !== e.changeType && "updateSelection" !== e.changeType && "updateFocusedRow" !== e.changeType) {
+                                _this._pager = null;
                                 _this.render()
                             }
                         }))
                     },
-                    _getPager: function() {
-                        var $element = this.element();
-                        return $element && $element.data("dxPager")
-                    },
                     _renderCore: function() {
                         var $element = this.element().addClass(this.addWidgetPrefix("pager"));
                         var pagerOptions = this.option("pager") || {};
@@ -117645,12 +117862,19 @@
                         if ((0, _type.isDefined)(pagerOptions.infoText)) {
                             options.infoText = pagerOptions.infoText
                         }
+                        if (this._pager) {
+                            this._pager.repaint();
+                            return
+                        }
                         if ((0, _window.hasWindow)()) {
-                            this._createComponent($element, _pager.default, options)
+                            this._pager = this._createComponent($element, _pager.default, options)
                         } else {
                             $element.addClass("dx-pager").html('<div class="dx-pages"><div class="dx-page"></div></div>')
                         }
                     },
+                    getPager: function() {
+                        return this._pager
+                    },
                     getPageSizes: function() {
                         var dataController = this.getController("data");
                         var pagerOptions = this.option("pager");
@@ -117701,12 +117925,16 @@
                                 this._pageSizes = null
                             }
                             if (!isDataSource) {
+                                this._pager = null;
                                 this._invalidate();
                                 if ((0, _window.hasWindow)() && isPager && this.component) {
                                     this.component.resize()
                                 }
                             }
                         }
+                    },
+                    dispose: function() {
+                        this._pager = null
                     }
                 });
                 var pagerModule = {
@@ -117783,12 +118011,28 @@
                             var _this$sortableFixedNa;
                             null === (_this$sortableFixedNa = _this[sortableFixedName]) || void 0 === _this$sortableFixedNa ? void 0 : _this$sortableFixedNa.$element().css("pointerEvents", toggle ? "auto" : "")
                         };
-                        var filter = this.option("dataRowTemplate") ? "> table > tbody.dx-row:not(.dx-freespace-row):not(.dx-virtual-row)" : "> table > tbody > .dx-row:not(.dx-freespace-row):not(.dx-virtual-row)";
+                        var rowSelector = ".dx-row:not(.dx-freespace-row):not(.dx-virtual-row):not(.dx-header-row):not(.dx-footer-row)";
+                        var filter = this.option("dataRowTemplate") ? "> table > tbody".concat(rowSelector) : "> table > tbody > ".concat(rowSelector);
                         if ((allowReordering || this[currentSortableName]) && $content.length) {
                             this[currentSortableName] = this._createComponent($content, _sortable.default, (0, _extend.extend)({
                                 component: this.component,
                                 contentTemplate: null,
                                 filter: filter,
+                                cursorOffset: function(options) {
+                                    var event = options.event;
+                                    var rowsViewOffset = (0, _renderer.default)(_this.element()).offset();
+                                    return {
+                                        x: event.pageX - rowsViewOffset.left
+                                    }
+                                },
+                                onDraggableElementShown: function(e) {
+                                    if (rowDragging.dragTemplate) {
+                                        return
+                                    }
+                                    var $dragElement = (0, _renderer.default)(e.dragElement);
+                                    var gridInstance = $dragElement.children(".dx-widget").data(_this.component.NAME);
+                                    _this._synchronizeScrollLeftPosition(gridInstance)
+                                },
                                 dragTemplate: this._getDraggableRowTemplate(),
                                 handle: rowDragging.showDragIcons && ".".concat("dx-command-drag"),
                                 dropFeedbackMode: "indicate"
@@ -117888,6 +118132,12 @@
                             }
                         }
                     },
+                    _synchronizeScrollLeftPosition: function(gridInstance) {
+                        var scrollable = null === gridInstance || void 0 === gridInstance ? void 0 : gridInstance.getScrollable();
+                        null === scrollable || void 0 === scrollable ? void 0 : scrollable.scrollTo({
+                            x: this._scrollLeft
+                        })
+                    },
                     _getDraggableRowTemplate: function() {
                         var _this3 = this;
                         return function(options) {
@@ -118301,9 +118551,9 @@
                                     $container.last().append($emptyRow)
                                 }
                             },
-                            _renderFreeSpaceRow: function($tableElement) {
+                            _renderFreeSpaceRow: function($tableElement, change) {
                                 var $freeSpaceRowElement = this._createEmptyRow("dx-freespace-row");
-                                $freeSpaceRowElement = this._wrapRowIfNeed($tableElement, $freeSpaceRowElement);
+                                $freeSpaceRowElement = this._wrapRowIfNeed($tableElement, $freeSpaceRowElement, "refresh" === (null === change || void 0 === change ? void 0 : change.changeType));
                                 this._appendEmptyRow($tableElement, $freeSpaceRowElement)
                             },
                             _checkRowKeys: function(options) {
@@ -118449,7 +118699,7 @@
                                     scrollingMode: scrollingMode
                                 }, options));
                                 this._checkRowKeys(options.change);
-                                this._renderFreeSpaceRow($table);
+                                this._renderFreeSpaceRow($table, options.change);
                                 if (!this._hasHeight) {
                                     this.updateFreeSpaceRowHeight($table)
                                 }
@@ -118862,7 +119112,7 @@
                                 if (items.length && tableElement) {
                                     var rowElements = this._getRowElements(tableElement).filter(":visible");
                                     if (!isTop) {
-                                        var height = this._hasHeight ? (0, _size.getOuterHeight)(this.element()) : (0, _renderer.default)((0, _window.getWindow)()).outerHeight();
+                                        var height = (0, _size.getOuterHeight)(this._hasHeight ? this.element() : (0, _window.getWindow)());
                                         viewportBoundary += height
                                     }
                                     for (itemIndex = 0; itemIndex < items.length; itemIndex++) {
@@ -119655,13 +119905,13 @@
                     getSelectedRowsData: function() {
                         return this._selection.getSelectedItems()
                     },
-                    changeItemSelection: function(visibleItemIndex, keys) {
+                    changeItemSelection: function(visibleItemIndex, keys, setFocusOnly) {
                         keys = keys || {};
                         if (this.isSelectionWithCheckboxes()) {
                             keys.control = true
                         }
                         var loadedItemIndex = visibleItemIndex + this._dataController.getRowIndexOffset() - this._dataController.getRowIndexOffset(true);
-                        return this._selection.changeItemSelection(loadedItemIndex, keys)
+                        return this._selection.changeItemSelection(loadedItemIndex, keys, setFocusOnly)
                     },
                     focusedItemIndex: function(itemIndex) {
                         if ((0, _type.isDefined)(itemIndex)) {
@@ -119966,7 +120216,7 @@
                                 _createRow: function(row) {
                                     var $row = this.callBase.apply(this, arguments);
                                     if (row) {
-                                        var isSelected = !!row.isSelected;
+                                        var isSelected = row.isSelected;
                                         if (isSelected) {
                                             $row.addClass("dx-selection")
                                         }
@@ -121521,7 +121771,10 @@
                                 var adapter = validator.option("adapter");
                                 if (adapter) {
                                     adapter.getValue = getValue;
-                                    adapter.validationRequestsCallbacks = []
+                                    adapter.validationRequestsCallbacks = [];
+                                    adapter.bypass = function() {
+                                        return parameters.row.isNewRow && !_this3._isValidationInProgress && !editingController.isCellModified(parameters)
+                                    }
                                 }
                             }
                             return validator
@@ -121724,7 +121977,7 @@
                                     }
                                 },
                                 _validateEditFormAfterUpdate: function(row, isCustomSetCellValue) {
-                                    if (isCustomSetCellValue && this._editForm && !row.isNewRow) {
+                                    if (isCustomSetCellValue && this._editForm) {
                                         this._editForm.validate()
                                     }
                                     this.callBase.apply(this, arguments)
@@ -122243,9 +122496,13 @@
                                     if (showValidationMessage && $cell && column && validationResult && validationResult.brokenRules) {
                                         var errorMessages = [];
                                         validationResult.brokenRules.forEach((function(rule) {
-                                            errorMessages.push(rule.message)
+                                            if (rule.message) {
+                                                errorMessages.push(rule.message)
+                                            }
                                         }));
-                                        this._showValidationMessage($focus, errorMessages, column.alignment || "left", revertTooltip)
+                                        if (errorMessages.length) {
+                                            this._showValidationMessage($focus, errorMessages, column.alignment || "left", revertTooltip)
+                                        }
                                     }!hideBorder && this._rowsView.element() && this._rowsView.updateFreeSpaceRowHeight()
                                 },
                                 focus: function($element, hideBorder) {
@@ -122779,6 +123036,7 @@
                         init: function() {
                             this.callBase.apply(this, arguments);
                             this._items = [];
+                            this._totalCount = -1;
                             this._isLoaded = true;
                             this._loadPageCount = 1;
                             this._virtualScrollController = new _uiGrid_core.VirtualScrollController(this.component, this._getVirtualScrollDataOptions())
@@ -122858,6 +123116,7 @@
                         _handleDataChanged: function(e) {
                             if (false === this.option(LEGACY_SCROLLING_MODE)) {
                                 this._items = this._dataSource.items().slice();
+                                this._totalCount = this._dataSourceTotalCount(true);
                                 this.callBase.apply(this, arguments);
                                 return
                             }
@@ -122878,6 +123137,9 @@
                         items: function() {
                             return this._items
                         },
+                        _dataSourceTotalCount: function(isBase) {
+                            return false === this.option(LEGACY_SCROLLING_MODE) && isVirtualMode(this) && !isBase ? this._totalCount : this.callBase()
+                        },
                         itemsCount: function(isBase) {
                             if (isBase || false === this.option(LEGACY_SCROLLING_MODE)) {
                                 return this.callBase()
@@ -123021,7 +123283,11 @@
                         var dataController = this.getController("data");
                         this.callBase();
                         dataController.pageChanged.add((function(pageIndex) {
-                            _this.scrollToPage(null !== pageIndex && void 0 !== pageIndex ? pageIndex : dataController.pageIndex())
+                            var scrollTop = _this._scrollTop;
+                            _this.scrollToPage(null !== pageIndex && void 0 !== pageIndex ? pageIndex : dataController.pageIndex());
+                            if (false === _this.option(LEGACY_SCROLLING_MODE) && _this._scrollTop === scrollTop) {
+                                dataController.updateViewport()
+                            }
                         }));
                         dataController.dataSourceChanged.add((function() {
                             !_this._scrollTop && _this._scrollToCurrentPageOnResize()
@@ -123135,10 +123401,17 @@
                         this._appendEmptyRow($table, $virtualRow, location)
                     },
                     _getRowHeights: function() {
-                        var rowHeights = this._getRowElements(this._tableElement).toArray().map((function(row) {
+                        var _this$getController, _this$getController$i;
+                        var isPopupEditMode = null === (_this$getController = this.getController("editing")) || void 0 === _this$getController ? void 0 : null === (_this$getController$i = _this$getController.isPopupEditMode) || void 0 === _this$getController$i ? void 0 : _this$getController$i.call(_this$getController);
+                        var rowElements = this._getRowElements(this._tableElement).toArray();
+                        if (isPopupEditMode) {
+                            rowElements = rowElements.filter((function(row) {
+                                return !(0, _renderer.default)(row).hasClass("dx-row-inserted")
+                            }))
+                        }
+                        return rowElements.map((function(row) {
                             return (0, _position.getBoundingRect)(row).height
-                        }));
-                        return rowHeights
+                        }))
                     },
                     _correctRowHeights: function(rowHeights) {
                         var dataController = this._dataController;
@@ -123190,10 +123463,11 @@
                             removeEmptyRows($virtualRows, "dx-virtual-row");
                             $tables.each((function(index, element) {
                                 var isFixed = index > 0;
+                                var prevFixed = _this3._isFixedTableRendering;
                                 _this3._isFixedTableRendering = isFixed;
                                 _this3._addVirtualRow((0, _renderer.default)(element), isFixed, "top", top);
                                 _this3._addVirtualRow((0, _renderer.default)(element), isFixed, "bottom", bottom);
-                                _this3._isFixedTableRendering = false
+                                _this3._isFixedTableRendering = prevFixed
                             }))
                         }
                     },
@@ -123246,6 +123520,7 @@
                         var legacyScrollingMode = true === this.option(LEGACY_SCROLLING_MODE);
                         var zeroTopPosition = 0 === e.scrollOffset.top;
                         if ((this._hasHeight || !legacyScrollingMode && zeroTopPosition) && this._rowHeight) {
+                            this._scrollTop = e.scrollOffset.top;
                             this._dataController.setViewportPosition(e.scrollOffset.top)
                         }
                         this.callBase.apply(this, arguments)
@@ -123361,7 +123636,7 @@
                                         return baseResult
                                     },
                                     _loadDataSource: function() {
-                                        if (this._rowsScrollController) {
+                                        if (this._rowsScrollController && isVirtualPaging(this)) {
                                             var _this$getLoadPagePara, _this$_dataSource;
                                             var _ref = null !== (_this$getLoadPagePara = this.getLoadPageParams()) && void 0 !== _this$getLoadPagePara ? _this$getLoadPagePara : {},
                                                 loadPageCount = _ref.loadPageCount;
@@ -123386,7 +123661,7 @@
                                                 var component = _this4.component;
                                                 var scrollable = component.getScrollable && component.getScrollable();
                                                 var isSortingOperation = _this4.dataSource().operationTypes().sorting;
-                                                if (scrollable && !isSortingOperation) {
+                                                if (scrollable && !isSortingOperation && rowIndex >= 0) {
                                                     var rowElement = component.getRowElement(rowIndex);
                                                     var $rowElement = rowElement && rowElement[0] && (0, _renderer.default)(rowElement[0]);
                                                     var top = $rowElement && $rowElement.position().top;
@@ -123463,7 +123738,7 @@
                                                 return false === that.option(LEGACY_SCROLLING_MODE) ? that._itemCount : that._items.filter(isItemCountable).length
                                             },
                                             hasKnownLastPage: function() {
-                                                return true
+                                                return false === that.option(LEGACY_SCROLLING_MODE) ? that.hasKnownLastPage() : true
                                             },
                                             pageIndex: function(index) {
                                                 if (void 0 !== index) {
@@ -123616,17 +123891,17 @@
                                             newItems.forEach((function(item) {
                                                 var rowType = item.rowType;
                                                 var itemCountable = isItemCountableByDataSource(item, dataSource);
+                                                var isNextGroupItem = "group" === rowType && (prevCountable || itemCountable || "group" !== prevRowType && currentIndex > 0);
+                                                var isNextDataItem = "data" === rowType && itemCountable && (prevCountable || "group" !== prevRowType);
                                                 if (!item.isNewRow && (0, _type.isDefined)(prevCountable)) {
-                                                    var isNextGroupItem = "group" === rowType && (prevCountable || itemCountable || "group" !== prevRowType && currentIndex > 0);
-                                                    var isNextDataItem = "data" === rowType && itemCountable && (prevCountable || "group" !== prevRowType);
                                                     var isPrevNewRowFirst = isPrevRowNew && !wasCountableItem;
-                                                    if (isNextGroupItem || isNextDataItem) {
-                                                        wasCountableItem = true;
-                                                        if (!isPrevNewRowFirst) {
-                                                            currentIndex++
-                                                        }
+                                                    if ((isNextGroupItem || isNextDataItem) && !isPrevNewRowFirst) {
+                                                        currentIndex++
                                                     }
                                                 }
+                                                if (isNextGroupItem || isNextDataItem) {
+                                                    wasCountableItem = true
+                                                }
                                                 item.loadIndex = currentIndex;
                                                 prevCountable = itemCountable;
                                                 prevRowType = rowType;
@@ -123758,6 +124033,7 @@
                                     setViewportPosition: function() {
                                         var rowsScrollController = this._rowsScrollController;
                                         var dataSource = this._dataSource;
+                                        this._isPaging = false;
                                         if (rowsScrollController) {
                                             rowsScrollController.setViewportPosition.apply(rowsScrollController, arguments)
                                         } else {
@@ -123829,8 +124105,9 @@
                                         var _this$getLoadPagePara4 = this.getLoadPageParams(),
                                             pageIndex = _this$getLoadPagePara4.pageIndex,
                                             loadPageCount = _this$getLoadPagePara4.loadPageCount;
+                                        var pageIndexIsValid = this._pageIndexIsValid(pageIndex);
                                         var result = null;
-                                        if (!this._isLoading && (pageIndex !== loadedPageParams.pageIndex || loadPageCount !== loadedPageParams.loadPageCount)) {
+                                        if (!this._isLoading && pageIndexIsValid && (pageIndex !== loadedPageParams.pageIndex || loadPageCount !== loadedPageParams.loadPageCount)) {
                                             result = {
                                                 pageIndex: pageIndex,
                                                 loadPageCount: loadPageCount
@@ -123838,6 +124115,13 @@
                                         }
                                         return result
                                     },
+                                    _pageIndexIsValid: function(pageIndex) {
+                                        var result = true;
+                                        if (isAppendMode(this) && this.hasKnownLastPage() || isVirtualMode(this)) {
+                                            result = pageIndex * this.pageSize() < this.totalItemsCount()
+                                        }
+                                        return result
+                                    },
                                     _loadItems: function(checkLoading) {
                                         var _dataSourceAdapter$lo, _dataSourceAdapter$pa, _this8 = this;
                                         var virtualPaging = isVirtualPaging(this);
@@ -123848,8 +124132,10 @@
                                         var currentPageIndex = null !== (_dataSourceAdapter$pa = null === dataSourceAdapter || void 0 === dataSourceAdapter ? void 0 : dataSourceAdapter.pageIndex()) && void 0 !== _dataSourceAdapter$pa ? _dataSourceAdapter$pa : 0;
                                         var pageIndexNotChanged = (null === changedParams || void 0 === changedParams ? void 0 : changedParams.pageIndex) === currentPageIndex;
                                         var allLoadedInAppendMode = isAppendMode(this) && this.totalItemsCount() < lastRequiredItemCount;
+                                        var isRepaintMode = "repaint" === this.option("editing.refreshMode");
+                                        var pageIndexIncreased = (null === changedParams || void 0 === changedParams ? void 0 : changedParams.pageIndex) > currentPageIndex;
                                         var result = false;
-                                        if (!dataSourceAdapter || virtualPaging && checkLoading && ((null === changedParams || void 0 === changedParams ? void 0 : changedParams.pageIndex) > currentPageIndex || pageIndexNotChanged && allLoadedInAppendMode)) {
+                                        if (!dataSourceAdapter || virtualPaging && checkLoading && (isRepaintMode || pageIndexIncreased || pageIndexNotChanged && allLoadedInAppendMode)) {
                                             return result
                                         }
                                         if (virtualPaging && this._isLoading) {
@@ -123904,7 +124190,7 @@
                                         var currentTake = null !== (_this$_loadViewportPa = null === (_this$_loadViewportPa2 = this._loadViewportParams) || void 0 === _this$_loadViewportPa2 ? void 0 : _this$_loadViewportPa2.take) && void 0 !== _this$_loadViewportPa ? _this$_loadViewportPa : 0;
                                         var rowsScrollController = this._rowsScrollController;
                                         var newTake = null === rowsScrollController || void 0 === rowsScrollController ? void 0 : rowsScrollController.getViewportParams().take;
-                                        (viewportIsNotFilled || currentTake < newTake) && itemCount && this.loadViewport({
+                                        (viewportIsNotFilled || currentTake < newTake) && !this._isPaging && itemCount && this.loadViewport({
                                             checkLoading: true
                                         })
                                     },
@@ -124397,7 +124683,8 @@
                             var _this$option2;
                             var virtualMode = "virtual" === this.option("scrolling.mode");
                             var totalItemsCount = this._dataOptions.totalItemsCount();
-                            var topIndex = this._viewportItemIndex;
+                            var hasKnownLastPage = this._dataOptions.hasKnownLastPage();
+                            var topIndex = hasKnownLastPage && this._viewportItemIndex > totalItemsCount ? totalItemsCount : this._viewportItemIndex;
                             var bottomIndex = this._viewportSize + topIndex;
                             var maxGap = this.option("scrolling.prerenderedRowChunkSize") || 1;
                             var isScrollingBack = this.isScrollingBack();
@@ -126269,7 +126556,7 @@
                         };
                         _proto._selectItemHandler = function() {
                             if (this._isMentionActive) {
-                                this._list.selectItem(this._list.option("focusedElement"))
+                                this._list.option("items").length ? this._list.selectItem(this._list.option("focusedElement")) : this._popup.hide()
                             }
                             return !this._isMentionActive
                         };
@@ -129527,6 +129814,7 @@
                 var _scroll_view = _interopRequireDefault(__webpack_require__( /*! ../../scroll_view */ 4741));
                 var _size = __webpack_require__( /*! ../../../core/utils/size */ 58664);
                 var _window = __webpack_require__( /*! ../../../core/utils/window */ 58201);
+                var _quill_importer = __webpack_require__( /*! ../quill_importer */ 60148);
 
                 function _interopRequireDefault(obj) {
                     return obj && obj.__esModule ? obj : {
@@ -129709,12 +129997,35 @@
 
                 function prepareLinkHandler(module) {
                     return function() {
+                        var _selection;
                         module.quill.focus();
                         var selection = module.quill.getSelection();
                         var selectionHasEmbedContent = (0, _table_helper.hasEmbedContent)(module, selection);
                         var formats = selection ? module.quill.getFormat() : {};
+                        var isCursorAtLink = formats.link && 0 === (null === (_selection = selection) || void 0 === _selection ? void 0 : _selection.length);
+                        var href = formats.link || "";
+                        if (isCursorAtLink) {
+                            var linkRange = function(module, range) {
+                                var Quill = (0, _quill_importer.getQuill)();
+                                var LinkBlot = Quill.import("formats/link");
+                                var _module$quill$scroll$ = module.quill.scroll.descendant(LinkBlot, range.index),
+                                    _module$quill$scroll$2 = _slicedToArray(_module$quill$scroll$, 2),
+                                    link = _module$quill$scroll$2[0],
+                                    offset = _module$quill$scroll$2[1];
+                                var result = !link ? null : {
+                                    index: range.index - offset,
+                                    length: link.length()
+                                };
+                                return result
+                            }(module, selection);
+                            if (linkRange) {
+                                selection = linkRange
+                            } else {
+                                href = ""
+                            }
+                        }
                         var formData = {
-                            href: formats.link || "",
+                            href: href,
                             text: selection && !selectionHasEmbedContent ? module.quill.getText(selection) : "",
                             target: Object.prototype.hasOwnProperty.call(formats, "target") ? !!formats.target : true
                         };
@@ -129726,8 +130037,9 @@
                         promise.done((function(formData, event) {
                             if (selection && !selectionHasEmbedContent) {
                                 var text = formData.text || formData.href;
-                                var index = selection.index,
-                                    length = selection.length;
+                                var _selection2 = selection,
+                                    index = _selection2.index,
+                                    length = _selection2.length;
                                 formData.text = void 0;
                                 module.saveValueChangeEvent(event);
                                 length && module.quill.deleteText(index, length, "silent");
@@ -131843,18 +132155,15 @@
                     _selectAllHandler: function(e) {
                         e.event && e.event.stopPropagation();
                         var isSelectedAll = this._selectAllCheckBox.option("value");
-                        var result = this._list._createActionByOption("onSelectAllValueChanged")({
-                            value: isSelectedAll
-                        });
-                        if (false === result) {
-                            return
-                        }
                         e.event && this._list._saveSelectionChangeEvent(e.event);
                         if (true === isSelectedAll) {
                             this._selectAllItems()
                         } else if (false === isSelectedAll) {
                             this._unselectAllItems()
                         }
+                        this._list._createActionByOption("onSelectAllValueChanged")({
+                            value: isSelectedAll
+                        })
                     },
                     _checkSelectAllCapability: function() {
                         var list = this._list;
@@ -136311,6 +136620,7 @@
                         this._visibleSubmenu = null;
                         this.$element().addClass("dx-menu");
                         _MenuBase.prototype._initMarkup.call(this);
+                        this._addCustomCssClass(this.$element());
                         this.setAria("role", "menubar")
                     };
                     _proto._render = function() {
@@ -136398,7 +136708,7 @@
                         (0, _iterator.each)(["rtlEnabled", "width", "accessKey", "activeStateEnabled", "animation", "dataSource", "disabled", "displayExpr", "displayExpr", "focusStateEnabled", "hint", "hoverStateEnabled", "itemsExpr", "items", "itemTemplate", "selectedExpr", "selectionMode", "tabIndex", "visible"], (function(_, option) {
                             menuOptions[option] = _this3.option(option)
                         }));
-                        (0, _iterator.each)(["onItemContextMenu", "onSelectionChanged"], (function(_, actionName) {
+                        (0, _iterator.each)(["onItemContextMenu", "onSelectionChanged", "onItemRendered"], (function(_, actionName) {
                             menuOptions[actionName] = function(e) {
                                 _this3._actions[actionName](e)
                             }
@@ -136464,15 +136774,15 @@
                     _proto._createSubmenu = function(node, $rootItem) {
                         var $submenuContainer = (0, _renderer.default)("<div>").addClass("dx-context-menu").appendTo($rootItem);
                         var items = this._getChildNodes(node);
-                        var result = this._createComponent($submenuContainer, _ui3.default, (0, _extend.extend)(this._getSubmenuOptions(), {
+                        var subMenu = this._createComponent($submenuContainer, _ui3.default, (0, _extend.extend)(this._getSubmenuOptions(), {
                             _dataAdapter: this._dataAdapter,
                             _parentKey: node.internalFields.key,
                             items: items,
                             onHoverStart: this._clearTimeouts.bind(this),
                             position: this.getSubmenuPosition($rootItem)
                         }));
-                        this._attachSubmenuHandlers($rootItem, result);
-                        return result
+                        this._attachSubmenuHandlers($rootItem, subMenu);
+                        return subMenu
                     };
                     _proto._getSubmenuOptions = function() {
                         var _this4 = this;
@@ -139633,16 +139943,20 @@
                                 this.hide()
                             },
                             upArrow: function(e) {
-                                _this._drag.moveUp(e)
+                                var _this$_drag;
+                                null === (_this$_drag = _this._drag) || void 0 === _this$_drag ? void 0 : _this$_drag.moveUp(e)
                             },
                             downArrow: function(e) {
-                                _this._drag.moveDown(e)
+                                var _this$_drag2;
+                                null === (_this$_drag2 = _this._drag) || void 0 === _this$_drag2 ? void 0 : _this$_drag2.moveDown(e)
                             },
                             leftArrow: function(e) {
-                                _this._drag.moveLeft(e)
+                                var _this$_drag3;
+                                null === (_this$_drag3 = _this._drag) || void 0 === _this$_drag3 ? void 0 : _this$_drag3.moveLeft(e)
                             },
                             rightArrow: function(e) {
-                                _this._drag.moveRight(e)
+                                var _this$_drag4;
+                                null === (_this$_drag4 = _this._drag) || void 0 === _this$_drag4 ? void 0 : _this$_drag4.moveRight(e)
                             }
                         })
                     },
@@ -139774,7 +140088,7 @@
                         this._initHideTopOverlayHandler(this.option("hideTopOverlayHandler"));
                         this._parentsScrollSubscriptionInfo = {
                             handler: function(e) {
-                                _this3._targetParentsScrollHandler(e)
+                                _this3._hideOnParentsScrollHandler(e)
                             }
                         };
                         this._updateResizeCallbackSkipCondition();
@@ -140232,7 +140546,7 @@
                     _toggleSubscriptions: function(enabled) {
                         if ((0, _window.hasWindow)()) {
                             this._toggleHideTopOverlayCallback(enabled);
-                            this._toggleParentsScrollSubscription(enabled)
+                            this._toggleHideOnParentsScrollSubscription(enabled)
                         }
                     },
                     _toggleHideTopOverlayCallback: function(subscribe) {
@@ -140245,7 +140559,7 @@
                             _hide_callback.hideCallback.remove(this._hideTopOverlayHandler)
                         }
                     },
-                    _toggleParentsScrollSubscription: function(needSubscribe) {
+                    _toggleHideOnParentsScrollSubscription: function(needSubscribe) {
                         var _this$_parentsScrollS;
                         var scrollEvent = (0, _index.addNamespace)("scroll", this.NAME);
                         var _ref = null !== (_this$_parentsScrollS = this._parentsScrollSubscriptionInfo) && void 0 !== _this$_parentsScrollS ? _this$_parentsScrollS : {},
@@ -140254,7 +140568,7 @@
                         _events_engine.default.off(prevTargets, scrollEvent, handler);
                         var closeOnScroll = this.option("hideOnParentScroll");
                         if (needSubscribe && closeOnScroll) {
-                            var $parents = this._$wrapper.parents();
+                            var $parents = this._hideOnParentScrollTarget().parents();
                             if ("desktop" === _devices.default.real().deviceType) {
                                 $parents = $parents.add(window)
                             }
@@ -140262,7 +140576,7 @@
                             this._parentsScrollSubscriptionInfo.prevTargets = $parents
                         }
                     },
-                    _targetParentsScrollHandler: function(e) {
+                    _hideOnParentsScrollHandler: function(e) {
                         var closeHandled = false;
                         var closeOnScroll = this.option("hideOnParentScroll");
                         if ((0, _type.isFunction)(closeOnScroll)) {
@@ -140272,6 +140586,9 @@
                             this.hide()
                         }
                     },
+                    _hideOnParentScrollTarget: function() {
+                        return this._$wrapper
+                    },
                     _render: function() {
                         this.callBase();
                         this._appendContentToElement();
@@ -140618,7 +140935,7 @@
                         this._parentsScrollSubscriptionInfo = null;
                         this.callBase();
                         this._toggleSafariScrolling();
-                        zIndexPool.remove(this._zIndex);
+                        this.option("visible") && zIndexPool.remove(this._zIndex);
                         this._$wrapper.remove();
                         this._$content.remove()
                     },
@@ -140702,7 +141019,7 @@
                                 this._toggleHideTopOverlayCallback(this.option("visible"));
                                 break;
                             case "hideOnParentScroll":
-                                this._toggleParentsScrollSubscription(this.option("visible"));
+                                this._toggleHideOnParentsScrollSubscription(this.option("visible"));
                                 break;
                             case "closeOnOutsideClick":
                             case "propagateOutsideClick":
@@ -146057,9 +146374,21 @@
                                 e.removeSourceElement = !!e.sourceGroup;
                                 that._adjustSortableOnChangedArgs(e);
                                 if (field) {
+                                    var targetIndex = e.targetIndex;
+                                    var fields = dataSource.getAreaFields(field.area, true);
+                                    var visibleFields = fields.filter((function(f) {
+                                        return false !== f.visible
+                                    }));
+                                    var fieldBeforeTarget = visibleFields[targetIndex - 1];
+                                    var invisibleFieldsIndexOffset = 0;
+                                    if (fieldBeforeTarget) {
+                                        invisibleFieldsIndexOffset = fields.filter((function(f) {
+                                            return false === f.visible && f.areaIndex <= fieldBeforeTarget.areaIndex
+                                        })).length
+                                    }
                                     that._applyChanges([getMainGroupField(dataSource, field)], {
                                         area: e.targetGroup,
-                                        areaIndex: e.targetIndex
+                                        areaIndex: targetIndex + invisibleFieldsIndexOffset
                                     })
                                 }
                             }
@@ -147578,16 +147907,8 @@
                             return hasRowsScroll ? dataAreaHeight : totalHeight + (hasColumnsScroll ? scrollBarWidth : 0)
                         };
                         (0, _common.deferUpdate)((function() {
-                            var resultWidths = that._dataArea.getColumnsWidth();
                             var rowHeights = that._rowsArea.getRowsHeight();
-                            var rowsAreaHeights = needSynchronizeFieldPanel ? rowHeights.slice(1) : rowHeights;
-                            var dataAreaHeights = that._dataArea.getRowsHeight();
                             var descriptionCellHeight = (0, _size.getOuterHeight)(descriptionCell[0], true) + (needSynchronizeFieldPanel ? rowHeights[0] : 0);
-                            var columnsAreaRowCount = that._dataController.getColumnsInfo().length;
-                            var resultHeights = (0, _uiPivot_grid.mergeArraysByMaxValue)(rowsAreaHeights, dataAreaHeights.slice(columnsAreaRowCount));
-                            var columnsAreaRowHeights = dataAreaHeights.slice(0, columnsAreaRowCount);
-                            var columnsAreaHeight = getArraySum(columnsAreaRowHeights);
-                            var rowsAreaColumnWidths = that._rowsArea.getColumnsWidth();
                             var filterAreaHeight = 0;
                             var dataAreaHeight = 0;
                             if (that._hasHeight) {
@@ -147597,6 +147918,19 @@
                                 bordersWidth = getCommonBorderWidth([columnAreaCell, dataAreaCell, tableElement, columnHeaderCell, filterHeaderCell], "height");
                                 dataAreaHeight = (0, _size.getHeight)(that.$element()) - filterAreaHeight - dataHeaderHeight - (Math.max((0, _size.getHeight)(that._dataArea.headElement()), (0, _size.getHeight)(columnAreaCell), descriptionCellHeight) + bordersWidth)
                             }
+                            var scrollBarWidth = that._dataArea.getScrollbarWidth();
+                            var hasVerticalScrollbar = calculateHasScroll(dataAreaHeight, (0, _size.getHeight)(that._dataArea.tableElement()));
+                            that._dataArea.tableElement().css({
+                                width: that._hasHeight && hasVerticalScrollbar && scrollBarWidth ? "calc(100% - ".concat(scrollBarWidth, "px)") : "100%"
+                            });
+                            var resultWidths = that._dataArea.getColumnsWidth();
+                            var rowsAreaHeights = needSynchronizeFieldPanel ? rowHeights.slice(1) : rowHeights;
+                            var dataAreaHeights = that._dataArea.getRowsHeight();
+                            var columnsAreaRowCount = that._dataController.getColumnsInfo().length;
+                            var resultHeights = (0, _uiPivot_grid.mergeArraysByMaxValue)(rowsAreaHeights, dataAreaHeights.slice(columnsAreaRowCount));
+                            var columnsAreaRowHeights = dataAreaHeights.slice(0, columnsAreaRowCount);
+                            var columnsAreaHeight = getArraySum(columnsAreaRowHeights);
+                            var rowsAreaColumnWidths = that._rowsArea.getColumnsWidth();
                             totalWidth = (0, _size.getWidth)(that._dataArea.tableElement());
                             totalHeight = getArraySum(resultHeights);
                             if (!totalWidth || !totalHeight) {
@@ -147616,15 +147950,10 @@
                             }
                             hasRowsScroll = that._hasHeight && calculateHasScroll(dataAreaHeight, totalHeight);
                             hasColumnsScroll = calculateHasScroll(groupWidth, totalWidth);
-                            var scrollBarWidth = that._dataArea.getScrollbarWidth();
                             var groupHeight = calculateGroupHeight(dataAreaHeight, totalHeight, hasRowsScroll, hasColumnsScroll, scrollBarWidth);
                             (0, _common.deferRender)((function() {
                                 that._columnsArea.tableElement().append(that._dataArea.headElement());
                                 rowFieldsHeader.tableElement().append(that._rowsArea.headElement());
-                                if (!hasColumnsScroll && hasRowsScroll && scrollBarWidth) {
-                                    adjustSizeArray(resultWidths, scrollBarWidth);
-                                    totalWidth -= scrollBarWidth
-                                }
                                 if (descriptionCellHeight > columnsAreaHeight) {
                                     adjustSizeArray(columnsAreaRowHeights, columnsAreaHeight - descriptionCellHeight);
                                     that._columnsArea.setRowsHeight(columnsAreaRowHeights)
@@ -150335,6 +150664,9 @@
                     _getContainerPosition: function() {
                         return this._positionController._getContainerPosition()
                     },
+                    _hideOnParentScrollTarget: function() {
+                        return (0, _renderer.default)(this._positionController._position.of || this.callBase())
+                    },
                     _getSideByLocation: function(location) {
                         var isFlippedByVertical = location.v.flip;
                         var isFlippedByHorizontal = location.h.flip;
@@ -152149,7 +152481,8 @@
                                     start: start,
                                     end: end,
                                     value: [start, end],
-                                    event: this._valueChangeEventInstance
+                                    event: this._valueChangeEventInstance,
+                                    previousValue: args.previousValue
                                 });
                                 this.validationRequest.fire({
                                     value: [start, end],
@@ -152200,7 +152533,7 @@
                 var _window = __webpack_require__( /*! ../core/utils/window */ 58201);
                 var _events_engine = _interopRequireDefault(__webpack_require__( /*! ../events/core/events_engine */ 55994));
                 var _drag = __webpack_require__( /*! ../events/drag */ 23174);
-                var _utils = __webpack_require__( /*! ../events/utils */ 39611);
+                var _index = __webpack_require__( /*! ../events/utils/index */ 39611);
                 var _visibility_change = __webpack_require__( /*! ../events/visibility_change */ 80506);
 
                 function _interopRequireDefault(obj) {
@@ -152223,9 +152556,9 @@
                     };
                     return _extends.apply(this, arguments)
                 }
-                var DRAGSTART_START_EVENT_NAME = (0, _utils.addNamespace)(_drag.start, "dxResizable");
-                var DRAGSTART_EVENT_NAME = (0, _utils.addNamespace)(_drag.move, "dxResizable");
-                var DRAGSTART_END_EVENT_NAME = (0, _utils.addNamespace)(_drag.end, "dxResizable");
+                var DRAGSTART_START_EVENT_NAME = (0, _index.addNamespace)(_drag.start, "dxResizable");
+                var DRAGSTART_EVENT_NAME = (0, _index.addNamespace)(_drag.move, "dxResizable");
+                var DRAGSTART_END_EVENT_NAME = (0, _index.addNamespace)(_drag.end, "dxResizable");
                 var SIDE_BORDER_WIDTH_STYLES = {
                     left: "borderLeftWidth",
                     top: "borderTopWidth",
@@ -153754,6 +154087,7 @@
                     }
                     var _proto = AppointmentForm.prototype;
                     _proto.create = function(triggerResize, changeSize, formData) {
+                        var _this = this;
                         var allowTimeZoneEditing = this.scheduler.getEditingConfig().allowTimeZoneEditing;
                         var _this$scheduler$getDa = this.scheduler.getDataAccessors(),
                             expr = _this$scheduler$getDa.expr;
@@ -153790,11 +154124,37 @@
                             formData: formData,
                             showColonAfterLabel: false,
                             labelLocation: "top",
+                            customizeItem: function(e) {
+                                if (_this.form && "group" === e.itemType) {
+                                    var dataExprs = _this.scheduler.getDataAccessors().expr;
+                                    var startDate = new Date(_this.formData[dataExprs.startDateExpr]);
+                                    var endDate = new Date(_this.formData[dataExprs.endDateExpr]);
+                                    var startTimeZoneEditor = e.items.find((function(i) {
+                                        return i.dataField === dataExprs.startDateTimeZoneExpr
+                                    }));
+                                    var endTimeZoneEditor = e.items.find((function(i) {
+                                        return i.dataField === dataExprs.endDateTimeZoneExpr
+                                    }));
+                                    if (startTimeZoneEditor) {
+                                        startTimeZoneEditor.editorOptions.dataSource = _this.createTimeZoneDataSource(startDate)
+                                    }
+                                    if (endTimeZoneEditor) {
+                                        endTimeZoneEditor.editorOptions.dataSource = _this.createTimeZoneDataSource(endDate)
+                                    }
+                                }
+                            },
                             screenByWidth: function(width) {
                                 return width < 600 || "desktop" !== _devices.default.current().deviceType ? "xs" : "lg"
                             }
                         })
                     };
+                    _proto.createTimeZoneDataSource = function(date) {
+                        return new _data_source.default({
+                            store: _utils.default.getDisplayedTimeZones(date),
+                            paginate: true,
+                            pageSize: 10
+                        })
+                    };
                     _proto._dateBoxValueChanged = function(args, dateExpr, isNeedCorrect) {
                         ! function(editor, value, previousValue) {
                             var isCurrentDateCorrect = null === value || !!value;
@@ -153813,7 +154173,7 @@
                         }
                     };
                     _proto._createTimezoneEditor = function(timeZoneExpr, secondTimeZoneExpr, visibleIndex, colSpan, isMainTimeZone) {
-                        var _this = this;
+                        var _this2 = this;
                         var visible = arguments.length > 5 && void 0 !== arguments[5] ? arguments[5] : false;
                         var noTzTitle = _message.default.format("dxScheduler-noTimezoneTitle");
                         return {
@@ -153830,7 +154190,7 @@
                                 placeholder: noTzTitle,
                                 searchEnabled: true,
                                 onValueChanged: function(args) {
-                                    var form = _this.form;
+                                    var form = _this2.form;
                                     var secondTimezoneEditor = form.getEditor(secondTimeZoneExpr);
                                     if (isMainTimeZone) {
                                         secondTimezoneEditor.option("value", args.value)
@@ -153841,15 +154201,15 @@
                         }
                     };
                     _proto._createDateBoxItems = function(dataExprs, allowTimeZoneEditing) {
-                        var _this2 = this;
+                        var _this3 = this;
                         var colSpan = allowTimeZoneEditing ? 2 : 1;
                         var firstDayOfWeek = this.scheduler.getFirstDayOfWeek();
                         return [createDateBoxEditor(dataExprs.startDateExpr, colSpan, firstDayOfWeek, "dxScheduler-editorLabelStartDate", (function(args) {
-                            _this2._dateBoxValueChanged(args, dataExprs.endDateExpr, (function(endValue, startValue) {
+                            _this3._dateBoxValueChanged(args, dataExprs.endDateExpr, (function(endValue, startValue) {
                                 return endValue < startValue
                             }))
                         })), this._createTimezoneEditor(dataExprs.startDateTimeZoneExpr, dataExprs.endDateTimeZoneExpr, 1, colSpan, true, allowTimeZoneEditing), createDateBoxEditor(dataExprs.endDateExpr, colSpan, firstDayOfWeek, "dxScheduler-editorLabelEndDate", (function(args) {
-                            _this2._dateBoxValueChanged(args, dataExprs.startDateExpr, (function(startValue, endValue) {
+                            _this3._dateBoxValueChanged(args, dataExprs.startDateExpr, (function(startValue, endValue) {
                                 return endValue < startValue
                             }))
                         })), this._createTimezoneEditor(dataExprs.endDateTimeZoneExpr, dataExprs.startDateTimeZoneExpr, 3, colSpan, false, allowTimeZoneEditing)]
@@ -153863,7 +154223,7 @@
                         this.form.itemOption(itemPath, "editorOptions", newEditorOption)
                     };
                     _proto._createMainItems = function(dataExprs, triggerResize, changeSize, allowTimeZoneEditing) {
-                        var _this3 = this;
+                        var _this4 = this;
                         return [{
                             dataField: dataExprs.textExpr,
                             editorType: "dxTextBox",
@@ -153897,10 +154257,10 @@
                                 editorOptions: {
                                     onValueChanged: function(args) {
                                         var value = args.value;
-                                        var startDateEditor = _this3.form.getEditor(dataExprs.startDateExpr);
-                                        var endDateEditor = _this3.form.getEditor(dataExprs.endDateExpr);
+                                        var startDateEditor = _this4.form.getEditor(dataExprs.startDateExpr);
+                                        var endDateEditor = _this4.form.getEditor(dataExprs.endDateExpr);
                                         var startDate = _date_serialization.default.deserializeDate(startDateEditor.option("value"));
-                                        if (_this3.semaphore.isFree() && startDate) {
+                                        if (_this4.semaphore.isFree() && startDate) {
                                             if (value) {
                                                 var allDayStartDate = _date.default.trimTime(startDate);
                                                 startDateEditor.option("value", new Date(allDayStartDate));
@@ -153908,16 +154268,16 @@
                                             } else {
                                                 var startDateWithStartHour = function(startDate, startDayHour) {
                                                     return new Date(new Date(startDate).setHours(startDayHour))
-                                                }(startDate, _this3.scheduler.getStartDayHour());
-                                                var endDate = _this3.scheduler.getCalculatedEndDate(startDateWithStartHour);
+                                                }(startDate, _this4.scheduler.getStartDayHour());
+                                                var endDate = _this4.scheduler.getCalculatedEndDate(startDateWithStartHour);
                                                 startDateEditor.option("value", startDateWithStartHour);
                                                 endDateEditor.option("value", endDate)
                                             }
                                         }
                                         var startDateItemPath = "".concat(APPOINTMENT_FORM_GROUP_NAMES.Main, ".").concat(dataExprs.startDateExpr);
                                         var endDateItemPath = "".concat(APPOINTMENT_FORM_GROUP_NAMES.Main, ".").concat(dataExprs.endDateExpr);
-                                        _this3._changeFormItemDateType(startDateItemPath, value);
-                                        _this3._changeFormItemDateType(endDateItemPath, value)
+                                        _this4._changeFormItemDateType(startDateItemPath, value);
+                                        _this4._changeFormItemDateType(endDateItemPath, value)
                                     }
                                 }
                             }, {
@@ -153931,7 +154291,7 @@
                                 },
                                 editorOptions: {
                                     onValueChanged: function(args) {
-                                        var form = _this3.form;
+                                        var form = _this4.form;
                                         var colSpan = args.value ? 1 : 2;
                                         form.itemOption(APPOINTMENT_FORM_GROUP_NAMES.Main, "colSpan", colSpan);
                                         form.itemOption(APPOINTMENT_FORM_GROUP_NAMES.Recurrence, "colSpan", colSpan);
@@ -153990,17 +154350,6 @@
                             this.form.itemOption(endDateItemPath, "editorOptions", endDateEditorOptions)
                         }
                     };
-                    _proto.updateTimeZoneEditorDataSource = function(date, expression) {
-                        var timeZoneDataSource = new _data_source.default({
-                            store: _utils.default.getDisplayedTimeZones(date),
-                            paginate: true,
-                            pageSize: 10
-                        });
-                        var options = {
-                            dataSource: timeZoneDataSource
-                        };
-                        this.setEditorOptions(expression, "Main", options)
-                    };
                     _proto.updateRecurrenceEditorStartDate = function(date, expression) {
                         var options = {
                             startDate: date
@@ -154012,16 +154361,22 @@
                         var editor = this.form.itemOption(editorPath);
                         editor && this.form.itemOption(editorPath, "editorOptions", (0, _extend.extend)({}, editor.editorOptions, options))
                     };
+                    _proto.setTimeZoneEditorDataSource = function(date, path) {
+                        var dataSource = this.createTimeZoneDataSource(date);
+                        this.setEditorOptions(path, "Main", {
+                            dataSource: dataSource
+                        })
+                    };
                     _proto.updateFormData = function(formData) {
                         this.semaphore.take();
+                        this.form.option("formData", formData);
                         var dataExprs = this.scheduler.getDataAccessors().expr;
                         var allDay = formData[dataExprs.allDayExpr];
                         var startDate = new Date(formData[dataExprs.startDateExpr]);
                         var endDate = new Date(formData[dataExprs.endDateExpr]);
-                        this.updateTimeZoneEditorDataSource(startDate, dataExprs.startDateTimeZoneExpr);
-                        this.updateTimeZoneEditorDataSource(endDate, dataExprs.endDateTimeZoneExpr);
+                        this.setTimeZoneEditorDataSource(startDate, dataExprs.startDateTimeZoneExpr);
+                        this.setTimeZoneEditorDataSource(endDate, dataExprs.endDateTimeZoneExpr);
                         this.updateRecurrenceEditorStartDate(startDate, dataExprs.recurrenceRuleExpr);
-                        this.form.option("formData", formData);
                         this.setEditorsType(allDay);
                         this.semaphore.release()
                     };
@@ -154079,9 +154434,7 @@
                 var _popup = _interopRequireDefault(__webpack_require__( /*! ../../popup */ 39114));
                 var _loading = __webpack_require__( /*! ../loading */ 71125);
                 var _appointmentAdapter = __webpack_require__( /*! ../appointmentAdapter */ 5480);
-                var _iterator = __webpack_require__( /*! ../../../core/utils/iterator */ 95479);
                 var _utils = __webpack_require__( /*! ../resources/utils */ 98140);
-                var _array = __webpack_require__( /*! ../../../core/utils/array */ 89386);
 
                 function _interopRequireDefault(obj) {
                     return obj && obj.__esModule ? obj : {
@@ -154143,13 +154496,6 @@
                         }
                     }]
                 };
-                var modifyResourceFields = function(rawAppointment, dataAccessors, resources, returnedObject) {
-                    (0, _iterator.each)(dataAccessors.resources.getter, (function(fieldName) {
-                        var value = dataAccessors.resources.getter[fieldName](rawAppointment);
-                        var isMultiple = (0, _utils.isResourceMultiple)(resources, fieldName);
-                        returnedObject[fieldName] = isMultiple ? (0, _array.wrapToArray)(value) : value
-                    }))
-                };
                 var ACTION_TO_APPOINTMENT = {
                     CREATE: 0,
                     UPDATE: 1,
@@ -154235,11 +154581,10 @@
                         var appointment = this._createAppointmentAdapter(rawAppointment);
                         var dataAccessors = this.scheduler.getDataAccessors();
                         var resources = this.scheduler.getResources();
-                        var result = _extends({}, rawAppointment, {
+                        var normalizedResources = (0, _utils.getNormalizedResources)(rawAppointment, dataAccessors, resources);
+                        return _extends({}, rawAppointment, normalizedResources, {
                             repeat: !!appointment.recurrenceRule
-                        });
-                        modifyResourceFields(rawAppointment, dataAccessors, resources, result);
-                        return result
+                        })
                     };
                     _proto._createForm = function() {
                         var rawAppointment = this.state.appointment.data;
@@ -154387,11 +154732,10 @@
                                     var startTime = startDate.getTime();
                                     var endTime = endDate.getTime();
                                     var inAllDayRow = allDay || endTime - startTime >= DAY_IN_MS;
-                                    var resources = {};
                                     var dataAccessors = _this5.scheduler.getDataAccessors();
                                     var resourceList = _this5.scheduler.getResources();
-                                    modifyResourceFields(_this5.state.lastEditData, dataAccessors, resourceList, resources);
-                                    _this5.scheduler.updateScrollPosition(startDate, resources, inAllDayRow);
+                                    var normalizedResources = (0, _utils.getNormalizedResources)(_this5.state.lastEditData, dataAccessors, resourceList);
+                                    _this5.scheduler.updateScrollPosition(startDate, normalizedResources, inAllDayRow);
                                     _this5.state.lastEditData = null
                                 }
                                 _this5._unlockSaveChanges();
@@ -154650,7 +154994,10 @@
                         currentAppointments.forEach((function(appointment) {
                             var sourceAppointment = _this._getAssociatedSourceAppointment(appointment, sourceAppointments);
                             if (sourceAppointment) {
-                                appointment.needRepaint = _this._isDataChanged(appointment.itemData) || _this._isSettingChanged(appointment.settings, sourceAppointment.settings) || _this._isAppointmentShouldAppear(appointment, sourceAppointment)
+                                var isDataChanged = _this._isDataChanged(appointment.itemData);
+                                var isSettingChanged = _this._isSettingChanged(appointment.settings, sourceAppointment.settings);
+                                var isAppointmentShouldAppear = _this._isAppointmentShouldAppear(appointment, sourceAppointment);
+                                appointment.needRepaint = isDataChanged || isSettingChanged || isAppointmentShouldAppear
                             }
                         }));
                         return currentAppointments.concat(this._getDeletedAppointments(currentAppointments, sourceAppointments))
@@ -154837,7 +155184,7 @@
                         }
                     };
                     _proto._getVerticalResizingRule = function() {
-                        var height = this.invoke("getCellHeight");
+                        var height = Math.round(this.invoke("getCellHeight"));
                         return {
                             handles: "top bottom",
                             minWidth: 0,
@@ -155686,7 +156033,8 @@
                         if (result > maxDate.getTime() || result <= minDate.getTime()) {
                             var tailOfCurrentDay = maxDate.getTime() - endDate.getTime();
                             var tailOfPrevDays = deltaTime - tailOfCurrentDay;
-                            var lastDay = new Date(endDate.setDate(endDate.getDate() + daysCount));
+                            var correctedEndDate = new Date(endDate).setDate(endDate.getDate() + daysCount);
+                            var lastDay = new Date(correctedEndDate);
                             lastDay.setHours(startDayHour, 0, 0, 0);
                             result = lastDay.getTime() + tailOfPrevDays - visibleDayDuration * (daysCount - 1)
                         }
@@ -156554,8 +156902,16 @@
                         var dataSource = this._dataSource;
                         var store = null === dataSource || void 0 === dataSource ? void 0 : dataSource.store();
                         if (store) {
-                            store.on("updating", (function(newItem) {
-                                _this._updatedAppointment = newItem
+                            store.on("updating", (function(key) {
+                                var keyName = store.key();
+                                if (keyName) {
+                                    _this._updatedAppointmentKeys.push({
+                                        key: keyName,
+                                        value: key
+                                    })
+                                } else {
+                                    _this._updatedAppointment = key
+                                }
                             }));
                             store.on("push", (function(pushItems) {
                                 var items = dataSource.items();
@@ -161510,6 +161866,7 @@
                 __webpack_require__( /*! ../../../ui/button_group */ 28236);
                 __webpack_require__( /*! ../../../ui/drop_down_button */ 45231);
                 var _utils = __webpack_require__( /*! ./utils */ 74842);
+                var _views = __webpack_require__( /*! ../../../renovation/ui/scheduler/model/views */ 47718);
 
                 function _interopRequireDefault(obj) {
                     return obj && obj.__esModule ? obj : {
@@ -161612,7 +161969,7 @@
                         var _this = this;
                         this.eventMap = new Map([
                             ["currentView", [function(view) {
-                                return _this.currentView = view
+                                _this.currentView = (0, _views.getCurrentView)((0, _utils.getViewName)(view), _this.option("views"))
                             }]],
                             ["items", [this.repaint.bind(this)]],
                             ["views", [_utils.validateViews]],
@@ -161645,7 +162002,7 @@
                         _Widget.prototype._init.call(this);
                         this._createEventMap();
                         this.$element().addClass("dx-scheduler-header");
-                        this.currentView = this.option("currentView")
+                        this.currentView = (0, _views.getCurrentView)((0, _utils.getViewName)(this.option("currentView")), this.option("views"))
                     };
                     _proto._render = function() {
                         _Widget.prototype._render.call(this);
@@ -162411,8 +162768,8 @@
                         var duration = endDateUtc ? endDateUtc.getTime() - startDateUtc.getTime() : 0;
                         this._initializeRRule(options, startDateUtc, rule.until);
                         var minTime = minDateUtc.getTime();
-                        var leftBorder = this._getLeftBorder(options, minDateUtc, duration);
-                        this.rRuleSet.between(leftBorder, maxDateUtc, true).forEach((function(date) {
+                        var newMinDate = new Date(minDateUtc.getTime() - duration);
+                        this.rRuleSet.between(newMinDate, maxDateUtc, true).forEach((function(date) {
                             var endAppointmentTime = date.getTime() + duration;
                             if (endAppointmentTime >= minTime) {
                                 var correctDate = _utils.default.createDateFromUTCWithLocalOffset(date);
@@ -162546,12 +162903,6 @@
                         this.rRule = new _rrule.RRule(ruleOptions);
                         this.rRuleSet.rrule(this.rRule)
                     };
-                    _proto._getLeftBorder = function(options, minDateUtc, appointmentDuration) {
-                        if (options.end && !_utils.default.isSameAppointmentDates(options.start, options.end)) {
-                            return new Date(minDateUtc.getTime() - appointmentDuration)
-                        }
-                        return minDateUtc
-                    };
                     _proto._parseRecurrenceRule = function(recurrence) {
                         var ruleObject = {};
                         var ruleParts = recurrence.split(";");
@@ -163587,7 +163938,7 @@
               !*** ./artifacts/transpiled-renovation-npm/ui/scheduler/resources/utils.js ***!
               \*****************************************************************************/
             function(__unused_webpack_module, exports, __webpack_require__) {
-                exports.setResourceToAppointment = exports.reduceResourcesTree = exports.loadResources = exports.isResourceMultiple = exports.groupAppointmentsByResourcesCore = exports.groupAppointmentsByResources = exports.getWrappedDataSource = exports.getValueExpr = exports.getResourcesDataByGroups = exports.getResourceTreeLeaves = exports.getResourceColor = exports.getResourceByField = exports.getPathToLeaf = exports.getPaintedResources = exports.getOrLoadResourceItem = exports.getGroupsObjectFromGroupsArray = exports.getGroupCount = exports.getFieldExpr = exports.getDisplayExpr = exports.getDataAccessors = exports.getCellGroups = exports.getAppointmentColor = exports.getAllGroups = exports.filterResources = exports.createResourcesTree = exports.createResourceEditorModel = exports.createReducedResourcesTree = exports.createExpressions = void 0;
+                exports.setResourceToAppointment = exports.reduceResourcesTree = exports.loadResources = exports.isResourceMultiple = exports.groupAppointmentsByResourcesCore = exports.groupAppointmentsByResources = exports.getWrappedDataSource = exports.getValueExpr = exports.getResourcesDataByGroups = exports.getResourceTreeLeaves = exports.getResourceColor = exports.getResourceByField = exports.getPathToLeaf = exports.getPaintedResources = exports.getOrLoadResourceItem = exports.getNormalizedResources = exports.getGroupsObjectFromGroupsArray = exports.getGroupCount = exports.getFieldExpr = exports.getDisplayExpr = exports.getDataAccessors = exports.getCellGroups = exports.getAppointmentColor = exports.getAllGroups = exports.filterResources = exports.createResourcesTree = exports.createResourceEditorModel = exports.createReducedResourcesTree = exports.createExpressions = void 0;
                 var _utils = __webpack_require__( /*! ../../../data/data_source/utils */ 9234);
                 var _data_source = __webpack_require__( /*! ../../../data/data_source/data_source */ 85273);
                 var _deferred = __webpack_require__( /*! ../../../core/utils/deferred */ 62754);
@@ -163849,22 +164200,21 @@
                 exports.getPaintedResources = getPaintedResources;
                 var getOrLoadResourceItem = function(resources, resourceLoaderMap, field, value) {
                     var result = new _deferred.Deferred;
-                    resources.forEach((function(resource) {
-                        var resourceField = getFieldExpr(resource);
-                        if (resourceField === field) {
-                            var dataSource = getWrappedDataSource(resource.dataSource);
-                            var valueExpr = getValueExpr(resource);
-                            if (!resourceLoaderMap.has(field)) {
-                                resourceLoaderMap.set(field, dataSource.load())
-                            }
-                            resourceLoaderMap.get(field).done((function(data) {
-                                var filteredData = (0, _query.default)(data).filter(valueExpr, value).toArray();
-                                result.resolve(filteredData[0])
-                            })).fail((function() {
-                                resourceLoaderMap.delete(field);
-                                result.reject()
-                            }))
+                    resources.filter((function(resource) {
+                        return getFieldExpr(resource) === field && (0, _type.isDefined)(resource.dataSource)
+                    })).forEach((function(resource) {
+                        var wrappedDataSource = getWrappedDataSource(resource.dataSource);
+                        var valueExpr = getValueExpr(resource);
+                        if (!resourceLoaderMap.has(field)) {
+                            resourceLoaderMap.set(field, wrappedDataSource.load())
                         }
+                        resourceLoaderMap.get(field).done((function(data) {
+                            var filteredData = (0, _query.default)(data).filter(valueExpr, value).toArray();
+                            result.resolve(filteredData[0])
+                        })).fail((function() {
+                            resourceLoaderMap.delete(field);
+                            result.reject()
+                        }))
                     }));
                     return result.promise()
                 };
@@ -164147,6 +164497,18 @@
                         return result.reject()
                     }));
                     return result.promise()
+                };
+                exports.getNormalizedResources = function(rawAppointment, dataAccessors, resources) {
+                    var result = {};
+                    (0, _iterator.each)(dataAccessors.resources.getter, (function(fieldName) {
+                        var value = dataAccessors.resources.getter[fieldName](rawAppointment);
+                        if ((0, _type.isDefined)(value)) {
+                            var isMultiple = isResourceMultiple(resources, fieldName);
+                            var resourceValue = isMultiple ? (0, _array.wrapToArray)(value) : value;
+                            result[fieldName] = resourceValue
+                        }
+                    }));
+                    return result
                 }
             },
         93837:
@@ -168970,8 +169332,9 @@
                                     itemTemplate: this._getAppointmentTemplate("appointmentTemplate")
                                 });
                                 this._postponeResourceLoading().done((function(resources) {
+                                    var _this2$_header;
                                     _this2._refreshWorkSpace(resources);
-                                    _this2._updateHeader();
+                                    null === (_this2$_header = _this2._header) || void 0 === _this2$_header ? void 0 : _this2$_header.option(_this2._headerConfig());
                                     _this2._filterAppointmentsByDate();
                                     _this2._appointments.option("allowAllDayResize", "day" !== value)
                                 }));
@@ -169052,6 +169415,7 @@
                                 break;
                             case "cellDuration":
                                 this._validateCellDuration();
+                                this._updateOption("workSpace", name, value);
                                 this._appointments.option("items", []);
                                 if (this._readyToRenderAppointments) {
                                     this._updateOption("workSpace", "hoursInterval", value / 60);
@@ -169164,18 +169528,6 @@
                                 _Widget.prototype._optionChanged.call(this, args)
                         }
                     };
-                    _proto._updateHeader = function() {
-                        var _this$_header5;
-                        null === (_this$_header5 = this._header) || void 0 === _this$_header5 ? void 0 : _this$_header5.option({
-                            intervalCount: this._getViewCountConfig().intervalCount,
-                            startViewDate: this.getStartViewDate(),
-                            min: this._dateOption("min"),
-                            max: this._dateOption("max"),
-                            currentDate: this._dateOption("currentDate"),
-                            firstDayOfWeek: this.getFirstDayOfWeek(),
-                            currentView: this.currentView
-                        })
-                    };
                     _proto._dateOption = function(optionName) {
                         var optionValue = this._getCurrentViewOption(optionName);
                         return _date_serialization.default.deserializeDate(optionValue)
@@ -169731,14 +170083,14 @@
                         var countConfig = this._getViewCountConfig();
                         var result = (0, _extend.extend)({
                             firstDayOfWeek: this.getFirstDayOfWeek(),
-                            currentView: this.currentView,
+                            currentView: this.option("currentView"),
                             isAdaptive: this.option("adaptivityEnabled"),
                             tabIndex: this.option("tabIndex"),
                             focusStateEnabled: this.option("focusStateEnabled"),
                             rtlEnabled: this.option("rtlEnabled"),
                             useDropDownViewSwitcher: this.option("useDropDownViewSwitcher"),
                             customizeDateNavigatorText: this.option("customizeDateNavigatorText"),
-                            agendaDuration: this.option("agendaDuration") || 7
+                            agendaDuration: currentViewOptions.agendaDuration || 7
                         }, currentViewOptions);
                         result.intervalCount = countConfig.intervalCount;
                         result.views = this.option("views");
@@ -169746,12 +170098,12 @@
                         result.max = new Date(this._dateOption("max"));
                         result.currentDate = _date.default.trimTime(new Date(this._dateOption("currentDate")));
                         result.onCurrentViewChange = function(name) {
-                            return _this11.option("currentView", name)
-                        };
-                        result.onCurrentDateChange = function(date) {
-                            return _this11.option("currentDate", date)
+                            _this11.option("currentView", name)
+                        }, result.onCurrentDateChange = function(date) {
+                            _this11.option("currentDate", date)
                         };
                         result.items = this.option("toolbar");
+                        result.startViewDate = this.getStartViewDate();
                         result.todayDate = function() {
                             var result = _this11.timeZoneCalculator.createDate(new Date, {
                                 path: "toGrid"
@@ -169840,7 +170192,7 @@
                         return this.currentViewType
                     };
                     _proto._renderWorkSpace = function(groups) {
-                        var _this$_header6;
+                        var _this$_header5;
                         this._readyToRenderAppointments && this._toggleSmallClass();
                         var $workSpace = (0, _renderer.default)("<div>").appendTo(this._mainContainer);
                         var countConfig = this._getViewCountConfig();
@@ -169851,7 +170203,7 @@
                         this._workSpace._attachTablesEvents();
                         this._workSpace.getWorkArea().append(this._appointments.$element());
                         this._recalculateWorkspace();
-                        countConfig.startDate && (null === (_this$_header6 = this._header) || void 0 === _this$_header6 ? void 0 : _this$_header6.option("currentDate", this._workSpace._getHeaderDate()));
+                        countConfig.startDate && (null === (_this$_header5 = this._header) || void 0 === _this$_header5 ? void 0 : _this$_header5.option("currentDate", this._workSpace._getHeaderDate()));
                         this._appointments.option("_collectorOffset", this.getCollectorOffset())
                     };
                     _proto._getViewCountConfig = function() {
@@ -170193,8 +170545,8 @@
                         var targetedAdapter = adapter.clone();
                         if (this._isAgenda() && adapter.isRecurrent) {
                             var agendaSettings = settings.agendaSettings;
-                            targetedAdapter.startDate = agendaSettings.startDate;
-                            targetedAdapter.endDate = agendaSettings.endDate
+                            targetedAdapter.startDate = _expressionUtils.ExpressionUtils.getField(this._dataAccessors, "startDate", agendaSettings);
+                            targetedAdapter.endDate = _expressionUtils.ExpressionUtils.getField(this._dataAccessors, "endDate", agendaSettings)
                         } else if (settings) {
                             targetedAdapter.startDate = info ? info.sourceAppointment.startDate : adapter.startDate;
                             targetedAdapter.endDate = info ? info.sourceAppointment.endDate : adapter.endDate
@@ -170371,7 +170723,8 @@
                         }
                     };
                     _proto.getStartViewDate = function() {
-                        return this._workSpace.getStartViewDate()
+                        var _this$_workSpace;
+                        return null === (_this$_workSpace = this._workSpace) || void 0 === _this$_workSpace ? void 0 : _this$_workSpace.getStartViewDate()
                     };
                     _proto.getEndViewDate = function() {
                         return this._workSpace.getEndViewDate()
@@ -173399,11 +173752,6 @@
                         get: function() {
                             return this.options.getScrolling().outlineCount
                         }
-                    }, {
-                        key: "viewportHeight",
-                        get: function() {
-                            return this.height ? this.options.getViewHeight() : (0, _window.getWindow)().innerHeight
-                        }
                     }, {
                         key: "cellWidth",
                         get: function() {
@@ -173412,10 +173760,17 @@
                         set: function(value) {
                             this._cellWidth = value
                         }
+                    }, {
+                        key: "viewportHeight",
+                        get: function() {
+                            var height = this.height && this.options.getViewHeight();
+                            return height > 0 ? height : (0, _window.getWindow)().innerHeight
+                        }
                     }, {
                         key: "viewportWidth",
                         get: function() {
-                            return this.width ? this.options.getViewWidth() : (0, _window.getWindow)().innerWidth
+                            var width = this.width && this.options.getViewWidth();
+                            return width > 0 ? width : (0, _window.getWindow)().innerWidth
                         }
                     }, {
                         key: "cellCountInsideTopVirtualRow",
@@ -175214,20 +175569,23 @@
                     _proto._attachDragEvents = function(element) {
                         var _this8 = this;
                         this._detachDragEvents(element);
+                        var removeClasses = function() {
+                            if (!_this8.preventDefaultDragging) {
+                                _this8.removeDroppableCellClass()
+                            }
+                        };
                         _events_engine.default.on(element, DragEventNames.ENTER, DRAG_AND_DROP_SELECTOR, {
                             checkDropTarget: function(target, event) {
                                 return !_this8._isOutsideScrollable(target, event)
                             }
                         }, (function(e) {
-                            _this8.removeDroppableCellClass();
-                            (0, _renderer.default)(e.target).addClass("dx-scheduler-date-table-droppable-cell")
-                        }));
-                        _events_engine.default.on(element, DragEventNames.LEAVE, (function() {
-                            return _this8.removeDroppableCellClass()
+                            if (!_this8.preventDefaultDragging) {
+                                _this8.removeDroppableCellClass();
+                                (0, _renderer.default)(e.target).addClass("dx-scheduler-date-table-droppable-cell")
+                            }
                         }));
-                        _events_engine.default.on(element, DragEventNames.DROP, DRAG_AND_DROP_SELECTOR, (function() {
-                            return _this8.removeDroppableCellClass()
-                        }))
+                        _events_engine.default.on(element, DragEventNames.LEAVE, removeClasses);
+                        _events_engine.default.on(element, DragEventNames.DROP, DRAG_AND_DROP_SELECTOR, removeClasses)
                     };
                     _proto._attachPointerEvents = function(element) {
                         var _this9 = this;
@@ -175993,12 +176351,14 @@
                     _proto._createDragBehaviorBase = function($element, options) {
                         var _this17 = this;
                         var container = this.$element().find(".".concat(_classes.FIXED_CONTAINER_CLASS));
-                        var element = this.$element();
-                        var isDefaultDraggingMode = "default" === this.option("draggingMode");
-                        this.dragBehavior.addTo($element, createDragBehaviorConfig(container, isDefaultDraggingMode, this.dragBehavior, (function() {
-                            return _this17._attachDragEvents(element)
+                        this.dragBehavior.addTo($element, createDragBehaviorConfig(container, this.isDefaultDraggingMode, this.dragBehavior, (function() {
+                            if (!_this17.isDefaultDraggingMode) {
+                                _this17.preventDefaultDragging = false
+                            }
                         }), (function() {
-                            return _this17._detachDragEvents(element)
+                            if (!_this17.isDefaultDraggingMode) {
+                                _this17.preventDefaultDragging = true
+                            }
                         }), (function() {
                             return _this17._getDroppableCell()
                         }), (function() {
@@ -176168,6 +176528,12 @@
                             getViewWidth: function() {
                                 return _this18.$element().width ? _this18.$element().width() : (0, _size.getWidth)(_this18.$element())
                             },
+                            getWindowHeight: function() {
+                                return (0, _window.getWindow)().innerHeight
+                            },
+                            getWindowWidth: function() {
+                                return (0, _window.getWindow)().innerWidth
+                            },
                             getScrolling: function() {
                                 return _this18.option("scrolling")
                             },
@@ -176864,10 +177230,15 @@
                         get: function() {
                             return this.option("timeZoneCalculator")
                         }
+                    }, {
+                        key: "isDefaultDraggingMode",
+                        get: function() {
+                            return "default" === this.option("draggingMode")
+                        }
                     }]);
                     return SchedulerWorkSpace
                 }(_widgetObserver.default);
-                var createDragBehaviorConfig = function(container, isDefaultDraggingMode, dragBehavior, attachGeneralEvents, detachGeneralEvents, getDroppableCell, getDateTables, removeDroppableCellClass, getCellWidth, options) {
+                var createDragBehaviorConfig = function(container, isDefaultDraggingMode, dragBehavior, enableDefaultDragging, disableDefaultDragging, getDroppableCell, getDateTables, removeDroppableCellClass, getCellWidth, options) {
                     var state = {
                         dragElement: void 0,
                         itemData: void 0
@@ -176894,7 +177265,7 @@
                         },
                         onDragStart: function(e) {
                             if (!isDefaultDraggingMode) {
-                                detachGeneralEvents()
+                                disableDefaultDragging()
                             }
                             var canceled = e.cancel;
                             var event = e.event;
@@ -176956,7 +177327,7 @@
                         onDragEnd: function(e) {
                             var _state$dragElement;
                             if (!isDefaultDraggingMode) {
-                                attachGeneralEvents()
+                                enableDefaultDragging()
                             }
                             if (!isItemDisabled()) {
                                 dragBehavior.onDragEnd(e)
@@ -182786,10 +183157,12 @@
                             return
                         }
                         this._loadItemDeferred && this._loadItemDeferred.always(function() {
-                            var initialSelectedItem = this.option("selectedItem");
+                            var _this$option = this.option(),
+                                initialSelectedItem = _this$option.selectedItem,
+                                text = _this$option.text;
                             if (this.option("acceptCustomValue")) {
                                 if (!saveEditingValue) {
-                                    this._updateField(initialSelectedItem);
+                                    this._updateField(null !== initialSelectedItem && void 0 !== initialSelectedItem ? initialSelectedItem : this._createCustomItem(text));
                                     this._clearFilter()
                                 }
                                 return
@@ -182824,8 +183197,8 @@
                         this.callBase(e)
                     },
                     _cancelSearchIfNeed: function(e) {
-                        var _this$option = this.option(),
-                            searchEnabled = _this$option.searchEnabled;
+                        var _this$option2 = this.option(),
+                            searchEnabled = _this$option2.searchEnabled;
                         var isOverlayTarget = this._isOverlayNestedTarget(null === e || void 0 === e ? void 0 : e.relatedTarget);
                         var shouldCancelSearch = this._wasSearch() && searchEnabled && !isOverlayTarget;
                         if (shouldCancelSearch) {
@@ -182985,7 +183358,7 @@
                     },
                     _wasSearch: function(value) {
                         if (!arguments.length) {
-                            return this._wasSearchValue
+                            return !!this._wasSearchValue
                         }
                         this._wasSearchValue = value
                     },
@@ -183181,7 +183554,7 @@
                     onSelectionChanged: function() {
                         this._selectionStrategy.onSelectionChanged()
                     },
-                    changeItemSelection: function(itemIndex, keys) {
+                    changeItemSelection: function(itemIndex, keys, setFocusOnly) {
                         var _this$options$allowLo, _this$options, _this = this;
                         var isSelectedItemsChanged;
                         var items = this.options.plainItems();
@@ -183214,14 +183587,16 @@
                             }
                         } else if (keys.control) {
                             this._resetItemSelectionWhenShiftKeyPressed();
-                            var isSelected = this._selectionStrategy.isItemDataSelected(itemData);
-                            if ("single" === this.options.mode) {
-                                this.clearSelectedItems()
-                            }
-                            if (isSelected) {
-                                this._removeSelectedItem(itemKey)
-                            } else {
-                                this._addSelectedItem(itemData, itemKey)
+                            if (!setFocusOnly) {
+                                var isSelected = this._selectionStrategy.isItemDataSelected(itemData);
+                                if ("single" === this.options.mode) {
+                                    this.clearSelectedItems()
+                                }
+                                if (isSelected) {
+                                    this._removeSelectedItem(itemKey)
+                                } else {
+                                    this._addSelectedItem(itemData, itemKey)
+                                }
                             }
                             isSelectedItemsChanged = true
                         } else {
@@ -183235,7 +183610,7 @@
                         if (isSelectedItemsChanged) {
                             (0, _deferred.when)(deferred).done((function() {
                                 _this._focusedItemIndex = itemIndex;
-                                _this.onSelectionChanged()
+                                !setFocusOnly && _this.onSelectionChanged()
                             }));
                             return true
                         }
@@ -183900,14 +184275,13 @@
                         this._initSelectedItemKeyHash();
                         this.updateSelectedItemKeyHash(this.options.selectedItemKeys)
                     },
-                    _loadSelectedItemsCore: function(keys, isDeselect, isSelectAll) {
+                    _loadSelectedItemsCore: function(keys, isDeselect, isSelectAll, filter) {
                         var deferred = new _deferred.Deferred;
                         var key = this.options.key();
                         if (!keys.length && !isSelectAll) {
                             deferred.resolve([]);
                             return deferred
                         }
-                        var filter = this.options.filter();
                         if (isSelectAll && isDeselect && !filter) {
                             deferred.resolve(this.getSelectedItems());
                             return deferred
@@ -184010,12 +184384,13 @@
                     _loadSelectedItems: function(keys, isDeselect, isSelectAll, updatedKeys) {
                         var that = this;
                         var deferred = new _deferred.Deferred;
+                        var filter = that.options.filter();
                         this._shouldMergeWithLastRequest = this._requestInProgress();
                         this._lastRequestData = this._collectLastRequestData(keys, isDeselect, isSelectAll, updatedKeys);
                         (0, _deferred.when)(that._lastLoadDeferred).always((function() {
                             var currentKeys = that._updateKeysByLastRequestData(keys, isDeselect, isSelectAll);
                             that._shouldMergeWithLastRequest = false;
-                            that._loadSelectedItemsCore(currentKeys, isDeselect, isSelectAll).done(deferred.resolve).fail(deferred.reject)
+                            that._loadSelectedItemsCore(currentKeys, isDeselect, isSelectAll, filter).done(deferred.resolve).fail(deferred.reject)
                         }));
                         that._lastLoadDeferred = deferred;
                         return deferred
@@ -184522,7 +184897,7 @@
                             return getFilterExpressionForDate.apply(column, arguments)
                         } else if ("number" === dataType) {
                             return getFilterExpressionForNumber.apply(column, arguments)
-                        } else if ("object" !== dataType) {
+                        } else {
                             filter = [selector, selectedFilterOperation || "=", filterValue]
                         }
                         return filter
@@ -184790,10 +185165,13 @@
                                                 onValueChanged: function(args) {
                                                     options.setValue(args.value)
                                                 },
-                                                onKeyDown: function(e) {
-                                                    if (checkEnterBug() && "enter" === (0, _index.normalizeKeyName)(e.event)) {
-                                                        e.component.blur();
-                                                        e.component.focus()
+                                                onKeyDown: function(_ref) {
+                                                    var component = _ref.component,
+                                                        event = _ref.event;
+                                                    var useMaskBehavior = component.option("useMaskBehavior");
+                                                    if ((checkEnterBug() || useMaskBehavior) && "enter" === (0, _index.normalizeKeyName)(event)) {
+                                                        component.blur();
+                                                        component.focus()
                                                     }
                                                 },
                                                 displayFormat: options.format,
@@ -185907,6 +186285,9 @@
                         this._needPreventAnimation = true
                     },
                     _swipeEndHandler: function(e) {
+                        if (this._isSingleValuePossible()) {
+                            return
+                        }
                         this._feedbackDeferred.resolve();
                         this._toggleActiveState(this._activeHandle(), false);
                         var offsetDirection = this.option("rtlEnabled") ? -1 : 1;
@@ -185920,6 +186301,9 @@
                         return this._$handle
                     },
                     _swipeUpdateHandler: function(e) {
+                        if (this._isSingleValuePossible()) {
+                            return
+                        }
                         this._saveValueChangeEvent(e.event);
                         this._updateHandlePosition(e)
                     },
@@ -185973,7 +186357,16 @@
                         this.option("value", value);
                         this._saveValueChangeEvent(void 0)
                     },
+                    _isSingleValuePossible: function() {
+                        var _this$option2 = this.option(),
+                            min = _this$option2.min,
+                            max = _this$option2.max;
+                        return min === max
+                    },
                     _startHandler: function(args) {
+                        if (this._isSingleValuePossible()) {
+                            return
+                        }
                         var e = args.event;
                         this._currentRatio = ((0, _index.eventData)(e).x - this._$bar.offset().left) / (0, _size.getWidth)(this._$bar);
                         if (this.option("rtlEnabled")) {
@@ -186138,7 +186531,7 @@
                                 this._updateTooltipOptions(args);
                                 break;
                             default:
-                                this.callBase(arguments)
+                                this.callBase(args)
                         }
                     },
                     updateTooltipPosition: function() {
@@ -186380,6 +186773,7 @@
                                 scrollLeft: $scrollable.scrollLeft(),
                                 scrollTop: $scrollable.scrollTop()
                             };
+                            _events_engine.default.off($scrollable, "scroll", this._sourceScrollHandler);
                             _events_engine.default.on($scrollable, "scroll", this._sourceScrollHandler)
                         }
                     },
@@ -186405,10 +186799,10 @@
                     },
                     _dragEnterHandler: function(e) {
                         this.callBase.apply(this, arguments);
-                        this._subscribeToSourceScroll(e);
                         if (this === this._getSourceDraggable()) {
                             return
                         }
+                        this._subscribeToSourceScroll(e);
                         this._updateItemPoints();
                         this.option("fromIndex", -1);
                         if (!this._isIndicateMode()) {
@@ -186442,7 +186836,9 @@
                     },
                     _dragLeaveHandler: function() {
                         this.callBase.apply(this, arguments);
-                        this._unsubscribeFromSourceScroll()
+                        if (this !== this._getSourceDraggable()) {
+                            this._unsubscribeFromSourceScroll()
+                        }
                     },
                     dragEnter: function() {
                         if (this !== this._getTargetDraggable()) {
@@ -186488,9 +186884,9 @@
                             if (itemPoint && void 0 !== itemPoint.top) {
                                 var isVertical = this._isVerticalOrientation();
                                 if (isVertical) {
-                                    return top <= itemPoint.top && itemPoint.top <= bottom
+                                    return top <= Math.ceil(itemPoint.top) && Math.floor(itemPoint.top) <= bottom
                                 } else {
-                                    return left <= itemPoint.left && itemPoint.left <= right
+                                    return left <= Math.ceil(itemPoint.left) && Math.floor(itemPoint.left) <= right
                                 }
                             }
                         }
@@ -186703,16 +187099,15 @@
                     },
                     _makeWidthCorrection: function($item, width) {
                         this._$scrollable = this._getScrollable($item);
-                        if (this._$scrollable && (0, _size.getWidth)(this._$scrollable) < width) {
+                        if (this._$scrollable) {
                             var scrollableWidth = (0, _size.getWidth)(this._$scrollable);
-                            var offsetLeft = $item.offset().left - this._$scrollable.offset().left;
-                            var offsetRight = scrollableWidth - (0, _size.getOuterWidth)($item) - offsetLeft;
-                            if (offsetLeft > 0) {
-                                width = scrollableWidth - offsetLeft
-                            } else if (offsetRight > 0) {
-                                width = scrollableWidth - offsetRight
-                            } else {
-                                width = scrollableWidth
+                            var overflowLeft = this._$scrollable.offset().left - $item.offset().left;
+                            var overflowRight = (0, _size.getOuterWidth)($item) - overflowLeft - scrollableWidth;
+                            if (overflowLeft > 0) {
+                                width -= overflowLeft
+                            }
+                            if (overflowRight > 0) {
+                                width -= overflowRight
                             }
                         }
                         return width
@@ -186878,10 +187273,13 @@
                             this._toggleDragSourceClass(true, $fromElement)
                         }
                     },
-                    _makeLeftCorrection: function(left, leftMargin) {
+                    _makeLeftCorrection: function(left) {
                         var $scrollable = this._$scrollable;
-                        if ($scrollable && this._isVerticalOrientation() && $scrollable.scrollLeft() > leftMargin) {
-                            left += $scrollable.scrollLeft() - leftMargin
+                        if ($scrollable && this._isVerticalOrientation()) {
+                            var overflowLeft = $scrollable.offset().left - left;
+                            if (overflowLeft > 0) {
+                                left += overflowLeft
+                            }
                         }
                         return left
                     },
@@ -186896,12 +187294,10 @@
                         var rtlEnabled = this.option("rtlEnabled");
                         var dropInsideItem = this.option("dropInsideItem");
                         var position = null;
-                        var leftMargin = 0;
                         var itemElement = items[toIndex];
                         if (itemElement) {
                             var $itemElement = (0, _renderer.default)(itemElement);
                             position = $itemElement.offset();
-                            leftMargin = parseFloat($itemElement.css("marginLeft"));
                             if (!isVerticalOrientation && rtlEnabled && !dropInsideItem) {
                                 position.left += (0, _size.getOuterWidth)($itemElement, true)
                             }
@@ -186921,7 +187317,7 @@
                             position = null
                         }
                         if (position) {
-                            position.left = this._makeLeftCorrection(position.left, leftMargin);
+                            position.left = this._makeLeftCorrection(position.left);
                             this._move(position, $placeholderElement)
                         }
                         $placeholderElement.toggle(!!position)
@@ -193713,6 +194109,7 @@
                 var _window = __webpack_require__( /*! ../core/utils/window */ 58201);
                 var _element = __webpack_require__( /*! ../core/element */ 6415);
                 var _common = __webpack_require__( /*! ../core/utils/common */ 20576);
+                var _support = __webpack_require__( /*! ../core/utils/support */ 60137);
                 var _scroll_view = _interopRequireDefault(__webpack_require__( /*! ./scroll_view */ 4741));
                 var _uiCollection_widget = _interopRequireDefault(__webpack_require__( /*! ./collection/ui.collection_widget.edit */ 11050));
 
@@ -193767,6 +194164,13 @@
                             options: {
                                 focusStateEnabled: true
                             }
+                        }, {
+                            device: function() {
+                                return _support.nativeScrolling
+                            },
+                            options: {
+                                showScrollbar: "onScroll"
+                            }
                         }])
                     },
                     _itemClass: function() {
@@ -194535,7 +194939,7 @@
                             this.callBase(item, property, value)
                         } else {
                             this.callBase(item, property, value);
-                            this._menu.itemOption(item, property, value)
+                            this._menu.renderMenuItems()
                         }
                         if ("disabled" === property || "options.disabled" === property) {
                             (0, _uiToolbar3.toggleItemFocusableElementTabIndex)(this, item)
@@ -196264,7 +196668,7 @@
                         var filterLength = encodeURI(JSON.stringify(filter)).length;
                         if (filterLength > maxFilterLengthInRequest) {
                             filter = function(itemData) {
-                                return keyMap[that._keyGetter(itemData)]
+                                return keyMap[needChildren ? that._parentIdGetter(itemData) : that._keyGetter(itemData)]
                             };
                             needLocalFiltering = isRemoteFiltering
                         }
@@ -197557,10 +197961,13 @@
                                     return this.callBase(value, preserve, isDeselect, isSelectAll)
                                 },
                                 changeItemSelection: function(itemIndex, keyboardKeys) {
+                                    var _this3 = this;
                                     var isRecursiveSelection = this.isRecursiveSelection();
                                     if (isRecursiveSelection && !keyboardKeys.shift) {
                                         var key = this._dataController.getKeyByRowIndex(itemIndex);
-                                        return this.selectedItemKeys(key, true, this.isRowSelected(key))
+                                        return this.selectedItemKeys(key, true, this.isRowSelected(key)).done((function() {
+                                            _this3.isRowSelected(key) && _this3.callBase(itemIndex, keyboardKeys, true)
+                                        }))
                                     }
                                     return this.callBase.apply(this, arguments)
                                 },
@@ -197629,7 +198036,7 @@
                                     return selectedParentNode && result || []
                                 },
                                 _getSelectedChildKeys: function(key, keysToIgnore) {
-                                    var _this3 = this;
+                                    var _this4 = this;
                                     var childKeys = [];
                                     var node = this._dataController.getNodeByKey(key);
                                     node && _uiTree_list.default.foreachNodes(node.children, (function(childNode) {
@@ -197637,7 +198044,7 @@
                                         if (ignoreKeyIndex < 0) {
                                             childKeys.push(childNode.key)
                                         }
-                                        return ignoreKeyIndex > 0 || ignoreKeyIndex < 0 && void 0 === _this3._selectionStateByKey[childNode.key]
+                                        return ignoreKeyIndex > 0 || ignoreKeyIndex < 0 && void 0 === _this4._selectionStateByKey[childNode.key]
                                     }));
                                     return childKeys
                                 },
@@ -197657,14 +198064,14 @@
                                     }
                                 },
                                 _normalizeChildrenKeys: function(key, args) {
-                                    var _this4 = this;
+                                    var _this5 = this;
                                     var node = this._dataController.getNodeByKey(key);
                                     node && node.children.forEach((function(childNode) {
                                         var index = args.selectedRowKeys.indexOf(childNode.key);
                                         if (index >= 0) {
                                             args.selectedRowKeys.splice(index, 1)
                                         }
-                                        _this4._normalizeChildrenKeys(childNode.key, args)
+                                        _this5._normalizeChildrenKeys(childNode.key, args)
                                     }))
                                 },
                                 _normalizeSelectedRowKeysCore: function(keys, args, preserve, isSelect) {
@@ -197735,11 +198142,11 @@
                                     return childKeys
                                 },
                                 _getAllSelectedRowKeys: function(keys) {
-                                    var _this5 = this;
+                                    var _this6 = this;
                                     var result = [];
                                     keys.forEach((function(key) {
-                                        var parentKeys = _this5._getSelectedParentKeys(key, [], true);
-                                        var childKeys = _this5._getAllChildKeys(key);
+                                        var parentKeys = _this6._getSelectedParentKeys(key, [], true);
+                                        var childKeys = _this6._getAllChildKeys(key);
                                         result.push.apply(result, parentKeys.concat([key], childKeys))
                                     }));
                                     result = this._removeDuplicatedKeys(result);
@@ -202899,6 +203306,9 @@
                         var discreteAxisDivisionMode = options.discreteAxisDivisionMode;
                         this._tickOffset = +("crossLabels" !== discreteAxisDivisionMode || !discreteAxisDivisionMode)
                     },
+                    aggregatedPointBetweenTicks: function() {
+                        return "crossTicks" === this._options.aggregatedPointsPosition
+                    },
                     resetApplyingAnimation: function(isFirstDrawing) {
                         this._resetApplyingAnimation = true;
                         if (isFirstDrawing) {
@@ -205787,6 +206197,9 @@
                     if (1 === ticks.length && 0 === ticks.indexOf(tick) && !(0, _type.isDefined)(tickInterval)) {
                         tickInterval = abs(tick) >= 1 ? 1 : (0, _math.adjust)(1 - abs(tick), tick)
                     }
+                    if (Object.is(tick, -0)) {
+                        tick = 0
+                    }
                     if (!(0, _type.isDefined)(format) && "discrete" !== options.type && tick && (10 === options.logarithmBase || !isLogarithmic)) {
                         if ("datetime" !== options.dataType && (0, _type.isDefined)(tickInterval)) {
                             if (ticks.length && -1 === ticks.indexOf(tick)) {
@@ -210885,7 +211298,10 @@
                             name: "pointHoverChanged"
                         },
                         onDone: {
-                            name: "done"
+                            name: "done",
+                            actionSettings: {
+                                excludeValidators: ["disabled"]
+                            }
                         },
                         onZoomStart: {
                             name: "zoomStart"
@@ -211504,7 +211920,7 @@
                         customizeLabel: "REFRESH_SERIES_REINIT",
                         scrollBar: "SCROLL_BAR"
                     },
-                    _optionChangesOrder: ["ROTATED", "PALETTE", "REFRESH_SERIES_REINIT", "AXES_AND_PANES", "INIT", "REINIT", "DATA_SOURCE", "REFRESH_SERIES_DATA_INIT", "DATA_INIT", "FORCE_DATA_INIT", "REFRESH_AXES", "CORRECT_AXIS"],
+                    _optionChangesOrder: ["ROTATED", "PALETTE", "REFRESH_SERIES_REINIT", "USE_SPIDER_WEB", "AXES_AND_PANES", "INIT", "REINIT", "DATA_SOURCE", "REFRESH_SERIES_DATA_INIT", "DATA_INIT", "FORCE_DATA_INIT", "REFRESH_AXES", "CORRECT_AXIS"],
                     _customChangesOrder: ["ANIMATION", "REFRESH_SERIES_FAMILIES", "FORCE_FIRST_DRAWING", "FORCE_DRAWING", "FORCE_RENDER", "VISUAL_RANGE", "SCROLL_BAR", "REINIT", "REFRESH", "FULL_RENDER"],
                     _change_ANIMATION: function() {
                         this._renderer.updateAnimationOptions(this._getAnimationOptions())
@@ -217003,10 +217419,16 @@
                 }() : _dom_component.default.inherit({
                     _eventsMap: {
                         onIncidentOccurred: {
-                            name: "incidentOccurred"
+                            name: "incidentOccurred",
+                            actionSettings: {
+                                excludeValidators: ["disabled"]
+                            }
                         },
                         onDrawn: {
-                            name: "drawn"
+                            name: "drawn",
+                            actionSettings: {
+                                excludeValidators: ["disabled"]
+                            }
                         }
                     },
                     _getDefaultOptions: function() {
@@ -217277,8 +217699,8 @@
                     },
                     _initEventTrigger: function() {
                         var that = this;
-                        that._eventTrigger = (0, _base_widget.createEventTrigger)(that._eventsMap, (function(name) {
-                            return that._createActionByOption(name)
+                        that._eventTrigger = (0, _base_widget.createEventTrigger)(that._eventsMap, (function(name, actionSettings) {
+                            return that._createActionByOption(name, actionSettings)
                         }))
                     },
                     _calculateCanvas: function() {
@@ -217568,7 +217990,7 @@
 
                     function createEvent(name) {
                         var eventInfo = eventsMap[name];
-                        triggers[eventInfo.name] = callbackGetter(name)
+                        triggers[eventInfo.name] = callbackGetter(name, eventInfo.actionSettings)
                     }
 
                     function triggerEvent(name, arg, complete) {
@@ -218294,9 +218716,15 @@
                         margin: exportOptions.margin,
                         svgToCanvas: exportOptions.svgToCanvas,
                         forceProxy: exportOptions.forceProxy,
-                        exportingAction: widget._createActionByOption("onExporting"),
-                        exportedAction: widget._createActionByOption("onExported"),
-                        fileSavingAction: widget._createActionByOption("onFileSaving")
+                        exportingAction: widget._createActionByOption("onExporting", {
+                            excludeValidators: ["disabled"]
+                        }),
+                        exportedAction: widget._createActionByOption("onExported", {
+                            excludeValidators: ["disabled"]
+                        }),
+                        fileSavingAction: widget._createActionByOption("onFileSaving", {
+                            excludeValidators: ["disabled"]
+                        })
                     }
                 }
                 var plugin = {
@@ -223816,6 +224244,7 @@
                             placeholderSize: null,
                             logarithmBase: 10,
                             discreteAxisDivisionMode: "betweenLabels",
+                            aggregatedPointsPosition: "betweenTicks",
                             width: 1,
                             label: {
                                 visible: true
@@ -229245,6 +229674,9 @@
                 });
                 exports.BaseGauge = BaseGauge;
                 var formatValue = function(value, options, extra) {
+                    if (Object.is(value, -0)) {
+                        value = 0
+                    }
                     options = options || {};
                     var text = _format(value, options.format);
                     var formatObject;
@@ -233487,7 +233919,11 @@
                         }
                     },
                     _optionChangesMap: {
-                        useSpiderWeb: "AXES_AND_PANES"
+                        useSpiderWeb: "USE_SPIDER_WEB"
+                    },
+                    _change_USE_SPIDER_WEB: function() {
+                        this._disposeAxes();
+                        this._requestChange(["AXES_AND_PANES"])
                     },
                     _getExtraOptions: function() {
                         return {
@@ -237597,7 +238033,8 @@
                     },
                     getValueRangeInitialValue: areaSeries.getValueRangeInitialValue,
                     _patchMarginOptions: function(options) {
-                        options.checkInterval = !this.useAggregation();
+                        var _this$getArgumentAxis;
+                        options.checkInterval = !this.useAggregation() || (null === (_this$getArgumentAxis = this.getArgumentAxis()) || void 0 === _this$getArgumentAxis ? void 0 : _this$getArgumentAxis.aggregatedPointBetweenTicks());
                         return options
                     },
                     _defaultAggregator: "sum",
@@ -239416,7 +239853,8 @@
                     getRangeData: function(series) {
                         var points = series.getPoints();
                         var useAggregation = series.useAggregation();
-                        var argumentCalculator = getRangeCalculator(series.argumentAxisType, points.length > 1 && series.getArgumentAxis(), createGetLogFunction(series.argumentAxisType, series.getArgumentAxis()));
+                        var argumentAxis = series.getArgumentAxis();
+                        var argumentCalculator = getRangeCalculator(series.argumentAxisType, points.length > 1 && argumentAxis, createGetLogFunction(series.argumentAxisType, argumentAxis));
                         var valueRangeCalculator = getRangeCalculator(series.valueAxisType, null, createGetLogFunction(series.valueAxisType, series.getValueAxis()));
                         var viewportReducer = getViewportReducer(series);
                         var range = points.reduce((function(range, point, index, points) {
@@ -239431,7 +239869,7 @@
                             }
                             return range
                         }), {
-                            arg: getInitialRange(series.argumentAxisType, series.argumentType, series.getArgumentRangeInitialValue()),
+                            arg: getInitialRange(series.argumentAxisType, series.argumentType, null !== argumentAxis && void 0 !== argumentAxis && argumentAxis.aggregatedPointBetweenTicks() ? void 0 : series.getArgumentRangeInitialValue()),
                             val: getInitialRange(series.valueAxisType, series.valueType, points.length ? series.getValueRangeInitialValue() : void 0),
                             viewport: getInitialRange(series.valueAxisType, series.valueType, points.length ? series.getValueRangeInitialValue() : void 0)
                         });
@@ -239440,7 +239878,7 @@
                             if ("discrete" === series.argumentAxisType) {
                                 range.arg = argumentRange
                             } else {
-                                var viewport = series.getArgumentAxis().getViewport();
+                                var viewport = argumentAxis.getViewport();
                                 if ((0, _type.isDefined)(viewport.startValue) || (0, _type.isDefined)(viewport.length)) {
                                     argumentCalculator(range.arg, argumentRange.min, argumentRange.min)
                                 }
@@ -244341,7 +244779,11 @@
                     },
                     _getIntervalCenter: function(intervalStart, intervalEnd) {
                         var argAxis = this.getArgumentAxis();
-                        return "discrete" !== argAxis.getOptions().type ? argAxis.getVisualRangeCenter({
+                        var axisOptions = argAxis.getOptions();
+                        if (argAxis.aggregatedPointBetweenTicks()) {
+                            return intervalStart
+                        }
+                        return "discrete" !== axisOptions.type ? argAxis.getVisualRangeCenter({
                             minVisible: intervalStart,
                             maxVisible: intervalEnd
                         }, true) : intervalStart
@@ -244978,6 +245420,9 @@
                         calculateInterval: _common.noop,
                         getMarginOptions: function() {
                             return {}
+                        },
+                        aggregatedPointBetweenTicks: function() {
+                            return false
                         }
                     }
                 }