chore: update Dayzed types (#373)

* chore(deps): bump dayzed from 3.1.0 to 3.2.1

Bumps [dayzed](https://github.com/deseretdigital/dayzed) from 3.1.0 to 3.2.1.
- [Release notes](https://github.com/deseretdigital/dayzed/releases)
- [Commits](deseretdigital/dayzed@v3.1.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* chore(types): use types from dayzed itself

* chore(deps): add @types/classnames

* fix(tests): update tests for "Today" related code

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Author: arthurdenner

package.json

@@ -39,7 +39,7 @@
     "classnames": "2.2.6",
     "core-js": "3.6.5",
     "date-fns": "2.15.0",
-    "dayzed": "3.1.0",
+    "dayzed": "3.2.1",
     "format-string-by-pattern": "1.2.1",
     "react-fast-compare": "3.2.0"
   },
@@ -51,6 +51,7 @@
     "@testing-library/jest-dom": "5.11.4",
     "@testing-library/react": "10.4.9",
     "@testing-library/user-event": "12.1.2",
+    "@types/classnames": "2.2.10",
     "@types/jest": "26.0.10",
     "@types/storybook__react": "5.2.1",
     "autoprefixer": "9.8.6",

src/__tests__/utils.test.ts

@@ -116,6 +116,8 @@ describe('getToday', () => {
   it('should return the correct result if `today` is not selectable', () => {
     expect(getToday(june14, june28)).toEqual({
       date: today,
+      nextMonth: false,
+      prevMonth: false,
       selectable: false,
       selected: false,
       today: true,
@@ -125,6 +127,8 @@ describe('getToday', () => {
   it('should return the correct result if `today` is selectable', () => {
     expect(getToday(june14)).toEqual({
       date: today,
+      nextMonth: false,
+      prevMonth: false,
       selectable: true,
       selected: false,
       today: true,

src/components/calendar/calendar.tsx

@@ -1,19 +1,15 @@
 import cn from 'classnames';
 import React, { Fragment } from 'react';
 import { Segment } from 'semantic-ui-react';
-import { Locale, SemanticDatepickerProps } from 'types';
+import { Locale, RenderProps, SemanticDatepickerProps } from 'types';
 import { getShortDate, getToday } from '../../utils';
 import Button from '../button';
 import CalendarCell from '../cell';
 import TodayButton from '../today-button';
 import './calendar.css';
 
-type CalendarProps = {
-  calendars: any[];
+interface CalendarProps extends RenderProps {
   filterDate: (date: Date) => boolean;
-  getBackProps: (props: any) => void;
-  getDateProps: (props: any) => void;
-  getForwardProps: (props: any) => void;
   inline: SemanticDatepickerProps['inline'];
   maxDate?: Date;
   minDate?: Date;
@@ -26,7 +22,7 @@ type CalendarProps = {
   showToday: SemanticDatepickerProps['showToday'];
   todayButton: string;
   weekdays: Locale['weekdays'];
-};
+}
 
 const styles: { [key: string]: React.CSSProperties } = {
   leftBtn: { textAlign: 'start' },

src/components/today-button.tsx

@@ -1,22 +1,22 @@
 import React from 'react';
+import { DateObj } from 'dayzed';
 import { Button } from 'semantic-ui-react';
 
-type TodayButtonProps = {
+interface TodayButtonProps extends DateObj {
   end?: boolean;
   hovered?: boolean;
   inRange?: boolean;
-  selectable?: boolean;
-  selected?: boolean;
   start?: boolean;
-  today?: boolean;
-};
+}
 
 const style: React.CSSProperties = { marginTop: 10 };
 
 const TodayButton: React.FC<TodayButtonProps> = ({
   end,
   hovered,
   inRange,
+  nextMonth,
+  prevMonth,
   selectable,
   selected,
   start,

src/pickers/base.tsx

@@ -1,9 +1,9 @@
 import Dayzed from 'dayzed';
 import React from 'react';
-import { DayzedProps } from '../types';
+import { BaseDatePickerProps } from '../types';
 import { getArrowKeyHandlers } from './utils';
 
-class BaseDatePicker extends React.Component<DayzedProps> {
+class BaseDatePicker extends React.Component<BaseDatePickerProps> {
   state = {
     offset: 0,
   };

src/types/index.ts

@@ -1,3 +1,4 @@
+import { Props as DayzedProps, RenderProps } from 'dayzed';
 import { FormInputProps, SemanticICONS } from 'semantic-ui-react';
 
 export type Object = { [key: string]: any };
@@ -77,29 +78,21 @@ export type SemanticDatepickerProps = PickedDayzedProps &
     showToday: boolean;
     type: 'basic' | 'range';
     datePickerOnly: boolean;
-    value: DayzedProps['selected'];
+    value: DayzedProps['selected'] | null;
   };
 
-export type DayzedProps = {
-  children: (children: any) => React.ReactNode;
-  date?: Date;
-  firstDayOfWeek: number;
-  maxDate?: Date;
-  minDate?: Date;
-  monthsToDisplay: number;
-  offset: number;
-  onDateSelected: (dateObj: any, event: React.SyntheticEvent) => void;
-  onOffsetChanged: () => void;
-  selected: Date | Date[] | null;
-  showOutsideDays: boolean;
+export type BaseDatePickerProps = DayzedProps & {
+  children: any;
 };
 
-export type BasicDatePickerProps = DayzedProps & {
+export interface BasicDatePickerProps extends BaseDatePickerProps {
   onChange: (event: React.SyntheticEvent, date: Date | null) => void;
   selected: Date;
-};
+}
 
-export type RangeDatePickerProps = DayzedProps & {
+export interface RangeDatePickerProps extends BaseDatePickerProps {
   onChange: (event: React.SyntheticEvent, dates: Date[] | null) => void;
   selected: Date[];
-};
+}
+
+export { DayzedProps, RenderProps };

src/utils.ts

@@ -1,11 +1,11 @@
+import { convertTokens } from '@date-fns/upgrade/v2';
+import { parse } from 'date-fns';
 import format from 'date-fns/format';
 import isBefore from 'date-fns/isBefore';
 import startOfDay from 'date-fns/startOfDay';
+import { DateObj } from 'dayzed';
 import { Object } from './types';
 
-import { convertTokens } from '@date-fns/upgrade/v2';
-import { parse } from 'date-fns';
-
 export const isSelectable = (date: Date, minDate?: Date, maxDate?: Date) => {
   if (
     (minDate && isBefore(date, minDate)) ||
@@ -17,11 +17,13 @@ export const isSelectable = (date: Date, minDate?: Date, maxDate?: Date) => {
   return true;
 };
 
-export const getToday = (minDate?: Date, maxDate?: Date) => {
+export const getToday = (minDate?: Date, maxDate?: Date): DateObj => {
   const today = new Date();
 
   return {
     date: startOfDay(today),
+    nextMonth: false,
+    prevMonth: false,
     selectable: isSelectable(today, minDate, maxDate),
     selected: false,
     today: true,
@@ -49,11 +51,11 @@ export const pick = (keysToPick: string[], obj: Object) => {
   return newObj;
 };
 
-export const moveElementsByN = (n: number, arr: any[]) =>
+export const moveElementsByN = <T>(n: number, arr: T[]) =>
   arr.slice(n).concat(arr.slice(0, n));
 
 export const formatSelectedDate = (
-  selectedDate: Date | Date[] | null,
+  selectedDate: Date | Date[] | null | undefined,
   dateFormat: string
 ) => {
   if (!selectedDate) {

yarn.lock

@@ -2766,6 +2766,11 @@
   resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb"
   integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==
 
+"@types/[email protected]":
+  version "2.2.10"
+  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.10.tgz#cc658ca319b6355399efc1f5b9e818f1a24bf999"
+  integrity sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -5767,10 +5772,10 @@ date-now@^0.1.4:
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
   integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
-dayzed@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/dayzed/-/dayzed-3.1.0.tgz#ca02d0e02828f2ebdfe100bf834f0a888af1c05a"
-  integrity sha512-Mwb/T78ppKDIoXsNgSLfIYfIO7ylal+vKp8VVMzK6rQq4VJSE7AdrGFN2EQDmve037J9TKZo06mX+QuuKQ2raA==
+dayzed@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/dayzed/-/dayzed-3.2.1.tgz#0387abfcaf9da57128ddcf92dfc3e2fceea5fcde"
+  integrity sha512-3jnjfUOGxGA31iYAR2QfiDzWVfl3ccejm7/ya5P1gYpOtc9b4PEcl0xUAf7f74czEteAC/oPQCspNv/LAJlIYw==
   dependencies:
     "@babel/runtime" "^7.6.2"
     date-fns "^2.0.0"