From 44e88bba29fee02138e965bb7fd643bbe9aea82d Mon Sep 17 00:00:00 2001 From: leekelleher Date: Mon, 20 May 2024 15:31:35 +0100 Subject: [PATCH] Code tidy-up --- ...y-editor-ui-media-entity-picker.element.ts | 2 +- ...property-editor-ui-media-picker.element.ts | 49 ++++++++----------- .../workspace-package-builder.element.ts | 5 +- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-entity-picker/property-editor-ui-media-entity-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-entity-picker/property-editor-ui-media-entity-picker.element.ts index 2653a68a76..6e6bbafd45 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-entity-picker/property-editor-ui-media-entity-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-entity-picker/property-editor-ui-media-entity-picker.element.ts @@ -33,7 +33,7 @@ export class UmbPropertyEditorUIMediaEntityPickerElement extends UmbLitElement i return undefined; } - #onChange(event: { target: UmbInputMediaElement }) { + #onChange(event: CustomEvent & { target: UmbInputMediaElement }) { this.value = event.target.selection?.join(',') ?? null; this.dispatchEvent(new UmbPropertyValueChangeEvent()); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts index ae46972bdf..a8111e89e7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts @@ -1,14 +1,14 @@ -import type { UmbInputMediaElement } from '../../components/input-media/input-media.element.js'; -import '../../components/input-media/input-media.element.js'; +import type { UmbInputRichMediaElement } from './components/input-rich-media/input-rich-media.element.js'; import type { UmbCropModel, UmbMediaPickerPropertyValue } from './index.js'; -import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { - UmbPropertyValueChangeEvent, - type UmbPropertyEditorConfigCollection, -} from '@umbraco-cms/backoffice/property-editor'; -import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbId } from '@umbraco-cms/backoffice/id'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; +import type { NumberRangeValueType } from '@umbraco-cms/backoffice/models'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; + +import './components/input-rich-media/input-rich-media.element.js'; /** * @element umb-property-editor-ui-media-picker @@ -39,28 +39,19 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme private _allowedMediaTypes: Array = []; public set config(config: UmbPropertyEditorConfigCollection | undefined) { - const multiple = config?.getByAlias('multiple'); - this._multiple = (multiple?.value as boolean) ?? false; + if (!config) return; - const startNodeId = config?.getByAlias('startNodeId'); - this._startNode = (startNodeId?.value as string) ?? ''; + this._multiple = Boolean(config.getValueByAlias('multiple')); + this._startNode = config.getValueByAlias('startNodeId') ?? ''; + this._focalPointEnabled = Boolean(config.getValueByAlias('enableFocalPoint')); + this._crops = config?.getValueByAlias>('crops') ?? []; - const enableFocalPoint = config?.getByAlias('enableFocalPoint'); - this._focalPointEnabled = (enableFocalPoint?.value as boolean) ?? false; - - const crops = config?.getByAlias('crops'); - this._crops = (crops?.value as Array) ?? []; - - const filter = config?.getByAlias('filter')?.value as string; + const filter = config.getValueByAlias('filter') ?? ''; this._allowedMediaTypes = filter?.split(',') ?? []; - const validationLimit = config?.getByAlias('validationLimit'); - if (!validationLimit) return; - - const minMax: Record = validationLimit.value as any; - - this._limitMin = minMax.min ?? 0; - this._limitMax = minMax.max ?? Infinity; + const minMax = config.getValueByAlias('validationLimit'); + this._limitMin = minMax?.min ?? 0; + this._limitMax = minMax?.max ?? Infinity; } public get config() { return undefined; @@ -80,8 +71,8 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme #value: Array = []; - #onChange(event: CustomEvent) { - const selection = (event.target as UmbInputMediaElement).selection; + #onChange(event: CustomEvent & { target: UmbInputRichMediaElement }) { + const selection = event.target.selection; const result = selection.map((mediaKey) => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts index b388e2e0ae..e4809f0ad0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts @@ -229,7 +229,10 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement { return html`
- +