Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/org/labkey/test/components/ui/grids/EditableGrid.java
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,8 @@ private void selectCell(WebElement cell)
private void activateCell(WebElement cell)
{
// If it is a selector, and it already has focus (is active), it will not have a div.cellular-display
if (Locator.tagWithClass("div", "select-input__control--is-focused").findElements(cell).isEmpty())
if (Locators.focusedSelect.findElements(cell).isEmpty()
&& Locators.inputCell.findElements(cell).isEmpty())
sendKeysToCell(cell, Keys.ENTER);
}

Expand Down Expand Up @@ -1178,9 +1179,8 @@ public boolean isCellSelected(WebElement cell)
catch (NoSuchElementException nse)
{
// If the cell is an open/active reactSelect the class attribute is different.
return Locator.tagWithClass("div", "select-input__control")
.findElement(cell)
.getDomAttribute("class").contains("select-input__control--is-focused");
return !Locators.focusedSelect.findElements(cell).isEmpty()
|| !Locators.inputCell.findElements(cell).isEmpty();
}
}

Expand Down Expand Up @@ -1433,6 +1433,7 @@ private Locators()
static final Locator.XPathLocator rows = Locator.tag("tbody").childTag("tr").withoutClass("grid-empty").withoutClass("grid-loading");
static final Locator headerCells = Locator.css("thead tr th");
static final Locator inputCell = Locator.css(".eg-input-cell");
static final Locator focusedSelect = Locator.tagWithClass("div", "select-input__control--is-focused");
static final Locator popover = Locator.byClass("popover");
}

Expand Down