devextreme 19.1.6 → 19.1.7

package/ui/grid_core/ui.grid_core.focus.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.focus.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -24,6 +24,7 @@ function _interopRequireDefault(obj) {
 }
 var ROW_FOCUSED_CLASS = "dx-row-focused",
     FOCUSED_ROW_SELECTOR = ".dx-row." + ROW_FOCUSED_CLASS,
+    DATA_GRID_TABLE_SELECTOR = ".dx-datagrid-table",
     CELL_FOCUS_DISABLED_CLASS = "dx-cell-focus-disabled";
 exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function() {
     return {
@@ -47,7 +48,11 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
                         if ("focusedRowEnabled" === args.name) {
                             args.handled = true
                         } else {
-                            this.callBase(args)
+                            if ("skipFocusedRowNavigation" === args.name) {
+                                args.handled = true
+                            } else {
+                                this.callBase(args)
+                            }
                         }
                     }
                 }
@@ -115,7 +120,7 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
             if (void 0 === key) {
                 this._resetFocusedRow()
             } else {
-                this.navigateToRow(key)
+                this._navigateToRow(key, true)
             }
         },
         _resetFocusedRow: function() {
@@ -139,17 +144,41 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
             return ["navigateToRow", "isRowFocused"]
         },
         navigateToRow: function(key) {
+            this._navigateToRow(key)
+        },
+        _navigateToRow: function(key, needFocusRow) {
             var that = this,
                 dataController = this.getController("data"),
                 rowIndex = this.option("focusedRowIndex"),
-                result = new _deferred.Deferred;
+                isVirtualRowRenderingMode = "virtual" === that.option("scrolling.rowRenderingMode"),
+                result = new _deferred.Deferred,
+                navigateInRowsView = function(key, result) {
+                    if (needFocusRow) {
+                        that._triggerUpdateFocusedRow(key, result)
+                    } else {
+                        var rowsView = that.getView("rowsView"),
+                            _rowIndex = that.getController("data").getRowIndexByKey(key),
+                            rowElement = rowsView.getRow(_rowIndex);
+                        rowsView._scrollToElement(rowElement)
+                    }
+                },
+                navigateTo = function(key, result) {
+                    if (isVirtualRowRenderingMode) {
+                        setTimeout(function() {
+                            that._navigateToVirtualRow(key, result, needFocusRow)
+                        })
+                    } else {
+                        navigateInRowsView(key, result)
+                    }
+                };
+            that.option("skipFocusedRowNavigation", !needFocusRow);
             if (void 0 === key || !dataController.dataSource()) {
                 return result.reject().promise()
             }
             var rowIndexByKey = that._getFocusedRowIndexByKey(key),
                 isPaginate = dataController.getDataSource().paginate();
             if (!isPaginate || rowIndex >= 0 && rowIndex === rowIndexByKey) {
-                that._triggerUpdateFocusedRow(key, result)
+                navigateTo(key, result)
             } else {
                 dataController.getPageIndexByKey(key).done(function(pageIndex) {
                     if (pageIndex < 0) {
@@ -161,25 +190,21 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
                             if (that.isRowFocused(key)) {
                                 result.resolve(that._getFocusedRowIndexByKey(key))
                             } else {
-                                that._triggerUpdateFocusedRow(key, result)
+                                navigateInRowsView(key, result)
                             }
                         }).fail(result.reject)
                     } else {
                         dataController.pageIndex(pageIndex).done(function() {
-                            if ("virtual" === that.option("scrolling.rowRenderingMode")) {
-                                setTimeout(function() {
-                                    that._navigateToVirtualRow(key, result)
-                                })
-                            } else {
-                                that._triggerUpdateFocusedRow(key, result)
-                            }
+                            navigateTo(key, result)
                         }).fail(result.reject)
                     }
+                }).always(function() {
+                    return that.option("skipFocusedRowNavigation", false)
                 }).fail(result.reject)
             }
             return result.promise()
         },
-        _navigateToVirtualRow: function(key, result) {
+        _navigateToVirtualRow: function(key, result, needFocusRow) {
             var that = this,
                 dataController = this.getController("data"),
                 rowsScrollController = dataController._rowsScrollController,
@@ -188,11 +213,13 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
             if (rowsScrollController && scrollable && rowIndex >= 0) {
                 var focusedRowIndex = rowIndex + dataController.getRowIndexOffset() - dataController.getRowIndexDelta(),
                     offset = rowsScrollController.getItemOffset(focusedRowIndex);
-                var triggerUpdateFocusedRow = function triggerUpdateFocusedRow() {
-                    that.component.off("contentReady", triggerUpdateFocusedRow);
-                    that._triggerUpdateFocusedRow(key, result)
-                };
-                that.component.on("contentReady", triggerUpdateFocusedRow);
+                if (needFocusRow) {
+                    var triggerUpdateFocusedRow = function triggerUpdateFocusedRow() {
+                        that.component.off("contentReady", triggerUpdateFocusedRow);
+                        that._triggerUpdateFocusedRow(key, result)
+                    };
+                    that.component.on("contentReady", triggerUpdateFocusedRow)
+                }
                 scrollable.scrollTo({
                     y: offset
                 })
@@ -209,8 +236,9 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
                         focusedRowKey: key
                     })
                 } else {
-                    var rowIndex = dataController.getRowIndexByKey(key);
-                    this._scrollToFocusedRow(this.getView("rowsView").getRow(rowIndex))
+                    var rowIndex = dataController.getRowIndexByKey(key),
+                        rowsView = this.getView("rowsView");
+                    rowsView._scrollToElement(rowsView.getRow(rowIndex))
                 }
                 result && result.resolve(focusedRowIndex)
             } else {
@@ -237,7 +265,7 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
                     keyboardController.setFocusedRowIndex(currentFocusedRowIndex);
                     this._triggerUpdateFocusedRow(focusedRowKey)
                 } else {
-                    this.navigateToRow(focusedRowKey).done(function(focusedRowIndex) {
+                    this._navigateToRow(focusedRowKey, true).done(function(focusedRowIndex) {
                         if (currentFocusedRowIndex >= 0 && focusedRowIndex < 0) {
                             _this2._focusRowByIndex()
                         }
@@ -270,47 +298,27 @@ exports.FocusController = _uiGrid_core2.default.ViewController.inherit(function(
             })
         },
         _clearPreviousFocusedRow: function($tableElement, focusedRowIndex) {
-            var $firstRow, $prevRowFocusedElement = $tableElement.find(FOCUSED_ROW_SELECTOR);
+            var isNotMasterDetailFocusedRow = function(_, focusedRow) {
+                var $focusedRowTable = (0, _renderer2.default)(focusedRow).closest(DATA_GRID_TABLE_SELECTOR);
+                return $tableElement.is($focusedRowTable)
+            };
+            var $prevRowFocusedElement = $tableElement.find(FOCUSED_ROW_SELECTOR).filter(isNotMasterDetailFocusedRow);
             $prevRowFocusedElement.removeClass(ROW_FOCUSED_CLASS).removeClass(CELL_FOCUS_DISABLED_CLASS).removeAttr("tabindex");
             $prevRowFocusedElement.children("td").removeAttr("tabindex");
             if (0 !== focusedRowIndex) {
-                $firstRow = (0, _renderer2.default)(this.getView("rowsView").getRowElement(0));
+                var $firstRow = (0, _renderer2.default)(this.getView("rowsView").getRowElement(0));
                 $firstRow.removeClass(CELL_FOCUS_DISABLED_CLASS).removeAttr("tabIndex")
             }
         },
         _prepareFocusedRow: function(changedItem, $tableElement, focusedRowIndex) {
-            var $row, tabIndex = this.option("tabindex") || 0;
+            var $row, tabIndex = this.option("tabindex") || 0,
+                rowsView = this.getView("rowsView");
             if (changedItem && ("data" === changedItem.rowType || "group" === changedItem.rowType)) {
-                $row = (0, _renderer2.default)(this.getView("rowsView")._getRowElements($tableElement).eq(focusedRowIndex));
+                $row = (0, _renderer2.default)(rowsView._getRowElements($tableElement).eq(focusedRowIndex));
                 $row.addClass(ROW_FOCUSED_CLASS).attr("tabindex", tabIndex);
-                this._scrollToFocusedRow($row)
+                rowsView._scrollToElement($row)
             }
             return $row
-        },
-        _scrollToFocusedRow: function($row) {
-            var $focusedRow, that = this,
-                rowsView = that.getView("rowsView"),
-                $rowsViewElement = rowsView.element();
-            if (!$rowsViewElement) {
-                return
-            }
-            $focusedRow = $row && $row.length ? $row : $rowsViewElement.find(FOCUSED_ROW_SELECTOR);
-            if ($focusedRow.length > 0) {
-                var diff, focusedRowRect = $focusedRow[0].getBoundingClientRect(),
-                    rowsViewRect = rowsView.element()[0].getBoundingClientRect();
-                if (focusedRowRect.bottom > rowsViewRect.bottom) {
-                    diff = focusedRowRect.bottom - rowsViewRect.bottom
-                } else {
-                    if (focusedRowRect.top < rowsViewRect.top) {
-                        diff = focusedRowRect.top - rowsViewRect.top
-                    }
-                }
-                if (diff) {
-                    rowsView.scrollTo({
-                        y: rowsView._scrollTop + diff
-                    })
-                }
-            }
         }
     }
 }());
@@ -332,14 +340,12 @@ module.exports = {
                 init: function() {
                     var rowIndex = this.option("focusedRowIndex"),
                         columnIndex = this.option("focusedColumnIndex");
-                    if (this.option("focusedRowEnabled")) {
-                        this.createAction("onFocusedRowChanging", {
-                            excludeValidators: ["disabled", "readOnly"]
-                        });
-                        this.createAction("onFocusedRowChanged", {
-                            excludeValidators: ["disabled", "readOnly"]
-                        })
-                    }
+                    this.createAction("onFocusedRowChanging", {
+                        excludeValidators: ["disabled", "readOnly"]
+                    });
+                    this.createAction("onFocusedRowChanged", {
+                        excludeValidators: ["disabled", "readOnly"]
+                    });
                     this.createAction("onFocusedCellChanging", {
                         excludeValidators: ["disabled", "readOnly"]
                     });
@@ -359,7 +365,7 @@ module.exports = {
                 setFocusedRowIndex: function(rowIndex) {
                     this.callBase(rowIndex);
                     var visibleRow = this.getController("data").getVisibleRows()[rowIndex];
-                    if (!visibleRow || !visibleRow.inserted) {
+                    if (!visibleRow || !visibleRow.isNewRow) {
                         this.option("focusedRowIndex", rowIndex)
                     }
                 },
@@ -448,8 +454,8 @@ module.exports = {
                     return this.callBase.apply(this, arguments)
                 },
                 _fireChanged: function(e) {
-                    var isPartialUpdateWithDeleting;
-                    if (this.option("focusedRowEnabled") && this._dataSource) {
+                    var isPartialUpdateWithDeleting, skipFocusedRowNavigation = this.option("skipFocusedRowNavigation");
+                    if (this.option("focusedRowEnabled") && !skipFocusedRowNavigation && this._dataSource) {
                         var isPartialUpdate = "update" === e.changeType && e.repaintChangesOnly;
                         isPartialUpdateWithDeleting = isPartialUpdate && e.changeTypes && e.changeTypes.indexOf("remove") >= 0;
                         if (isPartialUpdateWithDeleting) {
@@ -478,7 +484,7 @@ module.exports = {
                     this._prevPageIndex = pageIndex;
                     this._prevRenderingPageIndex = renderingPageIndex;
                     if (reload && void 0 !== focusedRowKey) {
-                        focusController.navigateToRow(focusedRowKey).done(function(focusedRowIndex) {
+                        focusController._navigateToRow(focusedRowKey, true).done(function(focusedRowIndex) {
                             if (focusedRowIndex < 0) {
                                 focusController._focusRowByIndex()
                             }
@@ -656,11 +662,11 @@ module.exports = {
                         $row = $cellElements.eq(0).parent(),
                         dataSource = that.component.getController("data")._dataSource,
                         operationTypes = dataSource && dataSource.operationTypes();
-                    that._scrollToFocusOnResize = that._scrollToFocusOnResize || function() {
-                        that.getController("focus")._scrollToFocusedRow($row);
-                        that.resizeCompleted.remove(that._scrollToFocusOnResize)
-                    };
                     if ($row.length) {
+                        that._scrollToFocusOnResize = that._scrollToFocusOnResize || function() {
+                            that._scrollToElement($row);
+                            that.resizeCompleted.remove(that._scrollToFocusOnResize)
+                        };
                         $row.attr("tabIndex", tabIndex);
                         if (rowIndex >= 0) {
                             if (columnIndex < 0) {
@@ -674,6 +680,10 @@ module.exports = {
                             }
                         }
                     }
+                },
+                _scrollToElement: function(element) {
+                    var scrollable = this.getScrollable();
+                    scrollable && scrollable.scrollToElement(element)
                 }
             }
         }

package/ui/grid_core/ui.grid_core.grid_view.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.grid_view.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/grid_core/ui.grid_core.header_filter.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.header_filter.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -101,9 +101,7 @@ var HeaderFilterController = _uiGrid_core2.default.ViewController.inherit(functi
             if (!(0, _type.isObject)(item)) {
                 item = {}
             } else {
-                if (item === value) {
-                    item = (0, _extend.extend)({}, item)
-                }
+                item = (0, _extend.extend)({}, item)
             }
             path.push(value);
             if (1 === path.length) {
@@ -112,7 +110,6 @@ var HeaderFilterController = _uiGrid_core2.default.ViewController.inherit(functi
                 item.value = path.join("/")
             }
             item.text = this.getHeaderItemText(displayValue, column, currentLevel, options.headerFilterOptions);
-            delete item.key;
             return item
         },
         getHeaderItemText: function(displayValue, column, currentLevel, headerFilterOptions) {

package/ui/grid_core/ui.grid_core.header_filter_core.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.header_filter_core.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/grid_core/ui.grid_core.header_panel.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.header_panel.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/grid_core/ui.grid_core.keyboard_navigation.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.keyboard_navigation.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -28,6 +28,8 @@ var _pointer = require("../../events/pointer");
 var _pointer2 = _interopRequireDefault(_pointer);
 var _common = require("../../core/utils/common");
 var _accessibility = require("../shared/accessibility");
+var _browser = require("../../core/utils/browser");
+var _browser2 = _interopRequireDefault(_browser);
 
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
@@ -54,8 +56,9 @@ var ROWS_VIEW_CLASS = "rowsview",
     CELL_FOCUS_DISABLED_CLASS = "dx-cell-focus-disabled",
     DATEBOX_WIDGET_NAME = "dxDateBox",
     FOCUS_STATE_CLASS = "dx-state-focused",
+    WIDGET_CLASS = "dx-widget",
     FAST_EDITING_DELETE_KEY = "delete",
-    INTERACTIVE_ELEMENTS_SELECTOR = "input:not([type='hidden']), textarea, a, [tabindex]",
+    INTERACTIVE_ELEMENTS_SELECTOR = "input:not([type='hidden']), textarea, a, select, [tabindex]",
     VIEWS = ["rowsView"],
     EDIT_MODE_ROW = "row",
     EDIT_MODE_FORM = "form",
@@ -133,11 +136,15 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
                         return
                     }
                     if ($cell.is("td") || $cell.hasClass(that.addWidgetPrefix(EDIT_FORM_ITEM_CLASS))) {
-                        if (that.getController("editorFactory").focus() || that._isCellEditMode()) {
+                        if (that.getController("editorFactory").focus()) {
                             that._focus($cell)
                         } else {
-                            if (that._isHiddenFocus) {
-                                that._focus($cell, true)
+                            if (that._isCellEditMode()) {
+                                that._focus($cell, that._isHiddenFocus)
+                            } else {
+                                if (that._isHiddenFocus) {
+                                    that._focus($cell, true)
+                                }
                             }
                         }
                         if (isEditing) {
@@ -170,34 +177,28 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
         $element.attr("tabIndex", (0, _type.isDefined)(tabIndex) ? tabIndex : 0)
     },
     _isEventInCurrentGrid: function(event) {
-        var $grid = (0, _renderer2.default)(event.target).closest("." + this.getWidgetContainerClass()).parent();
-        return $grid.is(this.component.$element())
+        return (0, _uiGrid_core3.isElementInCurrentGrid)(this, (0, _renderer2.default)(event.target))
     },
     _clickHandler: function(e) {
         var event = e.event,
             $target = (0, _renderer2.default)(event.currentTarget),
             data = event.data,
             focusedViewElement = data.view && data.view.element(),
-            isEditingCell = $target.hasClass(EDITOR_CELL_CLASS),
-            isEditingRow = $target.parent().hasClass(EDIT_ROW_CLASS);
+            $parent = $target.parent(),
+            isEditingRow = $parent.hasClass(EDIT_ROW_CLASS);
         if (this._isEventInCurrentGrid(event) && this._isCellValid($target, true)) {
             $target = this._isInsideEditForm($target) ? (0, _renderer2.default)(event.target) : $target;
             this._focusView(data.view, data.viewIndex);
             (0, _renderer2.default)(focusedViewElement).removeClass(FOCUS_STATE_CLASS);
-            if ($target.parent().hasClass(FREESPACE_ROW_CLASS)) {
+            if ($parent.hasClass(FREESPACE_ROW_CLASS)) {
                 this._updateFocusedCellPosition($target);
                 this._focusedView.element().attr("tabindex", 0);
                 this._focusedView.focus()
             } else {
-                if (!isEditingCell && !this._isMasterDetailCell($target)) {
+                if (!this._isMasterDetailCell($target) && !isEditingRow) {
                     this._clickTargetCellHandler(event, $target)
                 } else {
-                    if (isEditingCell && !isEditingRow) {
-                        this._clickTargetCellHandler(event, $target);
-                        this._updateFocusedCellPosition($target)
-                    } else {
-                        this._updateFocusedCellPosition($target)
-                    }
+                    this._updateFocusedCellPosition($target)
                 }
             }
         } else {
@@ -233,6 +234,7 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
             }
             this._updateFocusedCellPosition($cell);
             if (this._allowRowUpdating() && isCellEditMode && column && column.allowEditing) {
+                this._isNeedFocus = false;
                 this._isHiddenFocus = false
             } else {
                 var $target = event && (0, _renderer2.default)(event.target),
@@ -267,14 +269,16 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
                         isFocusedViewCorrect = that._focusedView && that._focusedView.name === view.name,
                         needUpdateFocus = false,
                         isAppend = e && ("append" === e.changeType || "prepend" === e.changeType),
-                        keyboardActionSelector = "." + ROW_CLASS + " > td, ." + ROW_CLASS;
+                        keyboardActionSelector = "." + ROW_CLASS + " > td, ." + ROW_CLASS,
+                        $focusedElement = (0, _renderer2.default)(":focus"),
+                        isFocusedElementCorrect = !$focusedElement.length || $focusedElement.closest($element).length || _browser2.default.msie && $focusedElement.is("body");
                     _events_engine2.default.off($element, _utils2.default.addNamespace(_pointer2.default.down, "dxDataGridKeyboardNavigation"), clickAction);
                     _events_engine2.default.on($element, _utils2.default.addNamespace(_pointer2.default.down, "dxDataGridKeyboardNavigation"), keyboardActionSelector, {
                         viewIndex: index,
                         view: view
                     }, clickAction);
                     that._initKeyDownProcessor(that, $element, that._keyDownHandler);
-                    if (isFocusedViewCorrect) {
+                    if (isFocusedViewCorrect && isFocusedElementCorrect) {
                         needUpdateFocus = that._isNeedFocus ? !isAppend : that._isHiddenFocus && isFullUpdate;
                         needUpdateFocus && that._updateFocus(true)
                     }
@@ -538,7 +542,7 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
             this._focusEditFormCell($cell);
             setTimeout(this._editingController.saveEditData.bind(this._editingController))
         } else {
-            _events_engine2.default.trigger((0, _renderer2.default)(target), "blur");
+            _events_engine2.default.trigger((0, _renderer2.default)(target), "change");
             this._editingController.closeEditCell();
             event.preventDefault()
         }
@@ -600,8 +604,9 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
             if (!keyPressEvent.isDefaultPrevented()) {
                 setTimeout(function() {
                     $input.val(editorValue);
-                    _events_engine2.default.off($input, "focusout");
-                    _events_engine2.default.on($input, "focusout", function() {
+                    var $widgetContainer = $input.closest("." + WIDGET_CLASS);
+                    _events_engine2.default.off($widgetContainer, "focusout");
+                    _events_engine2.default.one($widgetContainer, "focusout", function() {
                         _events_engine2.default.trigger($input, "change")
                     });
                     _events_engine2.default.trigger($input, inputEvent)
@@ -688,6 +693,8 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
             if (!args.cancel) {
                 cellPosition.rowIndex = args.newRowIndex;
                 args.isHighlighted = isHighlighted
+            } else {
+                $event && $event.preventDefault()
             }
         }
         args.$newCellElement = (0, _renderer2.default)(this._getCell(cellPosition));
@@ -857,7 +864,7 @@ var KeyboardNavigationController = _uiGrid_core2.default.ViewController.inherit(
         row = this._dataController.items()[this._getRowIndex($cell && $cell.parent())];
         if (column.allowEditing) {
             var _isDataRow = !row || "data" === row.rowType;
-            isEditingAllowed = editingOptions.allowUpdating ? _isDataRow : row && row.inserted
+            isEditingAllowed = editingOptions.allowUpdating ? _isDataRow : row && row.isNewRow
         }
         if (!isEditingAllowed) {
             this._editingController.closeEditCell()
@@ -1654,6 +1661,15 @@ module.exports = {
                 _delayedInputFocus: function() {
                     this._keyboardNavigationController._isNeedScroll = true;
                     this.callBase.apply(this, arguments)
+                },
+                _isEditingStart: function() {
+                    var keyboardNavigation = this.getController("keyboardNavigation"),
+                        cancel = this.callBase.apply(this, arguments);
+                    if (cancel && !keyboardNavigation._isNeedFocus) {
+                        var $cell = keyboardNavigation._getFocusedCell();
+                        keyboardNavigation._focus($cell, true)
+                    }
+                    return cancel
                 }
             },
             data: {

package/ui/grid_core/ui.grid_core.master_detail.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.master_detail.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -149,7 +149,7 @@ module.exports = {
                         }(0, _iterator.each)(items, function(index, item) {
                             result.push(item);
                             expandIndex = _uiGrid_core2.default.getIndexByKey(item.key, that._expandedItems);
-                            if ("data" === item.rowType && (item.isExpanded || expandIndex >= 0) && !item.inserted) {
+                            if ("data" === item.rowType && (item.isExpanded || expandIndex >= 0) && !item.isNewRow) {
                                 result.push({
                                     visible: item.isExpanded,
                                     rowType: "detail",

package/ui/grid_core/ui.grid_core.modules.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.modules.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/grid_core/ui.grid_core.pager.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.pager.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/

package/ui/grid_core/ui.grid_core.rows.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.rows.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -220,7 +220,7 @@ module.exports = {
                         dataController = this._dataController,
                         row = dataController.getVisibleRows()[arg.rowIndex],
                         watch = this.option("integrationOptions.watchMethod");
-                    if (!arg.data || "data" !== arg.rowType || arg.inserted || !this.option("twoWayBindingEnabled") || !watch || !row) {
+                    if (!arg.data || "data" !== arg.rowType || arg.isNewRow || !this.option("twoWayBindingEnabled") || !watch || !row) {
                         return
                     }
                     var dispose = watch(function() {

package/ui/grid_core/ui.grid_core.search.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.search.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -35,11 +35,13 @@ function allowSearch(column) {
 
 function parseValue(column, text) {
     var lookup = column.lookup;
+    if (!column.parseValue) {
+        return text
+    }
     if (lookup) {
         return column.parseValue.call(lookup, text)
-    } else {
-        return column.parseValue ? column.parseValue(text) : text
     }
+    return column.parseValue(text)
 }
 module.exports = {
     defaultOptions: function() {

package/ui/grid_core/ui.grid_core.selection.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.selection.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/
@@ -144,7 +144,7 @@ exports.SelectionController = _uiData_grid2.default.Controller.inherit(function(
                     return item.selected
                 },
                 isSelectableItem: function(item) {
-                    return item && "data" === item.rowType && !item.inserted
+                    return item && "data" === item.rowType && !item.isNewRow
                 },
                 getItemData: function(item) {
                     return item && (item.oldData || item.data || item)
@@ -578,7 +578,7 @@ module.exports = {
             },
             rowsView: {
                 renderSelectCheckBoxContainer: function($container, options) {
-                    if ("data" === options.rowType && !options.row.inserted) {
+                    if ("data" === options.rowType && !options.row.isNewRow) {
                         $container.addClass(EDITOR_CELL_CLASS);
                         this._attachCheckBoxClickEvent($container);
                         this.setAria("label", _message2.default.format("dxDataGrid-ariaSelectRow"), $container);

package/ui/grid_core/ui.grid_core.sorting.js

@@ -1,7 +1,7 @@
 /**
  * DevExtreme (ui/grid_core/ui.grid_core.sorting.js)
- * Version: 19.1.6
- * Build date: Wed Sep 11 2019
+ * Version: 19.1.7
+ * Build date: Fri Oct 11 2019
  *
  * Copyright (c) 2012 - 2019 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExtreme licensing here: https://js.devexpress.com/Licensing/