Skip to content

Commit eeb20fd

Browse files
authored
Merge branch 'main' into feature/telemetry-rudderstack
2 parents f334dd3 + 90d7e62 commit eeb20fd

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

package-lock.json

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"tslint": "~6.1.3",
117117
"tslint-config-prettier": "^1.18.0",
118118
"typescript": "~4.3.5",
119-
"typescript-tslint-plugin": "^1.0.1"
119+
"typescript-tslint-plugin": "^1.0.2"
120120
},
121121
"config": {
122122
"commitizen": {

projects/components/src/overlay/sheet/sheet-overlay.component.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { ChangeDetectionStrategy, Component, HostListener, Inject, Injector, TemplateRef, Type } from '@angular/core';
22
import { IconType } from '@hypertrace/assets-library';
3-
import { ExternalNavigationParams, GLOBAL_HEADER_HEIGHT, LayoutChangeService } from '@hypertrace/common';
3+
import { ExternalNavigationParams, LayoutChangeService } from '@hypertrace/common';
44
import { ButtonStyle } from '../../button/button';
55
import { IconSize } from '../../icon/icon-size';
6-
import { PopoverFixedPositionLocation, POPOVER_DATA } from '../../popover/popover';
6+
import { POPOVER_DATA } from '../../popover/popover';
77
import { PopoverRef } from '../../popover/popover-ref';
88
import { SheetConstructionData } from '../overlay.service';
99
import { SheetOverlayConfig, SheetSize } from './sheet';
@@ -72,7 +72,6 @@ export class SheetOverlayComponent {
7272
public constructor(
7373
private readonly popoverRef: PopoverRef,
7474
@Inject(POPOVER_DATA) sheetData: SheetConstructionData,
75-
@Inject(GLOBAL_HEADER_HEIGHT) globalHeaderHeight: string,
7675
layoutChange: LayoutChangeService
7776
) {
7877
const sheetConfig: SheetOverlayConfig = sheetData.config;
@@ -85,7 +84,7 @@ export class SheetOverlayComponent {
8584

8685
this.isComponentSheet = !(sheetConfig.content instanceof TemplateRef);
8786
this.renderer = sheetConfig.content;
88-
this.popoverRef.height(this.getHeightForPopover(globalHeaderHeight, sheetConfig.position));
87+
this.popoverRef.height('100vh');
8988
this.setWidth();
9089
this.navigationParams = sheetConfig.pageNavParams;
9190
this.rendererInjector = Injector.create({
@@ -137,8 +136,4 @@ export class SheetOverlayComponent {
137136
return '100%';
138137
}
139138
}
140-
141-
private getHeightForPopover(globalHeaderHeight: string, position?: PopoverFixedPositionLocation): string {
142-
return position === PopoverFixedPositionLocation.Right ? '100vh' : `calc(100vh - ${globalHeaderHeight})`;
143-
}
144139
}

0 commit comments

Comments
 (0)