Skip to content

V24 proposed fix #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: v24
Choose a base branch
from
Open

V24 proposed fix #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8375101
Index starts with 0, requiring >=
danielstieger Apr 5, 2023
c19a3db
Support Context Menu Handling (desktop style)
danielstieger Apr 5, 2023
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
6 changes: 3 additions & 3 deletions ...tion-grid-flow/src/main/java/com/vaadin/componentfactory/selectiongrid/SelectionGrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ public void focusOnCell(T item) {
*/
public void focusOnCell(T item, Column<T> column) {
int index = getIndexForItem(item);
if (index > 0) {
int colIndex = (column != null) ? getColumns().indexOf(column) : 0;
if (index >= 0) {
int colIndex = (column != null) ? getColumns().indexOf(column) : 1;
// delay the call of focus on cell if it's used on the same round trip (grid creation + focusCell)
this.getElement().executeJs("setTimeout(function() { $0.focusOnCell($1, $2) });", getElement(), index, colIndex);
}
Expand Down Expand Up @@ -241,4 +241,4 @@ public void removeThemeVariants(SelectionGridVariant... variants) {
getThemeNames().removeAll(Stream.of(variants)
.map(SelectionGridVariant::getVariantName).collect(Collectors.toList()));
}
}
}
18 changes: 18 additions & 0 deletions selection-grid-flow/src/main/resources/META-INF/resources/frontend/src/selection-grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@
customElements.whenDefined("vaadin-selection-grid").then(() => {
const Grid = customElements.get("vaadin-selection-grid");
if (Grid) {
const oldOnContextMenuHandler = Grid.prototype._onContextMenu;
Grid.prototype._onContextMenu = function _onContextMenu(e) {

const tr = e.composedPath().find((p) => p.nodeName === "TR");
if (tr && typeof tr.index != 'undefined') {
const item = tr._item;
const index = tr.index;
if (this.selectedItems && this.selectedItems.some((i) => i.key === item.key)) {
// in case current row selected, do nothing, else
} else {
this._selectionGridSelectRow(e);
}
}

const boundOnConextMenuHandler = oldOnContextMenuHandler.bind(this);
boundOnConextMenuHandler(e);
}

const oldClickHandler = Grid.prototype._onClick;
Grid.prototype._onClick = function _click(e) {
const boundOldClickHandler = oldClickHandler.bind(this);
Expand Down