Skip to content

fix: Prevent double triggering of select event for Dataframe. #13019

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

Closed
mendonca4 wants to merge 1 commit into from
Closed

fix: Prevent double triggering of select event for Dataframe. #13019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion js/dataframe/shared/Table.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,8 @@
const drag_state: DragState = {
is_dragging,
drag_start,
mouse_down_pos
mouse_down_pos,
click_handled: false
};

$: {
Expand Down
24 changes: 18 additions & 6 deletions js/dataframe/shared/utils/drag_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export type DragState = {
is_dragging: boolean;
drag_start: CellCoordinate | null;
mouse_down_pos: { x: number; y: number } | null;
click_handled: boolean;
};

export type DragHandlers = {
Expand Down Expand Up @@ -39,13 +40,13 @@ export function create_drag_handlers(
event.preventDefault();
event.stopPropagation();

state.click_handled = false;
state.mouse_down_pos = { x: event.clientX, y: event.clientY };
state.drag_start = [row, col];

if (!event.shiftKey && !event.metaKey && !event.ctrlKey) {
set_selected_cells([[row, col]]);
set_selected([row, col]);
handle_cell_click(event, row, col);
}
};

Expand All @@ -64,16 +65,27 @@ export function create_drag_handlers(
};

const end_drag = (event: MouseEvent): void => {
if (!state.is_dragging && state.drag_start) {
handle_cell_click(event, state.drag_start[0], state.drag_start[1]);
} else if (state.is_dragging && parent_element) {
parent_element.focus();
}
const was_dragging = state.is_dragging;
const drag_coords = state.drag_start;

state.is_dragging = false;
set_is_dragging(false);
state.drag_start = null;
state.mouse_down_pos = null;

if (drag_coords && !state.click_handled) {
const cell = (event.target as HTMLElement).closest("td");
const end_row = cell ? parseInt(cell.getAttribute("data-row") || "-1") : -1;
const end_col = cell ? parseInt(cell.getAttribute("data-col") || "-1") : -1;
const same_cell =
end_row === drag_coords[0] && end_col === drag_coords[1];
if (!was_dragging || same_cell) {
state.click_handled = true;
handle_cell_click(event, drag_coords[0], drag_coords[1]);
} else if (parent_element) {
parent_element.focus();
}
}
};

return {
Expand Down
Loading