From 8f86f737e8de5285d145e06bdfbcad31cdb1c88e Mon Sep 17 00:00:00 2001
From: David Godinez <davidgodinez@deephaven.io>
Date: Fri, 26 Jul 2024 08:37:13 -0600
Subject: [PATCH] fix nullable types

---
 .../elements/hooks/useDatepickerProps.test.ts |  4 +-
 .../src/elements/hooks/useDatepickerProps.ts  | 44 ++++++++++++++-----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.test.ts b/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.test.ts
index ea4eadd55..4872fbcf6 100644
--- a/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.test.ts
+++ b/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.test.ts
@@ -1,4 +1,4 @@
-import { parseDateValue } from './useDatepickerProps';
+import { parseDateValue, parseNullableDateValue } from './useDatepickerProps';
 
 describe('parseDateValue', () => {
   const isoDate = '2021-02-03';
@@ -8,7 +8,7 @@ describe('parseDateValue', () => {
   const invalidDate = 'invalid-date';
 
   it('should return null if the value is null', () => {
-    expect(parseDateValue(null)).toBeNull();
+    expect(parseNullableDateValue(null)).toBeNull();
   });
 
   it('should return undefined if the value is undefined', () => {
diff --git a/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.ts b/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.ts
index 01d044e3e..6adf13dfa 100644
--- a/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.ts
+++ b/plugins/ui/src/js/src/elements/hooks/useDatepickerProps.ts
@@ -93,13 +93,13 @@ export interface DeserializedDatePickerPropsInterface {
   defaultValue?: DateValue | null;
 
   /** The minimum allowed date that a user may select */
-  minValue?: DateValue | null;
+  minValue?: DateValue;
 
   /** The maximum allowed date that a user may select */
-  maxValue?: DateValue | null;
+  maxValue?: DateValue;
 
   /** A placeholder date that influences the format of the placeholder shown when no value is selected */
-  placeholderValue?: DateValue | null;
+  placeholderValue?: DateValue;
 
   /** Callback that is called for each date of the calendar. If it returns true, then the date is unavailable */
   isDateUnavailable?: (date: DateValue) => boolean;
@@ -151,14 +151,34 @@ export function useOnChangeCallback(
 }
 
 /**
- * Use memo to get a DateValue from a string.
+ * Use memo to get a DateValue from a nullable string.
  *
  * @param value the string date value
  * @returns DateValue or null
  */
-export function useDateValueMemo(
+export function useNullableDateValueMemo(
+  value?: string | null
+): DateValue | null | undefined {
+  return useMemo(() => parseNullableDateValue(value), [value]);
+}
+
+export function parseNullableDateValue(
   value?: string | null
 ): DateValue | null | undefined {
+  if (value === null) {
+    return value;
+  }
+
+  return parseDateValue(value);
+}
+
+/**
+ * Use memo to get a DateValue from a string.
+ *
+ * @param value the string date value
+ * @returns DateValue
+ */
+export function useDateValueMemo(value?: string): DateValue | undefined {
   return useMemo(() => parseDateValue(value), [value]);
 }
 
@@ -166,12 +186,10 @@ export function useDateValueMemo(
  * Parses a date value string into a DateValue.
  *
  * @param value the string date value
- * @returns DateValue or null
+ * @returns DateValue
  */
-export function parseDateValue(
-  value?: string | null
-): DateValue | null | undefined {
-  if (value == null) {
+export function parseDateValue(value?: string): DateValue | undefined {
+  if (value === undefined) {
     return value;
   }
 
@@ -249,8 +267,10 @@ export function useDatePickerProps<TProps>({
   const serializedOnKeyDown = useKeyboardEventCallback(onKeyDown);
   const serializedOnKeyUp = useKeyboardEventCallback(onKeyUp);
   const onChange = useOnChangeCallback(serializedOnChange);
-  const deserializedValue = useDateValueMemo(serializedValue);
-  const deserializedDefaultValue = useDateValueMemo(serializedDefaultValue);
+  const deserializedValue = useNullableDateValueMemo(serializedValue);
+  const deserializedDefaultValue = useNullableDateValueMemo(
+    serializedDefaultValue
+  );
   const deserializedMinValue = useDateValueMemo(serializedMinValue);
   const deserializedMaxValue = useDateValueMemo(serializedMaxValue);
   const deserializedPlaceholderValue = useDateValueMemo(