Skip to content
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

Jump to bottom

Make appSidebar scrollable inside #1485

Merged
merged 1 commit into from
Oct 20, 2020
Merged

Make appSidebar scrollable inside #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/components/AppSidebar/AppSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,14 +444,17 @@ export default {
}
</script>
<style lang="scss" scoped>
$header-height: 50px;
$sidebar-min-width: 300px;
$sidebar-max-width: 500px;

$desc-vertical-padding: 18px;
$desc-input-padding: 7px;
$desc-title-height: 30px;

// title and subtitle
$desc-height: $desc-title-height + 22px;
$desc-title-height: 30px;
$desc-subtitle-height: 22px;
$desc-height: $desc-title-height + $desc-subtitle-height;

$top-buttons-spacing: 6px;

/*
Expand All @@ -462,7 +465,7 @@ $top-buttons-spacing: 6px;
position: -webkit-sticky; // Safari support
position: sticky;
z-index: 1500;
top: $header-height;
top: var(--header-height);
right: 0;
display: flex;
overflow-x: hidden;
Expand All @@ -472,7 +475,7 @@ $top-buttons-spacing: 6px;
width: 27vw;
min-width: $sidebar-min-width;
max-width: $sidebar-max-width;
height: calc(100vh - #{$header-height});
height: calc(100vh - var(--header-height));
border-left: 1px solid var(--color-border);
background: var(--color-main-background);
.app-sidebar-header {
Expand Down
6 changes: 4 additions & 2 deletions src/components/AppSidebar/AppSidebarTabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,10 @@ export default {
</script>
<style lang="scss" scoped>
.app-sidebar-tabs {
flex: 1 1 auto;
display: flex;
flex-direction: column;
min-height: 0;
flex: 1 1 100%;

&__nav {
margin-top: 10px;
Expand Down Expand Up @@ -340,7 +341,8 @@ export default {
&__content {
position: relative;
// take full available height
flex: 1 1 100%;
min-height: 0;
height: 100%;
// force the use of the tab component if more than one tab
// you can just put raw content if you don't use tabs
&--multiple > :not(section) {
Expand Down
18 changes: 17 additions & 1 deletion src/components/AppSidebarTab/AppSidebarTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
:aria-labelledby="name"
class="app-sidebar__tab"
tabindex="0"
role="tabpanel">
role="tabpanel"
@scroll="onScroll">
<slot />
</section>
</template>
Expand Down Expand Up @@ -65,6 +66,19 @@ export default {
return this.$parent.activeTab === this.id
},
},

methods: {
onScroll(event) {
// Are we scrolled to the very bottom ?
if (this.$el.scrollHeight - this.$el.scrollTop === this.$el.clientHeight) {
/**
* Bottom scroll is reached
*/
this.$emit('bottomReached', event)
}
this.$emit('scroll', event)
},
},
}
</script>

Expand All @@ -73,6 +87,8 @@ export default {
display: none;
padding: 10px;
min-height: 100%; // fill available height
max-height: 100%; // scroll inside
overflow: auto;

&:focus {
border-color: var(--color-primary);
Expand Down