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

feat(ui5-dynamic-page): footer no longer takes space when hidden #7904

Merged
merged 2 commits into from
Nov 27, 2023
Merged

feat(ui5-dynamic-page): footer no longer takes space when hidden #7904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91fd0c3
feat(ui5-dynamic-page): prevent unnecessary content overflow when foo…
kineticjs Nov 22, 2023
743949d
feat(ui5-dynamic-page): move scroll listener to the new scroll container
kineticjs Nov 23, 2023
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
57 changes: 30 additions & 27 deletions packages/fiori/src/DynamicPage.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
<div class="{{classes.root}}">
<div class="{{classes.headerWrapper}}">
<slot name="titleArea"></slot>
{{#if headerInTitle}}
<slot name="headerArea"></slot>
{{/if}}
<div class="{{classes.scrollContainer}}"
@scroll="{{snapOnScroll}}">
<div class="{{classes.headerWrapper}}">
<slot name="titleArea"></slot>
{{#if headerInTitle}}
<slot name="headerArea"></slot>
{{/if}}

{{#if actionsInTitle}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
?pinned="{{headerPinned}}"
@ui5-expand-button-click={{onExpandClick}}
@ui5-pin-button-click={{onPinClick}}
></ui5-dynamic-page-header-actions>
{{/if}}
{{#if actionsInTitle}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
?pinned="{{headerPinned}}"
@ui5-expand-button-click={{onExpandClick}}
@ui5-pin-button-click={{onPinClick}}
></ui5-dynamic-page-header-actions>
{{/if}}

</div>
</div>

<div class="{{classes.content}}">
{{#if headerInContent}}
<slot name="headerArea"></slot>
{{/if}}
<div class="{{classes.content}}">
{{#if headerInContent}}
<slot name="headerArea"></slot>
{{/if}}

{{#unless actionsInTitle}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
?pinned="{{headerPinned}}"
@ui5-expand-button-click={{onExpandClick}}
@ui5-pin-button-click={{onPinClick}}
></ui5-dynamic-page-header-actions>
{{/unless}}
{{#unless actionsInTitle}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
?pinned="{{headerPinned}}"
@ui5-expand-button-click={{onExpandClick}}
@ui5-pin-button-click={{onPinClick}}
></ui5-dynamic-page-header-actions>
{{/unless}}

<slot></slot>
<slot></slot>
</div>
</div>

<div class="{{classes.footer}}">
Expand Down
19 changes: 12 additions & 7 deletions packages/fiori/src/DynamicPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,14 @@ class DynamicPage extends UI5Element {
_debounceInterval?: Timeout | null;
showHeaderInStickArea = false;

onAfterRendering() {
this.addEventListener("scroll", this.snapOnScroll.bind(this));
}

get classes() {
return {
root: {
"ui5-dynamic-page-root": true,
},
scrollContainer: {
"ui5-dynamic-page-scroll-container": true,
},
headerWrapper: {
"ui5-dynamic-page-title-header-wrapper": true,
},
Expand All @@ -101,6 +100,10 @@ class DynamicPage extends UI5Element {
return this.querySelector<DynamicPageHeader>("[ui5-dynamic-page-header]");
}

get scrollContainer(): HTMLElement | null | undefined {
return this.getDomRef()?.querySelector(".ui5-dynamic-page-scroll-container");
}

get actionsInTitle(): boolean {
return this.headerSnapped || this.showHeaderInStickArea || this.headerPinned;
}
Expand All @@ -117,18 +120,20 @@ class DynamicPage extends UI5Element {
return;
}

if (this.iPreviousScrollAmount === this.scrollTop || this.headerPinned) {
const scrollTop = this.scrollContainer!.scrollTop;

if (this.iPreviousScrollAmount === scrollTop || this.headerPinned) {
return;
}

this.iPreviousScrollAmount = this.scrollTop;
this.iPreviousScrollAmount = scrollTop;

if (this.isExpanding) {
this.isExpanding = false;
return;
}

if (this.scrollTop > this.dynamicPageHeader.getBoundingClientRect().height) {
if (scrollTop > this.dynamicPageHeader.getBoundingClientRect().height) {
this.headerSnapped = true;
this.showHeaderInStickArea = false;
} else {
Expand Down
19 changes: 13 additions & 6 deletions packages/fiori/src/themes/DynamicPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@

:host {
display: block;
height: 100%;
}

.ui5-dynamic-page-root {
height: inherit;
overflow-y: hidden;
}

.ui5-dynamic-page-scroll-container {
overflow-y: scroll;
height: 100%;
}
Expand All @@ -24,6 +33,10 @@
padding: 0 1rem;
}

:host([show-footer]) .ui5-dynamic-page-content {
padding-bottom: 4rem;
}

:host([show-footer]) .ui5-dynamic-page-footer {
animation: bounceShow 0.35s forwards ease-in-out;
}
Expand All @@ -32,12 +45,6 @@
animation: bounceHide 0.35s forwards ease-in-out;
}

:host {
display: block;
overflow-y: scroll;
height: 100%;
}

::slotted([slot="footer"]) {
/* TODO css vars? */
border: 1px solid;
Expand Down