From af11bea827f46589825dbf85ad1763829d939a23 Mon Sep 17 00:00:00 2001
From: Travis Tidwell <travis@form.io>
Date: Thu, 22 Dec 2022 14:14:03 -0600
Subject: [PATCH] FIO-6088: Fixing datetime issues with the calendar widget.

---
 src/components/_classes/component/Component.js | 14 +++++++++-----
 src/widgets/CalendarWidget.js                  |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/_classes/component/Component.js b/src/components/_classes/component/Component.js
index d203083012..2a6d5c5a06 100644
--- a/src/components/_classes/component/Component.js
+++ b/src/components/_classes/component/Component.js
@@ -1032,18 +1032,22 @@ export default class Component extends Element {
   }
 
   get timezone() {
-    if (this.component.timezone) {
-      return this.component.timezone;
+    return this.getTimezone(this.component);
+  }
+
+  getTimezone(settings) {
+    if (settings.timezone) {
+      return settings.timezone;
     }
-    if (this.component.displayInTimezone === 'utc') {
+    if (settings.displayInTimezone === 'utc') {
       return 'UTC';
     }
     const submissionTimezone = this.submissionTimezone;
     if (
       submissionTimezone &&
       (
-        (this.component.displayInTimezone === 'submission') ||
-        ((this.options.pdf || this.options.server) && (this.component.displayInTimezone === 'viewer'))
+        (settings.displayInTimezone === 'submission') ||
+        ((this.options.pdf || this.options.server) && (settings.displayInTimezone === 'viewer'))
       )
     ) {
       return submissionTimezone;
diff --git a/src/widgets/CalendarWidget.js b/src/widgets/CalendarWidget.js
index a7a80da99e..248d5357bd 100644
--- a/src/widgets/CalendarWidget.js
+++ b/src/widgets/CalendarWidget.js
@@ -228,7 +228,7 @@ export default class CalendarWidget extends InputWidget {
   }
 
   get timezone() {
-    return this.componentInstance.timezone;
+    return this.componentInstance.getTimezone(this.settings);
   }
 
   get defaultSettings() {