♻️ Refator: use isSomedayFormOpen instead of draft.isOpen

Author: tyler-dane

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

@@ -15,6 +15,7 @@ export const useSidebar = (
     state,
     state.setDraft,
     state.setIsDrafting,
+    state.setIsSomedayFormOpen,
   );
   useSidebarEffects(util);
 

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

@@ -1,5 +1,5 @@
 import { useState, useEffect } from "react";
-import { Schema_GridEvent } from "@web/common/types/web.event.types";
+import { Schema_Event } from "@core/types/event.types";
 import { COLUMN_MONTH, COLUMN_WEEK } from "@web/common/constants/web.constants";
 import { Measurements_Grid } from "@web/views/Calendar/hooks/grid/useGridLayout";
 import { useAppSelector } from "@web/store/store.hooks";
@@ -18,13 +18,14 @@ export const useSidebarState = (measurements: Measurements_Grid) => {
 
   const { eventType: draftType } = useAppSelector(selectDraftStatus);
 
-  const [draft, setDraft] = useState<Schema_GridEvent | null>(null);
+  const [draft, setDraft] = useState<Schema_Event | null>(null);
   const [isDrafting, setIsDrafting] = useState(false);
   const [isDraftingExisting, setIsDraftingExisting] = useState(false);
+  const [isSomedayFormOpen, setIsSomedayFormOpen] = useState(false);
 
   const isDragging = isDrafting && draft !== null;
   const { isOverAllDayRow, isOverGrid, isOverMainGrid, mouseCoords } =
-    useMousePosition(isDragging, draft?.isOpen, measurements);
+    useMousePosition(isDragging, isSomedayFormOpen, measurements);
 
   const somedayWeekIds = somedayEvents.columns[COLUMN_WEEK]
     .eventIds as string[];
@@ -35,7 +36,8 @@ export const useSidebarState = (measurements: Measurements_Grid) => {
   const isDraftingNew =
     isDrafting && !isDraftingExisting && !somedayIds.includes(draft?._id);
 
-  const shouldPreviewOnGrid = draft !== null && isOverGrid && !draft?.isOpen;
+  const shouldPreviewOnGrid =
+    draft !== null && isOverGrid && !isSomedayFormOpen;
 
   return {
     draft,
@@ -56,6 +58,7 @@ export const useSidebarState = (measurements: Measurements_Grid) => {
     setDraft,
     setIsDrafting,
     setIsDraftingExisting,
+    setIsSomedayFormOpen,
     setSomedayEvents,
   };
 };

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

@@ -47,8 +47,9 @@ import { State_Sidebar } from "./useSidebarState";
 export const useSidebarUtil = (
   dateCalcs: DateCalcs,
   state: State_Sidebar,
-  setDraft: React.Dispatch<React.SetStateAction<Schema_GridEvent | null>>,
+  setDraft: React.Dispatch<React.SetStateAction<Schema_Event | null>>,
   setIsDrafting: React.Dispatch<React.SetStateAction<boolean>>,
+  setIsSomedayFormOpen: React.Dispatch<React.SetStateAction<boolean>>,
 ) => {
   const dispatch = useAppDispatch();
 
@@ -154,7 +155,8 @@ export const useSidebarUtil = (
       Categories_Event.SOMEDAY_WEEK,
     );
 
-    setDraft({ ...somedayDefault, isOpen: true });
+    setDraft(somedayDefault);
+    setIsSomedayFormOpen(true);
     setIsDrafting(true);
   }, [setDraft]);
 
@@ -184,10 +186,7 @@ export const useSidebarUtil = (
 
   const onDraft = (event: Schema_Event, category: Categories_Event) => {
     state.setIsDrafting(true);
-    state.setDraft({
-      ...event,
-      isOpen: true,
-    });
+    state.setDraft(event);
 
     dispatch(
       draftSlice.actions.start({