From f9362089a0da82db02324966b171b8854a2118ac Mon Sep 17 00:00:00 2001 From: Lucas Almeida Date: Tue, 24 Jun 2025 13:07:15 -0300 Subject: [PATCH] =?UTF-8?q?fix(page):=20corrige=20c=C3=A1lculo=20do=20head?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #2561 --- .../po-page-content/po-page-content.component.spec.ts | 10 +++++++--- .../po-page-content/po-page-content.component.ts | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.spec.ts b/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.spec.ts index b755dee8ad..ac67a7e0e0 100644 --- a/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.spec.ts +++ b/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.spec.ts @@ -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; @@ -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`); }); diff --git a/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.ts b/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.ts index 0c6d30b14c..1ebc75020e 100644 --- a/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.ts +++ b/projects/ui/src/lib/components/po-page/po-page-content/po-page-content.component.ts @@ -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`;