Change-Id: I55e240980377d7ad94c06e2bf395acd95de32542
(cherry picked from commit 04eeee3d55
)
tags/7.7.0.beta1^0
@@ -2526,7 +2526,8 @@ public class Grid<T> extends ResizeComposite implements | |||
*/ | |||
private void setCellFocus(int rowIndex, int columnIndexDOM, | |||
RowContainer container) { | |||
if (rowIndex == rowWithFocus | |||
if (container == null | |||
|| rowIndex == rowWithFocus | |||
&& cellFocusRange.contains(columnIndexDOM) | |||
&& container == this.containerWithFocus) { | |||
return; |