fix sidebar and scrolling

Signed-off-by: dartcafe <github@dartcafe.de>

6 files changed, 17 insertions, 26 deletions

diff --git a/src/js/views/Administration.vue b/src/js/views/Administration.vue
index 1fd4a62b..f43d1025 100644
--- a/src/js/views/Administration.vue
+++ b/src/js/views/Administration.vue
@@ -122,7 +122,6 @@
 <script>
 import { mapGetters } from 'vuex'
 import { showError } from '@nextcloud/dialogs'
-import { emit } from '@nextcloud/event-bus'
 import { NcActions, NcActionButton, NcAppContent, NcButton, NcEmptyContent, NcModal } from '@nextcloud/vue'
 import { sortBy } from 'lodash'
 import HeaderBar from '../components/Base/HeaderBar.vue'
@@ -238,10 +237,6 @@ export default {
 
 		refreshView() {
 			window.document.title = `${t('polls', 'Polls')} - ${this.title}`
-			if (!this.filteredPolls(this.$route.params.type).find((poll) => poll.id === this.$store.state.poll.id)) {
-				emit('polls:sidebar:toggle', { open: false })
-			}
-
 		},
 
 		setSort(payload) {
diff --git a/src/js/views/Combo.vue b/src/js/views/Combo.vue
index 690ad9db..b936f289 100644
--- a/src/js/views/Combo.vue
+++ b/src/js/views/Combo.vue
@@ -55,7 +55,6 @@
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex'
 import { NcAppContent, NcEmptyContent } from '@nextcloud/vue'
-import { emit } from '@nextcloud/event-bus'
 import ComboTable from '../components/Combo/ComboTable.vue'
 import ActionToggleSidebar from '../components/Actions/ActionToggleSidebar.vue'
 import HeaderBar from '../components/Base/HeaderBar.vue'
@@ -107,7 +106,6 @@ export default {
 	},
 
 	created() {
-		emit('polls:sidebar:toggle', { open: (window.innerWidth > 920) })
 		this.verifyPolls()
 	},
 
diff --git a/src/js/views/PollList.vue b/src/js/views/PollList.vue
index 76d622fd..ed88de94 100644
--- a/src/js/views/PollList.vue
+++ b/src/js/views/PollList.vue
@@ -103,7 +103,6 @@
 <script>
 import { mapGetters, mapState, mapActions } from 'vuex'
 import { showError } from '@nextcloud/dialogs'
-import { emit } from '@nextcloud/event-bus'
 import { NcActions, NcActionButton, NcAppContent, NcEmptyContent } from '@nextcloud/vue'
 import HeaderBar from '../components/Base/HeaderBar.vue'
 import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
@@ -192,7 +191,6 @@ export default {
 		async loadPoll(pollId) {
 			try {
 				await this.$store.dispatch({ type: 'poll/get', pollId })
-				emit('polls:sidebar:toggle', { open: true })
 			} catch {
 				showError(t('polls', 'Error loading poll'))
 			}
@@ -200,10 +198,6 @@ export default {
 
 		refreshView() {
 			window.document.title = `${t('polls', 'Polls')} - ${this.title}`
-			if (!this.filteredPolls(this.$route.params.type).find((poll) => poll.id === this.$store.state.poll.id)) {
-				emit('polls:sidebar:toggle', { open: false })
-			}
-
 		},
 
 		async toggleArchive(pollId) {
diff --git a/src/js/views/SideBar.vue b/src/js/views/SideBar.vue
index 759b7414..05117282 100644
--- a/src/js/views/SideBar.vue
+++ b/src/js/views/SideBar.vue
@@ -133,12 +133,12 @@ export default {
 			useCollaboration: (state) => state.appSettings.useCollaboration,
 		}),
 	},
+
 	methods: {
 		closeSideBar() {
 			emit('polls:sidebar:toggle', { open: false })
 		},
 	},
-
 }
 
 </script>
diff --git a/src/js/views/SideBarCombo.vue b/src/js/views/SideBarCombo.vue
index 695f4fda..f3281278 100644
--- a/src/js/views/SideBarCombo.vue
+++ b/src/js/views/SideBarCombo.vue
@@ -22,7 +22,6 @@
 
 <template>
 	<NcAppSidebar ref="sideBar"
-		:active="active"
 		:title="t('polls', 'Select polls to combine')"
 		@close="closeSideBar()">
 		<NcAppSidebarTab :id="'polls'"
@@ -52,18 +51,12 @@ export default {
 		PollsAppIcon,
 	},
 
-	props: {
-		active: {
-			type: String,
-			default: t('polls', 'Polls').toLowerCase(),
-		},
-	},
-
 	computed: {
 		...mapGetters({
 			polls: 'polls/datePolls',
 		}),
 	},
+
 	methods: {
 		closeSideBar() {
 			emit('polls:sidebar:toggle', { open: false })
diff --git a/src/js/views/Vote.vue b/src/js/views/Vote.vue
index 0042a9d5..e3f118f8 100644
--- a/src/js/views/Vote.vue
+++ b/src/js/views/Vote.vue
@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<NcAppContent :class="[{ closed: closed }, poll.type]">
+	<NcAppContent :class="[{ closed: closed, 'page--scrolled': scrolled }, poll.type]">
 		<HeaderBar class="area__header">
 			<template #title>
 				{{ poll.title }}
@@ -116,6 +116,8 @@ export default {
 	data() {
 		return {
 			isLoading: false,
+			scrolled: false,
+			scrollElement: null,
 		}
 	},
 
@@ -157,16 +159,25 @@ export default {
 
 	},
 
-	created() {
-
-		emit('polls:sidebar:toggle', { open: (window.innerWidth > 920) })
+	mounted() {
+		this.scrollElement = document.getElementById('app-content-vue')
+		this.scrollElement.addEventListener('scroll', this.handleScroll)
 	},
 
 	beforeDestroy() {
+		this.scrollElement.removeEventListener('scroll', this.handleScroll)
 		this.$store.dispatch({ type: 'poll/reset' })
 	},
 
 	methods: {
+		handleScroll() {
+			if (this.scrollElement.scrollTop > 20) {
+				this.scrolled = true
+			} else {
+				this.scrolled = false
+			}
+		},
+
 		openOptions() {
 			emit('polls:sidebar:toggle', { open: true, activeTab: 'options' })
 		},