Skip to content

Commit a5482cb

Browse files
authored
dxFileManager: fix 'First item is selected when right-clicking on an empty area' (T1307139) (cherry-pick to 25_1) (#31220)
1 parent 4fc675b commit a5482cb

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
@@ -3,6 +3,7 @@ import 'ui/file_manager';
33
import fx from 'common/core/animation/fx';
44
import { FileManagerWrapper, createTestFileSystem } from '../../../helpers/fileManagerHelpers.js';
55
import { shouldSkipOnMobile } from '../../../helpers/device.js';
6+
import pointerMock from '../../../helpers/pointerMock.js';
67

78
const { test } = QUnit;
89

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

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

0 commit comments

Comments
 (0)