devextreme 21.1.8 → 21.1.9

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

@@ -1,7 +1,7 @@
 /*!
  * DevExtreme (dx.all.debug.js)
- * Version: 21.1.8
- * Build date: Fri Feb 04 2022
+ * Version: 21.1.9
+ * Build date: Fri Apr 22 2022
  *
  * Copyright (c) 2012 - 2022 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -1530,15 +1530,16 @@
         exports.normalizeKeyName = function(_ref4) {
             var key = _ref4.key,
                 which = _ref4.which;
+            var originalKey = key;
             var isKeySupported = !!key;
-            key = isKeySupported ? key : which;
-            if (key) {
+            if (key || which) {
                 if (isKeySupported) {
-                    key = KEY_MAP[key.toLowerCase()] || key
-                } else {
-                    key = LEGACY_KEY_CODES[key] || String.fromCharCode(key)
+                    key = KEY_MAP[key.toLowerCase()]
                 }
-                return key
+                if (!isKeySupported || !key && which) {
+                    key = LEGACY_KEY_CODES[which] || String.fromCharCode(which)
+                }
+                return key || originalKey
             }
         };
         exports.getChar = function(_ref5) {
@@ -8829,6 +8830,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;
@@ -12706,7 +12711,7 @@
                 this._toggleSafariScrolling(true);
                 this._actions = null;
                 this.callBase();
-                zIndexPool.remove(this._zIndex);
+                this.option("visible") && zIndexPool.remove(this._zIndex);
                 this._$wrapper.remove();
                 this._$content.remove()
             },
@@ -19268,7 +19273,6 @@
                         this._invalidate();
                         break;
                     case "inertiaEnabled":
-                    case "scrollByContent":
                     case "scrollByThumb":
                     case "bounceEnabled":
                     case "useKeyboard":
@@ -19281,6 +19285,7 @@
                         this._strategy && this._strategy.disabledChanged();
                         break;
                     case "updateManually":
+                    case "scrollByContent":
                         break;
                     case "width":
                         this.callBase(args);
@@ -23531,10 +23536,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
@@ -23569,8 +23576,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) {
@@ -25469,7 +25476,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
@@ -26250,6 +26261,9 @@
                 }(this._options, _specialFormat) : this._options;
                 return format(value, options.format)
             },
+            getOptions: function() {
+                return this._options
+            },
             getLocation: function() {
                 return (0, _utils.normalizeEnum)(this._options.location)
             },
@@ -31493,6 +31507,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);
@@ -31558,7 +31587,7 @@
                 return !!this._scrollSpeed
             };
             _proto.isScrollable = function($element) {
-                return ("auto" === $element.css(this._overFlowAttr) || $element.hasClass("dx-scrollable-container")) && $element.prop(this._scrollSizeProp) > $element[this._sizeAttr]()
+                return ("auto" === $element.css(this._overFlowAttr) || $element.hasClass("dx-scrollable-container")) && $element.prop(this._scrollSizeProp) > Math.ceil($element[this._sizeAttr]())
             };
             _proto._trySetScrollable = function(element, mousePosition) {
                 var $element = (0, _renderer.default)(element);
@@ -31960,6 +31989,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();
@@ -32208,6 +32240,7 @@
                     case "onDrop":
                     case "onDragEnter":
                     case "onDragLeave":
+                    case "onDraggableElementShown":
                         this["_" + name + "Action"] = this._createActionByOption(name);
                         break;
                     case "dragTemplate":
@@ -33297,7 +33330,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",
@@ -34861,7 +34895,7 @@
     /*! all exports used */
     function(module, exports, __webpack_require__) {
         exports.version = void 0;
-        exports.version = "21.1.8"
+        exports.version = "21.1.9"
     },
     /*!******************************************************************************!*\
       !*** ./artifacts/transpiled-renovation-npm/localization/ldml/date.format.js ***!
@@ -38551,7 +38585,13 @@
                 var cellOptions = this._getCellOptions(options);
                 if (options.columnIndices) {
                     if (options.row.cells) {
-                        options.row.cells[cellOptions.columnIndex] = cellOptions
+                        var cellIndex;
+                        options.row.cells.forEach((function(cell, i) {
+                            if (cell.columnIndex === cellOptions.columnIndex) {
+                                cellIndex = i
+                            }
+                        }));
+                        options.row.cells[cellIndex] = cellOptions
                     }
                 } else {
                     options.row.cells.push(cellOptions)
@@ -38824,9 +38864,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]
                                     }
@@ -40677,7 +40715,7 @@
         var _window = __webpack_require__( /*! ../core/utils/window */ 7);
         var _events_engine = _interopRequireDefault(__webpack_require__( /*! ../events/core/events_engine */ 5));
         var _drag = __webpack_require__( /*! ../events/drag */ 72);
-        var _utils = __webpack_require__( /*! ../events/utils */ 8);
+        var _index = __webpack_require__( /*! ../events/utils/index */ 8);
         var _visibility_change = __webpack_require__( /*! ../events/visibility_change */ 59);
 
         function _interopRequireDefault(obj) {
@@ -40700,9 +40738,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",
@@ -41617,7 +41655,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();
@@ -41630,6 +41669,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")
@@ -48302,7 +48345,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) {
@@ -48317,7 +48361,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)
                 });
@@ -48326,7 +48370,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)
                         }
@@ -49536,6 +49580,9 @@
                         class: "".concat(this._rootClassPrefix, "-annotations")
                     }).css(this._getAnnotationStyles()).linkOn(this._renderer.root, "annotations").linkAppend();
                     _events_engine.default.on(getDocument(), POINTER_ACTION, (function(e) {
+                        if (_this2._disposed) {
+                            return
+                        }
                         if (!_this2._annotations.tooltip.isCursorOnTooltip(e.pageX, e.pageY)) {
                             _this2._annotations.hideTooltip()
                         }
@@ -50167,7 +50214,7 @@
             onSelectionChanged: function() {
                 this._selectionStrategy.onSelectionChanged()
             },
-            changeItemSelection: function(itemIndex, keys) {
+            changeItemSelection: function(itemIndex, keys, setFocusOnly) {
                 var isSelectedItemsChanged;
                 var items = this.options.plainItems();
                 var item = items[itemIndex];
@@ -50181,14 +50228,16 @@
                     isSelectedItemsChanged = this.changeItemSelectionWhenShiftKeyPressed(itemIndex, items)
                 } 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 {
@@ -50201,7 +50250,7 @@
                 }
                 if (isSelectedItemsChanged) {
                     this._focusedItemIndex = itemIndex;
-                    this.onSelectionChanged();
+                    !setFocusOnly && this.onSelectionChanged();
                     return true
                 }
             },
@@ -56964,18 +57013,16 @@
                     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
                         }
                     }
                 }
                 return true
             },
             dragEnd: function(sourceEvent) {
-                var _sourceEvent$fromComp, _sourceEvent$fromComp2, _sourceEvent$toCompon, _sourceEvent$toCompon2;
-                null === (_sourceEvent$fromComp = (_sourceEvent$fromComp2 = sourceEvent.fromComponent)._unsubscribeFromSourceScroll) || void 0 === _sourceEvent$fromComp ? void 0 : _sourceEvent$fromComp.call(_sourceEvent$fromComp2);
-                null === (_sourceEvent$toCompon = (_sourceEvent$toCompon2 = sourceEvent.toComponent)._unsubscribeFromSourceScroll) || void 0 === _sourceEvent$toCompon ? void 0 : _sourceEvent$toCompon.call(_sourceEvent$toCompon2);
+                this._unsubscribeFromSourceScroll();
                 var $sourceElement = this._getSourceElement();
                 var sourceDraggable = this._getSourceDraggable();
                 var isSourceDraggable = sourceDraggable.NAME !== this.NAME;
@@ -59765,6 +59812,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;
@@ -60313,7 +60364,7 @@
                     var result = uploadFile(file.value, (function(loadedBytes) {
                         var arg = {
                             loaded: loadedBytes,
-                            total: file.size
+                            total: file.value.size
                         };
                         _this20._handleProgress(file, arg)
                     }));
@@ -62850,7 +62901,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, _vdom.normalizeStyles)(viewModel.styles)
             }), null, viewModel.widgetRef));
             return viewModel.shouldRenderConfigProvider ? (0, _inferno.createComponentVNode)(2, _config_provider.ConfigProvider, {
@@ -65103,9 +65153,18 @@
                         e.removeSourceElement = !!e.sourceGroup;
                         that._adjustSortableOnChangedArgs(e);
                         if (field) {
+                            var targetIndex = e.targetIndex;
+                            var areaInvisibleFields = dataSource.getAreaFields(field.area, true).filter((function(f) {
+                                return false === f.visible
+                            }));
+                            areaInvisibleFields.forEach((function(field) {
+                                if (field.areaIndex <= e.targetIndex) {
+                                    targetIndex++
+                                }
+                            }));
                             that._applyChanges([getMainGroupField(dataSource, field)], {
                                 area: e.targetGroup,
-                                areaIndex: e.targetIndex
+                                areaIndex: targetIndex
                             })
                         }
                     }
@@ -69398,7 +69457,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())
@@ -72680,14 +72739,23 @@
                 var formatObject = this._getLabelFormatObject(value, labelOptions, range);
                 return (0, _type.isFunction)(labelOptions.customizeHint) ? labelOptions.customizeHint.call(formatObject, formatObject) : void 0
             },
-            formatRange: function(startValue, endValue, interval) {
-                return (0, _smart_formatter.formatRange)(startValue, endValue, interval, this.getOptions())
+            formatRange: function(startValue, endValue, interval, argumentFormat) {
+                return (0, _smart_formatter.formatRange)({
+                    startValue: startValue,
+                    endValue: endValue,
+                    tickInterval: interval,
+                    argumentFormat: argumentFormat,
+                    axisOptions: this.getOptions()
+                })
             },
             _setTickOffset: function() {
                 var options = this._options;
                 var discreteAxisDivisionMode = options.discreteAxisDivisionMode;
                 this._tickOffset = +("crossLabels" !== discreteAxisDivisionMode || !discreteAxisDivisionMode)
             },
+            aggregatedPointBetweenTicks: function() {
+                return "crossTicks" === this._options.aggregatedPointsPosition
+            },
             resetApplyingAnimation: function(isFirstDrawing) {
                 this._resetApplyingAnimation = true;
                 if (isFirstDrawing) {
@@ -79404,7 +79472,7 @@
             },
             _validateEvent: function(e) {
                 var $target = (0, _renderer.default)(e.originalEvent.target);
-                return this._isThumb($target) || this._isScrollbar($target) || this._isContent($target)
+                return this._isThumb($target) || this._isScrollbar($target)
             },
             _isThumb: function($element) {
                 return this._scrollByThumb && this._scrollbar.isThumb($element)
@@ -79412,9 +79480,6 @@
             _isScrollbar: function($element) {
                 return this._scrollByThumb && $element && $element.is(this._$scrollbar)
             },
-            _isContent: function($element) {
-                return this._scrollByContent && !!$element.closest(this._$element).length
-            },
             _reachedMin: function() {
                 return Math.round(this._location - this._minOffset) <= 0
             },
@@ -79480,7 +79545,6 @@
                     $container: this._$container,
                     $wrapper: this._$wrapper,
                     $element: this._$element,
-                    scrollByContent: this.option("scrollByContent"),
                     scrollByThumb: this.option("scrollByThumb"),
                     scrollbarVisible: this.option("showScrollbar"),
                     bounceEnabled: this.option("bounceEnabled"),
@@ -79517,10 +79581,14 @@
                 }
                 this._prepareDirections();
                 this._eachScroller((function(scroller, direction) {
-                    var isValid = scroller._validateEvent(e);
+                    var $target = (0, _renderer.default)(e.originalEvent.target);
+                    var isValid = scroller._validateEvent(e) || this.option("scrollByContent") && this._isContent($target);
                     this._validDirections[direction] = isValid
                 }))
             },
+            _isContent: function($element) {
+                return !!$element.closest(this._$element).length
+            },
             _prepareDirections: function(value) {
                 value = value || false;
                 this._validDirections = {};
@@ -81283,9 +81351,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);
@@ -81299,9 +81372,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();
@@ -83276,6 +83354,8 @@
         var _renderer = _interopRequireDefault(__webpack_require__( /*! ../../../core/renderer */ 2));
         var _extend = __webpack_require__( /*! ../../../core/utils/extend */ 0);
         var _window = __webpack_require__( /*! ../../../core/utils/window */ 7);
+        var _events_engine = _interopRequireDefault(__webpack_require__( /*! ../../../events/core/events_engine */ 5));
+        var _index = __webpack_require__( /*! ../../../events/utils/index */ 8);
         var _base = _interopRequireDefault(__webpack_require__( /*! ./base */ 146));
         var _popup = _interopRequireDefault(__webpack_require__( /*! ../../popup */ 49));
         var _list = _interopRequireDefault(__webpack_require__( /*! ../../list */ 116));
@@ -83326,6 +83406,7 @@
                     _this.options = (0, _extend.extend)({}, _this._getDefaultOptions(), options);
                     _this._popup = _this.renderPopup();
                     _this._popup.$wrapper().addClass("dx-suggestion-list-wrapper");
+                    _this._renderPreventFocusOut();
                     return _this
                 }
                 _proto.renderList = function($container, options) {
@@ -83391,6 +83472,12 @@
                         this.insertEmbedContent(e)
                     }
                 };
+                _proto._renderPreventFocusOut = function() {
+                    var eventName = (0, _index.addNamespace)("mousedown", "dxHtmlEditorPopupModule");
+                    _events_engine.default.on(this._popup.$wrapper(), eventName, (function(e) {
+                        e.preventDefault()
+                    }))
+                };
                 _proto.insertEmbedContent = function(selectionChangedEvent) {};
                 _proto.showPopup = function() {
                     this._popup && this._popup.show()
@@ -87672,12 +87759,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
                             }
@@ -87700,6 +87781,12 @@
                             } else {
                                 resetColumnsCache(that)
                             }
+                            fullOptionName && fireOptionChanged(that, {
+                                fullOptionName: fullOptionName,
+                                optionName: optionName,
+                                value: value,
+                                prevValue: prevValue
+                            })
                         }
                     };
 
@@ -88054,7 +88141,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");
@@ -88250,6 +88338,7 @@
                             }))[0];
                             var isFixedFirstGroupColumn = firstGroupColumn && firstGroupColumn.fixed;
                             var isColumnFixing = this._isColumnFixing();
+                            var rtlEnabled = this.option("rtlEnabled");
                             if (expandColumns.length) {
                                 expandColumn = this.columnOption("command:expand")
                             }
@@ -88259,7 +88348,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"
@@ -90215,9 +90305,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()
+                                        that.updateItems(null !== change && void 0 !== change && null !== (_change$changeTypes = change.changeTypes) && void 0 !== _change$changeTypes && _change$changeTypes.virtualColumnsScrolling ? {
+                                            virtualColumnsScrolling: true
+                                        } : {})
                                     }))
                                 }
                                 if ((0, _type.isDefined)(optionNames.visible)) {
@@ -90741,12 +90834,21 @@
                             return null
                         },
                         _applyFilter: function() {
+                            var _this4 = this;
                             var dataSource = this._dataSource;
                             if (dataSource) {
                                 dataSource.pageIndex(0);
-                                return this.reload().done(this.pageChanged.fire.bind(this.pageChanged))
+                                this._isFilterApplying = true;
+                                return this.reload().done((function() {
+                                    if (_this4._isFilterApplying) {
+                                        _this4.pageChanged.fire()
+                                    }
+                                }))
                             }
                         },
+                        resetFilterApplying: function() {
+                            this._isFilterApplying = false
+                        },
                         filter: function(filterExpr) {
                             var dataSource = this._dataSource;
                             var filter = dataSource && dataSource.filter();
@@ -94162,12 +94264,12 @@
             getSelectedRowsData: function() {
                 return this._selection.getSelectedItems()
             },
-            changeItemSelection: function(itemIndex, keys) {
+            changeItemSelection: function(itemIndex, keys, setFocusOnly) {
                 keys = keys || {};
                 if (this.isSelectionWithCheckboxes()) {
                     keys.control = true
                 }
-                return this._selection.changeItemSelection(this._dataController.getRowIndexDelta() + itemIndex, keys)
+                return this._selection.changeItemSelection(this._dataController.getRowIndexDelta() + itemIndex, keys, setFocusOnly)
             },
             focusedItemIndex: function(itemIndex) {
                 if ((0, _type.isDefined)(itemIndex)) {
@@ -95626,7 +95728,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"
@@ -95638,7 +95741,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");
@@ -95982,10 +96085,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,
@@ -96621,11 +96727,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() {
@@ -96897,7 +97003,9 @@
                     };
                     var oldEditRowIndex = this._getVisibleEditRowIndex();
                     var deferred = new _deferred.Deferred;
-                    this.refresh();
+                    this.refresh({
+                        allowCancelEditing: true
+                    });
                     if (!this._allowRowAdding()) {
                         return deferred.reject("cancel")
                     }
@@ -97056,13 +97164,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,
@@ -97644,7 +97753,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()
                     }
@@ -97976,7 +98087,8 @@
                 },
                 highlightDataCell: function($cell, parameters) {
                     var cellModified = this.isCellModified(parameters);
-                    cellModified && parameters.column.setCellValue && $cell.addClass("dx-cell-modified")
+                    var shouldHighlight = cellModified && parameters.column.setCellValue && (this.getEditMode() !== _uiGrid_core3.EDIT_MODE_ROW || !parameters.row.isEditing);
+                    shouldHighlight && $cell.addClass("dx-cell-modified")
                 },
                 _afterInsertRow: _common.noop,
                 _beforeSaveEditData: function(change) {
@@ -98372,9 +98484,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)
                         },
@@ -98588,6 +98706,7 @@
                             var row = this.component.getVisibleRows()[rowIndex];
                             var templateOptions = {
                                 row: row,
+                                values: row.values,
                                 rowType: row.rowType,
                                 key: row.key,
                                 rowIndex: rowIndex
@@ -98826,11 +98945,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)
                             }
                         }
                     },
@@ -98945,12 +99064,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());
@@ -99294,7 +99419,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) {
@@ -99413,9 +99540,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)
                             }
@@ -99890,7 +100017,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
@@ -100094,7 +100224,7 @@
                             }
                         },
                         _validateEditFormAfterUpdate: function(row, isCustomSetCellValue) {
-                            if (isCustomSetCellValue && this._editForm && !row.isNewRow) {
+                            if (isCustomSetCellValue && this._editForm) {
                                 this._editForm.validate()
                             }
                             this.callBase.apply(this, arguments)
@@ -100625,9 +100755,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) {
@@ -101226,10 +101360,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
                     }))
                 }
             },
@@ -101428,7 +101563,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;
@@ -102350,7 +102485,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)();
@@ -105685,7 +105820,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),
@@ -105698,14 +105833,11 @@
                             _this.render()
                         }
                     } else if (!e || "update" !== e.changeType && "updateSelection" !== 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") || {};
@@ -105745,12 +105877,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");
@@ -105801,12 +105940,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 = {
@@ -107910,6 +108053,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")
@@ -108001,7 +108145,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)
                     }
                 }))
@@ -108081,21 +108225,24 @@
                 this.focusType = "cell"
             },
             _keyDownHandler: function(e) {
-                var isEditing = this._editingController.isEditing();
                 var needStopPropagation = true;
-                var originalEvent = e.originalEvent;
+                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":
                         case "rightArrow":
                             this._leftRightKeysHandler(e, isEditing);
+                            isHandled = true;
                             break;
                         case "upArrow":
                         case "downArrow":
@@ -108104,53 +108251,59 @@
                             } else {
                                 this._upDownKeysHandler(e, isEditing)
                             }
+                            isHandled = true;
                             break;
                         case "pageUp":
                         case "pageDown":
                             this._pageUpDownKeyHandler(e);
+                            isHandled = true;
                             break;
                         case "space":
-                            this._spaceKeyHandler(e, isEditing);
+                            isHandled = this._spaceKeyHandler(e, isEditing);
                             break;
                         case "A":
                             if ((0, _index.isCommandKeyPressed)(e.originalEvent)) {
-                                this._ctrlAKeyHandler(e, isEditing)
+                                this._ctrlAKeyHandler(e, isEditing);
+                                isHandled = true
                             } else {
-                                this._beginFastEditing(e.originalEvent)
+                                isHandled = this._beginFastEditing(e.originalEvent)
                             }
                             break;
                         case "tab":
                             this._tabKeyHandler(e, isEditing);
+                            isHandled = true;
                             break;
                         case "enter":
                             this._enterKeyHandler(e, isEditing);
+                            isHandled = true;
                             break;
                         case "escape":
                             this._escapeKeyHandler(e, isEditing);
+                            isHandled = true;
                             break;
                         case "F":
                             if ((0, _index.isCommandKeyPressed)(e.originalEvent)) {
-                                this._ctrlFKeyHandler(e)
+                                this._ctrlFKeyHandler(e);
+                                isHandled = true
                             } else {
-                                this._beginFastEditing(e.originalEvent)
+                                isHandled = this._beginFastEditing(e.originalEvent)
                             }
                             break;
                         case "F2":
                             this._f2KeyHandler();
+                            isHandled = true;
                             break;
                         case "del":
                         case "backspace":
                             if (this._isFastEditingAllowed() && !this._isFastEditingStarted()) {
-                                this._beginFastEditing(originalEvent, true)
-                            }
-                            break;
-                        default:
-                            if (!this._beginFastEditing(originalEvent)) {
-                                this._isNeedFocus = false;
-                                this._isNeedScroll = false;
-                                needStopPropagation = false
+                                isHandled = this._beginFastEditing(originalEvent, true)
                             }
                     }
+                    if (!isHandled && !this._beginFastEditing(originalEvent)) {
+                        this._isNeedFocus = false;
+                        this._isNeedScroll = false;
+                        needStopPropagation = false
+                    }
                     if (needStopPropagation) {
                         originalEvent.stopPropagation()
                     }
@@ -108195,14 +108348,16 @@
                 }
             },
             _upDownKeysHandler: function(eventArgs, isEditing) {
+                var _this$_editingControl;
                 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 : _this$_editingControl.isEditRow(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)) {
@@ -108246,10 +108401,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) {
@@ -108804,9 +108961,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");
@@ -108829,19 +108983,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 = $cell.width() + cellOffset.left <= 0
-                    } else if (cellOffset.top < 0) {
-                        isOverlapped = $cell.height() + cellOffset.top <= 0
-                    }
-                }
-                return isOverlapped
-            },
             _getFocusedCell: function() {
                 return (0, _renderer.default)(this._getCell(this._focusedCellPosition))
             },
@@ -109494,12 +109635,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) {
@@ -110504,16 +110645,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(scrollableContent.height() + scrollbarWidth - $scrollableContainer.height(), 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) {
@@ -111756,7 +111896,8 @@
                     },
                     changeTypes: {
                         columns: true,
-                        length: 1
+                        virtualColumnsScrolling: true,
+                        length: 2
                     }
                 });
                 this._renderTime = new Date - date
@@ -112394,18 +112535,22 @@
                 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 _change$items;
                     var isMainTable = 0 === index;
                     $tableElement = (0, _renderer.default)(element);
                     that._clearPreviousFocusedRow($tableElement, focusedRowIndex);
-                    that._prepareFocusedRow({
+                    var $row = that._prepareFocusedRow({
                         changedItem: null === change || void 0 === change ? void 0 : null === (_change$items = change.items) || void 0 === _change$items ? void 0 : _change$items[focusedRowIndex],
                         $tableElement: $tableElement,
-                        focusedRowIndex: focusedRowIndex,
-                        isMainTable: isMainTable
-                    })
-                }))
+                        focusedRowIndex: focusedRowIndex
+                    });
+                    if (isMainTable) {
+                        $mainRow = $row
+                    }
+                }));
+                $mainRow && rowsView.scrollToElementVertically($mainRow)
             },
             _clearPreviousFocusedRow: function($tableElement, focusedRowIndex) {
                 var _this3 = this;
@@ -112426,14 +112571,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
             }
@@ -112582,6 +112723,8 @@
                                     this.processUpdateFocusedRow(e)
                                 } else if ("append" === e.changeType || "prepend" === e.changeType) {
                                     this._updatePageIndexes()
+                                } else if ("update" === e.changeType && e.repaintChangesOnly) {
+                                    this.processUpdateFocusedRow(e)
                                 }
                             }
                         },
@@ -112848,6 +112991,7 @@
                             var scrollable = this.getScrollable();
                             if (scrollable && $row.length) {
                                 var position = scrollable.getScrollElementPosition($row, "vertical");
+                                this._dataController.resetFilterApplying();
                                 scrollable.scrollTo({
                                     top: position
                                 })
@@ -112921,6 +113065,21 @@
                     this[currentSortableName] = this._createComponent($content, _sortable.default, (0, _extend.extend)({
                         component: this.component,
                         contentTemplate: null,
+                        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)
+                        },
                         filter: "> table > tbody > .dx-row:not(.dx-freespace-row):not(.dx-virtual-row)",
                         dragTemplate: this._getDraggableRowTemplate(),
                         handle: rowDragging.showDragIcons && ".".concat("dx-command-drag"),
@@ -113009,6 +113168,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 _this2 = this;
                 return function(options) {
@@ -126769,10 +126934,15 @@
     /*! dynamic exports provided */
     /*! all exports used */
     function(module, exports, __webpack_require__) {
-        exports.formatRange = function(startValue, endValue, tickInterval, _ref) {
-            var dataType = _ref.dataType,
-                type = _ref.type,
-                logarithmBase = _ref.logarithmBase;
+        exports.formatRange = function(_ref) {
+            var startValue = _ref.startValue,
+                endValue = _ref.endValue,
+                tickInterval = _ref.tickInterval,
+                argumentFormat = _ref.argumentFormat,
+                _ref$axisOptions = _ref.axisOptions,
+                dataType = _ref$axisOptions.dataType,
+                type = _ref$axisOptions.type,
+                logarithmBase = _ref$axisOptions.logarithmBase;
             if ("discrete" === type) {
                 return ""
             }
@@ -126843,7 +127013,9 @@
                 dataType: dataType,
                 tickInterval: tickInterval,
                 logarithmBase: logarithmBase,
-                labelOptions: {}
+                labelOptions: {
+                    format: argumentFormat
+                }
             };
             return "".concat(smartFormatter(startValue, formatOptions), " - ").concat(smartFormatter(endValue, formatOptions))
         };
@@ -127635,7 +127807,7 @@
                 tick = _ref2[0],
                 insideTick = _ref2[1];
             if (!(0, _type.isDefined)(tick) || mathAbs(getValue(breakValue) - getValue(tick)) / interval > .25) {
-                if ((0, _type.isDefined)(insideTick)) {
+                if ((0, _type.isDefined)(insideTick) && mathAbs(getValue(insideTick) - getValue(tick)) / interval < 2) {
                     tick = insideTick
                 } else if (!(0, _type.isDefined)(tick)) {
                     tick = breakValue
@@ -127657,9 +127829,6 @@
                         return tick >= b.to
                     }));
                     var to = addCorrection(getBaseTick(b.to, [].concat(breakTicks[0], ticks[ticks.length - breakTicks.length - 1]), interval, getValue), -correction);
-                    if (getValue(to) - getValue(from) < 0) {
-                        to = addCorrection(breakTicks[0], -correction)
-                    }
                     if (getValue(to) - getValue(from) < interval && !b.gapSize) {
                         return result
                     }
@@ -131872,6 +132041,9 @@
                 calculateInterval: _common.noop,
                 getMarginOptions: function() {
                     return {}
+                },
+                aggregatedPointBetweenTicks: function() {
+                    return false
                 }
             }
         }
@@ -134120,6 +134292,7 @@
             "en-MS": "en-001",
             "en-MT": "en-001",
             "en-MU": "en-001",
+            "en-MV": "en-001",
             "en-MW": "en-001",
             "en-MY": "en-001",
             "en-NA": "en-001",
@@ -134165,6 +134338,7 @@
             "en-NL": "en-150",
             "en-SE": "en-150",
             "en-SI": "en-150",
+            "hi-Latn": "en-IN",
             "es-AR": "es-419",
             "es-BO": "es-419",
             "es-BR": "es-419",
@@ -134215,7 +134389,6 @@
             "ff-Adlm": "und",
             "ff-Arab": "und",
             "ha-Arab": "und",
-            "hi-Latn": "und",
             "iu-Latn": "und",
             "kk-Arab": "und",
             "ks-Deva": "und",
@@ -134427,6 +134600,7 @@
             "en-MS": "\xa4#,##0.00;(\xa4#,##0.00)",
             "en-MT": "\xa4#,##0.00;(\xa4#,##0.00)",
             "en-MU": "\xa4#,##0.00;(\xa4#,##0.00)",
+            "en-MV": "\xa4\xa0#,##0.00",
             "en-MW": "\xa4#,##0.00;(\xa4#,##0.00)",
             "en-MY": "\xa4#,##0.00;(\xa4#,##0.00)",
             "en-NA": "\xa4#,##0.00;(\xa4#,##0.00)",
@@ -134597,6 +134771,7 @@
             haw: "\xa4#,##0.00;(\xa4#,##0.00)",
             he: "#,##0.00\xa0\xa4",
             hi: "\xa4#,##,##0.00",
+            "hi-Latn": "\xa4#,##,##0.00",
             hr: "#,##0.00\xa0\xa4",
             "hr-BA": "#,##0.00\xa0\xa4",
             hsb: "#,##0.00\xa0\xa4",
@@ -134632,8 +134807,9 @@
             ko: "\xa4#,##0.00;(\xa4#,##0.00)",
             "ko-KP": "\xa4#,##0.00;(\xa4#,##0.00)",
             kok: "\xa4#,##0.00;(\xa4#,##0.00)",
-            ks: "\xa4\xa0#,##,##0.00",
-            "ks-Arab": "\xa4\xa0#,##,##0.00",
+            ks: "\xa4#,##0.00",
+            "ks-Arab": "\xa4#,##0.00",
+            "ks-Deva": "\xa4\xa0#,##0.00",
             ksb: "#,##0.00\xa4",
             ksf: "#,##0.00\xa0\xa4",
             ksh: "#,##0.00\xa0\xa4",
@@ -134903,6 +135079,7 @@
             "en-AE": 6,
             "en-BI": 1,
             "en-MP": 1,
+            "en-MV": 5,
             "en-SD": 6,
             eo: 1,
             es: 1,
@@ -136394,8 +136571,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",
@@ -136816,7 +136993,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",
@@ -143641,6 +143818,15 @@
                 }
                 return filter
             },
+            _isOnlyNegativeFiltersLeft: function(filters) {
+                return filters.every((function(filterItem, i) {
+                    if (i % 2 === 0) {
+                        return Array.isArray(filterItem) && "!" === filterItem[0]
+                    } else {
+                        return "and" === filterItem
+                    }
+                }))
+            },
             _addSelectionFilter: function(isDeselect, filter, isSelectAll) {
                 var currentFilter = isDeselect ? ["!", filter] : filter;
                 var currentOperation = isDeselect ? "and" : "or";
@@ -143648,8 +143834,12 @@
                 var selectionFilter = this.options.selectionFilter || [];
                 selectionFilter = this._denormalizeFilter(selectionFilter);
                 if (selectionFilter && selectionFilter.length) {
-                    this._removeSameFilter(selectionFilter, filter, isDeselect, isSelectAll);
+                    var removedIndex = this._removeSameFilter(selectionFilter, filter, isDeselect, isSelectAll);
                     var filterIndex = this._removeSameFilter(selectionFilter, filter, !isDeselect);
+                    var shouldCleanFilter = isDeselect && (-1 !== removedIndex || -1 !== filterIndex) && this._isOnlyNegativeFiltersLeft(selectionFilter);
+                    if (shouldCleanFilter) {
+                        selectionFilter = []
+                    }
                     var isKeyOperatorsAfterRemoved = this._isKeyFilter(filter) && this._hasKeyFiltersOnlyStartingFromIndex(selectionFilter, filterIndex);
                     needAddFilter = filter.length && !isKeyOperatorsAfterRemoved;
                     if (needAddFilter) {
@@ -143845,14 +144035,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
@@ -143955,12 +144144,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
@@ -149085,12 +149275,14 @@
                 if (event.isDefaultPrevented()) {
                     return true
                 }
-                var result = this._isNestedTarget(event.relatedTarget);
+                var shouldPrevent = this._isNestedTarget(event.relatedTarget);
                 if ("focusin" === event.type) {
-                    result = result && this._isNestedTarget(event.target) && !this._isInput(event.target)
+                    shouldPrevent = shouldPrevent && this._isNestedTarget(event.target) && !this._isInput(event.target)
+                } else if (!shouldPrevent) {
+                    this._toggleFocusClass(false, this.$element())
                 }
-                result && event.preventDefault();
-                return result
+                shouldPrevent && event.preventDefault();
+                return shouldPrevent
             },
             _isNestedTarget: function(target) {
                 return !!this.$element().find(target).length
@@ -152129,18 +152321,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;
@@ -160194,6 +160383,10 @@
                         var nestedItemsRunTimeInfo = component.getItemsRunTimeInfo();
                         _this2._itemsRunTimeInfo.removeItemsByItems(nestedItemsRunTimeInfo)
                     },
+                    onFieldItemRendered: function() {
+                        var _this2$_validationSum;
+                        null === (_this2$_validationSum = _this2._validationSummary) || void 0 === _this2$_validationSum ? void 0 : _this2$_validationSum._initGroupRegistration()
+                    },
                     colCount: options.colCount,
                     alignItemLabels: options.alignItemLabels,
                     cssItemClass: options.cssItemClass,
@@ -160333,7 +160526,8 @@
                 if (ITEM_OPTIONS_FOR_VALIDATION_UPDATING.indexOf(optionName) > -1) {
                     _validation_engine.default.addGroup(this._getValidationGroup());
                     if (this.option("showValidationSummary")) {
-                        this._validationSummary && this._validationSummary._initGroupRegistration()
+                        var _this$_validationSumm;
+                        null === (_this$_validationSumm = this._validationSummary) || void 0 === _this$_validationSumm ? void 0 : _this$_validationSumm._initGroupRegistration()
                     }
                 }
             },
@@ -161662,6 +161856,7 @@
                 })
             },
             _renderFieldItem: function(_ref3) {
+                var _this$option;
                 var item = _ref3.item,
                     $parent = _ref3.$parent,
                     rootElementCssClassList = _ref3.rootElementCssClassList;
@@ -161702,6 +161897,7 @@
                     $fieldEditorContainer = _renderFieldItem2.$fieldEditorContainer,
                     widgetInstance = _renderFieldItem2.widgetInstance,
                     $rootElement = _renderFieldItem2.$rootElement;
+                null === (_this$option = this.option("onFieldItemRendered")) || void 0 === _this$option ? void 0 : _this$option();
                 if (widgetInstance && item.dataField) {
                     this._bindDataField(widgetInstance, item.dataField, item.editorType, $fieldEditorContainer)
                 }
@@ -166568,7 +166764,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
                 };
@@ -170451,6 +170647,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;
@@ -170464,6 +170663,9 @@
                 return this._$handle
             },
             _swipeUpdateHandler: function(e) {
+                if (this._isSingleValuePossible()) {
+                    return
+                }
                 this._saveValueChangeEvent(e.event);
                 this._updateHandlePosition(e)
             },
@@ -170517,7 +170719,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) / this._$bar.width();
                 if (this.option("rtlEnabled")) {
@@ -185442,15 +185653,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
                         },
@@ -185487,7 +185699,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)
@@ -186848,10 +187060,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)
                         },
@@ -186920,7 +187135,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) {
@@ -186928,7 +187143,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
                         },
@@ -186948,14 +187163,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) {
@@ -187026,11 +187241,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);
@@ -194166,8 +194381,8 @@
                 var targetedAdapter = adapter.clone();
                 if (this._isAgenda() && adapter.isRecurrent) {
                     var agendaSettings = settings.agendaSettings;
-                    targetedAdapter.startDate = agendaSettings.startDate;
-                    targetedAdapter.endDate = agendaSettings.endDate
+                    targetedAdapter.startDate = this.fire("getField", "startDate", agendaSettings);
+                    targetedAdapter.endDate = this.fire("getField", "endDate", agendaSettings)
                 } else if (settings) {
                     targetedAdapter.startDate = info ? info.sourceAppointment.startDate : adapter.startDate;
                     targetedAdapter.endDate = info ? info.sourceAppointment.endDate : adapter.endDate
@@ -212881,14 +213096,16 @@
                 var actionInfo = this._createEditActionInfo("move", itemInfos, destinationDirectory);
                 return this._processEditAction(actionInfo, (function() {
                     return _this9._fileProvider.moveItems(items, destinationDirectory.fileItem)
-                }), (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) {
@@ -212899,11 +213116,13 @@
                 var actionInfo = this._createEditActionInfo("copy", itemInfos, destinationDirectory);
                 return this._processEditAction(actionInfo, (function() {
                     return _this10._fileProvider.copyItems(items, destinationDirectory.fileItem)
-                }), (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) {
@@ -212982,6 +213201,7 @@
             };
             _proto._processEditAction = function(actionInfo, action, completeAction) {
                 var _this13 = this;
+                var isAnyOperationSuccessful = false;
                 var actionResult = null;
                 this._raiseEditActionStarting(actionInfo);
                 try {
@@ -212997,11 +213217,12 @@
                 }
                 this._raiseEditActionResultAcquired(actionInfo);
                 return (0, _uiFile_manager.whenSome)(actionResult, (function(info) {
-                    return _this13._raiseCompleteEditActionItem(actionInfo, info)
+                    isAnyOperationSuccessful = true;
+                    _this13._raiseCompleteEditActionItem(actionInfo, info)
                 }), (function(errorInfo) {
                     return _this13._raiseEditActionItemError(actionInfo, errorInfo)
                 })).then((function() {
-                    completeAction();
+                    completeAction(isAnyOperationSuccessful);
                     _this13._raiseCompleteEditAction(actionInfo)
                 }))
             };
@@ -226794,6 +227015,7 @@
                     placeholderSize: null,
                     logarithmBase: 10,
                     discreteAxisDivisionMode: "betweenLabels",
+                    aggregatedPointsPosition: "betweenTicks",
                     width: 1,
                     label: {
                         visible: true
@@ -232541,7 +232763,7 @@
                 var aggregationInfo = this.aggregationInfo;
                 if (aggregationInfo) {
                     var axis = this.series.getArgumentAxis();
-                    var rangeText = axis.formatRange(aggregationInfo.intervalStart, aggregationInfo.intervalEnd, aggregationInfo.aggregationInterval);
+                    var rangeText = axis.formatRange(aggregationInfo.intervalStart, aggregationInfo.intervalEnd, aggregationInfo.aggregationInterval, tooltip.getOptions().argumentFormat);
                     if (rangeText) {
                         tooltipFormatObject.valueText += "\n".concat(rangeText)
                     }
@@ -238211,7 +238433,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 {
@@ -241462,7 +241688,7 @@
             dxRangeSelector.prototype._optionChangesMap[name] = "MOSTLY_TOTAL"
         }));
 
-        function getShiftDirection() {
+        function getSharpDirection() {
             return 1
         }
 
@@ -241506,18 +241732,12 @@
                 getTemplate: function() {}
             });
             this._updateSelectedRangeCallback = params.updateSelectedRange;
-            this._axis.getAxisSharpDirection = this._axis.getSharpDirectionByCoords = getShiftDirection;
+            this._axis.getAxisSharpDirection = this._axis.getSharpDirectionByCoords = getSharpDirection;
             this._axis.getTickStartPositionShift = getTickStartPositionShift;
             this._axis._checkShiftedLabels = checkShiftedLabels
         }
         AxisWrapper.prototype = {
             constructor: AxisWrapper,
-            dispose: function() {
-                this._axis.dispose()
-            },
-            calculateInterval: function(value, prevValue) {
-                return this._axis.calculateInterval(value, prevValue)
-            },
             update: function(options, isCompactMode, canvas, businessRange, seriesDataSource) {
                 var axis = this._axis;
                 axis.updateOptions(function(scaleOptions, isCompactMode, height, axisPosition) {
@@ -241585,10 +241805,12 @@
                 return this._axis.getOptions() || {}
             }
         };
-        ["setMarginOptions", "getFullTicks", "updateCanvas", "updateOptions", "getAggregationInfo", "getTranslator", "getVisualRangeLength", "getVisibleArea", "getMarginOptions", "getVisualRangeCenter"].forEach((function(methodName) {
-            AxisWrapper.prototype[methodName] = function() {
-                var axis = this._axis;
-                return axis[methodName].apply(axis, arguments)
+        (0, _iterator.each)(_base_axis.Axis.prototype, (function(field) {
+            if ("constructor" !== field && "_" !== field[0] && (0, _type2.isFunction)(_base_axis.Axis.prototype[field]) && !(field in AxisWrapper.prototype)) {
+                AxisWrapper.prototype[field] = function() {
+                    var axis = this._axis;
+                    return axis[field].apply(axis, arguments)
+                }
             }
         }));
         (0, _component_registrator.default)("dxRangeSelector", dxRangeSelector);