make generics optional on remaining types

Author: mark-tate

packages/date-adapters/src/types/index.ts

@@ -115,7 +115,7 @@ export type RecommendedFormats =
  */
 export type Timezone = "default" | "system" | "UTC" | string;
 
-export type ParserResult<TDate extends DateFrameworkType> = {
+export type ParserResult<TDate extends DateFrameworkType = DateFrameworkType> = {
   date: TDate;
 } & DateDetail;
 
@@ -126,7 +126,7 @@ export type ParserResult<TDate extends DateFrameworkType> = {
  * @template TLocale - The type of the locale, defaulting to any.
  */
 export interface SaltDateAdapter<
-  TDate extends DateFrameworkType,
+  TDate extends DateFrameworkType = DateFrameworkType,
   // biome-ignore lint/suspicious/noExplicitAny: locale is date framework dependent
   TLocale = any,
 > {

packages/lab/src/__tests__/__e2e__/calendar/Calendar.offset.cy.tsx

@@ -22,7 +22,7 @@ const adapterMoment = new AdapterMoment();
 const adapters = [adapterDateFns, adapterDayjs, adapterLuxon, adapterMoment];
 
 function getAllDatesInRange(
-  adapter: SaltDateAdapter<DateFrameworkType>,
+  adapter: SaltDateAdapter,
   startDate: DateFrameworkType,
   endDate: DateFrameworkType,
 ) {
@@ -55,7 +55,7 @@ describe('GIVEN a Calendar with `selectionVariant="offset"`', () => {
           adapter.add(date as any, { days: 4 });
         const offsetDate = endDateOffset(testDate);
         const datesInRange = getAllDatesInRange(
-          adapter as SaltDateAdapter<DateFrameworkType>,
+          adapter as SaltDateAdapter,
           testDate,
           offsetDate,
         );
@@ -228,7 +228,7 @@ describe('GIVEN a Calendar with `selectionVariant="offset"`', () => {
 });
 
 function assertRangeUnselected(
-  adapter: SaltDateAdapter<DateFrameworkType>,
+  adapter: SaltDateAdapter,
   baseDate: DateFrameworkType,
 ) {
   for (let i = 0; i <= 3; i++) {
@@ -239,7 +239,7 @@ function assertRangeUnselected(
 }
 
 function assertRangeSelected(
-  adapter: SaltDateAdapter<DateFrameworkType>,
+  adapter: SaltDateAdapter,
   baseDate: DateFrameworkType,
 ) {
   for (let i = 0; i <= 3; i++) {
@@ -272,7 +272,7 @@ describe('GIVEN a Calendar with `selectionVariant="offset" and `multiselect`', (
       const endDateOffset = (date: DateFrameworkType) =>
         adapter.add(date, { days: 3 });
       const testStartDate1 = adapter.parse("03/02/2024", "DD/MM/YYYY").date;
-      const testDate: DateRangeSelection<DateFrameworkType> = {
+      const testDate: DateRangeSelection = {
         startDate: testStartDate1,
         endDate: endDateOffset(testStartDate1),
       };
@@ -413,7 +413,7 @@ describe('GIVEN a Calendar with `selectionVariant="offset" and `multiselect`', (
         const testDate: DateFrameworkType = adapter.today();
 
         const selectStub = (
-          previousSelectedDate: DateRangeSelection<DateFrameworkType>[],
+          previousSelectedDate: DateRangeSelection[],
           newDate: DateFrameworkType,
         ) => {
           let newSelection = previousSelectedDate.filter(

packages/lab/src/__tests__/__e2e__/calendar/Calendar.range.cy.tsx

@@ -658,7 +658,7 @@ describe('GIVEN a Calendar with `selectionVariant="range" and `multiselect`', ()
       it("SHOULD allow multiple dates to be selected and unselected", () => {
         const testDate = adapter.today();
         const selectStub = (
-          previousSelectedDate: DateRangeSelection<DateFrameworkType>[],
+          previousSelectedDate: DateRangeSelection[],
           newDate: DateFrameworkType,
         ) => {
           let newSelection = previousSelectedDate.filter(

packages/lab/src/__tests__/__e2e__/calendar/Calendar.single.cy.tsx

@@ -570,7 +570,7 @@ describe('GIVEN a Calendar with `selectionVariant="single" and `multiselect`', (
       it("SHOULD allow multiple dates to be selected and unselected", () => {
         const testDate = adapter.today();
         const selectStub = (
-          previousSelectedDate: SingleDateSelection<DateFrameworkType>[],
+          previousSelectedDate: SingleDateSelection[],
           newDate: DateFrameworkType,
         ) => {
           let newSelection = previousSelectedDate.filter((previousDate) => {

packages/lab/src/__tests__/__e2e__/date-input/DateInputRange.cy.tsx

@@ -383,10 +383,7 @@ describe("GIVEN a DateInputRange", () => {
           .stub()
           .as("customParserSpy")
           .callsFake(
-            (
-              inputDate: string,
-              _field: DateParserField,
-            ): ParserResult<DateFrameworkType> => {
+            (inputDate: string, _field: DateParserField): ParserResult => {
               if (inputDate === "custom start date") {
                 return {
                   date: initialDate.startDate,
@@ -729,12 +726,12 @@ describe("GIVEN a DateInputRange", () => {
 
         function ControlledDateInput() {
           const [date, setDate] = useState<
-            DateRangeSelection<DateFrameworkType> | null | undefined
+            DateRangeSelection | null | undefined
           >(initialDate);
 
           const handleDateChange = (
             event: SyntheticEvent,
-            newDate: DateRangeSelection<DateFrameworkType> | null | undefined,
+            newDate: DateRangeSelection | null | undefined,
             details: DateInputRangeDetails,
           ) => {
             // React 16 backwards compatibility

packages/lab/src/__tests__/__e2e__/date-input/DateInputSingle.cy.tsx

@@ -62,7 +62,7 @@ function assertDateChange(
   spy: any,
   expectedValue: string,
   expectedDate: DateFrameworkType | null | undefined,
-  adapter: SaltDateAdapter<DateFrameworkType>,
+  adapter: SaltDateAdapter,
 ) {
   const lastCallArgs = spy.args[spy.callCount - 1];
   const date = lastCallArgs[1];
@@ -228,7 +228,7 @@ describe("GIVEN a DateInputSingle", () => {
         const customParserSpy = cy
           .stub()
           .as("customParserSpy")
-          .callsFake((inputDate: string): ParserResult<DateFrameworkType> => {
+          .callsFake((inputDate: string): ParserResult => {
             expect(inputDate).to.equal("custom value");
             return {
               date: initialDate,

packages/lab/src/calendar/Calendar.tsx

@@ -164,17 +164,14 @@ function isMultiselect(
 }
 
 function getStartOrEndDate(
-  dateRange:
-    | DateRangeSelection<DateFrameworkType>
-    | DateRangeSelection<DateFrameworkType>[]
-    | undefined,
+  dateRange: DateRangeSelection | DateRangeSelection[] | undefined,
   isMultiselect: boolean,
 ): DateFrameworkType | null | undefined {
   if (isMultiselect) {
-    const rangeArray = dateRange as DateRangeSelection<DateFrameworkType>[];
+    const rangeArray = dateRange as DateRangeSelection[];
     return rangeArray?.[0]?.startDate ?? rangeArray?.[0]?.endDate;
   }
-  const range = dateRange as DateRangeSelection<DateFrameworkType>;
+  const range = dateRange as DateRangeSelection;
   return range?.startDate ?? range?.endDate;
 }
 
@@ -183,7 +180,7 @@ let warnedOnce = false;
 export const Calendar = forwardRef<HTMLDivElement, CalendarProps>(
   (props: CalendarProps, ref: React.Ref<HTMLDivElement>) => {
     const targetWindow = useWindow();
-    const { dateAdapter } = useLocalization<DateFrameworkType>();
+    const { dateAdapter } = useLocalization();
     useComponentCssInjection({
       testId: "salt-calendar",
       css: calendarCss,

packages/lab/src/calendar/CalendarGrid.tsx

@@ -4,7 +4,6 @@ import {
   type ResponsiveProp,
   useForkRef,
 } from "@salt-ds/core";
-import type { DateFrameworkType } from "@salt-ds/date-adapters";
 import {
   type ComponentPropsWithoutRef,
   type FocusEventHandler,
@@ -58,7 +57,7 @@ export const CalendarGrid = forwardRef<HTMLDivElement, CalendarGridProps>(
       ...rest
     } = props;
 
-    const { dateAdapter } = useLocalization<DateFrameworkType>();
+    const { dateAdapter } = useLocalization();
 
     const {
       helpers: { setFocusedDate, setHoveredDate },

packages/lab/src/calendar/CalendarMonthHeader.tsx

@@ -29,7 +29,7 @@ export const CalendarMonthHeader = forwardRef<
   CalendarMonthHeaderProps
 >((props: CalendarMonthHeaderProps, ref: React.Ref<HTMLDivElement>) => {
   const { className, format: formatMonthProp = "MMMM", month, ...rest } = props;
-  const { dateAdapter } = useLocalization<DateFrameworkType>();
+  const { dateAdapter } = useLocalization();
 
   const targetWindow = useWindow();
   useComponentCssInjection({

packages/lab/src/calendar/CalendarNavigation.tsx

@@ -91,7 +91,7 @@ const ConditionalTooltip: React.FC<TooltipProps> = ({
 };
 
 function generateYearsBetweenRange(
-  dateAdapter: SaltDateAdapter<DateFrameworkType>,
+  dateAdapter: SaltDateAdapter,
   minYear: number,
   maxYear: number,
   timezone: Timezone = "default",
@@ -111,7 +111,7 @@ function useCalendarNavigation() {
     helpers: { setVisibleMonth, isDayVisible, isOutsideAllowedMonths },
   } = useCalendarContext();
 
-  const { dateAdapter } = useLocalization<DateFrameworkType>();
+  const { dateAdapter } = useLocalization();
 
   const disableNavigatePrevious = isDayVisible(minDate);
   const disableNavigateNext = isDayVisible(maxDate);
@@ -259,7 +259,7 @@ export const CalendarNavigation = forwardRef<
     ...rest
   } = props;
 
-  const { dateAdapter } = useLocalization<DateFrameworkType>();
+  const { dateAdapter } = useLocalization();
 
   const targetWindow = useWindow();
   useComponentCssInjection({