Merge pull request #2776 from innovaccer/develop

Develop

Author: anuradha9712

core/components/organisms/datePicker/DatePicker.tsx

@@ -250,17 +250,21 @@ export class DatePicker extends React.Component<DatePickerProps, DatePickerState
     };
 
     const isTodayDisabled = () => {
-      if (
-        (dateDisabledBefore && isSameDay(todayDate, dateDisabledBefore)) ||
-        (dateDisabledAfter && isSameDay(todayDate, dateDisabledAfter))
-      ) {
-        return false;
-      }
-
-      const isTodayDateDisabled =
-        (dateDisabledBefore && todayDate < dateDisabledBefore) || (dateDisabledAfter && todayDate > dateDisabledAfter);
+      const isSameAsDisabledBefore = dateDisabledBefore && isSameDay(todayDate, dateDisabledBefore);
+      const isSameAsDisabledAfter = dateDisabledAfter && isSameDay(todayDate, dateDisabledAfter);
 
-      return isTodayDateDisabled;
+      return (
+        (!isSameAsDisabledBefore &&
+          compareDate(
+            dateDisabledBefore,
+            'more',
+            todayDate.getFullYear(),
+            todayDate.getMonth(),
+            todayDate.getDate()
+          )) ||
+        (!isSameAsDisabledAfter &&
+          compareDate(dateDisabledAfter, 'less', todayDate.getFullYear(), todayDate.getMonth(), todayDate.getDate()))
+      );
     };
 
     const todayChipClass = classNames({

core/components/organisms/datePicker/__tests__/DatePicker.test.tsx

@@ -89,10 +89,50 @@ describe('DatePicker component today date chip', () => {
   });
 
   it('disable today chip in case of disabledAfter prop', () => {
-    const todayDate = new Date();
+    const todayDate = new Date(Date.now());
     const { getByTestId } = render(<DatePicker disabledAfter={todayDate} view="date" />);
     expect(getByTestId('DesignSystem-Chip--GenericChip')).not.toHaveClass('Chip-action--disabled');
   });
+
+  it('keeps today chip enabled when disabledBefore is today', () => {
+    const todayDate = new Date(Date.now());
+    const { getByTestId } = render(<DatePicker disabledBefore={todayDate} view="date" />);
+    expect(getByTestId('DesignSystem-Chip--GenericChip')).not.toHaveClass('Chip-action--disabled');
+  });
+
+  it('keeps today chip enabled when disabledAfter is today', () => {
+    const todayDate = new Date(Date.now());
+    const { getByTestId } = render(<DatePicker disabledAfter={todayDate} view="date" />);
+    expect(getByTestId('DesignSystem-Chip--GenericChip')).not.toHaveClass('Chip-action--disabled');
+  });
+
+  it('disables today chip when disabledBefore is tomorrow', () => {
+    const todayDate = new Date(Date.now());
+    const disabledBefore = new Date(todayDate);
+    disabledBefore.setDate(disabledBefore.getDate() + 1);
+    const { getByTestId } = render(<DatePicker disabledBefore={disabledBefore} view="date" />);
+    expect(getByTestId('DesignSystem-Chip--GenericChip')).toHaveClass('Chip-action--disabled');
+  });
+
+  it('disables today chip when disabledAfter is yesterday', () => {
+    const todayDate = new Date(Date.now());
+    const disabledAfter = new Date(todayDate);
+    disabledAfter.setDate(disabledAfter.getDate() - 1);
+    const { getByTestId } = render(<DatePicker disabledAfter={disabledAfter} view="date" />);
+    expect(getByTestId('DesignSystem-Chip--GenericChip')).toHaveClass('Chip-action--disabled');
+  });
+
+  it('disables today chip for inverted disabled range', () => {
+    const todayDate = new Date(Date.now());
+    const disabledBefore = new Date(todayDate);
+    disabledBefore.setDate(disabledBefore.getDate() + 1);
+    const disabledAfter = new Date(todayDate);
+    disabledAfter.setDate(disabledAfter.getDate() - 1);
+    const { getByTestId } = render(
+      <DatePicker disabledBefore={disabledBefore} disabledAfter={disabledAfter} view="date" />
+    );
+    expect(getByTestId('DesignSystem-Chip--GenericChip')).toHaveClass('Chip-action--disabled');
+  });
 });
 
 describe('renders DatePicker component Event Handlers ', () => {