Skip to content

fix: Clicking a folder in file explorer panel sometimes fails to open or close it #1099

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

Merged
jason-wang24 merged 1 commit into from
Feb 23, 2023
Merged

fix: Clicking a folder in file explorer panel sometimes fails to open or close it #1099

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
20 changes: 16 additions & 4 deletions packages/components/src/ItemList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ContextActionUtils } from './context-actions';
import './ItemList.scss';

const log = Log.module('ItemList');
const MIN_DRAG_DELTA = 5;

export interface DefaultListItem {
value?: string;
Expand Down Expand Up @@ -80,6 +81,8 @@ type ItemListState = {
isDragging: boolean;
isStuckToBottom: boolean;
scrollOffset: number | null;
mouseX: number | null;
mouseY: number | null;
};

/**
Expand Down Expand Up @@ -179,6 +182,8 @@ export class ItemList<T> extends PureComponent<
isDragging: false,
isStuckToBottom: isStickyBottom,
scrollOffset: null,
mouseX: null,
mouseY: null,
};
}

Expand Down Expand Up @@ -418,7 +423,11 @@ export class ItemList<T> extends PureComponent<
return;
}

this.setState({ mouseDownIndex: index });
this.setState({
mouseDownIndex: index,
mouseX: e.clientX,
mouseY: e.clientY,
});

window.addEventListener('mouseup', this.handleWindowMouseUp);

Expand Down Expand Up @@ -451,12 +460,15 @@ export class ItemList<T> extends PureComponent<

handleItemMouseMove(itemIndex: number, e: React.MouseEvent): void {
const { isDragSelect, isMultiSelect, disableSelect } = this.props;
const { mouseDownIndex, selectedRanges } = this.state;
const { mouseDownIndex, selectedRanges, mouseX, mouseY } = this.state;

if (mouseDownIndex == null || disableSelect) return;

this.setState({ isDragging: true });

const mouseMoveX = Math.abs(e.clientX - (mouseX ?? 0));
const mouseMoveY = Math.abs(e.clientY - (mouseY ?? 0));
if (mouseMoveX > MIN_DRAG_DELTA && mouseMoveY > MIN_DRAG_DELTA) {
this.setState({ isDragging: true });
}
if (isDragSelect || mouseDownIndex === itemIndex) {
this.focusItem(itemIndex);

Expand Down
⚡