Fix: navigator: range selection selects hidden items

aleksey-hoffman · Aug 2, 2022 · 1f23c5b · 1f23c5b
1 parent cdbef8d
commit 1f23c5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -330,6 +330,7 @@ export default new Vuex.Store({
       timeSinceLoadDirItems: 0,
       currentDir: {},
       dirItems: [],
+      filteredDirItems: [],
       selectedDirItems: [],
       previouslySelectedDirItems: [],
       history: {