From 896c8ccc9567327e004d96da2d15cbb924d357e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20M=C3=B8ller=20Jensen?=
 <26099018+JesmoDev@users.noreply.github.com>
Date: Thu, 8 Jun 2023 17:12:14 +1200
Subject: [PATCH] header-height-fit and remove tabs slot

---
 .../body-layout/body-layout.element.ts        | 23 +++++++------------
 .../views/search/log-search-view.element.ts   |  6 +----
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts
index f3f8c9fa9a..5fabfa07f0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts
@@ -10,7 +10,7 @@ import {
 } from '@umbraco-cms/backoffice/external/lit';
 import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
 
-//TODO: Add the following attributes to JSDocs: header-transparent, no-padding
+//TODO: Add the following attributes to JSDocs: header-transparent, no-padding, header-height-fit
 
 /**
  * @element umb-body-layout
@@ -42,9 +42,6 @@ export class UmbBodyLayoutElement extends LitElement {
 	@state()
 	private _navigationSlotHasChildren = false;
 
-	@state()
-	private _tabsSlotHasChildren = false;
-
 	@state()
 	private _actionsMenuSlotHasChildren = false;
 
@@ -83,7 +80,6 @@ export class UmbBodyLayoutElement extends LitElement {
 				id="header"
 				style="display: ${this.headline ||
 				this._headerSlotHasChildren ||
-				this._tabsSlotHasChildren ||
 				this._actionsMenuSlotHasChildren ||
 				this._navigationSlotHasChildren
 					? ''
@@ -97,10 +93,10 @@ export class UmbBodyLayoutElement extends LitElement {
 						this._headerSlotHasChildren = this.#hasNodes(e);
 					}}></slot>
 				<slot
-					id="tabs-slot"
-					name="tabs"
+					id="navigation-slot"
+					name="navigation"
 					@slotchange=${(e: Event) => {
-						this._tabsSlotHasChildren = this.#hasNodes(e);
+						this._actionsMenuSlotHasChildren = this.#hasNodes(e);
 					}}></slot>
 				<slot
 					id="action-menu-slot"
@@ -108,13 +104,6 @@ export class UmbBodyLayoutElement extends LitElement {
 					@slotchange=${(e: Event) => {
 						this._actionsMenuSlotHasChildren = this.#hasNodes(e);
 					}}></slot>
-
-				<slot
-					id="navigation-slot"
-					name="navigation"
-					@slotchange=${(e: Event) => {
-						this._actionsMenuSlotHasChildren = this.#hasNodes(e);
-					}}></slot>
 			</div>
 
 			<!-- This div should be changed for the uui-scroll-container when it gets updated -->
@@ -162,6 +151,10 @@ export class UmbBodyLayoutElement extends LitElement {
 				z-index: 1;
 			}
 
+			:host([header-height-fit]) #header {
+				height: fit-content;
+			}
+
 			:host([header-transparent]) #header {
 				background-color: transparent;
 				border-color: transparent;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/log-search-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/log-search-view.element.ts
index 2545458b23..ab2aaa2889 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/log-search-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/log-search-view.element.ts
@@ -32,7 +32,7 @@ export class UmbLogViewerSearchViewElement extends UmbLitElement {
 
 	render() {
 		return html`
-			<umb-body-layout header-transparent>
+			<umb-body-layout header-transparent header-height-fit>
 				<div id="header" slot="header">
 					<div id="levels-container">
 						<umb-log-viewer-log-level-filter-menu></umb-log-viewer-log-level-filter-menu>
@@ -59,10 +59,6 @@ export class UmbLogViewerSearchViewElement extends UmbLitElement {
 	static styles = [
 		UUITextStyles,
 		css`
-			umb-body-layout {
-				--umb-header-layout-height: fit-content;
-			}
-
 			uui-box {
 				--uui-box-default-padding: 0;
 			}