common type refactor

Author: aldabil21

src/lib/components/nav/WeekDateBtn.tsx

@@ -2,11 +2,11 @@ import { useState } from "react";
 import DateProvider from "../hoc/DateProvider";
 import { Button, Popover } from "@mui/material";
 import { endOfWeek, format, startOfWeek, addDays } from "date-fns";
-import { WeekProps } from "../../views/Week";
 import { LocaleArrow } from "../common/LocaleArrow";
 import { DateCalendar } from "@mui/x-date-pickers";
 import useStore from "../../hooks/useStore";
 import useArrowDisable from "../../hooks/useArrowDisable";
+import { WeekProps } from "../../types";
 
 interface WeekDateBtnProps {
   selectedDate: Date;

src/lib/types.ts

@@ -5,10 +5,7 @@ import { DragEvent } from "react";
 import { SelectOption } from "./components/inputs/SelectInput";
 import { View } from "./components/nav/Navigation";
 import { Store } from "./store/types";
-import { DayProps } from "./views/Day";
 import { StateItem } from "./views/Editor";
-import { MonthProps } from "./views/Month";
-import { WeekProps } from "./views/Week";
 import type { RRule } from "rrule";
 import type { JSX } from "react";
 
@@ -39,6 +36,33 @@ export type DayHours =
   | 23
   | 24;
 
+export type WeekDays = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+
+interface CommonWeekViewProps {
+  weekDays: WeekDays[];
+  weekStartOn: WeekDays;
+  disableGoToDay?: boolean;
+}
+
+interface CommonViewProps {
+  startHour: DayHours;
+  endHour: DayHours;
+  cellRenderer?(props: CellRenderedProps): JSX.Element;
+  headRenderer?(day: Date): JSX.Element;
+  navigation?: boolean;
+  step: number;
+}
+
+export interface MonthProps extends CommonWeekViewProps, CommonViewProps {}
+
+export interface WeekProps extends CommonWeekViewProps, CommonViewProps {
+  hourRenderer?(hour: string): JSX.Element;
+}
+
+export interface DayProps extends CommonViewProps {
+  hourRenderer?(hour: string): JSX.Element;
+}
+
 export interface CellRenderedProps {
   day: Date;
   start: Date;

src/lib/views/Day.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useCallback, Fragment, JSX } from "react";
+import { useEffect, useCallback, Fragment } from "react";
 import { Typography } from "@mui/material";
 import {
   format,
@@ -14,7 +14,7 @@ import {
 } from "date-fns";
 import TodayTypo from "../components/common/TodayTypo";
 import EventItem from "../components/events/EventItem";
-import { CellRenderedProps, DayHours, DefaultResource, ProcessedEvent } from "../types";
+import { DefaultResource, ProcessedEvent } from "../types";
 import {
   calcCellHeight,
   calcMinuteHeight,
@@ -31,16 +31,6 @@ import { MULTI_DAY_EVENT_HEIGHT } from "../helpers/constants";
 import useStore from "../hooks/useStore";
 import { DayAgenda } from "./DayAgenda";
 
-export interface DayProps {
-  startHour: DayHours;
-  endHour: DayHours;
-  step: number;
-  cellRenderer?(props: CellRenderedProps): JSX.Element;
-  headRenderer?(day: Date): JSX.Element;
-  hourRenderer?(hour: string): JSX.Element;
-  navigation?: boolean;
-}
-
 const Day = () => {
   const {
     day,

src/lib/views/Month.tsx

@@ -1,24 +1,12 @@
-import { useEffect, useCallback, JSX } from "react";
+import { useEffect, useCallback } from "react";
 import { addDays, eachWeekOfInterval, endOfMonth, startOfMonth } from "date-fns";
-import { CellRenderedProps, DayHours, DefaultResource } from "../types";
+import { DefaultResource } from "../types";
 import { getResourcedEvents, sortEventsByTheEarliest } from "../helpers/generals";
 import { WithResources } from "../components/common/WithResources";
 import useStore from "../hooks/useStore";
 import { MonthAgenda } from "./MonthAgenda";
 import MonthTable from "../components/month/MonthTable";
 
-export type WeekDays = 0 | 1 | 2 | 3 | 4 | 5 | 6;
-export interface MonthProps {
-  weekDays: WeekDays[];
-  weekStartOn: WeekDays;
-  startHour: DayHours;
-  endHour: DayHours;
-  cellRenderer?(props: CellRenderedProps): JSX.Element;
-  headRenderer?(day: Date): JSX.Element;
-  navigation?: boolean;
-  disableGoToDay?: boolean;
-}
-
 const Month = () => {
   const {
     month,

src/lib/views/Week.tsx

@@ -1,26 +1,12 @@
-import { useEffect, useCallback, JSX } from "react";
+import { useEffect, useCallback } from "react";
 import { startOfWeek, addDays, eachMinuteOfInterval, endOfDay, startOfDay, set } from "date-fns";
-import { CellRenderedProps, DayHours, DefaultResource } from "../types";
-import { WeekDays } from "./Month";
+import { DefaultResource } from "../types";
 import { calcCellHeight, calcMinuteHeight, getResourcedEvents } from "../helpers/generals";
 import { WithResources } from "../components/common/WithResources";
 import useStore from "../hooks/useStore";
 import { WeekAgenda } from "./WeekAgenda";
 import WeekTable from "../components/week/WeekTable";
 
-export interface WeekProps {
-  weekDays: WeekDays[];
-  weekStartOn: WeekDays;
-  startHour: DayHours;
-  endHour: DayHours;
-  step: number;
-  cellRenderer?(props: CellRenderedProps): JSX.Element;
-  headRenderer?(day: Date): JSX.Element;
-  hourRenderer?(hour: string): JSX.Element;
-  navigation?: boolean;
-  disableGoToDay?: boolean;
-}
-
 const Week = () => {
   const {
     week,