Skip to content

[stable28] fix(files): Make the navigation reactive to view changes and show also sub routes as active #43119

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

Merged
blizzz merged 6 commits into from
Jan 25, 2024
Merged

[stable28] fix(files): Make the navigation reactive to view changes and show also sub routes as active #43119

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24f4997
fix(files): Add declaration for `$navigation`
susnux Jan 25, 2024
d1fc93e
fix(files): Set default view and match also child routes
susnux Jan 20, 2024
5db658c
fix(files): Make sure `$navigation` is observable to react on changes
susnux Jan 20, 2024
3add75c
fix(files): Make sure to add the `fileid` on favorite folders navigat…
susnux Jan 21, 2024
6a5181f
fix(files): Ensure the correct `dir` query is set on folder action
susnux Jan 25, 2024
732283f
chore(assets): Recompile assets
nextcloud-command Jan 24, 2024
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
Prev Previous commit
Next Next commit
fix(files): Make sure $navigation is observable to react on changes 
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux
susnux committed Jan 25, 2024
commit 5db658c65565c27dc10cad896c822bfa2d92f1f7
3 changes: 2 additions & 1 deletion apps/files/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ Vue.use(PiniaVuePlugin)
const pinia = createPinia()

// Init Navigation Service
const Navigation = getNavigation()
// This only works with Vue 2 - with Vue 3 this will not modify the source but return just a oberserver
const Navigation = Vue.observable(getNavigation())
Vue.prototype.$navigation = Navigation

// Init Files App Settings Service
Expand Down
3 changes: 1 addition & 2 deletions apps/files/src/views/FilesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,7 @@ export default defineComponent({
},

currentView(): View {
return (this.$navigation.active
|| this.$navigation.views.find(view => view.id === 'files')) as View
return this.$navigation.active || this.$navigation.views.find((view) => view.id === (this.$route.params?.view ?? 'files'))
},

/**
Expand Down