Skip to content
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

Jump to bottom

fix: revert static drop mode for tree grid #3786

Merged
merged 2 commits into from
Oct 11, 2024
Merged

fix: revert static drop mode for tree grid #3786

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
09c628b
fix: revert static drop mode for tree grid
vursen Oct 9, 2024
d109123
Merge branch 'latest' into revert-static-drop-mode-for-tree-grids
vursen Oct 11, 2024
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
2 changes: 1 addition & 1 deletion frontend/demo/component/grid/grid-drag-drop-filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class Example extends LitElement {
this.expandedItems = event.detail.value;
}}"
rows-draggable
.dropMode=${this.draggedItem ? 'on-top' : undefined}
drop-mode="on-top"
@grid-dragstart="${(event: GridDragStartEvent<Person>) => {
this.draggedItem = event.detail.draggedItems[0];
}}"
Expand Down
2 changes: 1 addition & 1 deletion frontend/demo/component/grid/react/grid-drag-drop-filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function Example() {
expandedItems.value = event.detail.value;
}}
rowsDraggable
dropMode={draggedItem.value ? 'on-top' : undefined}
dropMode="on-top"
onGridDragstart={(event) => {
draggedItem.value = event.detail.draggedItems[0];
}}
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/com/vaadin/demo/component/grid/GridDragDropFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,15 @@ public GridDragDropFilters() {
treeData);
treeGrid.setDataProvider(treeDataProvider);
treeGrid.setRowsDraggable(true);
treeGrid.setDropMode(GridDropMode.ON_TOP);

// Only allow dragging staff
treeGrid.setDragFilter(person -> !person.isManager());
// Only allow dropping on managers
treeGrid.setDropFilter(person -> person.isManager());

treeGrid.addDragStartListener(e -> {
treeGrid.setDropMode(GridDropMode.ON_TOP);
draggedItem = e.getDraggedItems().get(0);
// Workaround https://github.com/vaadin/flow-components/issues/6310
treeGrid.getDataCommunicator().reset();
});

treeGrid.addDropListener(e -> {
Expand All @@ -70,7 +68,6 @@ public GridDragDropFilters() {
});

treeGrid.addDragEndListener(e -> {
treeGrid.setDropMode(null);
draggedItem = null;
});
// end::snippet[]
Expand Down
Loading