diff --git a/package-lock.json b/package-lock.json
index 27def218c3..6cd270d0bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2749,9 +2749,9 @@
       }
     },
     "node_modules/@internationalized/date": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.4.tgz",
-      "integrity": "sha512-qoVJVro+O0rBaw+8HPjUB1iH8Ihf8oziEnqMnvhJUSuVIrHOuZ6eNLHNvzXJKUvAtaDiqMnRlg8Z2mgh09BlUw==",
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.5.tgz",
+      "integrity": "sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==",
       "dependencies": {
         "@swc/helpers": "^0.5.0"
       }
@@ -29206,6 +29206,7 @@
         "@deephaven/utils": "file:../utils",
         "@fortawesome/fontawesome-svg-core": "^6.2.1",
         "@fortawesome/react-fontawesome": "^0.2.0",
+        "@internationalized/date": "^3.5.5",
         "@react-spectrum/theme-default": "^3.5.1",
         "@react-spectrum/utils": "^3.11.5",
         "@react-types/radio": "^3.8.1",
@@ -31647,6 +31648,7 @@
         "@deephaven/utils": "file:../utils",
         "@fortawesome/fontawesome-svg-core": "^6.2.1",
         "@fortawesome/react-fontawesome": "^0.2.0",
+        "@internationalized/date": "*",
         "@react-spectrum/theme-default": "^3.5.1",
         "@react-spectrum/utils": "^3.11.5",
         "@react-types/radio": "^3.8.1",
@@ -32652,9 +32654,9 @@
       "dev": true
     },
     "@internationalized/date": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.4.tgz",
-      "integrity": "sha512-qoVJVro+O0rBaw+8HPjUB1iH8Ihf8oziEnqMnvhJUSuVIrHOuZ6eNLHNvzXJKUvAtaDiqMnRlg8Z2mgh09BlUw==",
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.5.tgz",
+      "integrity": "sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==",
       "requires": {
         "@swc/helpers": "^0.5.0"
       }
diff --git a/packages/components/package.json b/packages/components/package.json
index f49480d4a9..ddbc0a6ea5 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -31,6 +31,7 @@
     "@deephaven/utils": "file:../utils",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
+    "@internationalized/date": "^3.5.5",
     "@react-spectrum/theme-default": "^3.5.1",
     "@react-spectrum/utils": "^3.11.5",
     "@react-types/radio": "^3.8.1",
diff --git a/packages/components/src/spectrum/dateAndTime.ts b/packages/components/src/spectrum/dateAndTime.ts
index c866dc4486..4e4c164be7 100644
--- a/packages/components/src/spectrum/dateAndTime.ts
+++ b/packages/components/src/spectrum/dateAndTime.ts
@@ -1,3 +1,9 @@
+import {
+  CalendarDate,
+  CalendarDateTime,
+  ZonedDateTime,
+} from '@internationalized/date';
+
 export {
   Calendar,
   type SpectrumCalendarProps as CalendarProps,
@@ -12,3 +18,17 @@ export {
   TimeField,
   type SpectrumTimeFieldProps as TimeFieldProps,
 } from '@adobe/react-spectrum';
+
+export type { CalendarDate, CalendarDateTime, ZonedDateTime };
+
+// This is the type for the DatePicker value
+export type DateValue = CalendarDate | CalendarDateTime | ZonedDateTime;
+
+// This is the type for DatePicker onChange
+export type MappedDateValue<T> = T extends ZonedDateTime
+  ? ZonedDateTime
+  : T extends CalendarDateTime
+  ? CalendarDateTime
+  : T extends CalendarDate
+  ? CalendarDate
+  : never;