From 98c1f9b4a172a2caa3b07d4b2f9f9346918103cf Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 3 May 2023 11:45:54 +0200
Subject: [PATCH] date input on change

---
 .../core/components/date-input/date-input.element.ts     | 9 +++++++--
 .../src/backoffice/core/components/index.ts              | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.element.ts
index 6662bc7585..4c375089f3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/date-input/date-input.element.ts
@@ -124,8 +124,13 @@ export class UmbDateInputElement extends FormControlMixin(UmbLitElement) {
 	#onChange(e: UUIInputEvent) {
 		e.stopPropagation();
 		const picked = e.target.value as string;
-		this.value = picked ? this.#localToUTC(picked) : '';
-		this.displayValue = picked ? picked : '';
+		if (!picked) {
+			this.value = '';
+			this.displayValue = '';
+			return;
+		}
+		this.value = this.offsetTime ? this.#valueToServerOffset(picked) : this.#localToUTC(picked);
+		this.displayValue = picked;
 		this.dispatchEvent(new CustomEvent('change'));
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts
index 2d3bf3b939..d1ed2f6b95 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts
@@ -19,6 +19,8 @@ import './debug/debug.element';
 import './dropdown/dropdown.element';
 import './empty-state/empty-state.element';
 import './extension-slot/extension-slot.element';
+
+import './date-input/date-input.element';
 import './input-checkbox-list/input-checkbox-list.element';
 import './input-color-picker/input-color-picker.element';
 import './input-eye-dropper/input-eye-dropper.element';
@@ -26,6 +28,7 @@ import './input-multi-url-picker/input-multi-url-picker.element';
 import './input-slider/input-slider.element';
 import './input-toggle/input-toggle.element';
 import './input-upload-field/input-upload-field.element';
+
 import './property-type-based-property/property-type-based-property.element';
 import './ref-property-editor-ui/ref-property-editor-ui.element';
 import './section/section-main/section-main.element';