From ce3f05a3f3bd2ccab0f57fe491c9194f0b90cc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 13 Feb 2024 16:11:00 +0100 Subject: [PATCH] clean up --- .../property-editor-ui-block-grid.element.ts | 27 ++++++------------- .../src/packages/core/event/index.ts | 8 +++--- .../packages/core/sorter/sorter.controller.ts | 2 +- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts index e1be1cd6c7..07e0b94f02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts @@ -4,15 +4,12 @@ import { UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS } from './manifests.js'; import { html, customElement, property, state, css, type PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; -import type { - UmbBlockGridLayoutModel, - UmbBlockGridTypeModel, - UmbBlockGridValueModel, - UmbBlockTypeGroup, -} from '@umbraco-cms/backoffice/block'; +import { + UmbPropertyValueChangeEvent, + type UmbPropertyEditorConfigCollection, +} from '@umbraco-cms/backoffice/property-editor'; +import type { UmbBlockGridTypeModel, UmbBlockGridValueModel, UmbBlockTypeGroup } from '@umbraco-cms/backoffice/block'; import type { NumberRangeValueType } from '@umbraco-cms/backoffice/models'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import '../../components/block-grid-entries/index.js'; /** @@ -77,23 +74,15 @@ export class UmbPropertyEditorUIBlockGridElement extends UmbLitElement implement // TODO: Prevent initial notification from these observes: this.observe(this.#context.layouts, (layouts) => { this._value = { ...this._value, layout: { [UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS]: layouts } }; - // Notify that the value has changed. - //console.log('layout changed', this._value); - // TODO: idea: consider inserting an await here, so other changes could appear first? Maybe some mechanism to only fire change event onces? - this._rootLayouts = layouts; - this.dispatchEvent(new UmbChangeEvent()); + this.dispatchEvent(new UmbPropertyValueChangeEvent()); }); this.observe(this.#context.contents, (contents) => { this._value = { ...this._value, contentData: contents }; - // Notify that the value has changed. - //console.log('content changed', this._value); - this.dispatchEvent(new UmbChangeEvent()); + this.dispatchEvent(new UmbPropertyValueChangeEvent()); }); this.observe(this.#context.settings, (settings) => { this._value = { ...this._value, settingsData: settings }; - // Notify that the value has changed. - //console.log('settings changed', this._value); - this.dispatchEvent(new UmbChangeEvent()); + this.dispatchEvent(new UmbPropertyValueChangeEvent()); }); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/event/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/event/index.ts index d3d128c997..7fb35d2757 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/event/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/event/index.ts @@ -1,7 +1,7 @@ -export * from './input.event.js'; +export * from './action-executed.event.js'; export * from './change.event.js'; export * from './delete.event.js'; -export * from './selection-change.event.js'; -export * from './action-executed.event.js'; -export * from './selected.event.js'; export * from './deselected.event.js'; +export * from './input.event.js'; +export * from './selected.event.js'; +export * from './selection-change.event.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts index 7ee0ee42c0..6be19679f9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts @@ -55,7 +55,7 @@ function setupPreventEvent(element: Element) { //(element as HTMLElement).setAttribute('draggable', 'false'); } function destroyPreventEvent(element: Element) { - element.draggable = false; + (element as HTMLElement).draggable = false; //element.removeAttribute('draggable'); }