Skip to content

Commit 9028990

Browse files
authored
dxFileManager: fix 'First item is selected when right-clicking on an empty area' (T1307139) (cherry-pick to 24_2) (#31224)
1 parent 94dbcda commit 9028990

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ class FileManagerThumbnailListBox extends CollectionWidget {
337337

338338
_focusOutHandler() {}
339339

340+
_focusInHandler() {}
341+
340342
_getItems() {
341343
return this.option('items') || [];
342344
}

packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import $ from 'jquery';
22
import 'ui/file_manager';
33
import fx from 'common/core/animation/fx';
44
import { FileManagerWrapper, createTestFileSystem, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js';
5+
import pointerMock from '../../../helpers/pointerMock.js';
56

67
const { test } = QUnit;
78

@@ -301,4 +302,13 @@ QUnit.module('Thumbnails View', moduleConfig, () => {
301302
assert.notOk(this.wrapper.isThumbnailsItemSelected('..'), 'parent folder is not visually highlited');
302303
});
303304

305+
test('Thumbnails view - should focus item only on selection (T1307139)', function(assert) {
306+
this.wrapper.getThumbnailsViewPort().trigger('focusin');
307+
assert.notOk(this.wrapper.isThumbnailsItemFocused('Folder 1'));
308+
309+
pointerMock(this.wrapper.findThumbnailsItem('Folder 1')).click();
310+
this.clock.tick(400);
311+
assert.ok(this.wrapper.isThumbnailsItemSelected('Folder 1'));
312+
assert.ok(this.wrapper.isThumbnailsItemFocused('Folder 1'));
313+
});
304314
});

0 commit comments

Comments
 (0)