🧹 Chore: fix type issues in sidebar hooks

Author: tyler-dane

packages/web/src/views/Calendar/components/Draft/sidebar/context/SidebarDraftContext.tsx

@@ -1,13 +1,6 @@
 import { createContext } from "react";
-import { useDraftForm } from "../../hooks/state/useDraftForm";
 import { Actions_Sidebar } from "../hooks/useSidebarActions";
-import { Setters_Sidebar, State_Sidebar_Local } from "../hooks/useSidebarState";
-
-export type Props_SidebarForm = ReturnType<typeof useDraftForm>;
-
-export interface State_Sidebar extends State_Sidebar_Local {
-  formProps: Props_SidebarForm;
-}
+import { Setters_Sidebar, State_Sidebar } from "../hooks/useSidebarState";
 
 interface SidebarDraftContextValue {
   state: State_Sidebar;

packages/web/src/views/Calendar/components/Draft/sidebar/hooks/useSidebarActions.ts

@@ -28,6 +28,7 @@ import {
 } from "@web/common/utils/web.date.util";
 import {
   selectDraft,
+  selectDraftCategory,
   selectIsDrafting,
 } from "@web/ducks/events/selectors/draft.selectors";
 import {
@@ -43,11 +44,11 @@ import {
 import { getSomedayEventsSlice } from "@web/ducks/events/slices/someday.slice";
 import { useAppDispatch, useAppSelector } from "@web/store/store.hooks";
 import { DateCalcs } from "@web/views/Calendar/hooks/grid/useDateCalcs";
-import { Setters_Sidebar, State_Sidebar_Local } from "./useSidebarState";
+import { Setters_Sidebar, State_Sidebar } from "./useSidebarState";
 
 export const useSidebarActions = (
   dateCalcs: DateCalcs,
-  state: State_Sidebar_Local,
+  state: State_Sidebar,
   setters: Setters_Sidebar,
 ) => {
   const dispatch = useAppDispatch();
@@ -57,11 +58,11 @@ export const useSidebarActions = (
   const isAtMonthlyLimit = useAppSelector(selectIsAtMonthlyLimit);
   const { start, end } = useAppSelector(selectDatesInView);
   const reduxDraft = useAppSelector(selectDraft);
+  const draftType = useAppSelector(selectDraftCategory);
+
   const viewStart = dayjs(start);
   const viewEnd = dayjs(end);
 
-  const { draft, draftType } = state;
-
   const { setDraft, setIsDrafting, setIsSomedayFormOpen, setSomedayEvents } =
     setters;
 
@@ -165,14 +166,14 @@ export const useSidebarActions = (
   }, [setDraft]);
 
   const discard = useCallback(() => {
-    if (draft) {
+    if (state.draft) {
       setDraft(null);
     }
 
     if (reduxDraft) {
       dispatch(draftSlice.actions.discard());
     }
-  }, [dispatch, draft, reduxDraft]);
+  }, [dispatch, state.draft, reduxDraft]);
 
   const getDatesAfterDroppingOn = (
     target: "mainGrid" | "alldayRow",

packages/web/src/views/Calendar/components/Draft/sidebar/hooks/useSidebarState.ts

@@ -1,10 +1,7 @@
 import { useEffect, useState } from "react";
 import { Schema_Event } from "@core/types/event.types";
 import { COLUMN_MONTH, COLUMN_WEEK } from "@web/common/constants/web.constants";
-import {
-  selectDraftStatus,
-  selectIsDNDing,
-} from "@web/ducks/events/selectors/draft.selectors";
+import { selectIsDNDing } from "@web/ducks/events/selectors/draft.selectors";
 import { selectCategorizedEvents } from "@web/ducks/events/selectors/someday.selectors";
 import { useAppSelector } from "@web/store/store.hooks";
 import { Measurements_Grid } from "@web/views/Calendar/hooks/grid/useGridLayout";
@@ -72,5 +69,5 @@ export const useSidebarState = (measurements: Measurements_Grid) => {
 };
 
 type Hook_Sidebar = ReturnType<typeof useSidebarState>;
-export type State_Sidebar_Local = Hook_Sidebar["state"];
+export type State_Sidebar = Hook_Sidebar["state"];
 export type Setters_Sidebar = Hook_Sidebar["setters"];