#25730: TimePicker Default Value Fix, Controllable Usage, Example Updates

change/@fluentui-date-time-utilities-d63c5a5c-4853-4fc8-b329-739b7176136a.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: Refactored getDateFromTimeSelection variable names.",
+  "packageName": "@fluentui/date-time-utilities",
+  "email": "jamwu@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-956c059f-a412-4dce-8d66-05ce162223fc.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "feat(TimePicker): Updated TimePicker controlled and uncontrolled props to work correctly.",
+  "packageName": "@fluentui/react",
+  "email": "jamwu@microsoft.com",
+  "dependentChangeType": "patch"
+}

packages/date-time-utilities/etc/date-time-utilities.api.md

@@ -105,7 +105,7 @@ export const formatYear: (date: Date) => string;
 export const getBoundedDateRange: (dateRange: Date[], minDate?: Date | undefined, maxDate?: Date | undefined) => Date[];
 
 // @public
-export const getDateFromTimeSelection: (useHour12: boolean, baseDate: Date, selectedTime: string) => Date;
+export const getDateFromTimeSelection: (useHour12: boolean, dateStartAnchor: Date, selectedTime: string) => Date;
 
 // @public
 export function getDatePartHashValue(date: Date): number;

packages/date-time-utilities/src/timeFormatting/index.ts

@@ -4,10 +4,17 @@
  * @param showSeconds - Whether to show seconds in the formatted string
  * @param useHour12 - Whether to use 12-hour time
  */
-export const formatTimeString = (date: Date, showSeconds?: boolean, useHour12?: boolean): string =>
-  date.toLocaleTimeString([], {
+export const formatTimeString = (date: Date, showSeconds?: boolean, useHour12?: boolean): string => {
+  let localeTimeString = date.toLocaleTimeString([], {
     hour: 'numeric',
     minute: '2-digit',
     second: showSeconds ? '2-digit' : undefined,
     hour12: useHour12,
   });
+
+  if (!useHour12 && localeTimeString.slice(0, 2) === '24') {
+    localeTimeString = '00' + localeTimeString.slice(2);
+  }
+
+  return localeTimeString;
+};

packages/date-time-utilities/src/timeMath/timeMath.ts

@@ -40,11 +40,11 @@ export const ceilMinuteToIncrement = (date: Date, increments: number) => {
 /**
  * Returns a date object from the selected time.
  * @param useHour12 - If the time picker uses 12 or 24 hour formatting
- * @param baseDate - The baseline date to calculate the offset of the selected time
+ * @param dateStartAnchor - The baseline date to calculate the offset of the selected time
  * @param selectedTime - A string representing the user selected time
  * @returns A new date object offset from the baseDate using the selected time.
  */
-export const getDateFromTimeSelection = (useHour12: boolean, baseDate: Date, selectedTime: string): Date => {
+export const getDateFromTimeSelection = (useHour12: boolean, dateStartAnchor: Date, selectedTime: string): Date => {
   const [, selectedHours, selectedMinutes, selectedSeconds, selectedAp] =
     TimeConstants.TimeFormatRegex.exec(selectedTime) || [];
 
@@ -61,17 +61,20 @@ export const getDateFromTimeSelection = (useHour12: boolean, baseDate: Date, sel
   }
 
   let hoursOffset;
-  if (baseDate.getHours() > hours || (baseDate.getHours() === hours && baseDate.getMinutes() > minutes)) {
-    hoursOffset = TimeConstants.HoursInOneDay - baseDate.getHours() + hours;
+  if (
+    dateStartAnchor.getHours() > hours ||
+    (dateStartAnchor.getHours() === hours && dateStartAnchor.getMinutes() > minutes)
+  ) {
+    hoursOffset = TimeConstants.HoursInOneDay - dateStartAnchor.getHours() + hours;
   } else {
-    hoursOffset = Math.abs(baseDate.getHours() - hours);
+    hoursOffset = Math.abs(dateStartAnchor.getHours() - hours);
   }
 
   const offset =
     TimeConstants.MillisecondsIn1Sec * TimeConstants.MinutesInOneHour * hoursOffset * TimeConstants.SecondsInOneMinute +
     seconds * TimeConstants.MillisecondsIn1Sec;
 
-  const date = new Date(baseDate.getTime() + offset);
+  const date = new Date(dateStartAnchor.getTime() + offset);
   date.setMinutes(minutes);
   date.setSeconds(seconds);
 

packages/react-examples/src/react/TimePicker/TimePicker.Basic.Example.tsx

@@ -0,0 +1,77 @@
+import * as React from 'react';
+import {
+  TimePicker,
+  ITimeRange,
+  Text,
+  IStackTokens,
+  Stack,
+  IStackStyles,
+  IComboBoxStyles,
+  IComboBox,
+} from '@fluentui/react';
+
+const stackStyles: Partial<IStackStyles> = { root: { width: 500 } };
+const stackTokens: IStackTokens = { childrenGap: 20 };
+
+const timePickerStyles: Partial<IComboBoxStyles> = {
+  optionsContainerWrapper: {
+    height: '500px',
+  },
+  root: {
+    width: '500px',
+  },
+};
+
+export const TimePickerBasicExample: React.FC = () => {
+  const [basicExampleTimeString, setBasicExampleTimeString] = React.useState<string>('');
+  const [nonDefaultOptionsExampleTimeString, setNonDefaultOptionsExampleTimeString] = React.useState<string>('');
+  const basicDateAnchor = new Date('November 25, 2021 09:00:00');
+  const nonDefaultOptionsDateAnchor = new Date('February 27, 2023 08:00:00');
+
+  const onBasicExampleChange = React.useCallback((_ev: React.FormEvent<IComboBox>, basicExampleTime: Date) => {
+    setBasicExampleTimeString(basicExampleTime.toString());
+  }, []);
+
+  const onNonDefaultOptionsExampleChange = React.useCallback((_, nonDefaultOptionsExampleTime: Date) => {
+    setNonDefaultOptionsExampleTimeString(nonDefaultOptionsExampleTime?.toString());
+  }, []);
+
+  const timeRange: ITimeRange = {
+    start: 8,
+    end: 14,
+  };
+
+  return (
+    <Stack tokens={stackTokens} styles={stackStyles}>
+      <TimePicker
+        placeholder="Basic example placeholder"
+        styles={timePickerStyles}
+        useHour12
+        allowFreeform
+        autoComplete="on"
+        label="TimePicker basic example"
+        onChange={onBasicExampleChange}
+        dateAnchor={basicDateAnchor}
+      />
+      <Text>{`⚓ Date anchor: ${basicDateAnchor.toString()}`}</Text>
+      <Text>{`⌚ Selected time: ${basicExampleTimeString ? basicExampleTimeString : '<no time selected>'}`}</Text>
+
+      <TimePicker
+        styles={timePickerStyles}
+        showSeconds
+        allowFreeform
+        increments={15}
+        autoComplete="on"
+        label="TimePicker with non default options"
+        placeholder="Non default options placeholder"
+        timeRange={timeRange}
+        dateAnchor={nonDefaultOptionsDateAnchor}
+        onChange={onNonDefaultOptionsExampleChange}
+      />
+      <Text>{`⚓ Date anchor: ${nonDefaultOptionsDateAnchor.toString()}`}</Text>
+      <Text>{`⌚ Selected time: ${
+        nonDefaultOptionsExampleTimeString ? nonDefaultOptionsExampleTimeString : '<no time selected>'
+      }`}</Text>
+    </Stack>
+  );
+};

packages/react-examples/src/react/TimePicker/TimePicker.Controlled.Example.tsx

@@ -0,0 +1,41 @@
+import * as React from 'react';
+import { TimePicker, Text, IStackTokens, Stack, IStackStyles, IComboBoxStyles } from '@fluentui/react';
+
+const stackStyles: Partial<IStackStyles> = { root: { width: 500 } };
+const stackTokens: IStackTokens = { childrenGap: 20 };
+
+const timePickerStyles: Partial<IComboBoxStyles> = {
+  optionsContainerWrapper: {
+    height: '500px',
+  },
+  root: {
+    width: '500px',
+  },
+};
+
+export const TimePickerControlledExample: React.FC = () => {
+  const dateAnchor = new Date('February 27, 2023 08:00:00');
+  const [time, setTime] = React.useState<Date>(new Date('February 27, 2023 10:00:00'));
+
+  const onControlledExampleChange = React.useCallback((_, newTime: Date) => {
+    setTime(newTime);
+  }, []);
+
+  return (
+    <Stack tokens={stackTokens} styles={stackStyles}>
+      <TimePicker
+        styles={timePickerStyles}
+        showSeconds
+        allowFreeform
+        increments={15}
+        autoComplete="on"
+        label="Controlled TimePicker with non default options"
+        dateAnchor={dateAnchor}
+        value={time}
+        onChange={onControlledExampleChange}
+      />
+      <Text>{`⚓ Date anchor: ${dateAnchor.toString()}`}</Text>
+      <Text>{`⌚ Selected time: ${time ? time.toString() : '<no time selected>'}`}</Text>
+    </Stack>
+  );
+};

packages/react-examples/src/react/TimePicker/TimePicker.CustomTimeStrings.Example.tsx

@@ -0,0 +1,50 @@
+import * as React from 'react';
+import { TimePicker, Text, IStackTokens, Stack, IStackStyles, IComboBoxStyles } from '@fluentui/react';
+
+const stackStyles: Partial<IStackStyles> = { root: { width: 500 } };
+const stackTokens: IStackTokens = { childrenGap: 20 };
+
+const timePickerStyles: Partial<IComboBoxStyles> = {
+  optionsContainerWrapper: {
+    height: '500px',
+  },
+  root: {
+    width: '500px',
+  },
+};
+
+export const TimePickerCustomTimeStringsExample: React.FC = () => {
+  const [customTimeString, setCustomTimeString] = React.useState<string>('');
+  const dateAnchor = new Date('February 27, 2023 08:00:00');
+  const onFormatDate = React.useCallback((date: Date) => `Custom prefix + ${date.toLocaleTimeString()}`, []);
+  const onValidateUserInput = React.useCallback((userInput: string) => {
+    if (!userInput.includes('Custom prefix +')) {
+      return 'Your input is missing "Custom prefix +"';
+    }
+    return '';
+  }, []);
+
+  const onChange = React.useCallback((_, time: Date) => {
+    console.log('Selected time: ', time);
+    setCustomTimeString(time.toString());
+  }, []);
+
+  return (
+    <Stack tokens={stackTokens} styles={stackStyles}>
+      <TimePicker
+        placeholder="Custom time strings example placeholder"
+        styles={timePickerStyles}
+        onFormatDate={onFormatDate}
+        onValidateUserInput={onValidateUserInput}
+        onChange={onChange}
+        useHour12
+        allowFreeform={false}
+        dateAnchor={dateAnchor}
+        autoComplete="on"
+        label="TimePicker with custom time strings"
+      />
+      <Text>{`⚓ Date anchor: ${dateAnchor.toString()}`}</Text>
+      <Text>{`⌚ Selected time: ${customTimeString ? customTimeString : '<no time selected>'}`}</Text>
+    </Stack>
+  );
+};

packages/react-examples/src/react/TimePicker/TimePicker.DateTimePicker.Example.tsx

@@ -0,0 +1,62 @@
+import * as React from 'react';
+import { TimePicker, DatePicker, Label, Text, IStackTokens, Stack, IStackStyles, IComboBox } from '@fluentui/react';
+
+const stackStyles: Partial<IStackStyles> = { root: { width: 500 } };
+const stackTokens: IStackTokens = { childrenGap: 20 };
+
+const snapTimeToUpdatedDateAnchor = (datePickerDate: Date, currentTime: Date) => {
+  let snappedTime = new Date(currentTime);
+
+  if (currentTime && !isNaN(currentTime.valueOf())) {
+    const startAnchor = new Date(datePickerDate);
+    const endAnchor = new Date(startAnchor);
+    endAnchor.setDate(startAnchor.getDate() + 1);
+    if (currentTime < startAnchor || currentTime > endAnchor) {
+      snappedTime = new Date(startAnchor);
+      snappedTime.setHours(currentTime.getHours());
+      snappedTime.setMinutes(currentTime.getMinutes());
+      snappedTime.setSeconds(currentTime.getSeconds());
+      snappedTime.setMilliseconds(currentTime.getMilliseconds());
+    }
+  }
+
+  return snappedTime;
+};
+
+export const TimePickerDateTimePickerExample: React.FC = () => {
+  const currentDate = new Date('2023-02-01 05:00:00');
+  const [datePickerDate, setDatePickerDate] = React.useState<Date>(currentDate);
+  const [currentTime, setCurrentTime] = React.useState<Date>();
+
+  const onSelectDate = React.useCallback(
+    (selectedDate: Date) => {
+      setDatePickerDate(selectedDate);
+      if (currentTime) {
+        const snappedTime = snapTimeToUpdatedDateAnchor(selectedDate, currentTime);
+        setCurrentTime(snappedTime);
+      }
+    },
+    [currentTime],
+  );
+
+  const onTimePickerChange = React.useCallback((_ev: React.FormEvent<IComboBox>, date: Date) => {
+    setCurrentTime(date);
+  }, []);
+
+  return (
+    <Stack tokens={stackTokens} styles={stackStyles}>
+      <Label>{'DatePicker and TimePicker combination'}</Label>
+      <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gridColumnGap: '3px' }}>
+        <DatePicker placeholder="Select a date..." value={datePickerDate} onSelectDate={onSelectDate} />
+        <TimePicker
+          placeholder="Select a time"
+          dateAnchor={datePickerDate}
+          value={currentTime}
+          onChange={onTimePickerChange}
+        />
+      </div>
+      <Text>{`⚓ Date anchor: ${datePickerDate.toString()}`}</Text>
+      <Text>{`⌚ Selected time: ${currentTime ? currentTime.toString() : '<no time selected>'}`}</Text>
+    </Stack>
+  );
+};