From 1f23c5bd9ff05efa310fec756cc281d7dad580d9 Mon Sep 17 00:00:00 2001 From: Aleksey Hoffman <61761672+aleksey-hoffman@users.noreply.github.com> Date: Wed, 3 Aug 2022 02:04:02 +0300 Subject: [PATCH] Fix: navigator: range selection selects hidden items --- .../Workspace/Areas/Navigator/ItemList/index.vue | 11 +++++------ src/store.js | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Workspace/Areas/Navigator/ItemList/index.vue b/src/components/Workspace/Areas/Navigator/ItemList/index.vue index 6813e375..4e5a00d6 100644 --- a/src/components/Workspace/Areas/Navigator/ItemList/index.vue +++ b/src/components/Workspace/Areas/Navigator/ItemList/index.vue @@ -47,6 +47,7 @@ export default { ...mapFields({ windowSize: 'windowSize', dirItems: 'navigatorView.dirItems', + filteredDirItems: 'navigatorView.filteredDirItems', navigatorViewInfoPanel: 'storageData.settings.infoPanels.navigatorView', navigatorShowHiddenDirItems: 'storageData.settings.navigator.showHiddenDirItems', filterQuery: 'filterField.view.navigator.query', @@ -298,16 +299,13 @@ export default { console.timeEnd('time::formattedDirItems') return results }, - dirItemsMatchingFilter () { - return this.getItemsMatchingFilter(this.dirItems) - }, directoryDirItems () { - return [...this.dirItemsMatchingFilter.filter(item => { + return [...this.getItemsMatchingFilter(this.dirItems).filter(item => { return item.type === 'directory' || item.type === 'directory-symlink' })] }, fileDirItems () { - return [...this.dirItemsMatchingFilter.filter(item => { + return [...this.getItemsMatchingFilter(this.dirItems).filter(item => { return item.type === 'file' || item.type === 'file-symlink' })] }, @@ -342,13 +340,14 @@ export default { return Math.floor(params.containerWidth / params.itemMinWidth) }, getItemsMatchingFilter (items) { - return itemFilter({ + this.filteredDirItems = itemFilter({ filterQuery: this.filterQuery, items, filterHiddenItems: !this.navigatorShowHiddenDirItems, filterProperties: this.$store.state.filterField.view.navigator.filterProperties, filterQueryOptions: this.$store.state.filterField.view.navigator.options, }) + return this.filteredDirItems }, getDirItemGroupTitleDescription (itemCount) { const itemWord = this.$localizeUtils.pluralize(itemCount, 'item') diff --git a/src/store.js b/src/store.js index f277569d..6affb583 100644 --- a/src/store.js +++ b/src/store.js @@ -330,6 +330,7 @@ export default new Vuex.Store({ timeSinceLoadDirItems: 0, currentDir: {}, dirItems: [], + filteredDirItems: [], selectedDirItems: [], previouslySelectedDirItems: [], history: {