From 4bb5a22d6d69fc1d3d16ab78f2a2d52ee9b002a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 29 Jun 2023 14:36:44 +0200 Subject: [PATCH] fix merge --- .../date-picker/property-editor-ui-date-picker.element.ts | 8 ++++---- .../src/packages/core/property-editors/index.ts | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/property-editors/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts index 53ce65b1f0..d88993a502 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts @@ -1,9 +1,9 @@ import { UmbPropertyValueChangeEvent } from '../../index.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UUITextStyles, InputType } from '@umbraco-cms/backoffice/external/uui'; +import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components'; +import type { UmbDataTypeConfigCollection, UmbInputDateElement } from '@umbraco-cms/backoffice/components'; /** * @element umb-property-editor-ui-date-picker @@ -40,7 +40,7 @@ export class UmbPropertyEditorUIDatePickerElement extends UmbLitElement implemen private _format?: string; @state() - private _inputType: InputType = 'datetime-local'; + private _inputType: UmbInputDateElement['type'] = 'datetime-local'; @state() private _min?: string; @@ -90,7 +90,7 @@ export class UmbPropertyEditorUIDatePickerElement extends UmbLitElement implemen .min=${this._min} .max=${this._max} .step=${this._step} - .offsetTime=${this._offsetTime} + .offsetTime=${this._offsetTime || false} label="Pick a date or time">`; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/index.ts deleted file mode 100644 index c9e077e01e..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './types/index.js'; -export * from './events/index.js';