diff --git a/packages/web/src/views/Calendar/components/Header/Header.tsx b/packages/web/src/views/Calendar/components/Header/Header.tsx index 926567a2d..3329f8948 100644 --- a/packages/web/src/views/Calendar/components/Header/Header.tsx +++ b/packages/web/src/views/Calendar/components/Header/Header.tsx @@ -1,4 +1,4 @@ -import { FC, useRef } from "react"; +import { FC } from "react"; import dayjs, { Dayjs } from "@core/util/date/dayjs"; import { theme } from "@web/common/styles/theme"; import { getCalendarHeadingLabel } from "@web/common/utils/datetime/web.date.util"; @@ -12,11 +12,9 @@ import { viewSlice } from "@web/ducks/events/slices/view.slice"; import { useAppDispatch, useAppSelector } from "@web/store/store.hooks"; import { RootProps } from "../../calendarView.types"; import { Util_Scroll } from "../../hooks/grid/useScroll"; -import { useReminderHotkey } from "../../hooks/shortcuts/useFocusHotkey"; import { WeekProps } from "../../hooks/useWeek"; import { TodayButton } from "../TodayButton/TodayButton"; import { DayLabels } from "./DayLabels"; -import { Reminder } from "./Reminder/Reminder"; import { ArrowNavigationButton, StyledHeaderLabel, @@ -51,10 +49,6 @@ export const Header: FC = ({ scrollUtil, today, weekProps }) => { scrollToNow(); }; - const reminderRef = useRef(null); - - useReminderHotkey(() => reminderRef.current?.focus(), [reminderRef]); - return ( <> @@ -76,7 +70,6 @@ export const Header: FC = ({ scrollUtil, today, weekProps }) => { {headerLabel} -
diff --git a/packages/web/src/views/Day/components/Header/Header.test.tsx b/packages/web/src/views/Day/components/Header/Header.test.tsx index 48a8bb0f6..8fe5c89bb 100644 --- a/packages/web/src/views/Day/components/Header/Header.test.tsx +++ b/packages/web/src/views/Day/components/Header/Header.test.tsx @@ -4,9 +4,23 @@ import { renderWithMemoryRouter } from "@web/__tests__/utils/providers/MemoryRou import { Header } from "./Header"; describe("Header", () => { - it("renders the header with reminder and view selector", async () => { + it("renders the header without reminder by default", async () => { await renderWithMemoryRouter(
); + // Check that Reminder component is NOT rendered by default + expect( + screen.queryByText("Click to add your reminder"), + ).not.toBeInTheDocument(); + + // Check that SelectView component is rendered + expect( + screen.getByRole("button", { name: /select view/i }), + ).toBeInTheDocument(); + }); + + it("renders the header with reminder when showReminder is true", async () => { + await renderWithMemoryRouter(
); + // Check that Reminder component is rendered (shows placeholder when no reminder) expect(screen.getByText("Click to add your reminder")).toBeInTheDocument(); @@ -17,7 +31,7 @@ describe("Header", () => { }); it("renders with proper layout structure", async () => { - await renderWithMemoryRouter(
); + await renderWithMemoryRouter(
); // Check that the header row exists (it should be a div with specific styling) // Since StyledHeaderRow is a styled div, we can check for the presence of its children diff --git a/packages/web/src/views/Day/components/Header/Header.tsx b/packages/web/src/views/Day/components/Header/Header.tsx index e4fa6dab2..a0c30cda6 100644 --- a/packages/web/src/views/Day/components/Header/Header.tsx +++ b/packages/web/src/views/Day/components/Header/Header.tsx @@ -8,16 +8,23 @@ import { } from "@web/views/Calendar/components/Header/styled"; import { useReminderHotkey } from "@web/views/Calendar/hooks/shortcuts/useFocusHotkey"; -export const Header: FC = () => { +interface HeaderProps { + showReminder?: boolean; +} + +export const Header: FC = ({ showReminder = false }) => { const reminderRef = useRef(null); - useReminderHotkey(() => reminderRef.current?.focus(), [reminderRef]); + useReminderHotkey( + showReminder ? () => reminderRef.current?.focus() : () => {}, + [reminderRef, showReminder], + ); return ( - + {showReminder && } diff --git a/packages/web/src/views/Now/view/NowView.tsx b/packages/web/src/views/Now/view/NowView.tsx index aa48aedf6..8c9b516fd 100644 --- a/packages/web/src/views/Now/view/NowView.tsx +++ b/packages/web/src/views/Now/view/NowView.tsx @@ -24,7 +24,7 @@ export const NowView = () => { -
+
, handlesKeyboardEvents: true, }, - { - id: ONBOARDING_STEP_IDS.REMINDER_INTRO_ONE, - component: (props: OnboardingStepProps) => , - disablePrevious: true, - }, - { - id: ONBOARDING_STEP_IDS.REMINDER_INTRO_TWO, - component: (props: OnboardingStepProps) => , - }, - { - id: ONBOARDING_STEP_IDS.SET_REMINDER, - component: (props: OnboardingStepProps) => , - }, - { - id: ONBOARDING_STEP_IDS.SET_REMINDER_SUCCESS, - component: (props: OnboardingStepProps) => ( - - ), - }, { id: ONBOARDING_STEP_IDS.SET_SOMEDAY_EVENTS_ONE, component: (props: OnboardingStepProps) => , + disablePrevious: true, }, { id: ONBOARDING_STEP_IDS.TASKS_INTRO, diff --git a/packages/web/src/views/Onboarding/constants/onboarding.constants.ts b/packages/web/src/views/Onboarding/constants/onboarding.constants.ts index 54db9181c..0c221d1bb 100644 --- a/packages/web/src/views/Onboarding/constants/onboarding.constants.ts +++ b/packages/web/src/views/Onboarding/constants/onboarding.constants.ts @@ -16,10 +16,6 @@ export const ONBOARDING_STEP_IDS = { WELCOME_NOTE_TWO: "welcome-note-two", SIGN_IN_WITH_GOOGLE_PRELUDE: "sign-in-with-google-prelude", SIGN_IN_WITH_GOOGLE: "sign-in-with-google", - REMINDER_INTRO_ONE: "reminder-intro-one", - REMINDER_INTRO_TWO: "reminder-intro-two", - SET_REMINDER: "set-reminder", - SET_REMINDER_SUCCESS: "set-reminder-success", SET_SOMEDAY_EVENTS_ONE: "set-someday-events-one", TASKS_INTRO: "tasks-intro", TASKS_TODAY: "tasks-today", diff --git a/packages/web/src/views/Onboarding/steps/index.ts b/packages/web/src/views/Onboarding/steps/index.ts index cef916bd0..b4ac132e3 100644 --- a/packages/web/src/views/Onboarding/steps/index.ts +++ b/packages/web/src/views/Onboarding/steps/index.ts @@ -5,8 +5,6 @@ export * from "./welcome/WelcomeNoteTwo"; export * from "./oauth/SignInWithGooglePrelude"; export * from "./oauth/SignInWithGoogle"; export * from "./oauth/SignInWithGoogleSuccess"; -export * from "./reminder/SetReminder"; -export * from "./reminder/SetReminderSuccess"; export * from "./tasks/DayTasksIntro/DayTasksIntro"; export * from "./tasks/TasksIntro/TasksIntro"; export * from "./outro/OutroTwo";