Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/web/src/views/Week/components/Draft/Draft.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ export const Draft: FC<Props> = ({ measurements, weekProps }) => {
startOfView: weekProps.query.startOfView,
endOfView: weekProps.query.endOfView,
});
const { setters, state } = useDraftContext();
const { actions, state } = useDraftContext();
const { draft, isDragging, isFormOpen, isResizing } = state;
const { setDraft } = setters;
const { setLocalDraft } = actions;
const gridDraftFromStore = useDraftStore(selectGridDraft);
const activity = useDraftStore(selectDraftActivity);

Expand All @@ -53,7 +53,7 @@ export const Draft: FC<Props> = ({ measurements, weekProps }) => {
gridDraftFromStore &&
(draft === null || activity === "eventRightClick")
) {
setDraft(gridDraftFromStore);
setLocalDraft(gridDraftFromStore);
}

// Sidebar edits write the shared draft store. Mirror into Week local draft
Expand All @@ -63,8 +63,8 @@ export const Draft: FC<Props> = ({ measurements, weekProps }) => {
return;
}

setDraft(gridDraftFromStore);
}, [gridDraftFromStore, isDragging, isFormOpen, isResizing, setDraft]);
setLocalDraft(gridDraftFromStore);
}, [gridDraftFromStore, isDragging, isFormOpen, isResizing, setLocalDraft]);

// GridEvent-shaped projection of the canonical GridEventDraft, for
// the still-unconverted grid-layout helpers below (deck layout, all-day
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import { createContext } from "react";
import { type Actions_Draft } from "../hooks/actions/useDraftActions";
import {
type Setters_Draft,
type State_Draft_Local,
} from "../hooks/state/useDraftState";
import { type State_Draft_Local } from "../hooks/state/useDraftState";

export type State_Draft = State_Draft_Local;

interface DraftContextValue {
state: State_Draft;
setters: Setters_Draft;
actions: Actions_Draft;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const DraftProvider = ({
const actions = useDraftActions(state, setters, dateCalcs, weekProps);

return (
<DraftContext.Provider value={{ state, setters, actions }}>
<DraftContext.Provider value={{ state, actions }}>
{children}
</DraftContext.Provider>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@ const renderGridDraft = ({
startDragging: mock(),
startResizing: mock(),
},
setters: {
setDraft: mock(),
},
state: {
draft,
dragOffset: { x: 0, y: 0 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ export const useDraftActions = (
openForm,
repositionDraftByKeyboard,
resize,
setLocalDraft: setDraft,
startDragging: (offset?: DragOffset) => {
// Placing `setIsFormOpenBeforeDragging` here rather than inside `startDragging`
// because `setIsFormOpenBeforeDragging` depends on `isFormOpen` and re-calculates
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ const renderMainGrid = () => {
value={
{
actions,
setters: {},
state: {},
} as never
}
Expand Down Expand Up @@ -276,7 +275,6 @@ const renderGridRegions = () => {
stopDragging: mock(),
stopResizing: mock(),
},
setters: {},
state: {},
} as never
}
Expand Down Expand Up @@ -317,7 +315,6 @@ const renderWeekGrid = (events: CompassEvent[] = []) => {
stopDragging: mock(),
stopResizing: mock(),
},
setters: {},
state: {},
} as never
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ const renderMainGridEvents = () =>
value={
{
actions: { stopDragging: mock(), stopResizing: mock() },
setters: {},
state: {},
} as never
}
Expand All @@ -190,7 +189,6 @@ const renderAllDayEvents = () =>
value={
{
actions: { stopDragging: mock(), stopResizing: mock() },
setters: {},
state: {},
} as never
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ const renderShortcuts = (options?: {
value={
{
actions: { repositionDraftByKeyboard },
setters: {},
state: {},
} as never
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const WeekInteractionCoordinator: FC<Props> = ({
startOfView: weekProps.query.startOfView,
endOfView: weekProps.query.endOfView,
});
const { actions, setters, state } = useDraftContext();
const { actions, state } = useDraftContext();
const updateEvent = useUpdateEvent();
const activeInteractionEventRef = useRef<Event | null>(null);
const layoutSourcesRef = useRef(getLayoutSources);
Expand Down Expand Up @@ -144,7 +144,7 @@ export const WeekInteractionCoordinator: FC<Props> = ({
if (result.hadFormOpenBeforeInteraction) {
const draft = gridEventDraftFromSavedResult(result.event);
if (draft) {
setters.setDraft(draft);
actions.setLocalDraft(draft);
draftActions.setGridDraft(draft);
}

Expand Down