Skip to content

fix(page): corrige cálculo do header #2565

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(page): corrige cálculo do header #2565

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
10 changes: 7 additions & 3 deletions projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('PoPageContentComponent:', () => {
});

it('setHeightContent: should calculate height without pageHeader', () => {
component.setHeightContent(undefined);
component.setHeightContent(undefined,undefined);

const bodyHeight = document.body.clientHeight;
const valueExpected = bodyHeight;
Expand All @@ -93,11 +93,15 @@ describe('PoPageContentComponent:', () => {

it('setHeightContent: should calculate height with bottom actions', () => {
const pageHeaderElement = fixtureDiv.debugElement.nativeElement.querySelector('.po-page-header') as HTMLElement;
const pageHeaderHeight = pageHeaderElement.offsetTop + pageHeaderElement.offsetHeight;
const pageElement = fixtureDiv.debugElement.nativeElement.querySelector('div.po-page') as HTMLElement;
const pageComputedStyle = window.getComputedStyle(pageElement);
const gap = pageComputedStyle.gap ? parseFloat(pageComputedStyle.gap) : 0;

const pageHeaderHeight = pageHeaderElement.offsetTop + pageHeaderElement.offsetHeight + gap;
const bodyHeight = document.body.clientHeight;
const valueExpected = bodyHeight - pageHeaderHeight;

component.setHeightContent(pageHeaderElement);
component.setHeightContent(pageHeaderElement,gap);

expect(component.height).toBe(`${valueExpected}px`);
});
Expand Down
9 changes: 6 additions & 3 deletions projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,18 @@ export class PoPageContentComponent extends PoPageContentBaseComponent implement
recalculateHeaderSize() {
setTimeout(() => {
const pageHeaderElement: HTMLElement = document.querySelector('div.po-page-header');
const pageElement: HTMLElement = document.querySelector('div.po-page');
const pageComputedStyle = window.getComputedStyle(pageElement);
const gap = pageComputedStyle.gap ? parseFloat(pageComputedStyle.gap) : 0;

this.setHeightContent(pageHeaderElement);
this.setHeightContent(pageHeaderElement, gap);
this.contentOpacity = 1;
});
}

setHeightContent(poPageHeader: HTMLElement) {
setHeightContent(poPageHeader: HTMLElement, gap: number) {
const bodyHeight = document.body.clientHeight;
const pageHeaderHeight = poPageHeader ? poPageHeader.offsetTop + poPageHeader.offsetHeight : 0;
const pageHeaderHeight = poPageHeader ? poPageHeader.offsetTop + poPageHeader.offsetHeight + gap : 0;
const newHeight = bodyHeight - pageHeaderHeight;

this.height = `${newHeight}px`;
Expand Down