diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts index c10e1a71b3..a7558ff5c3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts @@ -1,11 +1,10 @@ -import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { css, html, nothing, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbRoute, UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router'; -import type { ManifestWorkspaceView } from '@umbraco-cms/backoffice/extension-registry'; +import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit'; +import { createExtensionElement, UmbExtensionsManifestInitializer } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; - import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; +import type { ManifestWorkspaceView } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbRoute, UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router'; /** * @element umb-workspace-editor @@ -92,14 +91,15 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { ${this.#renderRoutes()} - ${this.enforceNoFooter - ? '' - : html` - - - - - `} + ${when( + !this.enforceNoFooter, + () => html` + + + + + `, + )} `; } @@ -114,10 +114,10 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { (view) => view.alias, (view) => html` - + .label="${view.meta.label ? this.localize.string(view.meta.label) : view.name}" + ?active=${'view/' + view.meta.pathname === this._activePath}> + ${view.meta.label ? this.localize.string(view.meta.label) : view.name} `, @@ -132,8 +132,8 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { if (!this.backPath) return nothing; return html` @@ -143,20 +143,17 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { } #renderRoutes() { + if (!this._routes || this._routes.length === 0) return nothing; return html` - ${this._routes && this._routes.length > 0 - ? html` - { - this._routerPath = event.target.absoluteRouterPath; - }} - @change=${(event: UmbRouterSlotChangeEvent) => { - this._activePath = event.target.localActiveViewPath; - }}> - ` - : nothing} + { + this._routerPath = event.target.absoluteRouterPath; + }} + @change=${(event: UmbRouterSlotChangeEvent) => { + this._activePath = event.target.localActiveViewPath; + }}> `; }