Skip to content

TreeView: support selection by shift+arrows/home/end when showCheckBoxesMode='none' #31353

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
pharret31 wants to merge 1 commit into from
Closed

TreeView: support selection by shift+arrows/home/end when showCheckBoxesMode='none' #31353

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
15 changes: 9 additions & 6 deletions packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1696,12 +1696,13 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties>
}

_moveFocus(location, e) {
const { rtlEnabled, selectByClick } = this.option();
const FOCUS_UP = 'up';
const FOCUS_DOWN = 'down';
const FOCUS_FIRST = 'first';
const FOCUS_LAST = 'last';
const FOCUS_LEFT = this.option('rtlEnabled') ? 'right' : 'left';
const FOCUS_RIGHT = this.option('rtlEnabled') ? 'left' : 'right';
const FOCUS_LEFT = rtlEnabled ? 'right' : 'left';
const FOCUS_RIGHT = rtlEnabled ? 'left' : 'right';
// @ts-expect-error ts-error
this.$element().find(`.${NODE_CONTAINER_CLASS}`).each(function () {
fx.stop(this, true);
Expand All @@ -1713,14 +1714,16 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties>
return;
}

const isSelectionByShiftAllowed = this._showCheckboxes() || selectByClick;

switch (location) {
case FOCUS_UP: {
const $prevItem = this._prevItem($items);
this.option('focusedElement', getPublicElement($prevItem));

const prevItemElement = this._getNodeItemElement($prevItem);
this.getScrollable().scrollToElement(prevItemElement);
if (e.shiftKey && this._showCheckboxes()) {
if (e.shiftKey && isSelectionByShiftAllowed) {
this._updateItemSelection(true, prevItemElement);
}
break;
Expand All @@ -1731,14 +1734,14 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties>

const nextItemElement = this._getNodeItemElement($nextItem);
this.getScrollable().scrollToElement(nextItemElement);
if (e.shiftKey && this._showCheckboxes()) {
if (e.shiftKey && isSelectionByShiftAllowed) {
this._updateItemSelection(true, nextItemElement);
}
break;
}
case FOCUS_FIRST: {
const $firstItem = $items.first();
if (e.shiftKey && this._showCheckboxes()) {
if (e.shiftKey && isSelectionByShiftAllowed) {
this._updateSelectionToFirstItem($items, $items.index(this._prevItem($items)));
}

Expand All @@ -1749,7 +1752,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties>
case FOCUS_LAST: {
const $lastItem = $items.last();

if (e.shiftKey && this._showCheckboxes()) {
if (e.shiftKey && isSelectionByShiftAllowed) {
this._updateSelectionToLastItem($items, $items.index(this._nextItem($items)));
}

Expand Down
Loading
Loading