From faaf0ccda7f5cfe650f475a1c660c32e46042b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20M=C3=B8ller=20Jensen?= <26099018+JesmoDev@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:23:07 +1200 Subject: [PATCH] rename attribute names --- .../core/collection/collection.element.ts | 2 +- .../body-layout/body-layout.element.ts | 33 ++++++++----------- .../dashboard-redirect-management.element.ts | 2 +- .../dashboard-examine-management.element.ts | 2 +- .../views/search/log-search-view.element.ts | 2 +- .../collection/user-collection.element.ts | 2 +- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts index 79d279ba2e..8a4a38b7e7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts @@ -85,7 +85,7 @@ export class UmbCollectionElement extends UmbLitElement { render() { return html` - + ${this._selection && this._selection.length > 0 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 326983a4ea..1d3ce0c301 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,6 +10,8 @@ import { } from '@umbraco-cms/backoffice/external/lit'; import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; +//TODO: Add the following attributes to JSDocs: header-shadow, header-clear + /** * @element umb-body-layout * @description Layout element to arrange elements in a body layout. A general layout for most views. @@ -25,21 +27,14 @@ import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; */ @customElement('umb-body-layout') export class UmbBodyLayoutElement extends LitElement { - /** - * Renders a headline in the header. - * @public - * @type {string} - * @attr {boolean} clear-header - renders the header without background and borders. - * @default '' - */ - - @query('#main') scrollContainer?: HTMLElement; + @query('#main') + private _scrollContainer?: HTMLElement; @property() public headline = ''; - @property({ type: Boolean, reflect: true, attribute: 'scroll-shadow' }) - public scrollShadow = false; + @property({ type: Boolean, reflect: true, attribute: 'header-shadow' }) + public headerShadow = false; @state() private _headerSlotHasChildren = false; @@ -62,21 +57,21 @@ export class UmbBodyLayoutElement extends LitElement { connectedCallback(): void { super.connectedCallback(); - if (this.scrollShadow) { + if (this.headerShadow) { requestAnimationFrame(() => { - this.scrollContainer?.addEventListener('scroll', this.#onScroll); + this._scrollContainer?.addEventListener('scroll', this.#onScroll); }); } } disconnectedCallback(): void { super.disconnectedCallback(); - this.scrollContainer?.removeEventListener('scroll', this.#onScroll); + this._scrollContainer?.removeEventListener('scroll', this.#onScroll); } #onScroll = () => { - if (!this.scrollContainer) return; - this.toggleAttribute('scrolling', this.scrollContainer.scrollTop > 0); + if (!this._scrollContainer) return; + this.toggleAttribute('scrolling', this._scrollContainer.scrollTop > 0); }; render() { @@ -155,17 +150,17 @@ export class UmbBodyLayoutElement extends LitElement { z-index: 1; } - :host([scroll-shadow]) #header { + :host([header-shadow]) #header { transition: box-shadow 150ms ease-in-out; box-shadow: 0 -1px 0px 0px rgba(0, 0, 0, 0.8); } - :host([clear-header]) #header { + :host([header-clear]) #header { background-color: transparent; border-color: transparent; } - :host([scroll-shadow][scrolling]) #header { + :host([header-shadow][scrolling]) #header { /* This should be using the uui-shadows but for now they are too drastic for this use case */ box-shadow: 0 1px 15px 0 rgba(0, 0, 0, 0.3); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts index 51e2d424e3..c6db92419e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts @@ -153,7 +153,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement { render() { return html` - +