Merge remote-tracking branch 'origin/AC-13174' into spartans_pr_19112025

Author: glo60612

app/code/Magento/Ui/view/base/web/js/form/element/date.js

@@ -87,6 +87,11 @@ define([
         initConfig: function () {
             this._super();
 
+            // Adopt picker format if provided under options in UI XML
+            if (this.options && this.options.pickerDateTimeFormat) {
+                this.pickerDateTimeFormat = this.options.pickerDateTimeFormat;
+            }
+
             if (!this.options.dateFormat) {
                 this.options.dateFormat = this.pickerDefaultDateFormat;
             }
@@ -95,6 +100,11 @@ define([
                 this.options.timeFormat = this.pickerDefaultTimeFormat;
             }
 
+            // If date-only and a picker format is explicitly configured, prefer it for calendar display format
+            if (!this.options.showsTime && this.pickerDateTimeFormat) {
+                this.options.dateFormat = this.pickerDateTimeFormat;
+            }
+
             this.prepareDateTimeFormats();
 
             return this;

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 define([
@@ -82,5 +82,30 @@ define([
             model.value('2:43 am');
             expect(model.getPreview()).toBe('02:43:00');
         });
+
+        it('Prefers pickerDateTimeFormat for date-only display format', function () {
+            // simulate UI XML providing pickerDateTimeFormat while showsTime is false
+            model.options.showsTime = false;
+            model.options.pickerDateTimeFormat = 'MM/dd/y';
+
+            // Re-init to adopt option and set options.dateFormat accordingly
+            model.initConfig();
+
+            expect(model.options.dateFormat).toBe('MM/dd/y');
+        });
+
+        it('Displays value using pickerDateTimeFormat when date-only', function () {
+            model.options.showsTime = false;
+            // Ensure consistent IO formats for this test case
+            model.outputDateFormat = 'MM/dd/y';
+            model.inputDateFormat = 'MM/dd/y';
+            model.pickerDateTimeFormat = 'MM/dd/y';
+
+            // Make sure formats are prepared
+            model.prepareDateTimeFormats();
+
+            model.value('21-11-2025');
+            expect(model.getPreview()).toBe('21-11-2025');
+        });
     });
 });